diff --git a/VERSION b/VERSION index fd208d20..6e85ef33 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.0-develop32 +1.18.0-develop33 diff --git a/docs/config/radarr.md b/docs/config/radarr.md index ce4dc2eb..7db18774 100644 --- a/docs/config/radarr.md +++ b/docs/config/radarr.md @@ -16,7 +16,7 @@ radarr: add_missing: false add_existing: false root_folder_path: S:/Movies - monitor: true + monitor: movie availability: announced quality_profile: HD-1080p tag: pmm @@ -33,7 +33,7 @@ radarr: | `add_existing` | Adds all existing movies in collections to Radarr.
Use the `radarr_add_existing` [Radarr Details](../metadata/details/arr.md#radarr-definition-settings) in the collection definition to add existing per collection.
**boolean:** true or false | false | ❌ | | `upgrade_existing` | Upgrades all existing movies in collections to match the Quality Profile of the collection.
Use the `radarr_upgrade_existing` [Radarr Details](../metadata/details/arr.md#radarr-definition-settings) in the collection definition to upgrade the Quality Profile per collection.
**boolean:** true or false | false | ❌ | | `root_folder_path` | Default Root Folder Path to use when adding new movies.
Use the `radarr_folder` [Radarr Details](../metadata/details/arr.md#radarr-definition-settings) in the collection definition to set the Root Folder per collection. | N/A | ✅ | -| `monitor` | Monitor the movie when adding new movies.
Use the `radarr_monitor` [Radarr Details](../metadata/details/arr.md#radarr-definition-settings) in the collection definition to set the Monitor value per collection. | true | ❌ | +| `monitor` | Monitor the movie when adding new movies.
Use the `radarr_monitor` [Radarr Details](../metadata/details/arr.md#radarr-definition-settings) in the collection definition to set the Monitor value per collection.
**Options:** `movie`, `collection`, `none` | true | ❌ | | `availability` | Default Minimum Availability to use when adding new movies.
Use the `radarr_availability` [Radarr Details](../metadata/details/arr.md#radarr-definition-settings) in the collection definition to set the Availability per collection.
**Options:** `announced`, `cinemas`, `released`, `db` | `announced` | ✅ | | `quality_profile` | Default Quality Profile to use when adding new movies.
Use the `radarr_quality` [Radarr Details](../metadata/details/arr.md#radarr-definition-settings) in the collection definition to set the Quality Profile per collection. | N/A | ❌ | | `tag` | Default this list or comma-separated string of tags to use when adding new movies.
Use the `radarr_tag` [Radarr Details](../metadata/details/arr.md#radarr-definition-settings) in the collection definition to set the Tags per collection. | ` ` | ❌ | @@ -76,7 +76,7 @@ radarr: add_existing: false upgrade_existing: false root_folder_path: /movies - monitor: true + monitor: movie availability: released quality_profile: Any tag: diff --git a/docs/metadata/details/arr.md b/docs/metadata/details/arr.md index b47560ca..fffe7fda 100644 --- a/docs/metadata/details/arr.md +++ b/docs/metadata/details/arr.md @@ -10,7 +10,7 @@ All the following attributes can override the global/library [Radarr](../../conf | `radarr_add_existing` | **Description:** Override Radarr `add_existing` attribute
**Values:** `true` or `false` | | `radarr_upgrade_existing` | **Description:** Override Radarr `upgrade_existing` attribute
**Values:** `true` or `false` | | `radarr_folder` | **Description:** Override Radarr `root_folder_path` attribute
**Values:** Folder Path | -| `radarr_monitor` | **Description:** Override Radarr `monitor` attribute
**Values:** `true` or `false` | +| `radarr_monitor` | **Description:** Override Radarr `monitor` attribute
**Values:** `movie`, `collection`, or `none` | | `radarr_availability` | **Description:** Override Radarr `availability` attribute
**Values:** `announced`, `cinemas`, `released`, `db` | | `radarr_quality` | **Description:** Override Radarr `quality_profile` attribute
**Values:** Radarr Quality Profile | | `radarr_tag` | **Description:** Override Radarr `tag` attribute
**Values:** List or comma-separated string of tags | diff --git a/modules/builder.py b/modules/builder.py index 26a06aac..d6e00529 100644 --- a/modules/builder.py +++ b/modules/builder.py @@ -1013,6 +1013,8 @@ class CollectionBuilder: elif method_name == "radarr_monitor": if str(method_data).lower() in radarr.monitor_translation: self.radarr_details["monitor"] = str(method_data).lower() + elif isinstance(method_data, bool): + self.radarr_details["monitor"] = "movie" if method_data else "none" else: raise Failed(f"{self.Type} Error: {method_name} attribute must be either movie, collection, or none") elif method_name == "radarr_folder": diff --git a/modules/config.py b/modules/config.py index a22abaef..82138178 100644 --- a/modules/config.py +++ b/modules/config.py @@ -178,6 +178,8 @@ class ConfigFile: if "save_missing" in self.data["libraries"][library]["settings"]: self.data["libraries"][library]["settings"]["save_report"] = self.data["libraries"][library]["settings"].pop("save_missing") if "radarr" in self.data["libraries"][library] and self.data["libraries"][library]["radarr"]: + if "monitor" in self.data["libraries"][library]["radarr"] and isinstance(self.data["libraries"][library]["radarr"]["monitor"], bool): + self.data["libraries"][library]["radarr"]["monitor"] = "movie" if self.data["libraries"][library]["radarr"]["monitor"] else "none" if "add" in self.data["libraries"][library]["radarr"]: self.data["libraries"][library]["radarr"]["add_missing"] = self.data["libraries"][library]["radarr"].pop("add") if "sonarr" in self.data["libraries"][library] and self.data["libraries"][library]["sonarr"]: @@ -232,6 +234,8 @@ class ConfigFile: if "notifiarr" in self.data: self.data["notifiarr"] = self.data.pop("notifiarr") if "anidb" in self.data: self.data["anidb"] = self.data.pop("anidb") if "radarr" in self.data: + if "monitor" in self.data["radarr"] and isinstance(self.data["radarr"]["monitor"], bool): + self.data["radarr"]["monitor"] = "movie" if self.data["radarr"]["monitor"] else "none" temp = self.data.pop("radarr") if temp and "add" in temp: temp["add_missing"] = temp.pop("add")