version 1.19.1

.github/workflows/version.yml

@@ -75,7 +75,7 @@ jobs:
           author_icon_url: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager/master/.github/docker.png
 
       - name: Checkout Configs Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: meisnate12/Plex-Meta-Manager-Configs
           token: ${{ secrets.PAT }}

CHANGELOG

@@ -1,10 +1,13 @@
+# Python Version
+Drops Support for Python 3.7
 
 # Requirements Update (requirements will need to be reinstalled)
-Updated GitPython requirement to 3.1.32
+Updated ArrAPI requirement to 1.4.3
+Updated GitPython requirement to 3.1.36
 Updated lxml requirement to 4.9.3
-Updated pathvalidate requirement to 3.1.0
+Updated pathvalidate requirement to 3.2.0
-Updated pillow requirement to 10.0.0
+Updated pillow requirement to 10.0.1
-Updated PlexAPI requirement to 4.14.0
+Updated PlexAPI requirement to 4.15.2
 Updated psutil requirement to 5.9.5
 Updated requests requirement to 2.31.0
 Updated ruamel.yaml requirement to 0.17.32
@@ -17,6 +20,8 @@ Add `tmdb_birthday` [Detail](https://metamanager.wiki/en/latest/metadata/details
 Add `match` [attribute](https://metamanager.wiki/en/latest/metadata/metadata/movie.html#matching-movies) to match movies within Plex to items within the Metadata file.
 Add `delete_collections_named` to [Shared Collection Variables](https://metamanager.wiki/en/latest/defaults/collection_variables.html)
 Add support for (GitHub Personal Access Tokens)[https://metamanager.wiki/en/latest/config/github.html] in config files. thanks @chazlarson
+Add runtime support for Shows, Seasons, Artists, and Albums.
+Add multiple ranges to the schedule system.
 
 # New Defaults Features
 New Default Translations of Danish, Dutch, Italian, Norwegian Bokmål, Portuguese (Brazil), and Spanish.
@@ -50,5 +55,6 @@ Fixes bug where TMDb Filters using a modifier were ignored.
 Fixes bug with `mal_search` when using the `sfw` attribute
 Fixes bug where sorting a collection would fail if the collection name had a `,` in it.
 Fixes run_end webhooks.
+Fixes Letterboxd issue
 
 Various other Minor Fixes

VERSION

@@ -1 +1 @@
-1.19.0-develop109
+1.19.1

docs/defaults/show/network.md

@@ -69,7 +69,6 @@ libraries:
           sort_by: title.asc
 ```
 
-
 ## Default values
 
 These are lists provided for reference to show what values will be in use if you do no customization.  If you want to customize these values, use the methods described above.  These do not show how to change a name or a list.
@@ -312,6 +311,11 @@ include:
     - YouTube
     - ZDF
     - ZEE5
+```
+
+### Default `addons`
+
+```yaml
 
 addons:
   ABC:

docs/metadata/details/schedule.md

@@ -11,13 +11,13 @@ These schedules do not trigger PMM to run; they control what PMM will do if it h
 The scheduling options are:
 
 | Name         | Description                                                                                                         | Format                                             | Example                                                              |
-|:-------------|:-----------------------------------------------------------------------------------------------------------|:---------------------------------------------------|:-------------------------------------------------------------|
+|:-------------|:--------------------------------------------------------------------------------------------------------------------|:---------------------------------------------------|:---------------------------------------------------------------------|
 | Hourly       | Update only when the script is run in that hour or hour range                                                       | hourly(Hour of Day)<br>hourly(Start Hour-End Hour) | `hourly(17)`<br>`hourly(17-04)`                                      |
 | Daily        | Update once a day                                                                                                   | daily                                              | `daily`                                                              |
 | Weekly       | Update once a week on the specified days (For multiple days, use a bar-separated (<code>&#124;</code>) list)        | weekly(Days of Week)                               | `weekly(sunday)`<br><code>weekly(sunday&#124;tuesday)</code>         |
 | Monthly      | Update once a month on the specified day                                                                            | monthly(Day of Month)                              | `monthly(1)`                                                         |
 | Yearly       | Update once a year on the specified day                                                                             | yearly(MM/DD)                                      | `yearly(01/30)`                                                      |
-| Range        | Updates whenever the date is within the range (For mulitple ranges, use a bar-separated (`\|`) list)      | range(MM/DD-MM/DD)                                 | `range(12/01-12/31)`<br>`range(8/01-8/15\|9/01-9/15)`      |
+| Range        | Updates whenever the date is within the range (For mulitple ranges, use a bar-separated (<code>&#124;</code>) list) | range(MM/DD-MM/DD)                                 | `range(12/01-12/31)`<br><code>range(8/01-8/15&#124;9/01-9/15)</code> |
 | Never        | Never updates                                                                                                       | never                                              | `never`                                                              |
 | Non Existing | Updates if it doesn't exist                                                                                         | non_existing                                       | `non_existing`                                                       |
 | All          | Requires that all comma separated scheduling options inside its brackets be meet in order to run                    | all[Options]                                       | `all[weekly(sunday), hourly(17)]`                                    |

modules/meta.py

@@ -464,7 +464,18 @@ class DataFile:
                         variables[f"{key}_encoded"] = util.quote(value)
 
                     default = {k: v for k, v in default.items() if k not in variables}
-                    optional = [o for o in optional if o not in variables and o not in default]
+                    og_optional = optional
+                    optional = []
+                    for key in og_optional:
+                        if "<<" in key and ">>" in key:
+                            for k, v in variables.items():
+                                if f"<<{k}>>" in key:
+                                    key = key.replace(f"<<{k}>>", v)
+                            for k, v in default.items():
+                                if f"<<{k}>>" in key:
+                                    key = key.replace(f"<<{k}>>", v)
+                        if key not in variables and key not in default:
+                            optional.append(key)
 
                     logger.trace("")
                     logger.trace(f"Variables: {variables}")
@@ -499,8 +510,6 @@ class DataFile:
                             for i_check in range(8):
                                 for option in optional:
                                     if option not in variables and f"<<{option}>>" in str(_data):
-                                        if _debug:
-                                            logger.trace(f"Failed {_method}: {_data}")
                                         raise Failed
                                 for variable, variable_data in variables.items():
                                     if (variable == "collection_name" or variable == "playlist_name") and _method in ["radarr_tag", "item_radarr_tag", "sonarr_tag", "item_sonarr_tag"]:

modules/notifiarr.py

@@ -1,6 +1,7 @@
 from json import JSONDecodeError
 from modules import util
 from modules.util import Failed
+from retrying import retry
 
 logger = util.logger
 
@@ -13,17 +14,25 @@ class Notifiarr:
         self.apikey = params["apikey"]
         self.header = {"X-API-Key": self.apikey}
         logger.secret(self.apikey)
-        response = self.config.get(f"{base_url}user/pmm/", headers=self.header, params={"fetch": "settings"})
+        try:
+            self.request(path="user", params={"fetch": "settings"})
+        except JSONDecodeError:
+            raise Failed("Notifiarr Error: Invalid response")
+
+    def notification(self, json):
+        return self.request(json=json)
+
+    @retry(stop_max_attempt_number=6, wait_fixed=10000, retry_on_exception=util.retry_if_not_failed)
+    def request(self, json=None, path="notification", params=None):
+        response = self.config.get(f"{base_url}{path}/pmm/", json=json, headers=self.header, params=params)
         try:
             response_json = response.json()
         except JSONDecodeError as e:
+            logger.error(response.content)
             logger.debug(e)
-            raise Failed("Notifiarr Error: Invalid response")
+            raise e
         if response.status_code >= 400 or ("result" in response_json and response_json["result"] == "error"):
             logger.debug(f"Response: {response_json}")
             raise Failed(f"({response.status_code} [{response.reason}]) {response_json}")
         if not response_json["details"]["response"]:
             raise Failed("Notifiarr Error: Invalid apikey")
-
-    def notification(self, json):
-        return self.config.get(f"{base_url}notification/pmm/", json=json, headers=self.header)

modules/util.py

@@ -669,9 +669,9 @@ def schedule_check(attribute, data, current_time, run_hour, is_all=False):
                 except ValueError:
                     logger.error(f"Schedule Error: yearly {display} must be in the MM/DD format i.e. yearly(11/22)")
             elif run_time.startswith("range"):
-                ok_ranges = param.lower().split("|")
+                ranges = []
-                err = None
+                range_pass = False
-                for ok_range in ok_ranges:
+                for ok_range in param.lower().split("|"):
                     match = re.match("^(1[0-2]|0?[1-9])/(3[01]|[12][0-9]|0?[1-9])-(1[0-2]|0?[1-9])/(3[01]|[12][0-9]|0?[1-9])$", ok_range)
                     if not match:
                         logger.error(f"Schedule Error: range {display} must be in the MM/DD-MM/DD format i.e. range(12/01-12/25)")
@@ -683,8 +683,12 @@ def schedule_check(attribute, data, current_time, run_hour, is_all=False):
                     start = datetime.strptime(f"{month_start}/{day_start}", "%m/%d")
                     end = datetime.strptime(f"{month_end}/{day_end}", "%m/%d")
                     range_collection = True
-                    schedule_str += f"\nScheduled between {pretty_months[month_start]} {num2words(day_start, to='ordinal_num')} and {pretty_months[month_end]} {num2words(day_end, to='ordinal_num')}"
+                    ranges.append(f"{pretty_months[month_start]} {num2words(day_start, to='ordinal_num')} and {pretty_months[month_end]} {num2words(day_end, to='ordinal_num')}")
                     if start <= check <= end if start < end else (check <= end or check >= start):
+                        range_pass = True
+                if ranges:
+                    schedule_str += f"\nScheduled {' or '.join(ranges)}"
+                if range_pass:
                     all_check += 1
         else:
             logger.error(f"Schedule Error: {display}")

plex_meta_manager.py

@@ -3,7 +3,6 @@ from collections import Counter
 from concurrent.futures import ProcessPoolExecutor
 from datetime import datetime
 from modules.logs import MyLogger
-import importlib.metadata
 
 if sys.version_info[0] != 3 or sys.version_info[1] < 8:
     print("Version Error: Version: %s.%s.%s incompatible please use Python 3.8+" % (sys.version_info[0], sys.version_info[1], sys.version_info[2]))
@@ -111,7 +110,6 @@ for arg_key, arg_data in arguments.items():
 env_version = get_env("BRANCH_NAME", "master")
 is_docker = get_env("PMM_DOCKER", False, arg_bool=True)
 is_linuxserver = get_env("PMM_LINUXSERVER", False, arg_bool=True)
-plexapi_version = importlib.metadata.version('PlexAPI')
 
 secret_args = {}
 plex_url = None
@@ -240,7 +238,7 @@ def start(attrs):
     new_version = latest_version[0] if latest_version and (version[1] != latest_version[1] or (version[2] and version[2] < latest_version[2])) else None
     if new_version:
         logger.info(f"    Newest Version: {new_version}")
-    logger.info(f"    PlexAPI library version: {plexapi_version}")
+    logger.info(f"    PlexAPI library version: {plexapi.VERSION}")
     logger.info(f"    Platform: {platform.platform()}")
     logger.info(f"    Memory: {round(psutil.virtual_memory().total / (1024.0 ** 3))} GB")
     if "time" in attrs and attrs["time"]:                   start_type = f"{attrs['time']} "

requirements.txt

@@ -2,9 +2,9 @@ arrapi==1.4.3
 GitPython==3.1.36
 lxml==4.9.3
 num2words==0.5.12
-pathvalidate==3.1.0
+pathvalidate==3.2.0
-pillow==10.0.0
+pillow==10.0.1
-PlexAPI==4.15.1
+PlexAPI==4.15.2
 psutil==5.9.5
 python-dotenv==1.0.0
 requests==2.31.0