From 35ad4f3597a603a8c7caa311c3c150d79f962529 Mon Sep 17 00:00:00 2001 From: bullmoose20 Date: Wed, 30 Mar 2022 19:03:57 -0400 Subject: [PATCH] fixes to existing yml files --- yozora/configs 2.0 - WIP/common/studio.yml | 197 ++++++++++++------ yozora/configs 2.0 - WIP/movie/chart.yml | 8 +- .../configs 2.0 - WIP/movie/streaming_uk.yml | 2 +- .../configs 2.0 - WIP/movie/streaming_us.yml | 2 +- yozora/configs 2.0 - WIP/tv/chart.yml | 10 +- yozora/configs 2.0 - WIP/tv/streaming_uk.yml | 2 +- yozora/configs 2.0 - WIP/tv/streaming_us.yml | 2 +- 7 files changed, 150 insertions(+), 73 deletions(-) diff --git a/yozora/configs 2.0 - WIP/common/studio.yml b/yozora/configs 2.0 - WIP/common/studio.yml index f9d6e18..2a34672 100644 --- a/yozora/configs 2.0 - WIP/common/studio.yml +++ b/yozora/configs 2.0 - WIP/common/studio.yml @@ -1,71 +1,148 @@ ###################################################### -# Smart Studio Collections # +# Dynamic Studio Collections # # Created by Yozora and Bullmoose20 # # # ###################################################### templates: - Studio: + studio_dynamic: + default: + URL_ENCODE: <> collection_mode: hide + sort_title: +05_<> + url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/common/studio/<>.jpg smart_filter: sort_by: release.desc any: - studio: <> - sort_title: +05_<> - url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/common/studio/<>.jpg + studio: <> -collections: - 20th Century Studios: - template: { name: Studio, studio: "20th Century" } - summary: "20th Century Studios is an American film production studio headquartered at the Fox Studio Lot in the Century City area of Los Angeles and is a subsidiary of Walt Disney Studios, a division of The Walt Disney Company." - Amazon Studios: - template: { name: Studio, studio: "Amazon" } - summary: "Amazon Studios is an American television and film producer and distributor that is a subsidiary of Amazon. It specializes in developing television series and distributing and producing films. It was started in late 2010." - Blue Sky Studios: - template: { name: Studio, studio: "Blue Sky Studios. Blue Sky Films" } - summary: Blue Sky Studios, Inc. is an American computer animation film studio based in Greenwich, Connecticut. It is a subsidiary of 20th Century Animation, a division of Disney Studios Content. - Columbia Pictures: - template: { name: Studio, studio: "Columbia Pictures, Columbia TriStar, TriStar" } - summary: Columbia Pictures is an American film production studio that is a member of the Sony Pictures Motion Picture Group, a division of Sony Entertainment's Sony Pictures Entertainment, which is one of the Big Five studios and a subsidiary of the multinational conglomerate Sony. - DreamWorks Studios: - template: { name: Studio, studio: "DreamWorks" } - summary: DreamWorks Animation LLC (also simply known as DreamWorks) is an American animation studio and a subsidiary of Universal Pictures, itself a subsidiary of Comcast's NBCUniversal. It is based in Glendale, California, and produces animated feature films, television programs, and online virtual games. - Illumination Entertainment: - template: { name: Studio, studio: "Illumination Entertainment, Illumination Films" } - summary: Illumination is an American film and animation studio founded by Chris Meledandri in 2007 and owned by Universal Pictures, a division of NBCUniversal, which is itself a division of Comcast. Meledandri produces the films, while Universal finances and distributes all the films. The studio is responsible for the Despicable Me and The Secret Life of Pets franchises and the film adaptations of Dr. Seuss’ books The Lorax and How the Grinch Stole Christmas. The Minions, characters from the Despicable Me series, are the studio's mascots. - Lionsgate: - template: { name: Studio, studio: "Lionsgate" } - summary: Lionsgate is a Canadian-American entertainment company. It was formed by Frank Giustra on July 10, 1997, domiciled in Vancouver, British Columbia, Canada and is currently headquartered in Santa Monica, California, United States - Lucasfilm Ltd: - template: { name: Studio, studio: "Lucasfilm" } - summary: Lucasfilm Ltd. LLC is an American film and television production company and a subsidiary of Walt Disney Studios, which is a business segment of the Walt Disney Company - Marvel Studios: - template: { name: Studio, studio: "Marvel Studios, Marvel Animation, Marvel Enterprises, Marvel Entertainment, Marvel" } - summary: Marvel Studios, LLC is an American film and television production company that is a subsidiary of Walt Disney Studios, a division of the Walt Disney Company. Marvel Studios is known for the production of the Marvel Cinematic Universe films, based on characters that appear in Marvel Comics publications. - Metro-Goldwyn-Mayer: - template: { name: Studio, studio: "Metro-Goldwyn-Mayer, MGM" } - summary: Metro-Goldwyn-Mayer Studios Inc. is an American media company, founded in 1924, that produces and distributes feature films and television programs. It is based in Beverly Hills, California. MGM was formed by Marcus Loew by combining Metro Pictures, Goldwyn Pictures, and Louis B. Mayer Pictures into a single company. - New Line Cinema: - template: { name: Studio, studio: "New Line" } - summary: New Line Cinema is an American film production studio and a film production label of the Warner Bros. Pictures Group division of Warner Bros. Entertainment. It was founded in 1967 by Robert Shaye as an independent film distribution company; later becoming a film studio. - Paramount Pictures: - template: { name: Studio, studio: "Paramount" } - summary: Paramount Pictures Corporation is an American film and television production and distribution company and the main namesake subsidiary of Paramount Global. - Pixar: - template: { name: Studio, studio: "Pixar" } - summary: Pixar Animation Studios, commonly known as Pixar, is an American computer animation studio based in Emeryville, California, a subsidiary of Disney Studios Content owned by The Walt Disney studio. Pixar began in 1979 as part of the Lucasfilm computer division, known as the Graphics Group, before its spin-off as a corporation on February 3, 1986, with funding from Apple co-founder Steve Jobs, who became its majority shareholder. Disney purchased Pixar in 2006 at a valuation of $7.4 billion by converting each share of Pixar stock to 2.3 shares of Disney stock, a transaction that resulted in Jobs becoming Disney's largest single shareholder at the time. Pixar is best known for its feature films technologically powered by RenderMan, the studio's own implementation of the industry-standard RenderMan Interface Specification image-rendering application programming interface. Luxo Jr., a desk lamp from the studio's 1986 short film of the same name, is the studio's mascot. - Sony Pictures: - template: { name: Studio, studio: "Sony" } - summary: Sony Pictures is an American diversified multinational mass media and entertainment studio conglomerate that produces, acquires, and distributes filmed entertainment through multiple platforms. - Studio Ghibli: - template: { name: Studio, studio: "Studio Ghibli" } - summary: Studio Ghibli Inc. is a Japanese animation film studio headquartered in Koganei, Tokyo. The studio is best known for its animated feature films, and has also produced several short films, television commercials, and one television film. The studio’s mascot and most recognizable symbol is the character, Totoro, a giant cat-like spirit from the 1988 classic, My Neighbor Totoro. - Universal Pictures: - template: { name: Studio, studio: "Universal" } - summary: Universal Pictures is an American film production and distribution company owned by Comcast through the NBCUniversal Film and Entertainment division of NBCUniversal. - Walt Disney Pictures: - template: { name: Studio, studio: "Disney" } - summary: Walt Disney Pictures is an American film production studio and subsidiary of Walt Disney Studios, which is owned by The Walt Disney Company. - Warner Bros. Pictures: - template: { name: Studio, studio: "Warner" } - summary: Warner Bros. Entertainment Inc. is an American diversified multinational mass media and entertainment conglomerate headquartered at the Warner Bros. Studios complex in Burbank, California, and a subsidiary of AT&T's WarnerMedia through its Studios & Networks division. \ No newline at end of file +dynamic_collections: + studios: # mapping name does not matter just needs to be unique + type: studio + title_format: <> + other_name: Other Studios + template: studio_dynamic + template_variables: + URL_ENCODE: + 20th Century Studios: 20th%20Century%20Studios + Amazon Studios: Amazon%20Studios + Blue Sky Studios: Blue%20Sky%20Studios + Columbia Pictures: Columbia%20Pictures + DreamWorks Studios: DreamWorks%20Studios + Illumination Entertainment: Illumination%20Entertainment + Marvel Studios: Marvel%20Studios + New Line Cinema: New%20Line%20Cinema + Paramount Pictures: Paramount%20Pictures + Sony Pictures: Sony%20Pictures + Studio Ghibli: Studio%20Ghibli + Universal Pictures: Universal%20Pictures + Walt Disney Pictures: Walt%20Disney%20Pictures + Warner Bros. Pictures: Warner%20Bros.%20Pictures + include: + - 20th Century Studios + - Amazon Studios + - Blue Sky Studios + - Columbia Pictures + - DreamWorks Studios + - Illumination Entertainment + - Lionsgate + - Lucasfilm Ltd + - Marvel Studios + - Metro-Goldwyn-Mayer + - New Line Cinema + - Paramount Pictures + - Pixar + - Sony Pictures + - Studio Ghibli + - Universal Pictures + - Walt Disney Pictures + - Warner Bros. Pictures + addons: + 20th Centruy Studios: + - 20th Century + Amazon Studios: + - Amazon + Blue Sky Studios: + - Blue Sky Films + Columbia Pictures: + - Columbia TriStar + - TriStar + DreamWorks Studios: + - DreamWorks + Illumination Entertainment: + - Illumination Films + Lucasfilm Ltd: + - Lucasfilm + Marvel Studios: + - Marvel Animation + - Marvel Enterprises + - Marvel Entertainment + - Marvel + Metro-Goldwyn-Mayer: + - MGM + New Line Cinema: + - New Line + Paramount Pictures: + - Paramount + Sony Pictures: + - Sony + Universal Pictures: + - Universal + Walt Disney Pictures: + - Disney + Warner Bros. Pictures: + - Warner + # 20th Century Studios: + # template: { name: Studio, studio: "20th Century" } + # summary: "20th Century Studios is an American film production studio headquartered at the Fox Studio Lot in the Century City area of Los Angeles and is a subsidiary of Walt Disney Studios, a division of The Walt Disney Company." + # Amazon Studios: + # template: { name: Studio, studio: "Amazon" } + # summary: "Amazon Studios is an American television and film producer and distributor that is a subsidiary of Amazon. It specializes in developing television series and distributing and producing films. It was started in late 2010." + # Blue Sky Studios: + # template: { name: Studio, studio: "Blue Sky Studios. Blue Sky Films" } + # summary: Blue Sky Studios, Inc. is an American computer animation film studio based in Greenwich, Connecticut. It is a subsidiary of 20th Century Animation, a division of Disney Studios Content. + # Columbia Pictures: + # template: { name: Studio, studio: "Columbia Pictures, Columbia TriStar, TriStar" } + # summary: Columbia Pictures is an American film production studio that is a member of the Sony Pictures Motion Picture Group, a division of Sony Entertainment's Sony Pictures Entertainment, which is one of the Big Five studios and a subsidiary of the multinational conglomerate Sony. + # DreamWorks Studios: + # template: { name: Studio, studio: "DreamWorks" } + # summary: DreamWorks Animation LLC (also simply known as DreamWorks) is an American animation studio and a subsidiary of Universal Pictures, itself a subsidiary of Comcast's NBCUniversal. It is based in Glendale, California, and produces animated feature films, television programs, and online virtual games. + # Illumination Entertainment: + # template: { name: Studio, studio: "Illumination Entertainment, Illumination Films" } + # summary: Illumination is an American film and animation studio founded by Chris Meledandri in 2007 and owned by Universal Pictures, a division of NBCUniversal, which is itself a division of Comcast. Meledandri produces the films, while Universal finances and distributes all the films. The studio is responsible for the Despicable Me and The Secret Life of Pets franchises and the film adaptations of Dr. Seuss’ books The Lorax and How the Grinch Stole Christmas. The Minions, characters from the Despicable Me series, are the studio's mascots. + # Lionsgate: + # template: { name: Studio, studio: "Lionsgate" } + # summary: Lionsgate is a Canadian-American entertainment company. It was formed by Frank Giustra on July 10, 1997, domiciled in Vancouver, British Columbia, Canada and is currently headquartered in Santa Monica, California, United States + # Lucasfilm Ltd: + # template: { name: Studio, studio: "Lucasfilm" } + # summary: Lucasfilm Ltd. LLC is an American film and television production company and a subsidiary of Walt Disney Studios, which is a business segment of the Walt Disney Company + # Marvel Studios: + # template: { name: Studio, studio: "Marvel Studios, Marvel Animation, Marvel Enterprises, Marvel Entertainment, Marvel" } + # summary: Marvel Studios, LLC is an American film and television production company that is a subsidiary of Walt Disney Studios, a division of the Walt Disney Company. Marvel Studios is known for the production of the Marvel Cinematic Universe films, based on characters that appear in Marvel Comics publications. + # Metro-Goldwyn-Mayer: + # template: { name: Studio, studio: "Metro-Goldwyn-Mayer, MGM" } + # summary: Metro-Goldwyn-Mayer Studios Inc. is an American media company, founded in 1924, that produces and distributes feature films and television programs. It is based in Beverly Hills, California. MGM was formed by Marcus Loew by combining Metro Pictures, Goldwyn Pictures, and Louis B. Mayer Pictures into a single company. + # New Line Cinema: + # template: { name: Studio, studio: "New Line" } + # summary: New Line Cinema is an American film production studio and a film production label of the Warner Bros. Pictures Group division of Warner Bros. Entertainment. It was founded in 1967 by Robert Shaye as an independent film distribution company; later becoming a film studio. + # Paramount Pictures: + # template: { name: Studio, studio: "Paramount" } + # summary: Paramount Pictures Corporation is an American film and television production and distribution company and the main namesake subsidiary of Paramount Global. + # Pixar: + # template: { name: Studio, studio: "Pixar" } + # summary: Pixar Animation Studios, commonly known as Pixar, is an American computer animation studio based in Emeryville, California, a subsidiary of Disney Studios Content owned by The Walt Disney studio. Pixar began in 1979 as part of the Lucasfilm computer division, known as the Graphics Group, before its spin-off as a corporation on February 3, 1986, with funding from Apple co-founder Steve Jobs, who became its majority shareholder. Disney purchased Pixar in 2006 at a valuation of $7.4 billion by converting each share of Pixar stock to 2.3 shares of Disney stock, a transaction that resulted in Jobs becoming Disney's largest single shareholder at the time. Pixar is best known for its feature films technologically powered by RenderMan, the studio's own implementation of the industry-standard RenderMan Interface Specification image-rendering application programming interface. Luxo Jr., a desk lamp from the studio's 1986 short film of the same name, is the studio's mascot. + # Sony Pictures: + # template: { name: Studio, studio: "Sony" } + # summary: Sony Pictures is an American diversified multinational mass media and entertainment studio conglomerate that produces, acquires, and distributes filmed entertainment through multiple platforms. + # Studio Ghibli: + # template: { name: Studio, studio: "Studio Ghibli" } + # summary: Studio Ghibli Inc. is a Japanese animation film studio headquartered in Koganei, Tokyo. The studio is best known for its animated feature films, and has also produced several short films, television commercials, and one television film. The studio’s mascot and most recognizable symbol is the character, Totoro, a giant cat-like spirit from the 1988 classic, My Neighbor Totoro. + # Universal Pictures: + # template: { name: Studio, studio: "Universal" } + # summary: Universal Pictures is an American film production and distribution company owned by Comcast through the NBCUniversal Film and Entertainment division of NBCUniversal. + # Walt Disney Pictures: + # template: { name: Studio, studio: "Disney" } + # summary: Walt Disney Pictures is an American film production studio and subsidiary of Walt Disney Studios, which is owned by The Walt Disney Company. + # Warner Bros. Pictures: + # template: { name: Studio, studio: "Warner" } + # summary: Warner Bros. Entertainment Inc. is an American diversified multinational mass media and entertainment conglomerate headquartered at the Warner Bros. Studios complex in Burbank, California, and a subsidiary of AT&T's WarnerMedia through its Studios & Networks division. \ No newline at end of file diff --git a/yozora/configs 2.0 - WIP/movie/chart.yml b/yozora/configs 2.0 - WIP/movie/chart.yml index d552f59..c07abc9 100644 --- a/yozora/configs 2.0 - WIP/movie/chart.yml +++ b/yozora/configs 2.0 - WIP/movie/chart.yml @@ -14,7 +14,7 @@ templates: collections: Newly Released Movies: - template: {name: sortorder} + template: {name: chartandrelease} summary: A collection of newly-released movies in cinema and on streaming services smart_filter: all: @@ -24,17 +24,17 @@ collections: country: United Kingdom, United States of America, Canada sort_by: release.desc TMDb Trending Movies: - template: {name: sortorder} + template: {name: chartandrelease} tmdb_trending_weekly: 250 summary: A collection of movies trending on TMDb sync_mode: sync TMDb Popular Movies: - template: {name: sortorder} + template: {name: chartandrelease} tmdb_popular: 250 summary: A collection of the most watched movies according to TMDb. smart_label: random TMDb Now Playing: - template: {name: sortorder} + template: {name: chartandrelease} tmdb_now_playing: 250 summary: A collection of movies that people are currently watching. smart_label: random diff --git a/yozora/configs 2.0 - WIP/movie/streaming_uk.yml b/yozora/configs 2.0 - WIP/movie/streaming_uk.yml index b8de2d3..448b6ef 100644 --- a/yozora/configs 2.0 - WIP/movie/streaming_uk.yml +++ b/yozora/configs 2.0 - WIP/movie/streaming_uk.yml @@ -10,7 +10,7 @@ templates: smart_label: release.desc sync_mode: sync sort_title: +02_<> - url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/common/streaming_service/<>/<>.jpg + url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/common/streaming_service/<>.jpg collections: All 4 Movies: diff --git a/yozora/configs 2.0 - WIP/movie/streaming_us.yml b/yozora/configs 2.0 - WIP/movie/streaming_us.yml index e3aca08..6383d6d 100644 --- a/yozora/configs 2.0 - WIP/movie/streaming_us.yml +++ b/yozora/configs 2.0 - WIP/movie/streaming_us.yml @@ -10,7 +10,7 @@ templates: smart_label: release.desc sync_mode: sync sort_title: +02_<> - url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/common/streaming_service/<>/<>.jpg + url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/common/streaming_service/<>.jpg collections: Apple TV+ Movies: diff --git a/yozora/configs 2.0 - WIP/tv/chart.yml b/yozora/configs 2.0 - WIP/tv/chart.yml index 8e62b31..dfabee0 100644 --- a/yozora/configs 2.0 - WIP/tv/chart.yml +++ b/yozora/configs 2.0 - WIP/tv/chart.yml @@ -5,7 +5,7 @@ ###################################################### templates: - sortorder: + chartandrelease: collection_mode: hide sort_title: +01_<> sync_mode: sync @@ -14,7 +14,7 @@ templates: collections: Newly Released Shows: - template: {name: sortorder} + template: {name: chartandrelease} summary: A collection of newly-released shows on TV and on streaming services smart_filter: all: @@ -22,7 +22,7 @@ collections: sort_by: release.desc limit: 100 New Episodes: - template: {name: sortorder} + template: {name: chartandrelease} summary: A collection of new episodes ready for watching! smart_filter: all: @@ -30,13 +30,13 @@ collections: sort_by: episode_added.desc limit: 100 TMDb Trending Shows: - template: {name: sortorder} + template: {name: chartandrelease} tmdb_trending_weekly: 250 smart_label: random sync_mode: sync summary: A collection of shows trending on TMDb TMDb Popular Shows: - template: {name: sortorder} + template: {name: chartandrelease} tmdb_popular: 250 summary: A collection of the most watched shows according to TMDb. smart_label: random diff --git a/yozora/configs 2.0 - WIP/tv/streaming_uk.yml b/yozora/configs 2.0 - WIP/tv/streaming_uk.yml index a7429ab..1962ef6 100644 --- a/yozora/configs 2.0 - WIP/tv/streaming_uk.yml +++ b/yozora/configs 2.0 - WIP/tv/streaming_uk.yml @@ -10,7 +10,7 @@ templates: smart_label: random sync_mode: sync sort_title: +02_<> - url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/common/streaming_service/<>/<>.jpg + url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/common/streaming_service/<>.jpg collections: All 4 Shows: diff --git a/yozora/configs 2.0 - WIP/tv/streaming_us.yml b/yozora/configs 2.0 - WIP/tv/streaming_us.yml index e5a8449..96cbc0f 100644 --- a/yozora/configs 2.0 - WIP/tv/streaming_us.yml +++ b/yozora/configs 2.0 - WIP/tv/streaming_us.yml @@ -10,7 +10,7 @@ templates: smart_label: random sync_mode: sync sort_title: +02_<> - url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/common/streaming_service/<>/<>.jpg + url_poster: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/common/streaming_service/<>.jpg collections: Apple TV+ Shows: