[57] fix award year collections

11 months ago · 3a3c6657c7
parent 1c2daab738
commit 3a3c6657c7
10 changed files with 69 additions and 53 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-1.19.1-develop56
+1.19.1-develop57
--- a/defaults/award/bafta.yml
+++ b/defaults/award/bafta.yml
@ -35,16 +35,17 @@ dynamic_collections:
    title_format: BAFTA <<key_name>>
    template:
      - use_year_collections
-      - imdb
+      - imdb_award
      - shared
      - arr
      - custom
    template_variables:
-      imdb_award:
-        default:
-          event_id: ev0000123
-          event_year: <<key>>
-          winning: true
+      event_id:
+        default: ev0000123
+      event_year:
+        default: <<key>>
+      winning:
+        default: true
      collection_order:
        default: release
      allowed_libraries:
--- a/defaults/award/cannes.yml
+++ b/defaults/award/cannes.yml
@ -35,16 +35,17 @@ dynamic_collections:
    title_format: Cannes <<key_name>>
    template:
      - use_year_collections
-      - imdb
+      - imdb_award
      - shared
      - arr
      - custom
    template_variables:
-      imdb_award:
-        default:
-          event_id: ev0000147
-          event_year: <<key>>
-          winning: true
+      event_id:
+        default: ev0000147
+      event_year:
+        default: <<key>>
+      winning:
+        default: true
      collection_order:
        default: release
      allowed_libraries:
--- a/defaults/award/choice.yml
+++ b/defaults/award/choice.yml
@ -21,16 +21,17 @@ dynamic_collections:
    title_format: Critics Choice Awards <<key_name>>
    template:
      - use_year_collections
-      - imdb
+      - imdb_award
      - shared
      - arr
      - custom
    template_variables:
-      imdb_award:
-        default:
-          event_id: ev0000133
-          event_year: <<key>>
-          winning: true
+      event_id:
+        default: ev0000133
+      event_year:
+        default: <<key>>
+      winning:
+        default: true
      collection_order:
        default: release
      image:
--- a/defaults/award/emmy.yml
+++ b/defaults/award/emmy.yml
@ -20,16 +20,17 @@ dynamic_collections:
    title_format: Emmys <<key_name>>
    template:
      - use_year_collections
-      - imdb
+      - imdb_award
      - shared
      - arr
      - custom
    template_variables:
-      imdb_award:
-        default:
-          event_id: ev0000223
-          event_year: <<key>>
-          winning: true
+      event_id:
+        default: ev0000223
+      event_year:
+        default: <<key>>
+      winning:
+        default: true
      collection_order:
        default: release
      image:
--- a/defaults/award/golden.yml
+++ b/defaults/award/golden.yml
@ -54,16 +54,17 @@ dynamic_collections:
    title_format: Golden Globe <<key_name>>
    template:
      - use_year_collections
-      - imdb
+      - imdb_award
      - shared
      - arr
      - custom
    template_variables:
-      imdb_award:
-        default:
-          event_id: ev0000292
-          event_year: <<key>>
-          winning: true
+      event_id:
+        default: ev0000292
+      event_year:
+        default: <<key>>
+      winning:
+        default: true
      collection_order:
        default: release
      image:
--- a/defaults/award/oscars.yml
+++ b/defaults/award/oscars.yml
@ -49,16 +49,17 @@ dynamic_collections:
    title_format: Oscars Winners <<key_name>>
    template:
      - use_year_collections
-      - imdb
+      - imdb_award
      - shared
      - arr
      - custom
    template_variables:
-      imdb_award:
-        default:
-          event_id: ev0000003
-          event_year: <<key>>
-          winning: true
+      event_id:
+        default: ev0000003
+      event_year:
+        default: <<key>>
+      winning:
+        default: true
      collection_order:
        default: release
      allowed_libraries:
--- a/defaults/award/spirit.yml
+++ b/defaults/award/spirit.yml
@ -21,16 +21,17 @@ dynamic_collections:
    title_format: Independent Spirit Awards <<key_name>>
    template:
      - use_year_collections
-      - imdb
+      - imdb_award
      - shared
      - arr
      - custom
    template_variables:
-      imdb_award:
-        default:
-          event_id: ev0000349
-          event_year: <<key>>
-          winning: true
+      event_id:
+        default: ev0000349
+      event_year:
+        default: <<key>>
+      winning:
+        default: true
      collection_order:
        default: release
      allowed_libraries:
--- a/defaults/award/sundance.yml
+++ b/defaults/award/sundance.yml
@ -35,16 +35,17 @@ dynamic_collections:
    title_format: Sundance Film Festival <<key_name>>
    template:
      - use_year_collections
-      - imdb
+      - imdb_award
      - shared
      - arr
      - custom
    template_variables:
-      imdb_award:
-        default:
-          event_id: ev0000631
-          event_year: <<key>>
-          winning: true
+      event_id:
+        default: ev0000631
+      event_year:
+        default: <<key>>
+      winning:
+        default: true
      collection_order:
        default: release
      allowed_libraries:
--- a/defaults/templates.yml
+++ b/defaults/templates.yml
@ -141,11 +141,19 @@ templates:
  imdb:
    optional:
      - imdb_list
-      - imdb_search
-      - imdb_award
    imdb_list: <<imdb_list>>
-    imdb_search: <<imdb_search>>
-    imdb_award: <<imdb_award>>
+
+  imdb_award:
+    optional:
+      - award_filter
+      - category_filter
+      - winning
+    imdb_award:
+      event_id: <<event_id>>
+      event_year: <<event_year>>
+      award_filter: <<award_filter>>
+      category_filter: <<category_filter>>
+      winning: <<winning>>

  tmdb_person:
    default: