[17] fix resolution default

VERSION

@@ -1 +1 @@
-1.18.3-develop16
+1.18.3-develop17

defaults/overlays/resolution.yml

@@ -49,18 +49,18 @@ external_templates:
               - IMAX
               - Remastered
               - Criterion
-      horizontal_offset:
+      final_horizontal_offset:
-        default: 15
+        default: <<horizontal_offset>>
         conditions:
           - type: resolution_dovetail
-            value: 45
+            value: <<horizontal_offset+30>>
       vertical_offset:
-        default: 15
+        default: <<vertical_offset>>
         conditions:
           - type: edition_dovetail
-            value: 79
+            value: <<vertical_offset+64>>
           - type: resolution_dovetail
-            value: 45
+            value: <<vertical_offset+30>>
       back_width:
         conditions:
           - type: [edition, resolution, edition_dovetail]
@@ -99,6 +99,8 @@ external_templates:
             value: edition
           - type: [resolution, resolution_dovetail]
             value: resolution
+    horizontal_offset: 15
+    vertical_offset: 15
     horizontal_align: left
     vertical_align: top
 
@@ -120,13 +122,11 @@ templates:
     optional:
       - search
       - use_<<key>>
-      - use_<<key_<<alt>>
       - use_edition
       - allowed_libraries
     allowed_library_types:
       - <<use_<<key>>>>
       - <<use_edition>>
-      - <<use_<<key>>_<<alt>>>>
       - <<allowed_libraries>>
     ignore_blank_results: true
     plex_all: true
@@ -163,12 +163,14 @@ templates:
     optional:
       - all
       - use_<<key>>
+      - use_<<key>>_<<alt>>
       - use_<<alt>>
       - use_resolution
       - allowed_libraries
     allowed_library_types:
       - <<use_<<key>>>>
       - <<use_<<alt>>>>
+      - <<use_<<key>>_<<alt>>>>
       - <<allowed_libraries>>
       - <<use_resolution>>
     ignore_blank_results: true

defaults/overlays/templates.yml

@@ -16,9 +16,11 @@ templates:
       font_size_<<key>>: <<font_size>>
       font_color_<<key>>: <<font_color>>
       font_style_<<key>>: <<font_style>>
-      horizontal_offset_<<key>>: <<horizontal_offset>>
+      final_horizontal_offset: <<horizontal_offset>>
+      horizontal_offset_<<key>>: <<final_horizontal_offset>>
       horizontal_align_<<key>>: <<horizontal_align>>
-      vertical_offset_<<key>>: <<vertical_offset>>
+      final_vertical_offset: <<vertical_offset>>
+      vertical_offset_<<key>>: <<final_vertical_offset>>
       vertical_align_<<key>>: <<vertical_align>>
       stroke_width_<<key>>: <<stroke_width>>
       stroke_color_<<key>>: <<stroke_color>>

modules/tvdb.py

@@ -106,7 +106,6 @@ class TVDb:
         tvdb_id, _, _ = self.get_id_from_url(tvdb_url, is_movie=is_movie)
         return TVDbObj(self, tvdb_id, is_movie=is_movie)
 
-
     @retry(stop_max_attempt_number=6, wait_fixed=10000, retry_on_exception=util.retry_if_not_failed)
     def get_request(self, tvdb_url):
         return self.config.get_html(tvdb_url, headers=util.header(self.language))