diff --git a/VERSION b/VERSION index aea3e90f..f9e4c315 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.19.0-develop94 +1.19.0-develop97 diff --git a/defaults/movie/continent.yml b/defaults/movie/continent.yml index 933355e0..7ac7011d 100644 --- a/defaults/movie/continent.yml +++ b/defaults/movie/continent.yml @@ -1,9 +1,9 @@ ############################################################################## -# Continent Collections # +# Continent Collections # # Created by Adam Pope, bartolomesorianol, Bullmoose20 & Sohjiro # -# Artwork Credit to Duhniel, Bullmoose20, and Wiki Commons # +# Artwork Credit to Duhniel, Bullmoose20, and Wiki Commons # # EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL # -# https://metamanager.wiki/en/latest/defaults/movie/continent.html # +# https://metamanager.wiki/en/latest/defaults/movie/continent.html # ############################################################################## external_templates: @@ -82,11 +82,11 @@ dynamic_collections: - Somalia - South Sudan - Uganda - - United Republic of Tanzania - - Tanzania # United Republic of Tanzania + - Tanzania + - United Republic of Tanzania # Tanzania - Zambia - Zimbabwe - # Middle Africa: + # Central Africa: - Angola - Cameroon - Central African Republic @@ -97,8 +97,8 @@ dynamic_collections: - Zaire # Democratic Republic of the Congo - Equatorial Guinea - Gabon - - Sao Tome and Principe - - São Tomé and Príncipe # Sao Tome and Principe + - São Tomé and Príncipe + - Sao Tome and Principe # São Tomé and Príncipe # Southern Africa: - Botswana - Eswatini @@ -109,8 +109,8 @@ dynamic_collections: # Western Africa: - Benin - Burkina Faso - - Cabo Verde - - Cape Verde # Cabo Verde + - Cape Verde + - Cabo Verde # Cape Verde - Côte d'Ivoire - Côte d’Ivoire # Côte d'Ivoire - Ivory Coast # Côte d'Ivoire @@ -171,8 +171,9 @@ dynamic_collections: - Sint Maarten - Trinidad and Tobago - Turks and Caicos Islands - - U.S. Virgin Islands - - United States Virgin Islands # U.S. Virgin Islands + - US Virgin Islands + - U.S. Virgin Islands # US Virgin Islands + - United States Virgin Islands # US Virgin Islands # Central America: - Belize - Costa Rica @@ -184,8 +185,8 @@ dynamic_collections: - Panama # South America: - Argentina - - Plurinational State of Bolivia - - Bolivia # Plurinational State of Bolivia + - Bolivia + - Plurinational State of Bolivia # Bolivia - Bouvet Island - Brazil - Chile @@ -203,18 +204,16 @@ dynamic_collections: - South Sandwich Islands # South Georgia and the South Sandwich Islands - Suriname - Uruguay - - Bolivarian Republic of Venezuela - - Venezuela # Bolivarian Republic of Venezuela + - Venezuela + - Bolivarian Republic of Venezuela # Venezuela # North America: - Bermuda - Canada - Greenland - Saint Pierre and Miquelon - St. Pierre and Miquelon # Saint Pierre and Miquelon - - United States of America - - United States # United States of America - Antarctica: - - Antarctica + - United States + - United States of America # United States Asia: # Central Asia: - Kazakhstan @@ -229,13 +228,13 @@ dynamic_collections: - Macao - Macau # Macao - Macau SAR China # Macao - - Democratic People's Republic of Korea - - North Korea # Democratic People's Republic of Korea + - North Korea + - Democratic People's Republic of Korea # North Korea - Japan - Mongolia - - Republic of Korea - - South Korea # Republic of Korea - - Korea # Republic of Korea + - South Korea + - Republic of Korea # South Korea + - Korea # South Korea - Taiwan - Taiwan, Province of China # Taiwan # South-Eastern Asia: @@ -243,17 +242,17 @@ dynamic_collections: - Brunei Darussalam # Brunei - Cambodia - Indonesia - - Lao People's Democratic Republic - - Lao # Lao People's Democratic Republic - - Laos # Lao People's Democratic Republic + - Laos + - Lao People's Democratic Republic # Laos + - Lao # Laos - Malaysia - Myanmar - Burma # Myanmar - Philippines - Singapore - Thailand - - Timor-Leste - - East Timor # Timor-Leste + - East Timor + - Timor-Leste # East Timor - Vietnam - Viet Nam # Vietnam # Southern Asia: @@ -261,8 +260,8 @@ dynamic_collections: - Bangladesh - Bhutan - India - - Islamic Republic of Iran - - Iran # Islamic Republic of Iran + - Iran + - Islamic Republic of Iran # Iran - Maldives - Nepal - Pakistan @@ -281,12 +280,12 @@ dynamic_collections: - Oman - Qatar - Saudi Arabia - - State of Palestine - - Palestine # State of Palestine - - Syrian Arab Republic - - Syria # Syrian Arab Republic - - Türkiye - - Turkey # Türkiye + - Palestine + - State of Palestine # Palestine + - Syria + - Syrian Arab Republic # Syria + - Turkey + - Türkiye # Turkey - United Arab Emirates - Yemen Europe: @@ -295,14 +294,14 @@ dynamic_collections: - Bulgaria - Czech Republic - Czechia # Czech Republic - - Czechoslovakia + - Czechoslovakia # Czech Republic - Hungary - Poland - - Republic of Moldova - - Moldova # Republic of Moldova + - Moldova + - Republic of Moldova # Moldova - Romania - - Russian Federation - - Russia # Russian Federation + - Russia + - Russian Federation # Russia - Soviet Union - Slovakia - Ukraine @@ -334,8 +333,8 @@ dynamic_collections: - Gibraltar - Greece - Kosovo - - Holy See - - Vatican City # Holy See + - Vatican City + - Holy See # Vatican City - Italy - Malta - Montenegro @@ -381,13 +380,17 @@ dynamic_collections: - Guam - Kiribati - Marshall Islands - - Federated States of Micronesia - - Micronesia # Federated States of Micronesia + - Micronesia + - Federated States of Micronesia # Micronesia - Nauru - Northern Mariana Islands - Palau - - United States Minor Outlying Islands - - U.S. Outlying Islands # United States Minor Outlying Islands + - US Minor Outlying Islands + - United States Minor Outlying Islands # US Minor Outlying Islands + - United States Outlying Islands # US Minor Outlying Islands + - U.S. Minor Outlying Islands # US Minor Outlying Islands + - U.S. Outlying Islands # US Minor Outlying Islands + - US Outlying Islands # US Minor Outlying Islands # Polynesia: - American Samoa - Cook Islands diff --git a/defaults/movie/country.yml b/defaults/movie/country.yml index 97dd9d85..3f1bb8f6 100644 --- a/defaults/movie/country.yml +++ b/defaults/movie/country.yml @@ -43,6 +43,7 @@ dynamic_collections: other: country_other dynamic: default: true + include: # Northern Africa: - Algeria @@ -72,10 +73,10 @@ dynamic_collections: - Somalia - South Sudan - Uganda - - United Republic of Tanzania + - Tanzania - Zambia - Zimbabwe - # Middle Africa: + # Central Africa: - Angola - Cameroon - Central African Republic @@ -84,7 +85,7 @@ dynamic_collections: - Democratic Republic of the Congo - Equatorial Guinea - Gabon - - Sao Tome and Principe + - São Tomé and Príncipe # Southern Africa: - Botswana - Eswatini @@ -94,7 +95,7 @@ dynamic_collections: # Western Africa: - Benin - Burkina Faso - - Cabo Verde + - Cape Verde - Côte d'Ivoire - Gambia - Ghana @@ -138,7 +139,7 @@ dynamic_collections: - Sint Maarten - Trinidad and Tobago - Turks and Caicos Islands - - U.S. Virgin Islands + - US Virgin Islands # Central America: - Belize - Costa Rica @@ -150,7 +151,7 @@ dynamic_collections: - Panama # South America: - Argentina - - Plurinational State of Bolivia + - Bolivia - Bouvet Island - Brazil - Chile @@ -164,13 +165,13 @@ dynamic_collections: - South Georgia and the South Sandwich Islands - Suriname - Uruguay - - Bolivarian Republic of Venezuela + - Venezuela # North America: - Bermuda - Canada - Greenland - Saint Pierre and Miquelon - - United States of America + - United States # Antarctica: - Antarctica # Central Asia: @@ -183,29 +184,29 @@ dynamic_collections: - China - Hong Kong - Macao - - Democratic People's Republic of Korea + - North Korea - Japan - Mongolia - - Republic of Korea + - South Korea - Taiwan # South-Eastern Asia: - Brunei - Cambodia - Indonesia - - Lao People's Democratic Republic + - Laos - Malaysia - Myanmar - Philippines - Singapore - Thailand - - Timor-Leste - - Viet Nam + - East Timor + - Vietnam # Southern Asia: - Afghanistan - Bangladesh - Bhutan - India - - Islamic Republic of Iran + - Iran - Maldives - Nepal - Pakistan @@ -224,9 +225,9 @@ dynamic_collections: - Oman - Qatar - Saudi Arabia - - State of Palestine - - Syrian Arab Republic - - Türkiye + - Palestine + - Syria + - Turkey - United Arab Emirates - Yemen # Eastern Europe: @@ -235,9 +236,9 @@ dynamic_collections: - Czech Republic - Hungary - Poland - - Republic of Moldova + - Moldova - Romania - - Russian Federation + - Russia - Slovakia - Ukraine # Northern Europe: @@ -267,7 +268,7 @@ dynamic_collections: - Gibraltar - Greece - Kosovo - - Holy See + - Vatican City - Italy - Malta - Montenegro @@ -284,7 +285,6 @@ dynamic_collections: - Belgium - France - Germany - - East Germany - Liechtenstein - Luxembourg - Monaco @@ -295,40 +295,34 @@ dynamic_collections: - Christmas Island - Cocos (Keeling) Islands - Heard Island and McDonald Islands - - Heard and McDonald Islands # Heard Island and McDonald Islands - New Zealand - Norfolk Island # Melanesia: - Fiji - New Caledonia - Papua New Guinea - - New Guinea # Papua New Guinea - Solomon Islands - Vanuatu # Micronesia: - Guam - Kiribati - Marshall Islands - - Federated States of Micronesia - - Micronesia # Federated States of Micronesia + - Micronesia - Nauru - Northern Mariana Islands - Palau - - United States Minor Outlying Islands - - U.S. Outlying Islands # United States Minor Outlying Islands + - US Minor Outlying Islands # Polynesia: - American Samoa - Cook Islands - French Polynesia - Niue - Pitcairn Islands - - Pitcairn # Pitcairn Islands - Samoa - Tokelau - Tonga - Tuvalu - Wallis and Futuna Islands - - Wallis and Futuna # Wallis and Futuna Islands addons: Tanzania: - United Republic of Tanzania @@ -336,12 +330,12 @@ dynamic_collections: - Congo Democratic Republic of the Congo: - Zaire - Sao Tome and Principe: - - São Tomé and Príncipe + São Tomé and Príncipe: + - Sao Tome and Principe Eswatini: - Swaziland - Cabo Verde: - - Cape Verde + Cape Verde: + - Cabo Verde Côte d'Ivoire: - Côte d’Ivoire - Ivory Coast @@ -365,78 +359,85 @@ dynamic_collections: - Saint Vincent and Grenadines - St. Vincent and the Grenadines - St. Vincent and Grenadines - U.S. Virgin Islands: + US Virgin Islands: + - U.S. Virgin Islands - United States Virgin Islands - Plurinational State of Bolivia: - - Bolivia + Bolivia: + - Plurinational State of Bolivia Falkland Islands: - Malvinas South Georgia and the South Sandwich Islands: - South Georgia and South Sandwich Islands - South Georgia - South Sandwich Islands - Bolivarian Republic of Venezuela: - - Venezuela + Venezuela: + - Bolivarian Republic of Venezuela Saint Pierre and Miquelon: - St. Pierre and Miquelon - United States of America: - - United States + United States: + - United States of America Hong Kong: - Hong Kong SAR China Macao: - Macau - Macau SAR China - Democratic People's Republic of Korea: - - North Korea - Republic of Korea: - - South Korea + North Korea: + - Democratic People's Republic of Korea + South Korea: + - Republic of Korea - Korea Taiwan: - Taiwan, Province of China Brunei: - Brunei Darussalam - Lao People's Democratic Republic: + Laos: + - Lao People's Democratic Republic - Lao - - Laos Myanmar: - Burma - Timor-Leste: - - East Timor - Viet Nam: - - Vietnam - Islamic Republic of Iran: - - Iran - State of Palestine: - - Palestine - Syrian Arab Republic: - - Syria - Türkiye: - - Turkey + East Timor: + - Timor-Leste + Vietnam: + - Viet Nam + Iran: + - Islamic Republic of Iran + Palestine: + - State of Palestine + Syria: + - Syrian Arab Republic + Turkey: + - Türkiye Czech Republic: - Czechia - Czechoslovakia - Republic of Moldova: - - Moldova - Russian Federation: - - Russia + Moldova: + - Republic of Moldova + Russia: + - Russian Federation - Soviet Union Svalbard and Jan Mayen Islands: - Svalbard and Jan Mayen - Holy See: - - Vatican City + Vatican City: + - Holy See North Macedonia: - Macedonia - Republic of North Macedonia France: - French Republic + Germany: + - East Germany Heard Island and McDonald Islands: - Heard and McDonald Islands Papua New Guinea: - New Guinea - Federated States of Micronesia: - - Micronesia - United States Minor Outlying Islands: + Micronesia: + - Federated States of Micronesia + US Minor Outlying Islands: + - United States Minor Outlying Islands + - United States Outlying Islands + - U.S. Minor Outlying Islands - U.S. Outlying Islands + - US Outlying Islands Pitcairn Islands: - Pitcairn Wallis and Futuna Islands: diff --git a/defaults/movie/region.yml b/defaults/movie/region.yml index 4eee80af..3873994e 100644 --- a/defaults/movie/region.yml +++ b/defaults/movie/region.yml @@ -1,7 +1,7 @@ ############################################################################## -# Region Collections # +# Region Collections # # Created by Adam Pope, bartolomesorianol, Bullmoose20 & Sohjiro # -# Artwork Credit to Duhniel, Bullmoose20, and Wiki Commons # +# Artwork Credit to Duhniel, Bullmoose20, and Wiki Commons # # EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL # # https://metamanager.wiki/en/latest/defaults/movie/region.html # ############################################################################## @@ -47,7 +47,7 @@ dynamic_collections: include: - Northern Africa - Eastern Africa - - Middle Africa + - Central Africa - Southern Africa - Western Africa - Caribbean @@ -98,11 +98,11 @@ dynamic_collections: - Somalia - South Sudan - Uganda - - United Republic of Tanzania - - Tanzania # United Republic of Tanzania + - Tanzania + - United Republic of Tanzania # Tanzania - Zambia - Zimbabwe - Middle Africa: + Central Africa: - Angola - Cameroon - Central African Republic @@ -113,8 +113,8 @@ dynamic_collections: - Zaire # Democratic Republic of the Congo - Equatorial Guinea - Gabon - - Sao Tome and Principe - - São Tomé and Príncipe # Sao Tome and Principe + - São Tomé and Príncipe + - Sao Tome and Principe # São Tomé and Príncipe Southern Africa: - Botswana - Eswatini @@ -125,8 +125,8 @@ dynamic_collections: Western Africa: - Benin - Burkina Faso - - Cabo Verde - - Cape Verde # Cabo Verde + - Cape Verde + - Cabo Verde # Cape Verde - Côte d'Ivoire - Côte d’Ivoire # Côte d'Ivoire - Ivory Coast # Côte d'Ivoire @@ -186,8 +186,9 @@ dynamic_collections: - Sint Maarten - Trinidad and Tobago - Turks and Caicos Islands - - U.S. Virgin Islands - - United States Virgin Islands # U.S. Virgin Islands + - US Virgin Islands + - U.S. Virgin Islands # US Virgin Islands + - United States Virgin Islands # US Virgin Islands Central America: - Belize - Costa Rica @@ -199,8 +200,8 @@ dynamic_collections: - Panama South America: - Argentina - - Plurinational State of Bolivia - - Bolivia # Plurinational State of Bolivia + - Bolivia + - Plurinational State of Bolivia # Bolivia - Bouvet Island - Brazil - Chile @@ -218,18 +219,16 @@ dynamic_collections: - South Sandwich Islands # South Georgia and the South Sandwich Islands - Suriname - Uruguay - - Bolivarian Republic of Venezuela - - Venezuela # Bolivarian Republic of Venezuela + - Venezuela + - Bolivarian Republic of Venezuela # Venezuela North America: - Bermuda - Canada - Greenland - Saint Pierre and Miquelon - St. Pierre and Miquelon # Saint Pierre and Miquelon - - United States of America - - United States # United States of America - Antarctica: - - Antarctica + - United States + - United States of America # United States Central Asia: - Kazakhstan - Kyrgyzstan @@ -243,13 +242,13 @@ dynamic_collections: - Macao - Macau # Macao - Macau SAR China # Macao - - Democratic People's Republic of Korea - - North Korea # Democratic People's Republic of Korea + - North Korea + - Democratic People's Republic of Korea # North Korea - Japan - Mongolia - - Republic of Korea - - South Korea # Republic of Korea - - Korea # Republic of Korea + - South Korea + - Republic of Korea # South Korea + - Korea # South Korea - Taiwan - Taiwan, Province of China # Taiwan South-Eastern Asia: @@ -257,17 +256,17 @@ dynamic_collections: - Brunei Darussalam # Brunei - Cambodia - Indonesia - - Lao People's Democratic Republic - - Lao # Lao People's Democratic Republic - - Laos # Lao People's Democratic Republic + - Laos + - Lao People's Democratic Republic # Laos + - Lao # Laos - Malaysia - Myanmar - Burma # Myanmar - Philippines - Singapore - Thailand - - Timor-Leste - - East Timor # Timor-Leste + - East Timor + - Timor-Leste # East Timor - Vietnam - Viet Nam # Vietnam Southern Asia: @@ -275,8 +274,8 @@ dynamic_collections: - Bangladesh - Bhutan - India - - Islamic Republic of Iran - - Iran # Islamic Republic of Iran + - Iran + - Islamic Republic of Iran # Iran - Maldives - Nepal - Pakistan @@ -295,12 +294,12 @@ dynamic_collections: - Oman - Qatar - Saudi Arabia - - State of Palestine - - Palestine # State of Palestine - - Syrian Arab Republic - - Syria # Syrian Arab Republic - - Türkiye - - Turkey # Türkiye + - Palestine + - State of Palestine # Palestine + - Syria + - Syrian Arab Republic # Syria + - Turkey + - Türkiye # Turkey - United Arab Emirates - Yemen Eastern Europe: @@ -308,15 +307,15 @@ dynamic_collections: - Bulgaria - Czech Republic - Czechia # Czech Republic - - Czechoslovakia + - Czechoslovakia # Czech Republic - Hungary - Poland - - Republic of Moldova - - Moldova # Republic of Moldova + - Moldova + - Republic of Moldova # Moldova - Romania - - Russian Federation - - Russia # Russian Federation - - Soviet Union + - Russia + - Russian Federation # Russia + - Soviet Union # Russia - Slovakia - Ukraine Northern Europe: @@ -347,8 +346,8 @@ dynamic_collections: - Gibraltar - Greece - Kosovo - - Holy See - - Vatican City # Holy See + - Vatican City + - Holy See # Vatican City - Italy - Malta - Montenegro @@ -393,13 +392,16 @@ dynamic_collections: - Guam - Kiribati - Marshall Islands - - Federated States of Micronesia - - Micronesia # Federated States of Micronesia + - Federated States of Micronesia # Micronesia - Nauru - Northern Mariana Islands - Palau - - United States Minor Outlying Islands - - U.S. Outlying Islands # United States Minor Outlying Islands + - US Minor Outlying Islands + - United States Minor Outlying Islands # US Minor Outlying Islands + - United States Outlying Islands # US Minor Outlying Islands + - U.S. Minor Outlying Islands # US Minor Outlying Islands + - U.S. Outlying Islands # US Minor Outlying Islands + - US Outlying Islands # US Minor Outlying Islands Polynesia: - American Samoa - Cook Islands diff --git a/defaults/show/continent.yml b/defaults/show/continent.yml index d37216a5..71fcb0d2 100644 --- a/defaults/show/continent.yml +++ b/defaults/show/continent.yml @@ -1,9 +1,9 @@ ############################################################################## -# Continent Collections # +# Continent Collections # # Created by Adam Pope, bartolomesorianol, Bullmoose20 & Sohjiro # -# Artwork Credit to Duhniel, Bullmoose20, and Wiki Commons # +# Artwork Credit to Duhniel, Bullmoose20, and Wiki Commons # # EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL # -# https://metamanager.wiki/en/latest/defaults/show/continent.html # +# https://metamanager.wiki/en/latest/defaults/show/continent.html # ############################################################################## external_templates: @@ -82,10 +82,10 @@ dynamic_collections: - so # Somalia - ss # South Sudan - ug # Uganda - - tz # United Republic of Tanzania [Tanzania] + - tz # Tanzania [United Republic of Tanzania] - zm # Zambia - zw # Zimbabwe - # Middle Africa: + # Central Africa: - ao # Angola - cm # Cameroon - cf # Central African Republic @@ -95,7 +95,7 @@ dynamic_collections: - zr # Zaire - gq # Equatorial Guinea - ga # Gabon - - st # Sao Tome and Principe + - st # São Tomé and Príncipe [Sao Tome and Principe] # Southern Africa: - bw # Botswana - sz # Eswatini [Swaziland] @@ -105,8 +105,8 @@ dynamic_collections: # Western Africa: - bj # Benin - bf # Burkina Faso - - cv # Cabo Verde [Cape Verde] - - ci # Côte d'Ivoire [Ivory Coast] + - cv # Cape Verde [Cabo Verde] + - ci # Côte d'Ivoire [Côte d’Ivoire] [Ivory Coast] - gm # Gambia - gh # Ghana - gn # Guinea @@ -150,7 +150,7 @@ dynamic_collections: - sx # Sint Maarten - tt # Trinidad and Tobago - tc # Turks and Caicos Islands - - vi # U.S. Virgin Islands [United States Virgin Islands] + - vi # US Virgin Islands [U.S. Virgin Islands] [United States Virgin Islands] # Central America: - bz # Belize - cr # Costa Rica @@ -162,7 +162,7 @@ dynamic_collections: - pa # Panama # South America: - ar # Argentina - - bo # Plurinational State of Bolivia [Bolivia] + - bo # Bolivia [Plurinational State of Bolivia] - bv # Bouvet Island - br # Brazil - cl # Chile @@ -176,13 +176,13 @@ dynamic_collections: - gs # South Georgia and the South Sandwich Islands [South Georgia] [South Sandwich Islands] - sr # Suriname - uy # Uruguay - - ve # Bolivarian Republic of Venezuela [Venezuela] + - ve # Venezuela [Bolivarian Republic of Venezuela] # North America: - bm # Bermuda - ca # Canada - gl # Greenland - pm # Saint Pierre and Miquelon - - us # United States of America [United States] + - us # United States [United States of America] Antarctica: - aq # Antarctica Asia: @@ -196,31 +196,31 @@ dynamic_collections: - cn # China - hk # Hong Kong - mo # Macao - - kp # Democratic People's Republic of Korea [North Korea] + - kp # North Korea [Democratic People's Republic of Korea] - jp # Japan - mn # Mongolia - - kr # Republic of Korea [South Korea] [Korea] + - kr # South Korea [Republic of Korea] [Korea] - tw # Taiwan [Taiwan, Province of China] # South-Eastern Asia: - bn # Brunei [Brunei Darussalam] - kh # Cambodia - id # Indonesia - - la # Lao People's Democratic Republic [Lao] + - la # Laos [Lao People's Democratic Republic] [Lao] - my # Malaysia - mm # Myanmar - bu # Burma - ph # Philippines - sg # Singapore - th # Thailand - - tl # Timor-Leste - tp # East Timor + - tl # Timor-Leste - vn # Vietnam [Viet Nam] # Southern Asia: - af # Afghanistan - bd # Bangladesh - bt # Bhutan - in # India - - ir # Islamic Republic of Iran [Iran] + - ir # Iran [Islamic Republic of Iran] - mv # Maldives - np # Nepal - pk # Pakistan @@ -239,9 +239,9 @@ dynamic_collections: - om # Oman - qa # Qatar - sa # Saudi Arabia - - ps # State of Palestine [Palestine] - - sy # Syrian Arab Republic [Syria] - - tr # Türkiye [Turkey] + - ps # Palestine [State of Palestine] + - sy # Syria [Syrian Arab Republic] + - tr # Turkey [Türkiye] - ae # United Arab Emirates - ye # Yemen Europe: @@ -252,9 +252,9 @@ dynamic_collections: - cs # Czechoslovakia - hu # Hungary - pl # Poland - - md # Republic of Moldova [Moldova] + - md # Moldova [Republic of Moldova] - ro # Romania - - ru # Russian Federation [Russia] + - ru # Russia [Russian Federation] - su # Soviet Union - sk # Slovakia - ua # Ukraine @@ -284,7 +284,7 @@ dynamic_collections: - gi # Gibraltar - gr # Greece - xk # Kosovo - - va # Holy See [Vatican City] + - va # Vatican City [Holy See] - it # Italy - mt # Malta - me # Montenegro @@ -324,11 +324,11 @@ dynamic_collections: - gu # Guam - ki # Kiribati - mh # Marshall Islands - - fm # Federated States of Micronesia [Micronesia] + - fm # Micronesia [Federated States of Micronesia] - nr # Nauru - mp # Northern Mariana Islands - pw # Palau - - um # United States Minor Outlying Islands + - um # US Minor Outlying Islands # Polynesia: - as # American Samoa - ck # Cook Islands diff --git a/defaults/show/country.yml b/defaults/show/country.yml index fcc300e4..966f8e65 100644 --- a/defaults/show/country.yml +++ b/defaults/show/country.yml @@ -43,6 +43,7 @@ dynamic_collections: other: country_other dynamic: default: true + include: # Northern Africa: - dz # Algeria @@ -72,20 +73,19 @@ dynamic_collections: - so # Somalia - ss # South Sudan - ug # Uganda - - tz # United Republic of Tanzania [Tanzania] + - tz # Tanzania [United Republic of Tanzania] - zm # Zambia - zw # Zimbabwe - # Middle Africa: + # Central Africa: - ao # Angola - cm # Cameroon - cf # Central African Republic - td # Chad - cg # Republic of the Congo [Congo] - cd # Democratic Republic of the Congo - - zr # Zaire - gq # Equatorial Guinea - ga # Gabon - - st # Sao Tome and Principe + - st # São Tomé and Príncipe [Sao Tome and Principe] # Southern Africa: - bw # Botswana - sz # Eswatini [Swaziland] @@ -95,8 +95,8 @@ dynamic_collections: # Western Africa: - bj # Benin - bf # Burkina Faso - - cv # Cabo Verde [Cape Verde] - - ci # Côte d'Ivoire [Ivory Coast] + - cv # Cape Verde [Cabo Verde] + - ci # Côte d'Ivoire [Côte d’Ivoire] [Ivory Coast] - gm # Gambia - gh # Ghana - gn # Guinea @@ -139,7 +139,7 @@ dynamic_collections: - sx # Sint Maarten - tt # Trinidad and Tobago - tc # Turks and Caicos Islands - - vi # U.S. Virgin Islands [United States Virgin Islands] + - vi # US Virgin Islands [U.S. Virgin Islands] [United States Virgin Islands] # Central America: - bz # Belize - cr # Costa Rica @@ -151,7 +151,7 @@ dynamic_collections: - pa # Panama # South America: - ar # Argentina - - bo # Plurinational State of Bolivia [Bolivia] + - bo # Bolivia [Plurinational State of Bolivia] - bv # Bouvet Island - br # Brazil - cl # Chile @@ -165,13 +165,13 @@ dynamic_collections: - gs # South Georgia and the South Sandwich Islands [South Georgia] [South Sandwich Islands] - sr # Suriname - uy # Uruguay - - ve # Bolivarian Republic of Venezuela [Venezuela] + - ve # Venezuela [Bolivarian Republic of Venezuela] # North America: - bm # Bermuda - ca # Canada - gl # Greenland - pm # Saint Pierre and Miquelon - - us # United States of America [United States] + - us # United States [United States of America] # Antarctica: - aq # Antarctica # Central Asia: @@ -184,23 +184,21 @@ dynamic_collections: - cn # China - hk # Hong Kong - mo # Macao - - kp # Democratic People's Republic of Korea [North Korea] + - kp # North Korea [Democratic People's Republic of Korea] - jp # Japan - mn # Mongolia - - kr # Republic of Korea [South Korea] [Korea] + - kr # South Korea [Republic of Korea] [Korea] - tw # Taiwan [Taiwan, Province of China] # South-Eastern Asia: - bn # Brunei [Brunei Darussalam] - kh # Cambodia - id # Indonesia - - la # Lao People's Democratic Republic [Lao] + - la # Laos [Lao People's Democratic Republic] [Lao] - my # Malaysia - mm # Myanmar - - bu # Burma - ph # Philippines - sg # Singapore - th # Thailand - - tl # Timor-Leste - tp # East Timor - vn # Vietnam [Viet Nam] # Southern Asia: @@ -208,7 +206,7 @@ dynamic_collections: - bd # Bangladesh - bt # Bhutan - in # India - - ir # Islamic Republic of Iran [Iran] + - ir # Iran [Islamic Republic of Iran] - mv # Maldives - np # Nepal - pk # Pakistan @@ -227,22 +225,20 @@ dynamic_collections: - om # Oman - qa # Qatar - sa # Saudi Arabia - - ps # State of Palestine [Palestine] - - sy # Syrian Arab Republic [Syria] - - tr # Türkiye [Turkey] + - ps # Palestine [State of Palestine] + - sy # Syria [Syrian Arab Republic] + - tr # Turkey [Türkiye] - ae # United Arab Emirates - ye # Yemen # Eastern Europe: - by # Belarus - bg # Bulgaria - cz # Czech Republic [Czechia] - - cs # Czechoslovakia - hu # Hungary - pl # Poland - - md # Republic of Moldova [Moldova] + - md # Moldova [Republic of Moldova] - ro # Romania - - ru # Russian Federation [Russia] - - su # Soviet Union + - ru # Russia [Russian Federation] - sk # Slovakia - ua # Ukraine # Northern Europe: @@ -271,7 +267,7 @@ dynamic_collections: - gi # Gibraltar - gr # Greece - xk # Kosovo - - va # Holy See [Vatican City] + - va # Vatican City [Holy See] - it # Italy - mt # Malta - me # Montenegro @@ -287,7 +283,6 @@ dynamic_collections: - be # Belgium - fr # France [French Republic] - de # Germany - - dd # East Germany - li # Liechtenstein - lu # Luxembourg - mc # Monaco @@ -310,11 +305,11 @@ dynamic_collections: - gu # Guam - ki # Kiribati - mh # Marshall Islands - - fm # Federated States of Micronesia [Micronesia] + - fm # Micronesia [Federated States of Micronesia] - nr # Nauru - mp # Northern Mariana Islands - pw # Palau - - um # United States Minor Outlying Islands + - um # US Minor Outlying Islands # Polynesia: - as # American Samoa - ck # Cook Islands @@ -326,3 +321,16 @@ dynamic_collections: - to # Tonga - tv # Tuvalu - wf # Wallis and Futuna Islands + addons: + cd: # Democratic Republic of the Congo + - zr # Zaire + mm: # Myanmar + - bu # Burma + tp: # East Timor + - tl # Timor-Leste + cz: # Czech Republic + - cs # Czechoslovakia + ru: # Russia + - su # Soviet Union + de: # Germany + - dd # East Germany \ No newline at end of file diff --git a/defaults/show/region.yml b/defaults/show/region.yml index ee036cca..7bf2541b 100644 --- a/defaults/show/region.yml +++ b/defaults/show/region.yml @@ -1,9 +1,9 @@ ############################################################################## -# Region Collections # +# Region Collections # # Created by Adam Pope, bartolomesorianol, Bullmoose20 & Sohjiro # -# Artwork Credit to Duhniel, Bullmoose20, and Wiki Commons # +# Artwork Credit to Duhniel, Bullmoose20, and Wiki Commons # # EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL # -# https://metamanager.wiki/en/latest/defaults/show/region.html # +# https://metamanager.wiki/en/latest/defaults/show/region.html # ############################################################################## external_templates: @@ -47,7 +47,7 @@ dynamic_collections: include: - Northern Africa - Eastern Africa - - Middle Africa + - Central Africa - Southern Africa - Western Africa - Caribbean @@ -98,10 +98,10 @@ dynamic_collections: - so # Somalia - ss # South Sudan - ug # Uganda - - tz # United Republic of Tanzania [Tanzania] + - tz # Tanzania [United Republic of Tanzania] - zm # Zambia - zw # Zimbabwe - Middle Africa: + Central Africa: - ao # Angola - cm # Cameroon - cf # Central African Republic @@ -111,7 +111,7 @@ dynamic_collections: - zr # Zaire - gq # Equatorial Guinea - ga # Gabon - - st # Sao Tome and Principe + - st # São Tomé and Príncipe [Sao Tome and Principe] Southern Africa: - bw # Botswana - sz # Eswatini [Swaziland] @@ -121,8 +121,8 @@ dynamic_collections: Western Africa: - bj # Benin - bf # Burkina Faso - - cv # Cabo Verde [Cape Verde] - - ci # Côte d'Ivoire [Ivory Coast] + - cv # Cape Verde [Cabo Verde] + - ci # Côte d'Ivoire [Côte d’Ivoire] [Ivory Coast] - gm # Gambia - gh # Ghana - gn # Guinea @@ -165,7 +165,7 @@ dynamic_collections: - sx # Sint Maarten - tt # Trinidad and Tobago - tc # Turks and Caicos Islands - - vi # U.S. Virgin Islands [United States Virgin Islands] + - vi # US Virgin Islands [U.S. Virgin Islands] [United States Virgin Islands] Central America: - bz # Belize - cr # Costa Rica @@ -177,7 +177,7 @@ dynamic_collections: - pa # Panama South America: - ar # Argentina - - bo # Plurinational State of Bolivia [Bolivia] + - bo # Bolivia [Plurinational State of Bolivia] - bv # Bouvet Island - br # Brazil - cl # Chile @@ -191,13 +191,13 @@ dynamic_collections: - gs # South Georgia and the South Sandwich Islands [South Georgia] [South Sandwich Islands] - sr # Suriname - uy # Uruguay - - ve # Bolivarian Republic of Venezuela [Venezuela] + - ve # Venezuela [Bolivarian Republic of Venezuela] North America: - bm # Bermuda - ca # Canada - gl # Greenland - pm # Saint Pierre and Miquelon - - us # United States of America [United States] + - us # United States [United States of America] Antarctica: - aq # Antarctica Central Asia: @@ -210,31 +210,31 @@ dynamic_collections: - cn # China - hk # Hong Kong - mo # Macao - - kp # Democratic People's Republic of Korea [North Korea] + - kp # North Korea [Democratic People's Republic of Korea] - jp # Japan - mn # Mongolia - - kr # Republic of Korea [South Korea] [Korea] + - kr # South Korea [Republic of Korea] [Korea] - tw # Taiwan [Taiwan, Province of China] South-Eastern Asia: - bn # Brunei [Brunei Darussalam] - kh # Cambodia - id # Indonesia - - la # Lao People's Democratic Republic [Lao] + - la # Laos [Lao People's Democratic Republic] [Lao] - my # Malaysia - mm # Myanmar - bu # Burma - ph # Philippines - sg # Singapore - th # Thailand - - tl # Timor-Leste - tp # East Timor + - tl # Timor-Leste - vn # Vietnam [Viet Nam] Southern Asia: - af # Afghanistan - bd # Bangladesh - bt # Bhutan - in # India - - ir # Islamic Republic of Iran [Iran] + - ir # Iran [Islamic Republic of Iran] - mv # Maldives - np # Nepal - pk # Pakistan @@ -253,9 +253,9 @@ dynamic_collections: - om # Oman - qa # Qatar - sa # Saudi Arabia - - ps # State of Palestine [Palestine] - - sy # Syrian Arab Republic [Syria] - - tr # Türkiye [Turkey] + - ps # Palestine [State of Palestine] + - sy # Syria [Syrian Arab Republic] + - tr # Turkey [Türkiye] - ae # United Arab Emirates - ye # Yemen Eastern Europe: @@ -265,9 +265,9 @@ dynamic_collections: - cs # Czechoslovakia - hu # Hungary - pl # Poland - - md # Republic of Moldova [Moldova] + - md # Moldova [Republic of Moldova] - ro # Romania - - ru # Russian Federation [Russia] + - ru # Russia [Russian Federation] - su # Soviet Union - sk # Slovakia - ua # Ukraine @@ -297,7 +297,7 @@ dynamic_collections: - gi # Gibraltar - gr # Greece - xk # Kosovo - - va # Holy See [Vatican City] + - va # Vatican City [Holy See] - it # Italy - mt # Malta - me # Montenegro @@ -336,11 +336,11 @@ dynamic_collections: - gu # Guam - ki # Kiribati - mh # Marshall Islands - - fm # Federated States of Micronesia [Micronesia] + - fm # Micronesia [Federated States of Micronesia] - nr # Nauru - mp # Northern Mariana Islands - pw # Palau - - um # United States Minor Outlying Islands + - um # US Minor Outlying Islands Polynesia: - as # American Samoa - ck # Cook Islands diff --git a/docs/defaults/movie/continent.md b/docs/defaults/movie/continent.md index e1c36ca7..359e0e7c 100644 --- a/docs/defaults/movie/continent.md +++ b/docs/defaults/movie/continent.md @@ -130,11 +130,11 @@ The following yml is provided for reference to show what values will be in use i - Somalia - South Sudan - Uganda - - United Republic of Tanzania - - Tanzania # United Republic of Tanzania + - Tanzania + - United Republic of Tanzania # Tanzania - Zambia - Zimbabwe - # Middle Africa: + # Central Africa: - Angola - Cameroon - Central African Republic @@ -145,8 +145,8 @@ The following yml is provided for reference to show what values will be in use i - Zaire # Democratic Republic of the Congo - Equatorial Guinea - Gabon - - Sao Tome and Principe - - São Tomé and Príncipe # Sao Tome and Principe + - São Tomé and Príncipe + - Sao Tome and Principe # São Tomé and Príncipe # Southern Africa: - Botswana - Eswatini @@ -157,8 +157,8 @@ The following yml is provided for reference to show what values will be in use i # Western Africa: - Benin - Burkina Faso - - Cabo Verde - - Cape Verde # Cabo Verde + - Cape Verde + - Cabo Verde # Cape Verde - Côte d'Ivoire - Côte d’Ivoire # Côte d'Ivoire - Ivory Coast # Côte d'Ivoire @@ -219,8 +219,9 @@ The following yml is provided for reference to show what values will be in use i - Sint Maarten - Trinidad and Tobago - Turks and Caicos Islands - - U.S. Virgin Islands - - United States Virgin Islands # U.S. Virgin Islands + - US Virgin Islands + - U.S. Virgin Islands # US Virgin Islands + - United States Virgin Islands # US Virgin Islands # Central America: - Belize - Costa Rica @@ -232,8 +233,8 @@ The following yml is provided for reference to show what values will be in use i - Panama # South America: - Argentina - - Plurinational State of Bolivia - - Bolivia # Plurinational State of Bolivia + - Bolivia + - Plurinational State of Bolivia # Bolivia - Bouvet Island - Brazil - Chile @@ -251,16 +252,16 @@ The following yml is provided for reference to show what values will be in use i - South Sandwich Islands # South Georgia and the South Sandwich Islands - Suriname - Uruguay - - Bolivarian Republic of Venezuela - - Venezuela # Bolivarian Republic of Venezuela + - Venezuela + - Bolivarian Republic of Venezuela # Venezuela # North America: - Bermuda - Canada - Greenland - Saint Pierre and Miquelon - St. Pierre and Miquelon # Saint Pierre and Miquelon - - United States of America - - United States # United States of America + - United States + - United States of America # United States Antarctica: - Antarctica Asia: @@ -277,13 +278,13 @@ The following yml is provided for reference to show what values will be in use i - Macao - Macau # Macao - Macau SAR China # Macao - - Democratic People's Republic of Korea - - North Korea # Democratic People's Republic of Korea + - North Korea + - Democratic People's Republic of Korea # North Korea - Japan - Mongolia - - Republic of Korea - - South Korea # Republic of Korea - - Korea # Republic of Korea + - South Korea + - Republic of Korea # South Korea + - Korea # South Korea - Taiwan - Taiwan, Province of China # Taiwan # South-Eastern Asia: @@ -291,17 +292,17 @@ The following yml is provided for reference to show what values will be in use i - Brunei Darussalam # Brunei - Cambodia - Indonesia - - Lao People's Democratic Republic - - Lao # Lao People's Democratic Republic - - Laos # Lao People's Democratic Republic + - Laos + - Lao People's Democratic Republic # Laos + - Lao # Laos - Malaysia - Myanmar - Burma # Myanmar - Philippines - Singapore - Thailand - - Timor-Leste - - East Timor # Timor-Leste + - East Timor + - Timor-Leste # East Timor - Vietnam - Viet Nam # Vietnam # Southern Asia: @@ -309,8 +310,8 @@ The following yml is provided for reference to show what values will be in use i - Bangladesh - Bhutan - India - - Islamic Republic of Iran - - Iran # Islamic Republic of Iran + - Iran + - Islamic Republic of Iran # Iran - Maldives - Nepal - Pakistan @@ -329,12 +330,12 @@ The following yml is provided for reference to show what values will be in use i - Oman - Qatar - Saudi Arabia - - State of Palestine - - Palestine # State of Palestine - - Syrian Arab Republic - - Syria # Syrian Arab Republic - - Türkiye - - Turkey # Türkiye + - Palestine + - State of Palestine # Palestine + - Syria + - Syrian Arab Republic # Syria + - Turkey + - Türkiye # Turkey - United Arab Emirates - Yemen Europe: @@ -343,14 +344,14 @@ The following yml is provided for reference to show what values will be in use i - Bulgaria - Czech Republic - Czechia # Czech Republic - - Czechoslovakia + - Czechoslovakia # Czech Republic - Hungary - Poland - - Republic of Moldova - - Moldova # Republic of Moldova + - Moldova + - Republic of Moldova # Moldova - Romania - - Russian Federation - - Russia # Russian Federation + - Russia + - Russian Federation # Russia - Soviet Union - Slovakia - Ukraine @@ -382,8 +383,8 @@ The following yml is provided for reference to show what values will be in use i - Gibraltar - Greece - Kosovo - - Holy See - - Vatican City # Holy See + - Vatican City + - Holy See # Vatican City - Italy - Malta - Montenegro @@ -429,13 +430,17 @@ The following yml is provided for reference to show what values will be in use i - Guam - Kiribati - Marshall Islands - - Federated States of Micronesia - - Micronesia # Federated States of Micronesia + - Micronesia + - Federated States of Micronesia # Micronesia - Nauru - Northern Mariana Islands - Palau - - United States Minor Outlying Islands - - U.S. Outlying Islands # United States Minor Outlying Islands + - US Minor Outlying Islands + - United States Minor Outlying Islands # US Minor Outlying Islands + - United States Outlying Islands # US Minor Outlying Islands + - U.S. Minor Outlying Islands # US Minor Outlying Islands + - U.S. Outlying Islands # US Minor Outlying Islands + - US Outlying Islands # US Minor Outlying Islands # Polynesia: - American Samoa - Cook Islands diff --git a/docs/defaults/movie/country.md b/docs/defaults/movie/country.md index 580afce5..36e17876 100644 --- a/docs/defaults/movie/country.md +++ b/docs/defaults/movie/country.md @@ -117,10 +117,10 @@ These are lists provided for reference to show what values will be in use if you - Somalia - South Sudan - Uganda - - United Republic of Tanzania + - Tanzania - Zambia - Zimbabwe - # Middle Africa: + # Central Africa: - Angola - Cameroon - Central African Republic @@ -129,7 +129,7 @@ These are lists provided for reference to show what values will be in use if you - Democratic Republic of the Congo - Equatorial Guinea - Gabon - - Sao Tome and Principe + - São Tomé and Príncipe # Southern Africa: - Botswana - Eswatini @@ -139,7 +139,7 @@ These are lists provided for reference to show what values will be in use if you # Western Africa: - Benin - Burkina Faso - - Cabo Verde + - Cape Verde - Côte d'Ivoire - Gambia - Ghana @@ -183,7 +183,7 @@ These are lists provided for reference to show what values will be in use if you - Sint Maarten - Trinidad and Tobago - Turks and Caicos Islands - - U.S. Virgin Islands + - US Virgin Islands # Central America: - Belize - Costa Rica @@ -195,7 +195,7 @@ These are lists provided for reference to show what values will be in use if you - Panama # South America: - Argentina - - Plurinational State of Bolivia + - Bolivia - Bouvet Island - Brazil - Chile @@ -209,13 +209,13 @@ These are lists provided for reference to show what values will be in use if you - South Georgia and the South Sandwich Islands - Suriname - Uruguay - - Bolivarian Republic of Venezuela + - Venezuela # North America: - Bermuda - Canada - Greenland - Saint Pierre and Miquelon - - United States of America + - United States # Antarctica: - Antarctica # Central Asia: @@ -228,29 +228,29 @@ These are lists provided for reference to show what values will be in use if you - China - Hong Kong - Macao - - Democratic People's Republic of Korea + - North Korea - Japan - Mongolia - - Republic of Korea + - South Korea - Taiwan # South-Eastern Asia: - Brunei - Cambodia - Indonesia - - Lao People's Democratic Republic + - Laos - Malaysia - Myanmar - Philippines - Singapore - Thailand - - Timor-Leste - - Viet Nam + - East Timor + - Vietnam # Southern Asia: - Afghanistan - Bangladesh - Bhutan - India - - Islamic Republic of Iran + - Iran - Maldives - Nepal - Pakistan @@ -269,9 +269,9 @@ These are lists provided for reference to show what values will be in use if you - Oman - Qatar - Saudi Arabia - - State of Palestine - - Syrian Arab Republic - - Türkiye + - Palestine + - Syria + - Turkey - United Arab Emirates - Yemen # Eastern Europe: @@ -280,9 +280,9 @@ These are lists provided for reference to show what values will be in use if you - Czech Republic - Hungary - Poland - - Republic of Moldova + - Moldova - Romania - - Russian Federation + - Russia - Slovakia - Ukraine # Northern Europe: @@ -312,7 +312,7 @@ These are lists provided for reference to show what values will be in use if you - Gibraltar - Greece - Kosovo - - Holy See + - Vatican City - Italy - Malta - Montenegro @@ -329,7 +329,6 @@ These are lists provided for reference to show what values will be in use if you - Belgium - France - Germany - - East Germany - Liechtenstein - Luxembourg - Monaco @@ -340,40 +339,34 @@ These are lists provided for reference to show what values will be in use if you - Christmas Island - Cocos (Keeling) Islands - Heard Island and McDonald Islands - - Heard and McDonald Islands # Heard Island and McDonald Islands - New Zealand - Norfolk Island # Melanesia: - Fiji - New Caledonia - Papua New Guinea - - New Guinea # Papua New Guinea - Solomon Islands - Vanuatu # Micronesia: - Guam - Kiribati - Marshall Islands - - Federated States of Micronesia - - Micronesia # Federated States of Micronesia + - Micronesia - Nauru - Northern Mariana Islands - Palau - - United States Minor Outlying Islands - - U.S. Outlying Islands # United States Minor Outlying Islands + - US Minor Outlying Islands # Polynesia: - American Samoa - Cook Islands - French Polynesia - Niue - Pitcairn Islands - - Pitcairn # Pitcairn Islands - Samoa - Tokelau - Tonga - Tuvalu - Wallis and Futuna Islands - - Wallis and Futuna # Wallis and Futuna Islands ``` ### Default `addons` @@ -386,12 +379,12 @@ These are lists provided for reference to show what values will be in use if you - Congo Democratic Republic of the Congo: - Zaire - Sao Tome and Principe: - - São Tomé and Príncipe + São Tomé and Príncipe: + - Sao Tome and Principe Eswatini: - Swaziland - Cabo Verde: - - Cape Verde + Cape Verde: + - Cabo Verde Côte d'Ivoire: - Côte d’Ivoire - Ivory Coast @@ -415,78 +408,85 @@ These are lists provided for reference to show what values will be in use if you - Saint Vincent and Grenadines - St. Vincent and the Grenadines - St. Vincent and Grenadines - U.S. Virgin Islands: + US Virgin Islands: + - U.S. Virgin Islands - United States Virgin Islands - Plurinational State of Bolivia: - - Bolivia + Bolivia: + - Plurinational State of Bolivia Falkland Islands: - Malvinas South Georgia and the South Sandwich Islands: - South Georgia and South Sandwich Islands - South Georgia - South Sandwich Islands - Bolivarian Republic of Venezuela: - - Venezuela + Venezuela: + - Bolivarian Republic of Venezuela Saint Pierre and Miquelon: - St. Pierre and Miquelon - United States of America: - - United States + United States: + - United States of America Hong Kong: - Hong Kong SAR China Macao: - Macau - Macau SAR China - Democratic People's Republic of Korea: - - North Korea - Republic of Korea: - - South Korea + North Korea: + - Democratic People's Republic of Korea + South Korea: + - Republic of Korea - Korea Taiwan: - Taiwan, Province of China Brunei: - Brunei Darussalam - Lao People's Democratic Republic: + Laos: + - Lao People's Democratic Republic - Lao - - Laos Myanmar: - Burma - Timor-Leste: - - East Timor - Viet Nam: - - Vietnam - Islamic Republic of Iran: - - Iran - State of Palestine: - - Palestine - Syrian Arab Republic: - - Syria - Türkiye: - - Turkey + East Timor: + - Timor-Leste + Vietnam: + - Viet Nam + Iran: + - Islamic Republic of Iran + Palestine: + - State of Palestine + Syria: + - Syrian Arab Republic + Turkey: + - Türkiye Czech Republic: - Czechia - Czechoslovakia - Republic of Moldova: - - Moldova - Russian Federation: - - Russia + Moldova: + - Republic of Moldova + Russia: + - Russian Federation - Soviet Union Svalbard and Jan Mayen Islands: - Svalbard and Jan Mayen - Holy See: - - Vatican City + Vatican City: + - Holy See North Macedonia: - Macedonia - Republic of North Macedonia France: - French Republic + Germany: + - East Germany Heard Island and McDonald Islands: - Heard and McDonald Islands Papua New Guinea: - New Guinea - Federated States of Micronesia: - - Micronesia - United States Minor Outlying Islands: + Micronesia: + - Federated States of Micronesia + US Minor Outlying Islands: + - United States Minor Outlying Islands + - United States Outlying Islands + - U.S. Minor Outlying Islands - U.S. Outlying Islands + - US Outlying Islands Pitcairn Islands: - Pitcairn Wallis and Futuna Islands: diff --git a/docs/defaults/movie/region.md b/docs/defaults/movie/region.md index f526023c..0170563b 100644 --- a/docs/defaults/movie/region.md +++ b/docs/defaults/movie/region.md @@ -91,7 +91,7 @@ The following yaml is provided for reference to show what values will be in use include: - Northern Africa - Eastern Africa - - Middle Africa + - Central Africa - Southern Africa - Western Africa - Caribbean @@ -146,11 +146,11 @@ The following yaml is provided for reference to show what values will be in use - Somalia - South Sudan - Uganda - - United Republic of Tanzania - - Tanzania # United Republic of Tanzania + - Tanzania + - United Republic of Tanzania # Tanzania - Zambia - Zimbabwe - Middle Africa: + Central Africa: - Angola - Cameroon - Central African Republic @@ -161,8 +161,8 @@ The following yaml is provided for reference to show what values will be in use - Zaire # Democratic Republic of the Congo - Equatorial Guinea - Gabon - - Sao Tome and Principe - - São Tomé and Príncipe # Sao Tome and Principe + - São Tomé and Príncipe + - Sao Tome and Principe # São Tomé and Príncipe Southern Africa: - Botswana - Eswatini @@ -173,8 +173,8 @@ The following yaml is provided for reference to show what values will be in use Western Africa: - Benin - Burkina Faso - - Cabo Verde - - Cape Verde # Cabo Verde + - Cape Verde + - Cabo Verde # Cape Verde - Côte d'Ivoire - Côte d’Ivoire # Côte d'Ivoire - Ivory Coast # Côte d'Ivoire @@ -234,8 +234,9 @@ The following yaml is provided for reference to show what values will be in use - Sint Maarten - Trinidad and Tobago - Turks and Caicos Islands - - U.S. Virgin Islands - - United States Virgin Islands # U.S. Virgin Islands + - US Virgin Islands + - U.S. Virgin Islands # US Virgin Islands + - United States Virgin Islands # US Virgin Islands Central America: - Belize - Costa Rica @@ -247,8 +248,8 @@ The following yaml is provided for reference to show what values will be in use - Panama South America: - Argentina - - Plurinational State of Bolivia - - Bolivia # Plurinational State of Bolivia + - Bolivia + - Plurinational State of Bolivia # Bolivia - Bouvet Island - Brazil - Chile @@ -266,16 +267,16 @@ The following yaml is provided for reference to show what values will be in use - South Sandwich Islands # South Georgia and the South Sandwich Islands - Suriname - Uruguay - - Bolivarian Republic of Venezuela - - Venezuela # Bolivarian Republic of Venezuela + - Venezuela + - Bolivarian Republic of Venezuela # Venezuela North America: - Bermuda - Canada - Greenland - Saint Pierre and Miquelon - St. Pierre and Miquelon # Saint Pierre and Miquelon - - United States of America - - United States # United States of America + - United States + - United States of America # United States Antarctica: - Antarctica Central Asia: @@ -291,13 +292,13 @@ The following yaml is provided for reference to show what values will be in use - Macao - Macau # Macao - Macau SAR China # Macao - - Democratic People's Republic of Korea - - North Korea # Democratic People's Republic of Korea + - North Korea + - Democratic People's Republic of Korea # North Korea - Japan - Mongolia - - Republic of Korea - - South Korea # Republic of Korea - - Korea # Republic of Korea + - South Korea + - Republic of Korea # South Korea + - Korea # South Korea - Taiwan - Taiwan, Province of China # Taiwan South-Eastern Asia: @@ -305,17 +306,17 @@ The following yaml is provided for reference to show what values will be in use - Brunei Darussalam # Brunei - Cambodia - Indonesia - - Lao People's Democratic Republic - - Lao # Lao People's Democratic Republic - - Laos # Lao People's Democratic Republic + - Laos + - Lao People's Democratic Republic # Laos + - Lao # Laos - Malaysia - Myanmar - Burma # Myanmar - Philippines - Singapore - Thailand - - Timor-Leste - - East Timor # Timor-Leste + - East Timor + - Timor-Leste # East Timor - Vietnam - Viet Nam # Vietnam Southern Asia: @@ -323,8 +324,8 @@ The following yaml is provided for reference to show what values will be in use - Bangladesh - Bhutan - India - - Islamic Republic of Iran - - Iran # Islamic Republic of Iran + - Iran + - Islamic Republic of Iran # Iran - Maldives - Nepal - Pakistan @@ -343,12 +344,12 @@ The following yaml is provided for reference to show what values will be in use - Oman - Qatar - Saudi Arabia - - State of Palestine - - Palestine # State of Palestine - - Syrian Arab Republic - - Syria # Syrian Arab Republic - - Türkiye - - Turkey # Türkiye + - Palestine + - State of Palestine # Palestine + - Syria + - Syrian Arab Republic # Syria + - Turkey + - Türkiye # Turkey - United Arab Emirates - Yemen Eastern Europe: @@ -356,15 +357,15 @@ The following yaml is provided for reference to show what values will be in use - Bulgaria - Czech Republic - Czechia # Czech Republic - - Czechoslovakia + - Czechoslovakia # Czech Republic - Hungary - Poland - - Republic of Moldova - - Moldova # Republic of Moldova + - Moldova + - Republic of Moldova # Moldova - Romania - - Russian Federation - - Russia # Russian Federation - - Soviet Union + - Russia + - Russian Federation # Russia + - Soviet Union # Russia - Slovakia - Ukraine Northern Europe: @@ -395,8 +396,8 @@ The following yaml is provided for reference to show what values will be in use - Gibraltar - Greece - Kosovo - - Holy See - - Vatican City # Holy See + - Vatican City + - Holy See # Vatican City - Italy - Malta - Montenegro @@ -441,13 +442,17 @@ The following yaml is provided for reference to show what values will be in use - Guam - Kiribati - Marshall Islands - - Federated States of Micronesia - - Micronesia # Federated States of Micronesia + - Micronesia + - Federated States of Micronesia # Micronesia - Nauru - Northern Mariana Islands - Palau - - United States Minor Outlying Islands - - U.S. Outlying Islands # United States Minor Outlying Islands + - US Minor Outlying Islands + - United States Minor Outlying Islands # US Minor Outlying Islands + - United States Outlying Islands # US Minor Outlying Islands + - U.S. Minor Outlying Islands # US Minor Outlying Islands + - U.S. Outlying Islands # US Minor Outlying Islands + - US Outlying Islands # US Minor Outlying Islands Polynesia: - American Samoa - Cook Islands diff --git a/docs/defaults/overlays/ribbon.md b/docs/defaults/overlays/ribbon.md index 2d8ac1ef..ffde6b6d 100644 --- a/docs/defaults/overlays/ribbon.md +++ b/docs/defaults/overlays/ribbon.md @@ -17,8 +17,8 @@ Supported Overlay Level: Movie, Show | Golden Globe Winner | `golden` | `160` | | Golden Globe Director | `golden_director` | `150` | | BAFTA Winner | `bafta` | `140` | -| Cannes Winner | `cabbes` | `130` | -| Berlinale Winner | `berlinLe` | `120` | +| Cannes Winner | `cannes` | `130` | +| Berlinale Winner | `berlinale` | `120` | | Venice Winner | `venice` | `110` | | Sundance Winner | `sundance` | `100` | | Emmys Winner | `emmys` | `90` | diff --git a/docs/defaults/show/continent.md b/docs/defaults/show/continent.md index 5b37fe63..7ec66dc0 100644 --- a/docs/defaults/show/continent.md +++ b/docs/defaults/show/continent.md @@ -133,19 +133,20 @@ These are lists provided for reference to show what values will be in use if you - so # Somalia - ss # South Sudan - ug # Uganda - - tz # United Republic of Tanzania [Tanzania] + - tz # Tanzania [United Republic of Tanzania] - zm # Zambia - zw # Zimbabwe - # Middle Africa: + # Central Africa: - ao # Angola - cm # Cameroon - cf # Central African Republic - td # Chad - cg # Republic of the Congo [Congo] - cd # Democratic Republic of the Congo + - zr # Zaire - gq # Equatorial Guinea - ga # Gabon - - st # Sao Tome and Principe + - st # São Tomé and Príncipe [Sao Tome and Principe] # Southern Africa: - bw # Botswana - sz # Eswatini [Swaziland] @@ -155,8 +156,8 @@ These are lists provided for reference to show what values will be in use if you # Western Africa: - bj # Benin - bf # Burkina Faso - - cv # Cabo Verde [Cape Verde] - - ci # Côte d'Ivoire [Ivory Coast] + - cv # Cape Verde [Cabo Verde] + - ci # Côte d'Ivoire [Côte d’Ivoire] [Ivory Coast] - gm # Gambia - gh # Ghana - gn # Guinea @@ -200,7 +201,7 @@ These are lists provided for reference to show what values will be in use if you - sx # Sint Maarten - tt # Trinidad and Tobago - tc # Turks and Caicos Islands - - vi # United States Virgin Islands + - vi # US Virgin Islands [U.S. Virgin Islands] [United States Virgin Islands] # Central America: - bz # Belize - cr # Costa Rica @@ -212,7 +213,7 @@ These are lists provided for reference to show what values will be in use if you - pa # Panama # South America: - ar # Argentina - - bo # Plurinational State of Bolivia [Bolivia] + - bo # Bolivia [Plurinational State of Bolivia] - bv # Bouvet Island - br # Brazil - cl # Chile @@ -226,13 +227,13 @@ These are lists provided for reference to show what values will be in use if you - gs # South Georgia and the South Sandwich Islands [South Georgia] [South Sandwich Islands] - sr # Suriname - uy # Uruguay - - ve # Bolivarian Republic of Venezuela [Venezuela] + - ve # Venezuela [Bolivarian Republic of Venezuela] # North America: - bm # Bermuda - ca # Canada - gl # Greenland - pm # Saint Pierre and Miquelon - - us # United States of America [United States] + - us # United States [United States of America] Antarctica: - aq # Antarctica Asia: @@ -246,31 +247,31 @@ These are lists provided for reference to show what values will be in use if you - cn # China - hk # Hong Kong - mo # Macao - - kp # Democratic People's Republic of Korea [North Korea] + - kp # North Korea [Democratic People's Republic of Korea] - jp # Japan - mn # Mongolia - - kr # Republic of Korea [South Korea] [Korea] + - kr # South Korea [Republic of Korea] [Korea] - tw # Taiwan [Taiwan, Province of China] # South-Eastern Asia: - bn # Brunei [Brunei Darussalam] - kh # Cambodia - id # Indonesia - - la # Lao People's Democratic Republic [Lao] + - la # Laos [Lao People's Democratic Republic] [Lao] - my # Malaysia - mm # Myanmar - bu # Burma - ph # Philippines - sg # Singapore - th # Thailand - - tl # Timor-Leste - tp # East Timor + - tl # Timor-Leste - vn # Vietnam [Viet Nam] # Southern Asia: - af # Afghanistan - bd # Bangladesh - bt # Bhutan - in # India - - ir # Islamic Republic of Iran [Iran] + - ir # Iran [Islamic Republic of Iran] - mv # Maldives - np # Nepal - pk # Pakistan @@ -289,9 +290,9 @@ These are lists provided for reference to show what values will be in use if you - om # Oman - qa # Qatar - sa # Saudi Arabia - - ps # State of Palestine [Palestine] - - sy # Syrian Arab Republic [Syria] - - tr # Türkiye [Turkey] + - ps # Palestine [State of Palestine] + - sy # Syria [Syrian Arab Republic] + - tr # Turkey [Türkiye] - ae # United Arab Emirates - ye # Yemen Europe: @@ -302,9 +303,10 @@ These are lists provided for reference to show what values will be in use if you - cs # Czechoslovakia - hu # Hungary - pl # Poland - - md # Republic of Moldova [Moldova] + - md # Moldova [Republic of Moldova] - ro # Romania - - ru # Russian Federation [Russia] + - ru # Russia [Russian Federation] + - su # Soviet Union - sk # Slovakia - ua # Ukraine # Northern Europe: @@ -332,7 +334,8 @@ These are lists provided for reference to show what values will be in use if you - hr # Croatia - gi # Gibraltar - gr # Greece - - va # Holy See [Vatican City] + - xk # Kosovo + - va # Vatican City [Holy See] - it # Italy - mt # Malta - me # Montenegro @@ -348,6 +351,7 @@ These are lists provided for reference to show what values will be in use if you - be # Belgium - fr # France [French Republic] - de # Germany + - dd # East Germany - li # Liechtenstein - lu # Luxembourg - mc # Monaco @@ -371,11 +375,11 @@ These are lists provided for reference to show what values will be in use if you - gu # Guam - ki # Kiribati - mh # Marshall Islands - - fm # Federated States of Micronesia [Micronesia] + - fm # Micronesia [Federated States of Micronesia] - nr # Nauru - mp # Northern Mariana Islands - pw # Palau - - um # United States Minor Outlying Islands + - um # US Minor Outlying Islands # Polynesia: - as # American Samoa - ck # Cook Islands diff --git a/docs/defaults/show/country.md b/docs/defaults/show/country.md index 26b177cb..e07ae522 100644 --- a/docs/defaults/show/country.md +++ b/docs/defaults/show/country.md @@ -120,20 +120,19 @@ include: - so # Somalia - ss # South Sudan - ug # Uganda - - tz # United Republic of Tanzania [Tanzania] + - tz # Tanzania [United Republic of Tanzania] - zm # Zambia - zw # Zimbabwe - # Middle Africa: + # Central Africa: - ao # Angola - cm # Cameroon - cf # Central African Republic - td # Chad - cg # Republic of the Congo [Congo] - cd # Democratic Republic of the Congo - - zr # Zaire - gq # Equatorial Guinea - ga # Gabon - - st # Sao Tome and Principe + - st # São Tomé and Príncipe [Sao Tome and Principe] # Southern Africa: - bw # Botswana - sz # Eswatini [Swaziland] @@ -143,8 +142,8 @@ include: # Western Africa: - bj # Benin - bf # Burkina Faso - - cv # Cabo Verde [Cape Verde] - - ci # Côte d'Ivoire [Ivory Coast] + - cv # Cape Verde [Cabo Verde] + - ci # Côte d'Ivoire [Côte d’Ivoire] [Ivory Coast] - gm # Gambia - gh # Ghana - gn # Guinea @@ -187,7 +186,7 @@ include: - sx # Sint Maarten - tt # Trinidad and Tobago - tc # Turks and Caicos Islands - - vi # U.S. Virgin Islands [United States Virgin Islands] + - vi # US Virgin Islands [U.S. Virgin Islands] [United States Virgin Islands] # Central America: - bz # Belize - cr # Costa Rica @@ -199,7 +198,7 @@ include: - pa # Panama # South America: - ar # Argentina - - bo # Plurinational State of Bolivia [Bolivia] + - bo # Bolivia [Plurinational State of Bolivia] - bv # Bouvet Island - br # Brazil - cl # Chile @@ -213,13 +212,13 @@ include: - gs # South Georgia and the South Sandwich Islands [South Georgia] [South Sandwich Islands] - sr # Suriname - uy # Uruguay - - ve # Bolivarian Republic of Venezuela [Venezuela] + - ve # Venezuela [Bolivarian Republic of Venezuela] # North America: - bm # Bermuda - ca # Canada - gl # Greenland - pm # Saint Pierre and Miquelon - - us # United States of America [United States] + - us # United States [United States of America] # Antarctica: - aq # Antarctica # Central Asia: @@ -232,23 +231,21 @@ include: - cn # China - hk # Hong Kong - mo # Macao - - kp # Democratic People's Republic of Korea [North Korea] + - kp # North Korea [Democratic People's Republic of Korea] - jp # Japan - mn # Mongolia - - kr # Republic of Korea [South Korea] [Korea] + - kr # South Korea [Republic of Korea] [Korea] - tw # Taiwan [Taiwan, Province of China] # South-Eastern Asia: - bn # Brunei [Brunei Darussalam] - kh # Cambodia - id # Indonesia - - la # Lao People's Democratic Republic [Lao] + - la # Laos [Lao People's Democratic Republic] [Lao] - my # Malaysia - mm # Myanmar - - bu # Burma - ph # Philippines - sg # Singapore - th # Thailand - - tl # Timor-Leste - tp # East Timor - vn # Vietnam [Viet Nam] # Southern Asia: @@ -256,7 +253,7 @@ include: - bd # Bangladesh - bt # Bhutan - in # India - - ir # Islamic Republic of Iran [Iran] + - ir # Iran [Islamic Republic of Iran] - mv # Maldives - np # Nepal - pk # Pakistan @@ -275,22 +272,20 @@ include: - om # Oman - qa # Qatar - sa # Saudi Arabia - - ps # State of Palestine [Palestine] - - sy # Syrian Arab Republic [Syria] - - tr # Türkiye [Turkey] + - ps # Palestine [State of Palestine] + - sy # Syria [Syrian Arab Republic] + - tr # Turkey [Türkiye] - ae # United Arab Emirates - ye # Yemen # Eastern Europe: - by # Belarus - bg # Bulgaria - cz # Czech Republic [Czechia] - - cs # Czechoslovakia - hu # Hungary - pl # Poland - - md # Republic of Moldova [Moldova] + - md # Moldova [Republic of Moldova] - ro # Romania - - ru # Russian Federation [Russia] - - su # Soviet Union + - ru # Russia [Russian Federation] - sk # Slovakia - ua # Ukraine # Northern Europe: @@ -319,7 +314,7 @@ include: - gi # Gibraltar - gr # Greece - xk # Kosovo - - va # Holy See [Vatican City] + - va # Vatican City [Holy See] - it # Italy - mt # Malta - me # Montenegro @@ -335,7 +330,6 @@ include: - be # Belgium - fr # France [French Republic] - de # Germany - - dd # East Germany - li # Liechtenstein - lu # Luxembourg - mc # Monaco @@ -358,11 +352,11 @@ include: - gu # Guam - ki # Kiribati - mh # Marshall Islands - - fm # Federated States of Micronesia [Micronesia] + - fm # Micronesia [Federated States of Micronesia] - nr # Nauru - mp # Northern Mariana Islands - pw # Palau - - um # United States Minor Outlying Islands + - um # US Minor Outlying Islands # Polynesia: - as # American Samoa - ck # Cook Islands @@ -375,3 +369,21 @@ include: - tv # Tuvalu - wf # Wallis and Futuna Islands ``` + +### Default `addons` + +```yaml + addons: + cd: # Democratic Republic of the Congo + - zr # Zaire + mm: # Myanmar + - bu # Burma + tp: # East Timor + - tl # Timor-Leste + cz: # Czech Republic + - cs # Czechoslovakia + ru: # Russia + - su # Soviet Union + de: # Germany + - dd # East Germany +``` \ No newline at end of file diff --git a/docs/defaults/show/region.md b/docs/defaults/show/region.md index cb635ba6..9649f749 100644 --- a/docs/defaults/show/region.md +++ b/docs/defaults/show/region.md @@ -94,7 +94,7 @@ These are lists provided for reference to show what values will be in use if you include: - Northern Africa - Eastern Africa - - Middle Africa + - Central Africa - Southern Africa - Western Africa - Caribbean @@ -149,10 +149,10 @@ These are lists provided for reference to show what values will be in use if you - so # Somalia - ss # South Sudan - ug # Uganda - - tz # United Republic of Tanzania [Tanzania] + - tz # Tanzania [United Republic of Tanzania] - zm # Zambia - zw # Zimbabwe - Middle Africa: + Central Africa: - ao # Angola - cm # Cameroon - cf # Central African Republic @@ -162,7 +162,7 @@ These are lists provided for reference to show what values will be in use if you - zr # Zaire - gq # Equatorial Guinea - ga # Gabon - - st # Sao Tome and Principe + - st # São Tomé and Príncipe [Sao Tome and Principe] Southern Africa: - bw # Botswana - sz # Eswatini [Swaziland] @@ -172,8 +172,8 @@ These are lists provided for reference to show what values will be in use if you Western Africa: - bj # Benin - bf # Burkina Faso - - cv # Cabo Verde [Cape Verde] - - ci # Côte d'Ivoire [Ivory Coast] + - cv # Cape Verde [Cabo Verde] + - ci # Côte d'Ivoire [Côte d’Ivoire] [Ivory Coast] - gm # Gambia - gh # Ghana - gn # Guinea @@ -216,7 +216,7 @@ These are lists provided for reference to show what values will be in use if you - sx # Sint Maarten - tt # Trinidad and Tobago - tc # Turks and Caicos Islands - - vi # U.S. Virgin Islands [United States Virgin Islands] + - vi # US Virgin Islands [U.S. Virgin Islands] [United States Virgin Islands] Central America: - bz # Belize - cr # Costa Rica @@ -228,7 +228,7 @@ These are lists provided for reference to show what values will be in use if you - pa # Panama South America: - ar # Argentina - - bo # Plurinational State of Bolivia [Bolivia] + - bo # Bolivia [Plurinational State of Bolivia] - bv # Bouvet Island - br # Brazil - cl # Chile @@ -242,13 +242,13 @@ These are lists provided for reference to show what values will be in use if you - gs # South Georgia and the South Sandwich Islands [South Georgia] [South Sandwich Islands] - sr # Suriname - uy # Uruguay - - ve # Bolivarian Republic of Venezuela [Venezuela] + - ve # Venezuela [Bolivarian Republic of Venezuela] North America: - bm # Bermuda - ca # Canada - gl # Greenland - pm # Saint Pierre and Miquelon - - us # United States of America [United States] + - us # United States [United States of America] Antarctica: - aq # Antarctica Central Asia: @@ -261,31 +261,31 @@ These are lists provided for reference to show what values will be in use if you - cn # China - hk # Hong Kong - mo # Macao - - kp # Democratic People's Republic of Korea [North Korea] + - kp # North Korea [Democratic People's Republic of Korea] - jp # Japan - mn # Mongolia - - kr # Republic of Korea [South Korea] [Korea] + - kr # South Korea [Republic of Korea] [Korea] - tw # Taiwan [Taiwan, Province of China] South-Eastern Asia: - bn # Brunei [Brunei Darussalam] - kh # Cambodia - id # Indonesia - - la # Lao People's Democratic Republic [Lao] + - la # Laos [Lao People's Democratic Republic] [Lao] - my # Malaysia - mm # Myanmar - bu # Burma - ph # Philippines - sg # Singapore - th # Thailand - - tl # Timor-Leste - tp # East Timor + - tl # Timor-Leste - vn # Vietnam [Viet Nam] Southern Asia: - af # Afghanistan - bd # Bangladesh - bt # Bhutan - in # India - - ir # Islamic Republic of Iran [Iran] + - ir # Iran [Islamic Republic of Iran] - mv # Maldives - np # Nepal - pk # Pakistan @@ -304,9 +304,9 @@ These are lists provided for reference to show what values will be in use if you - om # Oman - qa # Qatar - sa # Saudi Arabia - - ps # State of Palestine [Palestine] - - sy # Syrian Arab Republic [Syria] - - tr # Türkiye [Turkey] + - ps # Palestine [State of Palestine] + - sy # Syria [Syrian Arab Republic] + - tr # Turkey [Türkiye] - ae # United Arab Emirates - ye # Yemen Eastern Europe: @@ -316,9 +316,9 @@ These are lists provided for reference to show what values will be in use if you - cs # Czechoslovakia - hu # Hungary - pl # Poland - - md # Republic of Moldova [Moldova] + - md # Moldova [Republic of Moldova] - ro # Romania - - ru # Russian Federation [Russia] + - ru # Russia [Russian Federation] - su # Soviet Union - sk # Slovakia - ua # Ukraine @@ -348,7 +348,7 @@ These are lists provided for reference to show what values will be in use if you - gi # Gibraltar - gr # Greece - xk # Kosovo - - va # Holy See [Vatican City] + - va # Vatican City [Holy See] - it # Italy - mt # Malta - me # Montenegro @@ -387,11 +387,11 @@ These are lists provided for reference to show what values will be in use if you - gu # Guam - ki # Kiribati - mh # Marshall Islands - - fm # Federated States of Micronesia [Micronesia] + - fm # Micronesia [Federated States of Micronesia] - nr # Nauru - mp # Northern Mariana Islands - pw # Palau - - um # United States Minor Outlying Islands + - um # US Minor Outlying Islands Polynesia: - as # American Samoa - ck # Cook Islands diff --git a/docs/metadata/builders/letterboxd.md b/docs/metadata/builders/letterboxd.md index 89b662f5..5dd72d38 100644 --- a/docs/metadata/builders/letterboxd.md +++ b/docs/metadata/builders/letterboxd.md @@ -47,7 +47,7 @@ You can add different filters directly to this builder. | `year`1 | **Description:** Search for the specified year range.
**Values:** range of int i.e. `1990-1999` | | `note`1 | **Description:** Search for the specified value in the note. The note is the list owner's note not sitewide note.
**Values:** Any String | -1 These filters only work if the URL is to the List View of the Letterboxd list. +1 These filters only work if the URL is to the List View of the Letterboxd list. (i.e. it should have `/detail/` in the url) ```yaml collections: diff --git a/modules/builder.py b/modules/builder.py index d1372029..a880b409 100644 --- a/modules/builder.py +++ b/modules/builder.py @@ -2997,6 +2997,7 @@ class CollectionBuilder: logger.error("Details: Failed to Update Please delete the collection and run again") logger.info("") else: + self.obj.reload() #self.obj.batchEdits() batch_display = "Collection Metadata Edits" if summary and str(summary[1]) != str(self.obj.summary): diff --git a/modules/meta.py b/modules/meta.py index ca12907d..7dd0eab0 100644 --- a/modules/meta.py +++ b/modules/meta.py @@ -1480,17 +1480,15 @@ class MetadataFile(DataFile): logger.info("") logger.info(f"{id_type} ID Mapping: {mapping_id}") if self.library.is_movie and mapping_id in self.library.movie_map: - for item_id in self.library.movie_map[mapping_id]: - item.append(self.library.fetch_item(item_id)) + item.extend([self.library.fetch_item(i) for i in self.library.movie_map[mapping_id]]) elif self.library.is_show and mapping_id in self.library.show_map: - for item_id in self.library.show_map[mapping_id]: - item.append(self.library.fetch_item(item_id)) + item.extend([self.library.fetch_item(i) for i in self.library.show_map[mapping_id]]) elif mapping_id in self.library.imdb_map: - for item_id in self.library.imdb_map[mapping_id]: - item.append(self.library.fetch_item(item_id)) + item.extend([self.library.fetch_item(i) for i in self.library.imdb_map[mapping_id]]) else: logger.error(f"{self.type_str} Error: {id_type} ID not mapped") continue + title = mapping_name if mapping_id is None else None blank_edition = False edition_titles = [] @@ -1598,7 +1596,7 @@ class MetadataFile(DataFile): logger.info("") logger.separator(f"Updating {i.title}", space=False, border=False) logger.info("") - self.update_metadata_item(i, mapping_name, meta, methods) + self.update_metadata_item(i, mapping_name, meta, methods, title=title) except Failed as e: logger.error(e) except NotScheduled as e: @@ -1606,7 +1604,7 @@ class MetadataFile(DataFile): except Failed as e: logger.error(e) - def update_metadata_item(self, item, mapping_name, meta, methods): + def update_metadata_item(self, item, mapping_name, meta, methods, title=None): updated = False @@ -1703,7 +1701,7 @@ class MetadataFile(DataFile): genres = tmdb_item.genres #item.batchEdits() - add_edit("title", item, meta, methods) + add_edit("title", item, meta, methods, value=title) add_edit("sort_title", item, meta, methods, key="titleSort") if self.library.is_movie: if "edition" in methods and not self.library.plex_pass: diff --git a/modules/operations.py b/modules/operations.py index e5b1d294..d0b12a05 100644 --- a/modules/operations.py +++ b/modules/operations.py @@ -512,9 +512,9 @@ class Operations: new_poster = None new_background = None if self.library.mass_poster_update: - self.library.poster_update(item, new_poster, tmdb=tmdb_item.poster_url if tmdb_item else None) + self.library.poster_update(item, new_poster, tmdb=tmdb_item.poster_url if tmdb_item else None, title=item.title) if self.library.mass_background_update: - self.library.background_update(item, new_background, tmdb=tmdb_item.backdrop_url if tmdb_item else None) + self.library.background_update(item, new_background, tmdb=tmdb_item.backdrop_url if tmdb_item else None, title=item.title) if self.library.is_show and ( (self.library.mass_poster_update and @@ -536,11 +536,12 @@ class Operations: except Failed: season_poster = None season_background = None + season_title = f"S{season.seasonNumber} {season.title}" tmdb_poster = tmdb_seasons[season.seasonNumber].poster_url if season.seasonNumber in tmdb_seasons else None if self.library.mass_poster_update: - self.library.poster_update(season, season_poster, tmdb=tmdb_poster, title=season.title if season else None) + self.library.poster_update(season, season_poster, tmdb=tmdb_poster, title=season_title if season else None) if self.library.mass_background_update: - self.library.background_update(season, season_background, title=season.title if season else None) + self.library.background_update(season, season_background, title=season_title if season else None) if (self.library.mass_poster_update and self.library.mass_poster_update["episodes"]) or \ (self.library.mass_background_update and self.library.mass_background_update["episodes"]): @@ -559,11 +560,12 @@ class Operations: except Failed: episode_poster = None episode_background = None + episode_title = f"S{season.seasonNumber}E{episode.episodeNumber} {episode.title}" tmdb_poster = tmdb_episodes[episode.episodeNumber].still_url if episode.episodeNumber in tmdb_episodes else None if self.library.mass_poster_update: - self.library.poster_update(episode, episode_poster, tmdb=tmdb_poster, title=episode.title if episode else None) + self.library.poster_update(episode, episode_poster, tmdb=tmdb_poster, title=episode_title if episode else None) if self.library.mass_background_update: - self.library.background_update(episode, episode_background, title=episode.title if episode else None) + self.library.background_update(episode, episode_background, title=episode_title if episode else None) episode_ops = [ self.library.mass_episode_audience_rating_update, self.library.mass_episode_critic_rating_update, diff --git a/modules/overlays.py b/modules/overlays.py index 3bb7d1f9..faf3d072 100644 --- a/modules/overlays.py +++ b/modules/overlays.py @@ -416,6 +416,8 @@ class Overlays: added_titles = [] if builder.found_items: for item in builder.found_items: + if builder.limit and len(added_titles) >= builder.limit: + break key_to_item[item.ratingKey] = item added_titles.append(item) if item.ratingKey not in properties[prop_name].keys: diff --git a/requirements.txt b/requirements.txt index d48f0f47..b8a17dcf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -arrapi==1.4.2 +arrapi==1.4.3 GitPython==3.1.32 lxml==4.9.3 num2words==0.5.12