Merge pull request #144 from bullmoose20/master

implemented dovi filter in overlays

bullmoose20/Acting-Template.txt

@@ -1,4 +1,5 @@
 Adam Driver 
+Adam Driver2 
 Adam Sandler 
 Al Pacino 
 Amanda Seyfried 

bullmoose20/README.md

@@ -6,31 +6,31 @@ A full version of this including all the images/folders/xcf/psd and more that I
 For ease of use just unzip everything in the bullmoose20-pmmsetup_<timestamp>.zip file to your docker container config folder and edit the config.yml to match your settings. Then run the container, open terminal/console, and use the following command ```python plex_meta_manager.py -r```
 
 Playlists Preview: <br>
-![Playlists](Playlists.png)
+![Playlists](Playlists.jpg)
 <br>
 <br>
 Movie Library With Overlays Preview: <br>
-![Movies with overlays](MovieLibrary.png)
+![Movies with overlays](MovieLibrary.jpg)
 <br>
 <br>
 Movie Collections Preview: <br>
-![Movies with overlays](MovieCollection01.png)
+![Movies with overlays](MovieCollection01.jpg)
 <br>
 <br>
 Movie Collections Preview Continued: <br>
-![Movies with overlays](MovieCollection02.png)
+![Movies with overlays](MovieCollection02.jpg)
 <br>
 <br>
 Movie Collections Preview Continued: <br>
-![Movies with overlays](MovieCollection03.png)
+![Movies with overlays](MovieCollection03.jpg)
 <br>
 <br>
 TV Shows Library with Overlays Preview: <br>
-![TV Shows with overlays](TVLibrary.png)<br>
+![TV Shows with overlays](TVLibrary.jpg)<br>
 <br>
 <br>
 TV Shows Collections with Overlays Preview: <br>
-![TV Shows with overlays](TVCollections01.png)<br>
+![TV Shows with overlays](TVCollections01.jpg)<br>
 <br>
 <br>
 

bullmoose20/config.yml

@@ -5,6 +5,7 @@ playlist_files:
 libraries:                                      # Library mappings must have a colon (:) placed after them
   Movies:
     metadata_path:
+      #- file: config/metadata/movies/Cleaner.yml
       #- file: config/metadata/movies/Movies.yml
       - file: config/metadata/movies/MovieCharts.yml
       - file: config/metadata/movies/Holidays.yml
@@ -44,13 +45,16 @@ libraries:                                      # Library mappings must have a c
           collection_mode: hide
   TV Shows:
     metadata_path:
+      #- file: config/metadata/movies/Cleaner.yml
       #- file: config/metadata/shows/TVShows.yml
       - file: config/metadata/shows/ShowCharts.yml
       - file: config/metadata/shows/Studios.yml
       - file: config/metadata/shows/Genres.yml
       - file: config/metadata/shows/Networks.yml
+      - file: config/metadata/movies/People.yml
       - file: config/metadata/shows/Decades.yml
       - file: config/metadata/overlays.yml
+      
     settings:
       missing_path: config/missing
       asset_directory:
@@ -62,6 +66,7 @@ libraries:                                      # Library mappings must have a c
         - config/assets/yearsanddecades
         - config/assets/playlists
         - config/assets/
+        - config/overlays/
     operations:
       split_duplicates: true
       assets_for_all: true

bullmoose20/metadata/movies/Awards.yml

@@ -53,6 +53,7 @@ collections:
   #schedule: yearly (02/21)
 
  Venice:
+  #test: true
   template: { name: Award} 
   trakt_list: https://trakt.tv/users/maxwelldeux/lists/venice-film-festival-golden-lion
   summary: "The Venice Film Festival or Venice International Film Festival (Italian: Mostra Internazionale d'Arte Cinematografica della Biennale di Venezia is the world's oldest film festival"

bullmoose20/metadata/movies/Cleaner.yml

@@ -0,0 +1,126 @@
+#############################################
+#                                           #
+#          Cleaner/Test Yml for             #
+#           Movies and TV Shows             #
+#                                           #
+#############################################
+
+collections:
+  # Adam Driver2:
+    # #test: true
+    # tmdb_actor_details: 1023139
+    # collection_mode: hide
+ 
+  Remove Labels:
+    test: true
+    build_collection: false
+    plex_search:
+      any:
+        label: 
+          - "Cannes - Palme d'or"
+          - "Valentine's Day Movies"
+          - 1080p Overlay
+          - 1080p-HDR Overlay
+          - 480p Overlay
+          - 4K Overlay
+          - 4K-Dolby Overlay
+          - 4K-HDR Overlay
+          - 720p Overlay
+          - BAFTA Best Films
+          - Best of 2014
+          - Best of 2015
+          - Best of 2016
+          - Best of 2017
+          - Best of 2018
+          - Best of 2019
+          - Best of 2020
+          - Best of 2021
+          - Blue Sky
+          - DC Extended Universe
+          - DreamWorks
+          - Emmy Winners
+          - Gangster
+          - Golden Globes
+          - Golden Globes 2015
+          - Golden Globes 2017
+          - Golden Globes 2019
+          - Golden Globes 2020
+          - Golden Globes 2021
+          - Illumination Entertainment
+          - IMDb Top 100 Film Noir
+          - IMDb Top 100 Superhero Movies
+          - IMDb Top 250
+          - LGBTQ+
+          - Martial Arts
+          - Marvel Studios
+          - MindF#ck
+          - Oscars Best Picture Winners
+          - Oscars Nominated
+          - Oscars Winners
+          - Pandemic
+          - Pixar
+          - Plex Popular
+          - Popular
+          - Sony Pictures
+          - Sony Pictures Animation
+          - Sword & Sorcery
+          - Trending
+          - Venice
+          - Walt Disney Animation Studios
+          - Walt Disney Pictures
+          - Warner Bros. Pictures
+          - Top Rated
+    item_label.remove:
+      - "Cannes - Palme d'or"
+      - "Valentine's Day Movies"
+      - 1080p Overlay
+      - 1080p-HDR Overlay
+      - 480p Overlay
+      - 4K Overlay
+      - 4K-Dolby Overlay
+      - 4K-HDR Overlay
+      - 720p Overlay
+      - BAFTA Best Films
+      - Best of 2014
+      - Best of 2015
+      - Best of 2016
+      - Best of 2017
+      - Best of 2018
+      - Best of 2019
+      - Best of 2020
+      - Best of 2021
+      - Blue Sky
+      - DC Extended Universe
+      - DreamWorks
+      - Emmy Winners
+      - Gangster
+      - Golden Globes
+      - Golden Globes 2015
+      - Golden Globes 2017
+      - Golden Globes 2019
+      - Golden Globes 2020
+      - Golden Globes 2021
+      - Illumination Entertainment
+      - IMDb Top 100 Film Noir
+      - IMDb Top 100 Superhero Movies
+      - IMDb Top 250
+      - LGBTQ+
+      - Martial Arts
+      - Marvel Studios
+      - MindF#ck
+      - Oscars Best Picture Winners
+      - Oscars Nominated
+      - Oscars Winners
+      - Pandemic
+      - Pixar
+      - Plex Popular
+      - Popular
+      - Sony Pictures
+      - Sony Pictures Animation
+      - Sword & Sorcery
+      - Trending
+      - Venice
+      - Walt Disney Animation Studios
+      - Walt Disney Pictures
+      - Warner Bros. Pictures
+      - Top Rated

bullmoose20/metadata/movies/Genres.yml

@@ -16,12 +16,14 @@ templates:
     sort_title: +15_<<collection_name>>
     collection_mode: hide
     sync_mode: sync
-    smart_label: alpha
+    smart_label: random
 collections:
   Action & adventure:
+    test: true
     template: { name: genre, genre: "Action & adventure" }
     #url_poster: https://i.imgur.com/5rP3mqc.jpg
   Action:
+    test: true
     template: { name: genre, genre: action }
     #url_poster: https://i.imgur.com/5rP3mqc.jpg
   Adventure:
@@ -77,6 +79,7 @@ collections:
     imdb_list: https://www.imdb.com/list/ls062688328/
     summary: LGBTQ+ film is a genre of films where the characters decpict lesbian, gay, bisexual, transgender, queer and intersex people.
   Martial Arts:
+    #test: true
     template: { name: Special Genre }
     imdb_list:
       - https://www.imdb.com/list/ls000099643/
@@ -84,7 +87,8 @@ collections:
       - https://www.imdb.com/list/ls068378513/
       - https://www.imdb.com/list/ls090404120/
     summary: Martial Arts film is a sub-genre of action films that feature numerous martial arts combat between characters. These combats are usually the films' primary appeal and entertainment value, and often are a method of storytelling and character expression and development. Martial Arts are frequently featured in training scenes and other sequences in addition to fights. Martial Arts films commonly include other types of action, such as hand-to-hand combat, stuntwork, chases, and gunfights.
-  Mindf#ck:
+  MindF#ck:
+    test: true
     template: { name: Special Genre }
     trakt_list:
      - https://trakt.tv/users/hdlists/lists/mindfuck-movies
@@ -100,6 +104,7 @@ collections:
     template: { name: genre, genre: mystery }
     #url_poster: https://i.imgur.com/t1ArisJ.jpg
   Pandemic:
+    #test: true
     template: { name: Special Genre }
     imdb_list:
       - url: https://www.imdb.com/search/keyword/?keywords=deadly-virus%2Chealth-crisis%2Cpandemic%2Cpublic-health-epidemic%2Cvirus%2Ccoronavirus&sort=moviemeter,asc&mode=detail&page=1&ref_=kw_ref_key
@@ -135,8 +140,8 @@ collections:
     template: { name: genre, genre: sport }
     #url_poster: https://i.imgur.com/uGtTbYV.jpg
   Spy:
-    template: {name: genre, genre: espionage,spy}
+    template: {name: genre, genre: "espionage,spy"}
-    #url_poster: https://i.imgur.com/IlVrIQB.png
+    #url_poster: https://i.imgur.com/IlVrIQB.jpg
   Stand Up Comedy:
     template: { name: Special Genre }
     imdb_list:
@@ -153,8 +158,10 @@ collections:
     template: { name: genre, genre: thriller }
     #url_poster: https://i.imgur.com/i4K4wXI.jpg
   War:
+    #test: true
     template: { name: genre, genre: war }
     #url_poster: https://i.imgur.com/tPgvWij.jpg
   Western:
+    #test: true
     template: { name: genre, genre: western }
     #url_poster: https://i.imgur.com/NbiRkV6.jpg

bullmoose20/metadata/movies/People.yml

@@ -17,6 +17,7 @@ templates:
 
 collections:
   Adam Driver:
+    #test: true
     template: { name: Person, person: "Adam Driver" }
   Adam Sandler:
     template: { name: Person, person: "Adam Sandler" }

bullmoose20/metadata/movies/PeopleTMDB.yml

@@ -0,0 +1,150 @@
+collections:
+  Adam Driver2:
+    test: true
+    tmdb_actor_details: 1023139
+    collection_mode: hide
+ 
+  Remove Labels:
+    test: true
+    plex_search:
+      any:
+        label: 
+          - Gangster
+          - Emmy Winners
+          - Marvel Studios
+          - DC Extended Universe
+          - Popular
+          - "Cannes - Palme d'or"
+          - "New Year's Day Movies"
+          - "St. Patrick's Day Movies"
+          - "Valentine's Day Movies"
+          - 1080p Overlay
+          - 1080p-HDR Overlay
+          - 480p Overlay
+          - 4K Overlay
+          - 4K-HDR Overlay
+          - BAFTA Best Films
+          - Best of 2014
+          - Best of 2015
+          - Best of 2016
+          - Best of 2017
+          - Best of 2018
+          - Best of 2019
+          - Best of 2020
+          - Best of 2021
+          - Blue Sky
+          - Christmas Movies
+          - DC Extended Universe
+          - DreamWorks
+          - Easter Movies
+          - Emmy Winners
+          - Gangster
+          - Golden Globes
+          - Golden Globes 2015
+          - Golden Globes 2017
+          - Golden Globes 2019
+          - Golden Globes 2020
+          - Golden Globes 2021
+          - Halloween Movies
+          - Illumination Entertainment
+          - IMDb Top 100 Film Noir
+          - IMDb Top 100 Superhero Movies
+          - IMDb Top 250
+          - LGBTQ+
+          - M#rtial Arts
+          - Martial Arts
+          - Marvel Studios
+          - Mindf#ck
+          - Mindf#ck Movies
+          - MindF@ck
+          - MindF_ck
+          - Mindfuck Movies
+          - Oscars Best Picture Winners
+          - Oscars Nominated
+          - Oscars Winners
+          - P#ndemic
+          - Pandemic
+          - Pixar
+          - Plex Popular
+          - Sony Pictures
+          - Sony Pictures Animation
+          - Sword & Sorcery
+          - T#st
+          - Thanksgiving Movies
+          - Top Rated
+          - Trending
+          - Venice
+          - Walt Disney Animation Studios
+          - Walt Disney Pictures
+          - Warner Bros. Pictures
+    item_label.remove:
+      - Gangster
+      - Emmy Winners
+      - Marvel Studios
+      - DC Extended Universe
+      - Popular
+      - "Cannes - Palme d'or"
+      - "New Year's Day Movies"
+      - "St. Patrick's Day Movies"
+      - "Valentine's Day Movies"
+      - 1080p Overlay
+      - 1080p-HDR Overlay
+      - 480p Overlay
+      - 4K Overlay
+      - 4K-HDR Overlay
+      - BAFTA Best Films
+      - Best of 2014
+      - Best of 2015
+      - Best of 2016
+      - Best of 2017
+      - Best of 2018
+      - Best of 2019
+      - Best of 2020
+      - Best of 2021
+      - Blue Sky
+      - Christmas Movies
+      - DC Extended Universe
+      - DreamWorks
+      - Easter Movies
+      - Emmy Winners
+      - Gangster
+      - Golden Globes
+      - Golden Globes 2015
+      - Golden Globes 2017
+      - Golden Globes 2019
+      - Golden Globes 2020
+      - Golden Globes 2021
+      - Halloween Movies
+      - Illumination Entertainment
+      - IMDb Top 100 Film Noir
+      - IMDb Top 100 Superhero Movies
+      - IMDb Top 250
+      - LGBTQ+
+      - M#rtial Arts
+      - Martial Arts
+      - Marvel Studios
+      - Mindf#ck
+      - Mindf#ck Movies
+      - MindF@ck
+      - MindF_ck
+      - Mindfuck Movies
+      - Oscars Best Picture Winners
+      - Oscars Nominated
+      - Oscars Winners
+      - P#ndemic
+      - Pandemic
+      - Pixar
+      - Plex Popular
+      - Sony Pictures
+      - Sony Pictures Animation
+      - Sword & Sorcery
+      - T#st
+      - Thanksgiving Movies
+      - Top Rated
+      - Trending
+      - Venice
+      - Walt Disney Animation Studios
+      - Walt Disney Pictures
+      - Warner Bros. Pictures
+    build_collection: false
+    

bullmoose20/metadata/overlays.yml

@@ -6,16 +6,26 @@
 #############################################################
 
 collections:
-  480p:
+  480p-Dolby-HDR:
     test: true
     #revert_overlay: true
     plex_search:
       all:
         resolution: 480p
-        hdr: false
+        hdr: true
     filters:
-      filepath.not: '[DV '
+      has_dolby_vision: true
-    item_overlay: 480p
+    item_overlay: 480p-Dolby-HDR
+    build_collection: false 
+  480p-Dolby:
+    test: true
+    #revert_overlay: true
+    plex_search:
+      all:
+        resolution: 480p
+    filters:
+      has_dolby_vision: true
+    item_overlay: 480p-Dolby
     build_collection: false
   480p-HDR:
     test: true
@@ -25,61 +35,19 @@ collections:
         resolution: 480p
         hdr: true
     filters:
-      filepath.not: '[DV '
+      has_dolby_vision: false
     item_overlay: 480p-HDR
     build_collection: false
-  480p-Dolby:
+  480p:
     test: true
     #revert_overlay: true
     plex_search:
       all:
         resolution: 480p
-    filters:
-      filepath: '[DV '
-    item_overlay: 480p-Dolby
-    build_collection: false
-  480p-Dolby-HDR:
-    test: true
-    #revert_overlay: true
-    plex_search:
-      all:
-        resolution: 480p
-        hdr: true
-    filters:
-      filepath: '[DV '
-    item_overlay: 480p-Dolby-HDR
-    build_collection: false 
-  720p:
-    test: true
-    #revert_overlay: true
-    plex_search:
-      all:
-        resolution: 720p
         hdr: false
     filters:
-      filepath.not: '[DV '
+      has_dolby_vision: false
-    item_overlay: 720p
+    item_overlay: 480p
-    build_collection: false
-  720p-HDR:
-    test: true
-    #revert_overlay: true
-    plex_search:
-      all:
-        resolution: 720p
-        hdr: true
-    filters:
-      filepath.not: '[DV '
-    item_overlay: 720p-HDR
-    build_collection: false
-  720p-Dolby:
-    test: true
-    #revert_overlay: true
-    plex_search:
-      all:
-        resolution: 720p
-    filters:
-      filepath: '[DV '
-    item_overlay: 720p-Dolby
     build_collection: false
   720p-Dolby-HDR:
     test: true
@@ -89,40 +57,40 @@ collections:
         resolution: 720p
         hdr: true
     filters:
-      filepath: '[DV '
+      has_dolby_vision: true
     item_overlay: 720p-Dolby-HDR
     build_collection: false 
-  1080p:
+  720p-Dolby:
     test: true
     #revert_overlay: true
     plex_search:
       all:
-        resolution: 1080p
+        resolution: 720p
-        hdr: false
     filters:
-      filepath.not: '[DV '
+      has_dolby_vision: true
-    item_overlay: 1080p
+    item_overlay: 720p-Dolby
     build_collection: false
-  1080p-HDR:
+  720p-HDR:
     test: true
     #revert_overlay: true
     plex_search:
       all:
-        resolution: 1080p
+        resolution: 720p
         hdr: true
     filters:
-      filepath.not: '[DV '
+      has_dolby_vision: false
-    item_overlay: 1080p-HDR
+    item_overlay: 720p-HDR
     build_collection: false
-  1080p-Dolby:
+  720p:
     test: true
     #revert_overlay: true
     plex_search:
       all:
-        resolution: 1080p
+        resolution: 720p
+        hdr: false
     filters:
-      filepath: '[DV '
+      has_dolby_vision: false
-    item_overlay: 1080p-Dolby
+    item_overlay: 720p
     build_collection: false
   1080p-Dolby-HDR:
     test: true
@@ -132,40 +100,40 @@ collections:
         resolution: 1080p
         hdr: true
     filters:
-      filepath: '[DV '
+      has_dolby_vision: true
     item_overlay: 1080p-Dolby-HDR
     build_collection: false 
-  4K:
+  1080p-Dolby:
     test: true
     #revert_overlay: true
     plex_search:
       all:
-        resolution: 4K
+        resolution: 1080p
-        hdr: false
     filters:
-      filepath.not: '[DV '
+      has_dolby_vision: true
-    item_overlay: 4K
+    item_overlay: 1080p-Dolby
     build_collection: false
-  4K-HDR:
+  1080p-HDR:
     test: true
     #revert_overlay: true
     plex_search:
       all:
-        resolution: 4K
+        resolution: 1080p
         hdr: true
     filters:
-      filepath.not: '[DV '
+      has_dolby_vision: false
-    item_overlay: 4K-HDR
+    item_overlay: 1080p-HDR
     build_collection: false
-  4K-Dolby:
+  1080p:
     test: true
     #revert_overlay: true
     plex_search:
       all:
-        resolution: 4K
+        resolution: 1080p
+        hdr: false
     filters:
-      filepath: '[DV '
+      has_dolby_vision: false
-    item_overlay: 4K-Dolby
+    item_overlay: 1080p
     build_collection: false
   4K-Dolby-HDR:
     test: true
@@ -175,9 +143,41 @@ collections:
         resolution: 4K
         hdr: true
     filters:
-      filepath: '[DV '
+      has_dolby_vision: true
     item_overlay: 4K-Dolby-HDR
     build_collection: false 
+  4K-Dolby:
+    test: true
+    #revert_overlay: true
+    plex_search:
+      all:
+        resolution: 4K
+    filters:
+      has_dolby_vision: true
+    item_overlay: 4K-Dolby
+    build_collection: false
+  4K-HDR:
+    test: true
+    #revert_overlay: true
+    plex_search:
+      all:
+        resolution: 4K
+        hdr: true
+    filters:
+      has_dolby_vision: false
+    item_overlay: 4K-HDR
+    build_collection: false
+  4K:
+    test: true
+    #revert_overlay: true
+    plex_search:
+      all:
+        resolution: 4K
+        hdr: false
+    filters:
+      has_dolby_vision: false
+    item_overlay: 4K
+    build_collection: false
   HDR:
     test: true
     #revert_overlay: true
@@ -185,7 +185,7 @@ collections:
       all:
         hdr: true
     filters:
-      filepath.not: '[DV '
+      has_dolby_vision: false
       resolution.not: 4K
     item_overlay: HDR
     build_collection: false
@@ -194,7 +194,7 @@ collections:
     #revert_overlay: true
     plex_all: true
     filters:
-      filepath: '[DV '
+      has_dolby_vision: true
       resolution.not: 4K
     item_overlay: Dolby
     build_collection: false

bullmoose20/metadata/shows/Genres.yml

@@ -16,12 +16,14 @@ templates:
     sort_title: +15_<<collection_name>>
     collection_mode: hide
     sync_mode: sync
-    smart_label: alpha
+    smart_label: random
 collections:
   Action & adventure:
+    test: true
     template: { name: genre, genre: "Action & adventure" }
     #url_poster: https://i.imgur.com/5rP3mqc.jpg
   Action:
+    test: true
     template: { name: genre, genre: action }
     #url_poster: https://i.imgur.com/5rP3mqc.jpg
   Adventure:
@@ -77,6 +79,7 @@ collections:
     imdb_list: https://www.imdb.com/list/ls062688328/
     summary: LGBTQ+ film is a genre of films where the characters decpict lesbian, gay, bisexual, transgender, queer and intersex people.
   Martial Arts:
+    #test: true
     template: { name: Special Genre }
     imdb_list:
       - https://www.imdb.com/list/ls000099643/
@@ -84,7 +87,8 @@ collections:
       - https://www.imdb.com/list/ls068378513/
       - https://www.imdb.com/list/ls090404120/
     summary: Martial Arts film is a sub-genre of action films that feature numerous martial arts combat between characters. These combats are usually the films' primary appeal and entertainment value, and often are a method of storytelling and character expression and development. Martial Arts are frequently featured in training scenes and other sequences in addition to fights. Martial Arts films commonly include other types of action, such as hand-to-hand combat, stuntwork, chases, and gunfights.
-  Mindf#ck:
+  MindF#ck:
+    test: true
     template: { name: Special Genre }
     trakt_list:
      - https://trakt.tv/users/hdlists/lists/mindfuck-movies
@@ -100,6 +104,7 @@ collections:
     template: { name: genre, genre: mystery }
     #url_poster: https://i.imgur.com/t1ArisJ.jpg
   Pandemic:
+    #test: true
     template: { name: Special Genre }
     imdb_list:
       - url: https://www.imdb.com/search/keyword/?keywords=deadly-virus%2Chealth-crisis%2Cpandemic%2Cpublic-health-epidemic%2Cvirus%2Ccoronavirus&sort=moviemeter,asc&mode=detail&page=1&ref_=kw_ref_key
@@ -135,8 +140,8 @@ collections:
     template: { name: genre, genre: sport }
     #url_poster: https://i.imgur.com/uGtTbYV.jpg
   Spy:
-    template: {name: genre, genre: espionage,spy}
+    template: {name: genre, genre: "espionage,spy"}
-    #url_poster: https://i.imgur.com/IlVrIQB.png
+    #url_poster: https://i.imgur.com/IlVrIQB.jpg
   Stand Up Comedy:
     template: { name: Special Genre }
     imdb_list:
@@ -153,8 +158,10 @@ collections:
     template: { name: genre, genre: thriller }
     #url_poster: https://i.imgur.com/i4K4wXI.jpg
   War:
+    #test: true
     template: { name: genre, genre: war }
     #url_poster: https://i.imgur.com/tPgvWij.jpg
   Western:
+    #test: true
     template: { name: genre, genre: western }
     #url_poster: https://i.imgur.com/NbiRkV6.jpg