diff --git a/VERSION b/VERSION index 669b0646..16ddfcad 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.19.1-develop54 +1.19.1-develop55 diff --git a/defaults/award/bafta.yml b/defaults/award/bafta.yml index 537467ee..9394c89d 100644 --- a/defaults/award/bafta.yml +++ b/defaults/award/bafta.yml @@ -35,13 +35,18 @@ dynamic_collections: title_format: BAFTA <> template: - use_year_collections - - trakt + - imdb - shared - arr - custom template_variables: - trakt_list: - default: https://trakt.tv/users/pjcob/lists/<>-bafta + imdb_award: + default: + event_id: ev0000123 + event_year: <> + winning: true + collection_order: + default: release allowed_libraries: default: movie image: diff --git a/defaults/award/cannes.yml b/defaults/award/cannes.yml index 1405a187..4e361847 100644 --- a/defaults/award/cannes.yml +++ b/defaults/award/cannes.yml @@ -35,13 +35,18 @@ dynamic_collections: title_format: Cannes <> template: - use_year_collections - - trakt + - imdb - shared - arr - custom template_variables: - trakt_list: - default: https://trakt.tv/users/pjcob/lists/<>-cannes + imdb_award: + default: + event_id: ev0000147 + event_year: <> + winning: true + collection_order: + default: release allowed_libraries: default: movie image: diff --git a/defaults/award/choice.yml b/defaults/award/choice.yml index b8fa1dc1..8c9abaae 100644 --- a/defaults/award/choice.yml +++ b/defaults/award/choice.yml @@ -21,13 +21,18 @@ dynamic_collections: title_format: Critics Choice Awards <> template: - use_year_collections - - trakt + - imdb - shared - arr - custom template_variables: - trakt_list: - default: https://trakt.tv/users/pjcob/lists/<>-<>-choice + imdb_award: + default: + event_id: ev0000133 + event_year: <> + winning: true + collection_order: + default: release image: default: award/choice/<> translation_key: diff --git a/defaults/award/emmy.yml b/defaults/award/emmy.yml index 03c91b41..8b328e39 100644 --- a/defaults/award/emmy.yml +++ b/defaults/award/emmy.yml @@ -25,10 +25,13 @@ dynamic_collections: - arr - custom template_variables: - imdb_list: - default: https://www.imdb.com/search/title/?release_date=<>-05-31,<>-06-01&groups=emmy_winner&sort=<> - imdb_sort: - default: moviemeter,asc + imdb_award: + default: + event_id: ev0000223 + event_year: <> + winning: true + collection_order: + default: release image: default: award/emmys/winner/<> translation_key: diff --git a/defaults/award/golden.yml b/defaults/award/golden.yml index 0a71fd6d..c6b0749e 100644 --- a/defaults/award/golden.yml +++ b/defaults/award/golden.yml @@ -59,10 +59,13 @@ dynamic_collections: - arr - custom template_variables: - imdb_list: - default: https://www.imdb.com/search/title/?release_date=<>-01-01,<>-12-31&groups=golden_globe_winner&sort=<> - imdb_sort: - default: moviemeter,asc + imdb_award: + default: + event_id: ev0000292 + event_year: <> + winning: true + collection_order: + default: release image: default: award/golden/winner/<> translation_key: diff --git a/defaults/award/oscars.yml b/defaults/award/oscars.yml index 014c86e6..3f8cc650 100644 --- a/defaults/award/oscars.yml +++ b/defaults/award/oscars.yml @@ -22,7 +22,8 @@ collections: translation_key: oscars_picture - name: arr - name: custom - imdb_list: https://www.imdb.com/search/title/?groups=best_picture_winner + imdb_search: + event.winning: oscar_picture Oscars Best Director Winners: variables: @@ -35,7 +36,8 @@ collections: translation_key: oscars_director - name: arr - name: custom - imdb_list: https://www.imdb.com/search/title/?groups=best_director_winner + imdb_search: + event.winning: oscar_director dynamic_collections: Oscars Winners Awards: @@ -52,10 +54,13 @@ dynamic_collections: - arr - custom template_variables: - imdb_list: - default: https://www.imdb.com/search/title/?release_date=<>-01-01,<>-12-31&groups=oscar_winner&sort=<> - imdb_sort: - default: moviemeter,asc + imdb_award: + default: + event_id: ev0000003 + event_year: <> + winning: true + collection_order: + default: release allowed_libraries: default: movie image: diff --git a/defaults/award/spirit.yml b/defaults/award/spirit.yml index 4b1bd96f..a86c08ee 100644 --- a/defaults/award/spirit.yml +++ b/defaults/award/spirit.yml @@ -21,13 +21,18 @@ dynamic_collections: title_format: Independent Spirit Awards <> template: - use_year_collections - - trakt + - imdb - shared - arr - custom template_variables: - trakt_list: - default: https://trakt.tv/users/pjcob/lists/<>-independent-spirits + imdb_award: + default: + event_id: ev0000349 + event_year: <> + winning: true + collection_order: + default: release allowed_libraries: default: movie image: diff --git a/defaults/award/sundance.yml b/defaults/award/sundance.yml index 71477049..c22208c5 100644 --- a/defaults/award/sundance.yml +++ b/defaults/award/sundance.yml @@ -35,13 +35,18 @@ dynamic_collections: title_format: Sundance Film Festival <> template: - use_year_collections - - trakt + - imdb - shared - arr - custom template_variables: - trakt_list: - default: https://trakt.tv/users/pjcob/lists/<>-sundance + imdb_award: + default: + event_id: ev0000631 + event_year: <> + winning: true + collection_order: + default: release allowed_libraries: default: movie image: diff --git a/defaults/overlays/ribbon.yml b/defaults/overlays/ribbon.yml index 6c296b69..1152fcf5 100644 --- a/defaults/overlays/ribbon.yml +++ b/defaults/overlays/ribbon.yml @@ -50,17 +50,20 @@ overlays: Oscars Best Picture: variables: {key: oscars, weight: 180} template: {name: standard, allowed_libraries: movie} - imdb_list: https://www.imdb.com/search/title/?groups=best_picture_winner + imdb_search: + event.winning: oscar_picture Oscars Best Director: variables: {key: oscars_director, weight: 170} template: {name: standard, allowed_libraries: movie} - imdb_list: https://www.imdb.com/search/title/?groups=best_director_winner + imdb_search: + event.winning: oscar_director Golden Globe Winner: variables: {key: golden, weight: 160} template: [name: standard, name: ribbon] - imdb_list: https://www.imdb.com/search/title/?groups=golden_globe_winner + imdb_search: + event.winning: golden Golden Globe Best Director: variables: {key: golden_director, weight: 150} @@ -95,7 +98,8 @@ overlays: Emmys Winner: variables: {key: emmys, weight: 90} template: [name: standard, name: ribbon] - imdb_list: https://www.imdb.com/search/title/?groups=emmy_winner + imdb_search: + event.winning: emmy Critics Choice Winners: variables: {key: choice, weight: 80} @@ -131,4 +135,5 @@ overlays: Razzies Winner: variables: {key: razzie, weight: 10} template: {name: standard, allowed_libraries: movie} - imdb_list: https://www.imdb.com/search/title/?groups=razzie_winner + imdb_search: + event.winning: razzie diff --git a/defaults/templates.yml b/defaults/templates.yml index a90b9f76..fc6e7c05 100644 --- a/defaults/templates.yml +++ b/defaults/templates.yml @@ -141,7 +141,11 @@ templates: imdb: optional: - imdb_list + - imdb_search + - imdb_award imdb_list: <> + imdb_search: <> + imdb_award: <> tmdb_person: default: diff --git a/modules/config.py b/modules/config.py index 5244ecc7..93f8ca06 100644 --- a/modules/config.py +++ b/modules/config.py @@ -485,8 +485,7 @@ class ConfigFile: yaml = YAML(self.config_path) if "settings" not in yaml.data or not yaml.data["settings"]: yaml.data["settings"] = {} - if "run_order" not in yaml.data["settings"]: - yaml.data["settings"]["run_order"] = new_run_order + yaml.data["settings"]["run_order"] = new_run_order yaml.save() self.session = requests.Session()