Merge branch 'meisnate12:master' into master

pull/507/head
mraniki 3 years ago committed by GitHub
commit 3b09114d8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -6,6 +6,7 @@ templates:
sort_title: +1_<<num>><<collection_name>> sort_title: +1_<<num>><<collection_name>>
sync_mode: sync sync_mode: sync
smart_label: random smart_label: random
collections: collections:
Suggested Anime: Suggested Anime:
sort_title: ++_Suggested sort_title: ++_Suggested

@ -0,0 +1,47 @@
######################################################
# Studio Collections #
######################################################
templates:
Studio:
optional:
- company
tmdb_company: <<company>>
sort_title: +2_<<collection_name>>
sync_mode: sync
smart_label: release.desc
collections:
Aardman:
template: { name: Studio, company: 297 }
summary: Aardman Animations, Ltd. is a British animation studio based in Bristol, England. Aardman is known for films made using stop-motion clay animation techniques, particularly those featuring Plasticine characters Wallace and Gromit.
Blue Sky:
template: { name: Studio, company: 9383 }
url_poster: https://theposterdb.com/api/assets/38152
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.
DreamWorks:
template: { name: Studio, company: 521 }
filters:
collection.not: Aardman
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, company: 6704 }
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.
Pixar:
template: { name: Studio, company: 3 }
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 Company. 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 company'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.
Studio Ghibli:
template: { name: Studio, company: 10342 }
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 studios mascot and most recognizable symbol is the character, Totoro, a giant cat-like spirit from the 1988 classic, My Neighbor Totoro.
Sony Pictures Animation:
template: { name: Studio, company: 2251 }
summary: Sony Pictures Animation Inc. is an American animation studio owned by Sony Entertainment's Sony Pictures Entertainment through their Motion Picture Group division and founded on May 9, 2002. The studio's films are distributed worldwide by Sony Pictures Releasing under their Columbia Pictures label, while all direct-to-video releases are released by Sony Pictures Home Entertainment.
Warner Animation Group:
template: { name: Studio, company: 25120 }
summary: The Warner Animation Group (WAG) is an American animation studio that is the feature animation division of Warner Bros. Entertainment. Established on January 7, 2013, the studio is the successor to the dissolved 2D traditional hand-drawn animation studio Warner Bros. Feature Animation, which shut down in 2003 and the dissolved family film division Warner Bros. Family Entertainment, which shut down in 2009. The entity is also a sister animation studio of the regular animation studio Warner Bros. Animation
Walt Disney Animation Studios:
template: { name: Studio }
imdb_list: https://www.imdb.com/list/ls059383351/
summary: Walt Disney Animation Studios (WDAS), sometimes shortened to Disney Animation, is an American animation studio that creates animated features and short films for The Walt Disney Company. Founded on October 16, 1923 by brothers Walt Disney and Roy O. Disney, it is one of the oldest-running animation studios in the world. It is currently organized as a division of Walt Disney Studios and is headquartered at the Roy E. Disney Animation Building at the Walt Disney Studios lot in Burbank, California.
Walt Disney Pictures:
template: { name: Studio }
imdb_list: https://www.imdb.com/list/ls077114097/
summary: Walt Disney Pictures is an American film production studio of The Walt Disney Studios, which is owned by The Walt Disney Company. The studio is the flagship producer of live-action feature films within the Walt Disney Studios unit, and is based at the Walt Disney Studios in Burbank, California. Animated films produced by Walt Disney Animation Studios and Pixar Animation Studios are also released under this brand. Walt Disney Studios Motion Pictures distributes and markets the films produced by Walt Disney Pictures.

@ -3,22 +3,26 @@ libraries:
metadata_path: metadata_path:
- metadata/movies/metadata.yml - metadata/movies/metadata.yml
- metadata/movies/overlays.yml - metadata/movies/overlays.yml
- metadata/movies/anime.yml
- metadata/movies/serien.yml
- metadata/movies/admin.yml - metadata/movies/admin.yml
- metadata/movies/Filme.yml - metadata/movies/Filme.yml
- metadata/movies/People.yml - metadata/movies/People.yml
- metadata/movies/Genres.yml # - metadata/movies/Genres.yml
- metadata/movies/Countries.yml
- metadata/movies/Awards.yml - metadata/movies/Awards.yml
- metadata/movies/Decades.yml - metadata/movies/Decades.yml
- metadata/movies/Watchlists.yml - metadata/movies/Suggestions.yml
settings: settings:
asset_directory: asset_directory:
- assets/movies/collections - assets/movies/collections
- assets/movies/filme - assets/movies/filme
- assets/movies/people - assets/movies/people
- assets/movies/genres # - assets/movies/genres
- assets/movies/countries
- assets/movies/awards - assets/movies/awards
- assets/movies/decades - assets/movies/decades
- assets/movies/watchlists - assets/movies/suggestions
operations: operations:
split_duplicates: true split_duplicates: true
tmdb_collections: tmdb_collections:
@ -55,11 +59,13 @@ libraries:
- 748 - 748
- 535313 - 535313
template: template:
minimum_items: 2
tmdb_collection_details: <<collection_id>> tmdb_collection_details: <<collection_id>>
sort_title: <<collection_name>> sort_title: <<collection_name>>
Anime: Anime:
metadata_path: metadata_path:
- metadata/anime/metadata.yml - metadata/anime/metadata.yml
- metadata/anime/filme.yml
- metadata/anime/admin.yml - metadata/anime/admin.yml
- metadata/anime/Anime.yml - metadata/anime/Anime.yml
settings: settings:
@ -70,6 +76,7 @@ libraries:
metadata_path: metadata_path:
- metadata/shows/metadata.yml - metadata/shows/metadata.yml
- metadata/shows/overlays.yml - metadata/shows/overlays.yml
- metadata/shows/filme.yml
- metadata/shows/admin.yml - metadata/shows/admin.yml
- metadata/shows/Serien.yml - metadata/shows/Serien.yml
settings: settings:
@ -93,7 +100,7 @@ settings:
create_asset_folders: false create_asset_folders: false
show_missing_assets: true show_missing_assets: true
show_missing_season_assets: true show_missing_season_assets: true
collection_minimum: 2 minimum_items: 1
missing_only_released: true missing_only_released: true
delete_below_minimum: true delete_below_minimum: true
only_filter_missing: false only_filter_missing: false
@ -103,6 +110,9 @@ settings:
dimensional_asset_rename: false dimensional_asset_rename: false
show_options: false show_options: false
playlist_sync_to_user: all playlist_sync_to_user: all
download_url_assets: false
default_collection_order:
verify_ssl: true
plex: plex:
url: <url> url: <url>
token: <token> token: <token>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save