Fix trailing slash bug when configuring external tools

theotherp · Feb 18, 2024 · 6c53be5 · 6c53be5
1 parent 93990b0
commit 6c53be5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/core/src/main/java/org/nzbhydra/searching/cleanup/HistoryCleanupTask.java b/core/src/main/java/org/nzbhydra/searching/cleanup/HistoryCleanupTask.java
@@ -70,8 +70,9 @@ public void deleteOldResults() {
             Optional<Integer> optionalHighestId;
             Instant deleteOlderThanHistory;
             if (keepHistory) {
-                logger.info("Starting deletion of old history entries");
-                deleteOlderThanHistory = Instant.now().minus(keepSearchResultsForWeeks * 7, ChronoUnit.DAYS);
+                int keepDays = keepSearchResultsForWeeks * 7;
+                logger.info("Starting deletion of old history entries older than {} days", keepDays);
+                deleteOlderThanHistory = Instant.now().minus(keepDays, ChronoUnit.DAYS);
                 optionalHighestId = getIdBefore(deleteOlderThanHistory, "SEARCH", ASC_DESC.DESC, connection);
             } else {
                 optionalHighestId = Optional.of(Integer.MAX_VALUE);

diff --git a/core/src/main/resources/static/js/nzbhydra.js b/core/src/main/resources/static/js/nzbhydra.js
@@ -5901,6 +5901,7 @@ function ConfigService($http, $q, $cacheFactory, $uibModal, bootstrapped, Reques
             growl.error("No usenet or torrent indexers configured");
         }
 
+
         $scope.nzbhydraName = "NZBHydra2";
         $scope.xdarrHost = "http://localhost:"
         $scope.addType = "SINGLE";
@@ -5916,7 +5917,7 @@ function ConfigService($http, $q, $cacheFactory, $uibModal, bootstrapped, Reques
             $scope.xdarrHost += "8989";
             $scope.categories = "5030,5040";
             if (externalTool === "Sonarrv3") {
-                $scope.externalToolDisplayName = "Sonarr v3";
+                $scope.externalToolDisplayName = "Sonarr v3+";
             }
         } else if (externalTool === "Radarr" || externalTool === "Radarrv3") {
             $scope.xdarrHost += "7878";

diff --git a/core/src/main/resources/static/js/nzbhydra.js.map b/core/src/main/resources/static/js/nzbhydra.js.map
diff --git a/core/ui-src/js/config/config-service.js b/core/ui-src/js/config/config-service.js
@@ -138,6 +138,7 @@ function ConfigService($http, $q, $cacheFactory, $uibModal, bootstrapped, Reques
             growl.error("No usenet or torrent indexers configured");
         }
 
+
         $scope.nzbhydraName = "NZBHydra2";
         $scope.xdarrHost = "http://localhost:"
         $scope.addType = "SINGLE";
@@ -153,7 +154,7 @@ function ConfigService($http, $q, $cacheFactory, $uibModal, bootstrapped, Reques
             $scope.xdarrHost += "8989";
             $scope.categories = "5030,5040";
             if (externalTool === "Sonarrv3") {
-                $scope.externalToolDisplayName = "Sonarr v3";
+                $scope.externalToolDisplayName = "Sonarr v3+";
             }
         } else if (externalTool === "Radarr" || externalTool === "Radarrv3") {
             $scope.xdarrHost += "7878";

diff --git a/shared/mapping/src/main/java/org/nzbhydra/externaltools/AddRequest.java b/shared/mapping/src/main/java/org/nzbhydra/externaltools/AddRequest.java
@@ -18,6 +18,7 @@
 
 import lombok.Data;
 import org.nzbhydra.springnative.ReflectionMarker;
+import org.springframework.util.StringUtils;
 
 @Data
 @ReflectionMarker
@@ -82,4 +83,8 @@ public boolean isV3() {
     private Integer priority;
     private boolean useHydraPriorities;
 
+    public String getXdarrHost() {
+        return
+                StringUtils.trimTrailingCharacter(xdarrHost, '/');
+    }
 }