Allow to configure Radarr v5 automatically.

Closes #889
theotherp · Sep 11, 2023 · c66b70f · c66b70f
1 parent a749219
commit c66b70f
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 40 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>nzbhydra2</artifactId>
-        <version>5.1.10</version>
+        <version>5.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>core</artifactId>
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>org.nzbhydra</groupId>
             <artifactId>mapping</artifactId>
-            <version>5.1.10</version>
+            <version>5.1.11-SNAPSHOT</version>
         </dependency>
 
         <!-- spring (boot) -->

diff --git a/core/src/main/java/org/nzbhydra/externaltools/ExternalTools.java b/core/src/main/java/org/nzbhydra/externaltools/ExternalTools.java
@@ -216,7 +216,7 @@ private boolean failOnUnknownVersion(AddRequest addRequest) throws IOException {
             }
         } else if (addRequest.getExternalTool() == AddRequest.ExternalTool.Radarrv3) {
             //For some reason some radarr v3 builds return 10.xxx instead of 3.xxx
-            if (version == null || (!version.startsWith("3") && !version.startsWith("4") && !version.startsWith("10"))) {
+            if (version == null || (!version.startsWith("3") && !version.startsWith("4") && !version.startsWith("5") && !version.startsWith("10"))) {
                 messages.add("Error: configuration for v3 but returned version is " + version);
                 throw new IOException("Error: configuration for v3 but returned version is " + version);
             }

diff --git a/core/src/main/resources/changelog.yaml b/core/src/main/resources/changelog.yaml
@@ -1,4 +1,10 @@
 #@formatter:off
+-   version: "v5.1.11"
+    date: "2023-09-1"
+    changes:
+        -   type: "fix"
+            text: "Allow to configure Radarr v5 automatically. See #889"
+    final: true
 -   version: "v5.1.10"
     date: "2023-07-21"
     changes:

diff --git a/docker/radarr/data/config.xml b/docker/radarr/data/config.xml
@@ -1,16 +1,17 @@
 <Config>
-    <LogLevel>info</LogLevel>
-    <UrlBase></UrlBase>
-    <UpdateMechanism>Docker</UpdateMechanism>
-    <BindAddress>*</BindAddress>
-    <Port>7878</Port>
-    <SslPort>9898</SslPort>
-    <EnableSsl>False</EnableSsl>
-    <LaunchBrowser>True</LaunchBrowser>
-    <ApiKey>apikey</ApiKey>
-    <AuthenticationMethod>None</AuthenticationMethod>
-    <Branch>master</Branch>
-    <SslCertPath></SslCertPath>
-    <SslCertPassword></SslCertPassword>
-    <InstanceName>Radarr</InstanceName>
-</Config>
+  <LogLevel>info</LogLevel>
+  <UrlBase></UrlBase>
+  <UpdateMechanism>Docker</UpdateMechanism>
+  <BindAddress>*</BindAddress>
+  <Port>7878</Port>
+  <SslPort>9898</SslPort>
+  <EnableSsl>False</EnableSsl>
+  <LaunchBrowser>True</LaunchBrowser>
+  <ApiKey>apikey</ApiKey>
+  <AuthenticationMethod>Basic</AuthenticationMethod>
+  <Branch>nightly</Branch>
+  <SslCertPath></SslCertPath>
+  <SslCertPassword></SslCertPassword>
+  <InstanceName>Radarr</InstanceName>
+  <AuthenticationRequired>DisabledForLocalAddresses</AuthenticationRequired>
+</Config>
diff --git a/docker/radarr/docker-compose.yml b/docker/radarr/docker-compose.yml
@@ -2,13 +2,15 @@
 version: "2.1"
 services:
     radarr:
-        image: lscr.io/linuxserver/radarr:latest
+        image: lscr.io/linuxserver/radarr:5.0.2-nightly
         container_name: radarr
         environment:
             - PUID=1000
             - PGID=1000
             - TZ=Europe/London
         volumes:
             - ./data:/config
+        extra_hosts:
+            - "host.docker.internal:host-gateway"
         ports:
             - 7878:7878
diff --git a/other/mockserver/pom.xml b/other/mockserver/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.nzbhydra</groupId>
             <artifactId>mapping</artifactId>
-            <version>5.1.10</version>
+            <version>5.1.11-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jaxb-impl</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.nzbhydra</groupId>
     <artifactId>nzbhydra2</artifactId>
     <packaging>pom</packaging>
-    <version>5.1.10</version>
+    <version>5.1.11-SNAPSHOT</version>
 
     <modules>
         <module>shared</module>

diff --git a/releases/generic-release/pom.xml b/releases/generic-release/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>releases</artifactId>
-        <version>5.1.10</version>
+        <version>5.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>generic-release</artifactId>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.nzbhydra</groupId>
             <artifactId>core</artifactId>
-            <version>5.1.10</version>
+            <version>5.1.11-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/releases/linux-amd64-release/pom.xml b/releases/linux-amd64-release/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>releases</artifactId>
-        <version>5.1.10</version>
+        <version>5.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>linux-amd64-release</artifactId>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.nzbhydra</groupId>
             <artifactId>core</artifactId>
-            <version>5.1.10</version>
+            <version>5.1.11-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/releases/linux-arm64-release/pom.xml b/releases/linux-arm64-release/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>releases</artifactId>
-        <version>5.1.10</version>
+        <version>5.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>linux-arm64-release</artifactId>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.nzbhydra</groupId>
             <artifactId>core</artifactId>
-            <version>5.1.10</version>
+            <version>5.1.11-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/releases/pom.xml b/releases/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>nzbhydra2</artifactId>
-        <version>5.1.10</version>
+        <version>5.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>releases</artifactId>
     <packaging>pom</packaging>
-    <version>5.1.10</version>
+    <version>5.1.11-SNAPSHOT</version>
 
     <modules>
         <module>generic-release</module>

diff --git a/releases/windows-release/pom.xml b/releases/windows-release/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>releases</artifactId>
-        <version>5.1.10</version>
+        <version>5.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>windows-release</artifactId>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.nzbhydra</groupId>
             <artifactId>core</artifactId>
-            <version>5.1.10</version>
+            <version>5.1.11-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/shared/assertions/pom.xml b/shared/assertions/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>shared</artifactId>
-        <version>5.1.10</version>
+        <version>5.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>assertions</artifactId>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.nzbhydra</groupId>
             <artifactId>mapping</artifactId>
-            <version>5.1.10</version>
+            <version>5.1.11-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>

diff --git a/shared/mapping/pom.xml b/shared/mapping/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>shared</artifactId>
-        <version>5.1.10</version>
+        <version>5.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>mapping</artifactId>

diff --git a/shared/pom.xml b/shared/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>nzbhydra2</artifactId>
-        <version>5.1.10</version>
+        <version>5.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>shared</artifactId>
     <packaging>pom</packaging>
-    <version>5.1.10</version>
+    <version>5.1.11-SNAPSHOT</version>
 
     <modules>
         <module>mapping</module>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>nzbhydra2</artifactId>
-        <version>5.1.10</version>
+        <version>5.1.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>tests</artifactId>

diff --git a/tests/system/pom.xml b/tests/system/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.nzbhydra</groupId>
         <artifactId>tests</artifactId>
-        <version>5.1.10</version>
+        <version>5.1.11-SNAPSHOT</version>
     </parent>
 
     <groupId>org.nzbhydra.tests</groupId>
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.nzbhydra</groupId>
             <artifactId>mapping</artifactId>
-            <version>5.1.10</version>
+            <version>5.1.11-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.github.docker-java</groupId>
@@ -128,7 +128,7 @@
         <dependency>
             <groupId>org.nzbhydra</groupId>
             <artifactId>assertions</artifactId>
-            <version>5.1.10</version>
+            <version>5.1.11-SNAPSHOT</version>
         </dependency>