[150] minor fixes

VERSION

@@ -1 +1 @@
-1.17.3-develop149
+1.17.3-develop150

defaults/both/content_rating_cs.yml

@@ -45,6 +45,25 @@ dynamic_collections:
       translation_key:
         default: content_rating_cs
         other: content_rating_other
+      order:
+        1: "01_"
+        2: "02_"
+        3: "03_"
+        4: "04_"
+        5: "05_"
+        6: "06_"
+        7: "07_"
+        8: "08_"
+        9: "09_"
+        10: "10_"
+        11: "11_"
+        12: "12_"
+        13: "13_"
+        14: "14_"
+        15: "15_"
+        16: "16_"
+        17: "17_"
+        18: "18_"
     include:
       - 1
       - 2

defaults/chart/basic.yml

@@ -15,10 +15,6 @@ translations:
   pmm: translations
 
 collections:
-  Chart Collections:
-    template:
-      - name: separator
-        separator: chart
 
   Newly Released:
     variables:

defaults/chart/flixpatrol.yml

@@ -1,6 +1,6 @@
 ##############################################################################
 #                       FlixPatrol Charts Collections                        #
-#                 Created by Yozora, Bullmoose20, anon_fawkes & Sohjiro      #
+#           Created by Yozora, Bullmoose20, anon_fawkes, & Sohjiro           #
 #          EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL           #
 #     https://metamanager.wiki/en/latest/defaults/chart/flixpatrol.html      #
 ##############################################################################

defaults/overlays/language.yml

@@ -0,0 +1,171 @@
+##############################################################################
+#                             Languages Overlays                             #
+#           Created by Yozora, Bullmoose20, Cpt Kuesel, & Sohjiro            #
+#          EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL           #
+#    https://metamanager.wiki/en/latest/defaults/overlays/languages.html     #
+##############################################################################
+
+external_templates:
+  pmm: templates
+  template_variables:
+    default:
+      style: round
+      country: <<key>>
+    queue: position
+    pmm: flag/<<style>>/<<country>>
+
+queues:
+  position:
+    left:
+      - horizontal_align: left
+        vertical_align: top
+        horizontal_offset: 15
+        vertical_offset: 15
+      - horizontal_align: left
+        vertical_align: top
+        horizontal_offset: 15
+        vertical_offset: 75
+      - horizontal_align: left
+        vertical_align: top
+        horizontal_offset: 15
+        vertical_offset: 135
+      - horizontal_align: left
+        vertical_align: top
+        horizontal_offset: 15
+        vertical_offset: 195
+      - horizontal_align: left
+        vertical_align: top
+        horizontal_offset: 15
+        vertical_offset: 255
+    right:
+      - horizontal_align: right
+        vertical_align: top
+        horizontal_offset: 15
+        vertical_offset: 15
+      - horizontal_align: right
+        vertical_align: top
+        horizontal_offset: 15
+        vertical_offset: 75
+      - horizontal_align: right
+        vertical_align: top
+        horizontal_offset: 15
+        vertical_offset: 135
+      - horizontal_align: right
+        vertical_align: top
+        horizontal_offset: 15
+        vertical_offset: 195
+      - horizontal_align: right
+        vertical_align: top
+        horizontal_offset: 15
+        vertical_offset: 255
+
+templates:
+  flags:
+    conditionals:
+      search_attribute:
+        default: audio_language
+        conditions:
+          - use_subtitles: true
+            value: subtitle_language
+    ignore_blank_results: true
+    plex_search:
+      all:
+        <<search_attribute>>: <<key>>
+
+overlays:
+  
+  german:
+    variables: {key: de, weight: 240}
+    template: [name: standard, name: flags]
+
+  english:
+    variables: {key: en, weight: 230, country: us}
+    template: [name: standard, name: flags]
+
+  french:
+    variables: {key: fr, weight: 220}
+    template: [name: standard, name: flags]
+
+  japanese:
+    variables: {key: ja, weight: 210, country: jp}
+    template: [name: standard, name: flags]
+
+  korean:
+    variables: {key: ko, weight: 200, country: kr}
+    template: [name: standard, name: flags]
+
+  chinese:
+    variables: {key: zh, weight: 190, country: cn}
+    template: [name: standard, name: flags]
+
+  danish:
+    variables: {key: da, weight: 180, country: dk}
+    template: [name: standard, name: flags]
+
+  russian:
+    variables: {key: ru, weight: 170}
+    template: [name: standard, name: flags]
+
+  spanish:
+    variables: {key: es, weight: 160}
+    template: [name: standard, name: flags]
+
+  italian:
+    variables: {key: it, weight: 150}
+    template: [name: standard, name: flags]
+
+  portuguese:
+    variables: {key: pt, weight: 140}
+    template: [name: standard, name: flags]
+
+  hindi:
+    variables: {key: hi, weight: 130, country: in}
+    template: [name: standard, name: flags]
+
+  telugu:
+    variables: {key: te, weight: 120, country: in}
+    template: [name: standard, name: flags]
+
+  farsi:
+    variables: {key: fa, weight: 110, country: ir}
+    template: [name: standard, name: flags]
+
+  thai:
+    variables: {key: th, weight: 100}
+    template: [name: standard, name: flags]
+
+  dutch:
+    variables: {key: nl, weight: 90}
+    template: [name: standard, name: flags]
+
+  norwegian:
+    variables: {key: no, weight: 80}
+    template: [name: standard, name: flags]
+
+  icelandic:
+    variables: {key: is, weight: 70}
+    template: [name: standard, name: flags]
+
+  swedish:
+    variables: {key: sv, weight: 60, country: se}
+    template: [name: standard, name: flags]
+
+  turkish:
+    variables: {key: tr, weight: 50}
+    template: [name: standard, name: flags]
+
+  polish:
+    variables: {key: pl, weight: 40}
+    template: [name: standard, name: flags]
+
+  czech:
+    variables: {key: cs, weight: 30, country: cz}
+    template: [name: standard, name: flags]
+
+  ukrainian:
+    variables: {key: uk, weight: 20, country: ua}
+    template: [name: standard, name: flags]
+
+  hungarian:
+    variables: {key: hu, weight: 10}
+    template: [name: standard, name: flags]

defaults/overlays/language_count.yml

@@ -1,15 +1,15 @@
 ##############################################################################
-#                           Audio Language Overlay                           #
+#                           Language Count Overlay                           #
 #                 Created by Yozora, Bullmoose20, & Sohjiro                  #
 #                     Credit to Magic815 for base images                     #
 #          EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL           #
-#  https://metamanager.wiki/en/latest/defaults/overlays/audio_language.html  #
+#  https://metamanager.wiki/en/latest/defaults/overlays/language_count.html  #
 ##############################################################################
 
 external_templates:
   pmm: templates
   template_variables:
-    group: audio_language
+    group: language
     horizontal_offset: 0
     horizontal_align: center
     vertical_offset: 30
@@ -20,7 +20,7 @@ external_templates:
     pmm: <<overlay_name>>
 
 templates:
-  audio_language:
+  language:
     default:
       minimum: 2
     optional:
@@ -35,9 +35,8 @@ overlays:
 
   Dual-Audio:
     variables: {key: dual, weight: 20, lt: 3}
-    template: [name: standard, name: audio_language]
-
+    template: [name: standard, name: language]
 
   Multi-Audio:
     variables: {key: multi, weight: 10}
-    template: [name: standard, name: audio_language]
+    template: [name: standard, name: language]

docs/conf.py

@@ -130,7 +130,7 @@ html_theme_options = {
                 ("QNAP Walkthrough", "home/guides/qnap"),
                 ("Synology Walkthrough", "home/guides/synology"),
             ]),
-            ("Docker Images", "home/guides/alternative-docker"),
+            ("Docker Images", "home/docker"),
             ("Log Files", "home/logs"),
             ("Run Commands & Environment Variables", "home/environmental"),
             ("Knowledgebase/FAQ", "home/kb"),
@@ -269,11 +269,12 @@ html_theme_options = {
                 ("Shared Variables", "defaults/overlays/variables"),
                 ("_divider", ),
                 ("Audio Codec", "defaults/overlays/audio_codec"),
-                ("Audio Languages", "defaults/overlays/audio_language"),
                 ("Common Sense Age Ratings", "defaults/overlays/commonsense"),
                 ("Direct Play Only", "defaults/overlays/direct_play"),
                 ("Episode Info", "defaults/overlays/episode_info"),
                 ("FlixPatrol Top", "defaults/overlays/flixpatrol"),
+                ("Language Count", "defaults/overlays/language_count"),
+                ("Languages", "defaults/overlays/languages"),
                 ("MediaStinger", "defaults/overlays/mediastinger"),
                 ("Ratings", "defaults/overlays/ratings"),
                 ("Resolution/Edition", "defaults/overlays/resolution"),

docs/defaults/overlays.md

@@ -11,13 +11,14 @@ These overlays are applied by calling the below paths into the `overlay_path` [s
 ### Overlay Files
 
 | Default                                        |       path       | Example Overlays                                                          |  Movies  |   Shows   |  Seasons  | Episodes |
-|:-----------------------------------------------|:-----------------:|:--------------------------------------------------------------------------|:--------:|:---------:|:---------:|:--------:|
+|:-----------------------------------------------|:----------------:|:--------------------------------------------------------------------------|:--------:|:---------:|:---------:|:--------:|
 | [Audio Codec](overlays/audio_codec)            |  `audio_codec`   | Dolby Atmos logo, DTS logo                                                | ✅  |  ✅  |  ✅  | ✅  |
-| [Audio Language](overlays/audio_language)      | `audio_language`  | French Audio, Korean Audio                                                | ✅  |  ✅  |  ✅  | ✅  |
 | [CommonSense Age Rating](overlays/commonsense) |  `commonsense`   | "3+", "16+"                                                               | ✅  |  ✅  | ❗  | ❗ |
 | [Direct Play](overlays/direct_play)            |  `direct_play`   | "Direct Play Only"                                                        | ✅  | ❗  | ❗  | ✅  |
 | [Episode Info](overlays/episode_info)          |  `episode_info`  | "S01E01", "S02E09"                                                        | ❌ | ❌  | ❌  | ✅  |
 | [FlixPatrol](overlays/flixpatrol)              |   `flixpatrol`   | "Streaming service logo with words "TOP"                                  | ✅  |  ✅  | ❌  | ❌ |
+| [Language Count](overlays/language_count)      | `language_count` | Dual-Audio, Multi-Audio, Dual-Subtitle, Multi-Subtitle                    | ✅  |  ✅  |  ✅  | ✅  |
+| [Languages](overlays/languages)                |   `languages`    | Flags Based on the Audio/Subtitles a file has                             | ✅  |  ✅  |  ✅  | ✅  |
 | [Mediastinger](overlays/mediastinger)          |  `mediastinger`  | Mediastinger Logo for After/During Credit Scenes                          | ✅  |  ✅  | ❌  | ❌ |
 | [Ratings](overlays/ratings)                    |    `ratings`     | IMDb Audience Rating, Metacritic Critic Rating                            | ✅  |  ✅  | ❌  | ✅  |
 | [Resolution/Editions](overlays/resolution)     |   `resolution`   | 4K Dolby Vision logo, 720P logo, "Director's Cut", "Criterion Collection" | ✅  |  ✅  | ❌  | ✅  |

docs/defaults/overlays/languages.md

@@ -0,0 +1,7 @@
+|                                     f                                      |
+|:--------------------------------------------------------------------------:|
+|                             Languages Overlays                             |
+|           Created by Yozora, Bullmoose20, Cpt Kuesel, & Sohjiro            |
+|          EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL           |
+|    https://metamanager.wiki/en/latest/defaults/overlays/languages.html     |
+ #                              Languages Overlays                            #

modules/builder.py

@@ -2219,10 +2219,8 @@ class CollectionBuilder:
         return True
 
     def check_missing_filters(self, item_id, is_movie, tmdb_item=None, check_released=False):
-        final_return = True
         if self.has_tmdb_filters or check_released:
             try:
-                final_return = False
                 if tmdb_item is None:
                     if is_movie:
                         tmdb_item = self.config.TMDb.get_movie(item_id, ignore_cache=True)
@@ -2234,6 +2232,9 @@ class CollectionBuilder:
             date_to_check = tmdb_item.release_date if is_movie else tmdb_item.first_air_date
             if not date_to_check or date_to_check > self.current_time:
                 return False
+        final_return = True
+        if self.has_tmdb_filters:
+            final_return = False
             for filter_list in self.filters:
                 tmdb_f = [(k, v) for k, v in filter_list if k in tmdb_filters]
                 if not tmdb_f:

modules/config.py

@@ -116,13 +116,13 @@ class ConfigFile:
         self.overlays_only = attrs["overlays_only"] if "overlays_only" in attrs else False
         current_time = datetime.now()
 
-        self.data = YAML(self.config_path).data
-
         with open(self.config_path, encoding="utf-8") as fp:
-            logger.separator("Redacted Config", space=False, border=False, trace=True)
+            logger.separator("Redacted Config", space=False, border=False, debug=True)
             for line in fp.readlines():
-                logger.trace(re.sub(r"(token|client.*|url|api_*key|secret|webhooks|error|run_start|run_end|version|changes|username|password): .+", r"\1: (redacted)", line.strip("\r\n")))
-            logger.trace("")
+                logger.debug(re.sub(r"(token|client.*|url|api_*key|secret|webhooks|error|run_start|run_end|version|changes|username|password): .+", r"\1: (redacted)", line.strip("\r\n")))
+            logger.debug("")
+
+        self.data = YAML(self.config_path).data
 
         def replace_attr(all_data, attr, par):
             if "settings" not in all_data:
@@ -830,8 +830,6 @@ class ConfigFile:
                 if lib and "template_variables" in lib and lib["template_variables"] and isinstance(lib["template_variables"], dict):
                     lib_vars = lib["template_variables"]
 
-                logger.separator("Metadata Files", space=False, border=False)
-
                 try:
                     if lib and "metadata_path" in lib:
                         if not lib["metadata_path"]:
@@ -859,8 +857,6 @@ class ConfigFile:
                         except NotScheduled:
                             params["skip_library"] = True
 
-                logger.separator("Overlay Files", space=False, border=False)
-
                 params["overlay_path"] = []
                 params["remove_overlays"] = False
                 params["reapply_overlays"] = False

modules/meta.py

@@ -207,8 +207,9 @@ class DataFile:
                 elif not isinstance(self.templates[variables["name"]][0], dict):
                     raise Failed(f"{self.data_type} Error: template {variables['name']} is not a dictionary")
                 else:
-                    logger.debug(f"Template {variables['name']}")
-                    logger.debug(f"Call: {variables}")
+                    logger.separator(f"Template {variables['name']}", space=False, border=False, debug=True)
+                    logger.trace("")
+                    logger.trace(f"Call: {variables}")
 
                     remove_variables = []
                     optional = []
@@ -248,6 +249,7 @@ class DataFile:
                         (extra_variables, "Definition", False),
                         (self.temp_vars, "Config", True)
                     ]:
+                        logger.trace("")
                         logger.trace(f"{input_type}: {input_dict}")
                         for input_key, input_value in input_dict.items():
                             if input_key == "conditionals":
@@ -386,7 +388,7 @@ class DataFile:
                         if "move_prefix" in template:
                             prefix = template["move_prefix"]
                         elif "move_collection_prefix" in template:
-                            logger.debuf("")
+                            logger.debug("")
                             logger.debug(f"{self.data_type} Warning: template sub-attribute move_collection_prefix will run as move_prefix")
                             prefix = template["move_collection_prefix"]
                         if prefix:
@@ -413,14 +415,15 @@ class DataFile:
                     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]
 
-                    logger.debug("")
-                    logger.debug(f"Variables: {variables}")
-                    logger.debug("")
-                    logger.debug(f"Defaults: {default}")
-                    logger.debug("")
-                    logger.debug(f"Optional: {optional}")
+                    logger.trace("")
+                    logger.trace(f"Variables: {variables}")
+                    logger.trace("")
+                    logger.trace(f"Defaults: {default}")
+                    logger.trace("")
+                    logger.trace(f"Optional: {optional}")
                     logger.trace("")
                     logger.trace(f"Translation: {translation_variables}")
+                    logger.debug("")
 
                     def check_for_var(_method, _data):
                         def scan_text(og_txt, var, actual_value):
@@ -522,6 +525,7 @@ class MetadataFile(DataFile):
         else:
             logger.info("")
             logger.separator(f"Loading Metadata {file_type}: {path}")
+            logger.debug("")
             data = self.load_file(self.type, self.path)
             self.metadata = get_dict("metadata", data, library.metadatas)
             self.templates = get_dict("templates", data)
@@ -1464,6 +1468,7 @@ class PlaylistFile(DataFile):
         self.data_type = "Playlist"
         logger.info("")
         logger.info(f"Loading Playlist {file_type}: {path}")
+        logger.debug("")
         data = self.load_file(self.type, self.path)
         self.playlists = get_dict("playlists", data, self.config.playlist_names)
         self.templates = get_dict("templates", data)
@@ -1480,6 +1485,7 @@ class OverlayFile(DataFile):
         self.data_type = "Overlay"
         logger.info("")
         logger.info(f"Loading Overlay {file_type}: {path}")
+        logger.debug("")
         data = self.load_file(self.type, self.path, overlay=True)
         self.overlays = get_dict("overlays", data)
         self.templates = get_dict("templates", data)

modules/tvdb.py

@@ -131,10 +131,9 @@ class TVDb:
         else:
             raise Failed(f"TVDb Error: {tvdb_url} must begin with {urls['movies']} or {urls['series']}")
         expired = None
-        tvdb_id = None
-        if self.config.Cache and not ignore_cache:
+        if self.config.Cache and not ignore_cache and not is_movie:
             tvdb_id, expired = self.config.Cache.query_tvdb_map(tvdb_url, self.expiration)
-        if tvdb_id and not expired and not is_movie:
+            if tvdb_id and not expired:
                 return tvdb_id, None, None
         logger.trace(f"URL: {tvdb_url}")
         try:
@@ -161,7 +160,7 @@ class TVDb:
                         pass
                 if tmdb_id is None and imdb_id is None:
                     raise Failed(f"TVDb Error: No TMDb ID or IMDb ID found")
-            if self.config.Cache and not ignore_cache:
+            if self.config.Cache and not ignore_cache and not is_movie:
                 self.config.Cache.update_tvdb_map(expired, tvdb_url, tvdb_id, self.expiration)
             return tvdb_id, tmdb_id, imdb_id
         elif tvdb_url.startswith(urls["movie_id"]):