Fix conflicts

anon_fawkes/README.md

@@ -0,0 +1,19 @@
+```yaml
+libraries:
+  Movies:
+    metadata_path:
+    - git: anon_fawkes/collections/networks.yml
+    overlay_path:
+    - git: anon_fawkes/overlays/stream_on.yml
+```
+**Movies Overlays Preview**: <br>
+![Movies](https://i.imgur.com/oBt9zPP.png)
+<br>
+
+**TV Shows Overlays Preview**: <br>
+![TV Shows](https://i.imgur.com/lwpSCW8.png)
+<br>
+
+**Collections Preview**: <br>
+![Collections](https://i.imgur.com/NdGlVYU.png)
+<br>

anon_fawkes/collections/networks.yml

@@ -1,82 +1,42 @@
-collections:
-  Apple TV+:
-    mdblist_list:
-      url: https://mdblist.com/lists/plexmetamanager/appletv-<<library_type>>s/
-    sync_mode: sync
-    collection_order: custom
-    sort_title: +Apple TV
-    summary: <<library_type>>s From the Streaming Service Apple TV
-    url_poster: https://theposterdb.com/api/assets/206165
-
+external_templates:
+  git: PMM/templates
+  template_variables:
+    collection_section: "21"
 
-  Netflix:
+templates:
+  network:
     mdblist_list:
-      url: https://mdblist.com/lists/plexmetamanager/netflix-<<library_type>>s/
+      url: https://mdblist.com/lists/plexmetamanager/<<type>>-<<library_type>>s/
     sync_mode: sync
     collection_order: custom
-    sort_title: +Netflixw
-    summary: <<library_type>>s From the Streaming Service Netflix
-    url_poster: https://theposterdb.com/api/assets/205048
-
-  Amazon Prime Video:
-    mdblist_list:
-      url: https://mdblist.com/lists/plexmetamanager/amazon-<<library_type>>s/
+    sort_title: +<<collection_name>>
+    summary: <<library_type>>s From the Streaming Service <<collection_name>>
+    url_poster: https://theposterdb.com/api/assets/<<poster>>
+  discovery:
+    imdb_list:
+      url: https://www.imdb.com/search/title/?companies=co0834810
     sync_mode: sync
     collection_order: custom
-    sort_title: +Amazon Prime Video
-    summary: <<library_type>>s From the Streaming Service Amazon Prime
-    url_poster: https://theposterdb.com/api/assets/222004
+    sort_title: +<<collection_name>>
+    summary: <<library_type>>s From the Streaming Service <<collection_name>>
+    url_poster: https://theposterdb.com/api/assets/<<poster>>
 
+collections:
+  AppleTVPlus:
+    template: {name: network, type: appletv, poster: 206165}
+  Netflix:
+    template: {name: network, type: netflix, poster: 205048}
+  Amazon Prime Video:
+    template: {name: network, type: amazon, poster: 222004}
   Hulu:
-    mdblist_list:
-      url: https://mdblist.com/lists/plexmetamanager/hulu-<<library_type>>s/
-    sync_mode: sync
-    collection_order: custom
-    sort_title: +Hulu
-    summary: <<library_type>>s From the Streaming Service Hulu
-    url_poster: https://theposterdb.com/api/assets/220348
-
+    template: {name: network, type: hulu, poster: 220348}
   Paramount:
-    mdblist_list:
-      url: https://mdblist.com/lists/plexmetamanager/paramount-<<library_type>>s/
-    sync_mode: sync
-    collection_order: custom
-    sort_title: +Paramount+
-    summary: <<library_type>>s From the Streaming Service Paramount
-    url_poster: https://theposterdb.com/api/assets/168828
-
+    template: {name: network, type: paramount, poster: 168828}
   Peacock:
-    mdblist_list:
-      url: https://mdblist.com/lists/plexmetamanager/peacock-<<library_type>>s/
-    sync_mode: sync
-    collection_order: custom
-    sort_title: +Peacock
-    summary: <<library_type>>s From the Streaming Service Peacock
-    url_poster: https://theposterdb.com/api/assets/205411
-
-  Discovery+:
-    imdb_list:
-      url: https://www.imdb.com/search/title/?companies=co0834810
-    sync_mode: sync
-    collection_order: custom
-    sort_title: +Discovery+
-    summary: <<library_type>>s From the Streaming Service Discovery
-    url_poster: https://theposterdb.com/api/assets/220371
-
-  Disney+:
-    mdblist_list:
-      url: https://mdblist.com/lists/plexmetamanager/disney-<<library_type>>s/
-    sync_mode: sync
-    collection_order: custom
-    sort_title: +Disney+
-    summary: <<library_type>>s From the Streaming Service Disney
-    url_poster: https://theposterdb.com/api/assets/204376
-
+    template: {name: network, type: peacock, poster: 205411}
+  Disney:
+    template: {name: network, type: disney, poster: 204376}
   HBO Max:
-    mdblist_list:
-      url: https://mdblist.com/lists/plexmetamanager/hbomax-<<library_type>>s/
-    sync_mode: sync
-    collection_order: custom
-    sort_title: +HBO Max
-    summary: <<library_type>>s From the Streaming Service HBO Max
-    url_poster: https://theposterdb.com/api/assets/168825
+    template: {name: network, type: hbo, poster: 168825}
+  DiscoveryPlus:
+    template: {name: discovery, poster: 220371}

anon_fawkes/overlays/stream_on.yml

@@ -0,0 +1,146 @@
+#############################################################
+#               Streaming On Network Overlay                #
+#              Created by anon_fawkes & NaDs                #
+#             Credit to Magic815 for base images            #
+#############################################################
+#                                                           #
+#  Call this from your config.yml (Movie or Show):          #
+#  If nothing is specified these are the defaults           #
+#                                                           #
+#  The style variable can be either "Square" or "Round"     #
+#                                                           #
+#    overlay_path:                                          #
+#      - git: anon_fawkes/overlays/stream_on.yml            #
+#        template_variables:                                #
+#          style: Square                                    #
+#                                                           #
+#          # Use the Netflix overlay                        #
+#          use_netflix: true                                #
+#          # Use the Disney+ overlay                        #
+#          use_disney: true                                 #
+#          # Use the HBO overlay                            #
+#          use_hbo: true                                    #
+#          # Use the Hulu overlay                           #
+#          use_hulu: true                                   #
+#          # Use the Prime overlay                          #
+#          use_prime: true                                  #
+#          # Use the Paramount+ overlay                     #
+#          use_paramount: true                              #
+#          # Use the Discovery+ overlay                     #
+#          use_discovery: true                              #
+#          # Use the Apple TV + overlay                     #
+#          use_apple: true                                  #
+#          # Use the Peacock overlay                        #
+#          use_peacock: true                                #
+#                                                           #
+#############################################################
+
+queues:
+  stream:
+    - horizontal_offset: 15         # This is the first position
+      horizontal_align: center
+      vertical_offset: 15
+      vertical_align: bottom
+    - horizontal_offset: 130       # This is the second position
+      horizontal_align: center
+      vertical_offset: 15
+      vertical_align: bottom
+    - horizontal_offset: 245         # This is the third position
+      horizontal_align: center
+      vertical_offset: 15
+      vertical_align: bottom
+    - horizontal_offset: 360         # This is the third position
+      horizontal_align: center
+      vertical_offset: 15
+      vertical_align: bottom
+
+templates:
+  Streaming:
+    optional:
+      - use_<<slug>>
+    default:
+      overlay: <<overlay_name>>
+      horizontal_offset: 15
+      horizontal_align: right
+      vertical_offset: 15
+      vertical_align: bottom
+      weight_<<key>>: <<weight>>
+      style: Square
+    ignore_blank_results: true
+    overlay:
+      name: <<overlay_name>>
+      queue: stream
+      style: <<style>>
+      weight: <<weight_<<key>>>>
+      horizontal_offset: <<horizontal_offset>>
+      horizontal_align: <<horizontal_align>>
+      vertical_offset: <<vertical_offset>>
+      vertical_align: <<vertical_align>>
+      git: anon_fawkes/overlays/images/<<overlay_name>>-<<style>>
+
+overlays:
+  STREAMBLANK:
+    template:
+      - name: Streaming
+    overlay:
+      name: STREAMBLANK
+      git: anon_fawkes/overlays/images/STREAMBLANK
+    plex_search:
+      validate: false
+      any:
+        collection:
+          - AppleTVPlus
+          - Prime
+          - Hulu
+          - Paramount
+          - Peacock
+          - DiscoveryPlus
+          - Disney
+          - HBO
+          - Netflix
+
+  Netflix:
+    template: {name: Streaming, weight: 900, slug: netflix}
+    plex_search:
+      all:
+        collection: Netflix
+  Prime:
+    template: {name: Streaming, weight: 800, slug: prime}
+    plex_search:
+      all:
+        collection: Prime
+  Hulu:
+    template: {name: Streaming, weight: 700, slug: hulu}
+    plex_search:
+      all:
+        collection: Hulu
+  Paramount:
+    template: {name: Streaming, weight: 600, slug: paramount}
+    plex_search:
+      all:
+        collection: Paramount
+  Peacock:
+    template: {name: Streaming, weight: 500, slug: peacock}
+    plex_search:
+      all:
+        collection: Peacock
+  DiscoveryPlus:
+    template: {name: Streaming, weight: 400, slug: discovery}
+    plex_search:
+      all:
+        collection: Discovery+
+  Disney:
+    template: {name: Streaming, weight: 300, slug: disney}
+    plex_search:
+      all:
+        collection: Disney
+  HBO:
+    template: {name: Streaming, weight: 200, slug: hbo}
+    plex_search:
+      all:
+        collection: HBO
+  AppleTVPlus:
+    template: {name: Streaming, weight: 100, slug: apple}
+    plex_search:
+      all:
+        collection: AppleTVPlus