Sonarr v3 compatibility (#59)

nylonee · Dec 19, 2023 · dcbbc34 · dcbbc34
1 parent 76e4261
commit dcbbc34
Show file tree

Hide file tree

Showing 11 changed files with 519 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ upon startup of the app, where the logs will list the movies/tv shows that are o
 ### Requirements
 
 * Plex Pass Subscription
-* Sonarr v4 or higher
+* Sonarr v3 or higher
 * Radarr v3 or higher
 * Friends must change their privacy settings so that the main user can see their watchlists
 * Docker or Java
@@ -65,9 +65,9 @@ Docker tag options:
 Running this using native java requires the fat jar, download the latest from the Releases tab, and run:
 
 ```bash
-java -Dsonarr.apikey=YOUR_API_KEY\
-  -Dradarr.apikey=YOUR_API_KEY\
-  -Dplex.token=YOUR_PLEX_TOKEN\
+java "-Dsonarr.apikey=YOUR_API_KEY"\
+  "-Dradarr.apikey=YOUR_API_KEY"\
+  "-Dplex.token=YOUR_PLEX_TOKEN"\
   -Xmx100m\
   -jar watchlistarr.java
 ```

diff --git a/src/main/scala/configuration/Configuration.scala b/src/main/scala/configuration/Configuration.scala
@@ -12,6 +12,7 @@ case class Configuration(
                           sonarrRootFolder: String,
                           sonarrBypassIgnored: Boolean,
                           sonarrSeasonMonitoring: String,
+                          sonarrLanguageProfileId: Int,
                           radarrBaseUrl: Uri,
                           radarrApiKey: String,
                           radarrQualityProfileId: Int,

diff --git a/src/main/scala/configuration/ConfigurationUtils.scala b/src/main/scala/configuration/ConfigurationUtils.scala
@@ -19,7 +19,7 @@ object ConfigurationUtils {
     for {
       sonarrConfig <- getSonarrConfig(configReader, client)
       refreshInterval = configReader.getConfigOption(Keys.intervalSeconds).flatMap(_.toIntOption).getOrElse(60).seconds
-      (sonarrBaseUrl, sonarrApiKey, sonarrQualityProfileId, sonarrRootFolder) = sonarrConfig
+      (sonarrBaseUrl, sonarrApiKey, sonarrQualityProfileId, sonarrRootFolder, sonarrLanguageProfileId) = sonarrConfig
       sonarrBypassIgnored = configReader.getConfigOption(Keys.sonarrBypassIgnored).exists(_.toBoolean)
       sonarrSeasonMonitoring = configReader.getConfigOption(Keys.sonarrSeasonMonitoring).getOrElse("all")
       radarrConfig <- getRadarrConfig(configReader, client)
@@ -36,6 +36,7 @@ object ConfigurationUtils {
       sonarrRootFolder,
       sonarrBypassIgnored,
       sonarrSeasonMonitoring,
+      sonarrLanguageProfileId,
       radarrBaseUrl,
       radarrApiKey,
       radarrQualityProfileId,
@@ -46,31 +47,42 @@ object ConfigurationUtils {
       skipFriendSync
     )
 
-  private def getSonarrConfig(configReader: ConfigurationReader, client: HttpClient): IO[(Uri, String, Int, String)] = {
+  private def getSonarrConfig(configReader: ConfigurationReader, client: HttpClient): IO[(Uri, String, Int, String, Int)] = {
     val url = configReader.getConfigOption(Keys.sonarrBaseUrl).flatMap(Uri.fromString(_).toOption).getOrElse {
       val default = "http://localhost:8989"
       logger.warn(s"Unable to fetch sonarr baseUrl, using default $default")
       Uri.unsafeFromString(default)
     }
     val apiKey = configReader.getConfigOption(Keys.sonarrApiKey).getOrElse(throwError("Unable to find sonarr API key"))
 
-    getToArr(client)(url, apiKey, "rootFolder").map {
-      case Right(res) =>
-        logger.info("Successfully connected to Sonarr")
-        val allRootFolders = res.as[List[RootFolder]].getOrElse(List.empty)
-        selectRootFolder(allRootFolders, configReader.getConfigOption(Keys.sonarrRootFolder))
-      case Left(err) =>
-        throwError(s"Unable to connect to Sonarr at $url, with error $err")
-    }.flatMap(rootFolder =>
-      getToArr(client)(url, apiKey, "qualityprofile").map {
+    for {
+      rootFolder <- getToArr(client)(url, apiKey, "rootFolder").map {
+        case Right(res) =>
+          logger.info("Successfully connected to Sonarr")
+          val allRootFolders = res.as[List[RootFolder]].getOrElse(List.empty)
+          selectRootFolder(allRootFolders, configReader.getConfigOption(Keys.sonarrRootFolder))
+        case Left(err) =>
+          throwError(s"Unable to connect to Sonarr at $url, with error $err")
+      }
+      qualityProfileId <- getToArr(client)(url, apiKey, "qualityprofile").map {
         case Right(res) =>
           val allQualityProfiles = res.as[List[QualityProfile]].getOrElse(List.empty)
           val chosenQualityProfile = configReader.getConfigOption(Keys.sonarrQualityProfile)
-          (url, apiKey, getQualityProfileId(allQualityProfiles, chosenQualityProfile), rootFolder)
+          getQualityProfileId(allQualityProfiles, chosenQualityProfile)
         case Left(err) =>
           throwError(s"Unable to connect to Sonarr at $url, with error $err")
       }
-    )
+      languageProfileId <- getToArr(client)(url, apiKey, "languageprofile").map {
+        case Right(res) =>
+          val allLanguageProfiles = res.as[List[LanguageProfile]].getOrElse(List.empty)
+          allLanguageProfiles.headOption.map(_.id).getOrElse {
+            logger.warn("Unable to find a language profile, using 1 as default")
+            1
+          }
+        case Left(err) =>
+          throwError(s"Unable to connect to Sonarr at $url, with error $err")
+      }
+    } yield (url, apiKey, qualityProfileId, rootFolder, languageProfileId)
   }
 
   private def getRadarrConfig(configReader: ConfigurationReader, client: HttpClient): IO[(Uri, String, Int, String)] = {

diff --git a/src/main/scala/configuration/LanguageProfile.scala b/src/main/scala/configuration/LanguageProfile.scala
@@ -0,0 +1,3 @@
+package configuration
+
+private[configuration] case class LanguageProfile(name: String, id: Int)
diff --git a/src/main/scala/sonarr/SonarrPost.scala b/src/main/scala/sonarr/SonarrPost.scala
@@ -1,3 +1,11 @@
 package sonarr
 
-private[sonarr] case class SonarrPost(title: String, tvdbId: Long, qualityProfileId: Int, rootFolderPath: String, addOptions: SonarrAddOptions, monitored: Boolean = true)
+private[sonarr] case class SonarrPost(
+                                       title: String,
+                                       tvdbId: Long,
+                                       qualityProfileId: Int,
+                                       rootFolderPath: String,
+                                       addOptions: SonarrAddOptions,
+                                       languageProfileId: Int,
+                                       monitored: Boolean = true
+                                     )
diff --git a/src/main/scala/sonarr/SonarrUtils.scala b/src/main/scala/sonarr/SonarrUtils.scala
@@ -28,7 +28,14 @@ trait SonarrUtils extends SonarrConversions {
   protected def addToSonarr(client: HttpClient)(config: Configuration)(item: Item): IO[Unit] = {
 
     val addOptions = SonarrAddOptions(config.sonarrSeasonMonitoring)
-    val show = SonarrPost(item.title, item.getTvdbId.getOrElse(0L), config.sonarrQualityProfileId, config.sonarrRootFolder, addOptions)
+    val show = SonarrPost(
+      item.title,
+      item.getTvdbId.getOrElse(0L),
+      config.sonarrQualityProfileId,
+      config.sonarrRootFolder,
+      addOptions,
+      config.sonarrLanguageProfileId,
+    )
 
     val result = postToArr[Unit](client)(config.sonarrBaseUrl, config.sonarrApiKey, "series")(show.asJson)
       .fold(