diff --git a/VERSION b/VERSION index 8e513e11..54fd8923 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.17.3-develop76 +1.17.3-develop77 diff --git a/config/config.yml.template b/config/config.yml.template index c3b031a6..d131f272 100644 --- a/config/config.yml.template +++ b/config/config.yml.template @@ -5,33 +5,33 @@ libraries: # This is called out once within metadata_path: - file: config/Movies.yml # This is a local file on the system - folder: config/Movies/ # This is a local directory on the system - - git: PMM/chart/basic # This is a file within the https://github.com/meisnate12/Plex-Meta-Manager-Configs Repository - - git: PMM/chart/imdb # This is a file within the https://github.com/meisnate12/Plex-Meta-Manager-Configs Repository + - pmm: basic # This is a file within the defaults folder in the Repository + - pmm: imdb # This is a file within the defaults folder in the Repository overlay_path: - remove_overlays: false # Set this to true to remove all overlays - file: config/Overlays.yml # This is a local file on the system - - git: PMM/overlays/imdb_top_250 # This is a file within the https://github.com/meisnate12/Plex-Meta-Manager-Configs Repository + - pmm: ribbon # This is a file within the defaults folder in the Repository TV Shows: metadata_path: - file: config/TVShows.yml - folder: config/TV Shows/ - - git: PMM/chart/basic # This is a file within the https://github.com/meisnate12/Plex-Meta-Manager-Configs Repository - - git: PMM/chart/imdb # This is a file within the https://github.com/meisnate12/Plex-Meta-Manager-Configs Repository + - pmm: basic # This is a file within the defaults folder in the Repository + - pmm: imdb # This is a file within the defaults folder in the Repository overlay_path: - remove_overlays: false # Set this to true to remove all overlays - file: config/Overlays.yml # This is a local file on the system - - git: PMM/overlays/imdb_top_250 # This is a file within the https://github.com/meisnate12/Plex-Meta-Manager-Configs Repository + - pmm: ribbon # This is a file within the defaults folder in the Repository Anime: metadata_path: - file: config/Anime.yml - - git: PMM/chart/basic # This is a file within the https://github.com/meisnate12/Plex-Meta-Manager-Configs Repository - - git: PMM/chart/anilist # This is a file within the https://github.com/meisnate12/Plex-Meta-Manager-Configs Repository + - pmm: basic # This is a file within the defaults folder in the Repository + - pmm: anilist # This is a file within the defaults folder in the Repository Music: metadata_path: - file: config/Music.yml playlist_files: - file: config/playlists.yml - - git: PMM/playlist # This is a file within the https://github.com/meisnate12/Plex-Meta-Manager-Configs Repository + - pmm: playlist # This is a file within the defaults folder in the Repository settings: cache: true cache_expiration: 60 diff --git a/defaults/award/other.yml b/defaults/award/other_award.yml similarity index 100% rename from defaults/award/other.yml rename to defaults/award/other_award.yml diff --git a/defaults/both/genre.yml b/defaults/both/genre.yml index 43daf46f..fda072d2 100644 --- a/defaults/both/genre.yml +++ b/defaults/both/genre.yml @@ -43,7 +43,7 @@ dynamic_collections: Genre: type: genre template: - - genre_dynamic + - smart_filter - translation - shared template_variables: diff --git a/defaults/chart/other.yml b/defaults/chart/other_chart.yml similarity index 100% rename from defaults/chart/other.yml rename to defaults/chart/other_chart.yml diff --git a/defaults/movie/universe.yml b/defaults/movie/universe.yml index 18bc70e4..43e43c74 100644 --- a/defaults/movie/universe.yml +++ b/defaults/movie/universe.yml @@ -29,7 +29,7 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: "02" diff --git a/defaults/overlays/flixpatrol.yml b/defaults/overlays/flixpatrol.yml index 0973364d..274daf34 100644 --- a/defaults/overlays/flixpatrol.yml +++ b/defaults/overlays/flixpatrol.yml @@ -14,7 +14,7 @@ queues: vertical_align: top templates: - Top10: + FlixPatrol: optional: - use_<> - time_window_<> @@ -22,6 +22,7 @@ templates: default: style: round overlay: <> + slug: <> horizontal_offset: 15 horizontal_align: left vertical_offset: 15 @@ -74,14 +75,14 @@ templates: overlays: Netflix: - template: {name: Top10, weight: 600, key: netflix} + template: {name: FlixPatrol, weight: 600, key: netflix} Disney: - template: {name: Top10, weight: 500, key: disney} + template: {name: FlixPatrol, weight: 500, key: disney} HBO: - template: {name: Top10, weight: 400, key: hbo} + template: {name: FlixPatrol, weight: 400, key: hbo} Hulu: - template: {name: Top10, weight: 300, key: hulu} + template: {name: FlixPatrol, weight: 300, key: hulu} Paramount: - template: {name: Top10, weight: 200, key: paramount, slug: paramount_plus} + template: {name: FlixPatrol, weight: 200, key: paramount, slug: paramount_plus} Prime: - template: {name: Top10, weight: 100, key: prime, slug: amazon_prime} \ No newline at end of file + template: {name: FlixPatrol, weight: 100, key: prime, slug: amazon_prime} \ No newline at end of file diff --git a/defaults/show/network.yml b/defaults/show/network.yml index 8bf00f2c..ed86ead8 100644 --- a/defaults/show/network.yml +++ b/defaults/show/network.yml @@ -26,19 +26,12 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: "04" -templates: - networks_dynamic: - default: - sort_by: release.desc - url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/network/<>.jpg - smart_filter: - sort_by: <> - any: - network: <> +translations: + pmm: translations collections: Network Collections: @@ -47,15 +40,22 @@ collections: separator: network dynamic_collections: - Network US: + Network: type: network title_format: <> template: - - networks_dynamic + - smart_filter - shared other_template: - - networks_dynamic + - smart_filter - shared + template_variables: + search_term: + default: network + image: + default: network/<> + translation_key: + default: network include: - A&E - ABC