diff --git a/VERSION b/VERSION index 9d30b20d..2b861b46 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.19.0-develop90 +1.19.0-develop91 diff --git a/defaults/overlays/languages.yml b/defaults/overlays/languages.yml index a9762f98..9296ac21 100644 --- a/defaults/overlays/languages.yml +++ b/defaults/overlays/languages.yml @@ -44,11 +44,12 @@ external_templates: country: <> country_<>: <> offset: 10 + width: 190 queue: flags addon_position: <> addon_offset: <> back_color: "#00000099" - back_width: 190 + back_width: <> back_align: <> font: fonts/Inter-Bold.ttf font_size: 50 @@ -441,7 +442,7 @@ overlays: template: [name: flags, name: standard] filipino: - variables: {key: fil, text: FIL, weight: 265, country: ph} + variables: {key: fil, text: FIL, weight: 265, country: ph, width: 230} template: [name: flags, name: standard] galician: @@ -564,8 +565,8 @@ overlays: variables: {key: iu, text: IK, weight: 7, country: ca} template: [name: flags, name: standard] - romany: - variables: {key: rom, text: ROM, weight: 6, country: ro} + romani: + variables: {key: rom, text: ROM, weight: 6, country: ro, width: 230} template: [name: flags, name: standard] amharic: diff --git a/docs/defaults/overlays/languages.md b/docs/defaults/overlays/languages.md index ab9f3fca..c2928476 100644 --- a/docs/defaults/overlays/languages.md +++ b/docs/defaults/overlays/languages.md @@ -10,78 +10,78 @@ Supported library types: Movie & Show ## Supported Audio/Subtitle Language Flags -| Audio/Subtitle Languages | Key | Weight | Default Flag | Default Use | -|:-------------------------|:-----|:-------|:-------------|:-----------:| -| English | `en` | `610` | `us` | ✅ | -| German | `de` | `600` | `de` | ✅ | -| French | `fr` | `590` | `fr` | ✅ | -| Spanish | `es` | `580` | `es` | ✅ | -| Portuguese | `pt` | `570` | `pt` | ✅ | -| Japanese | `ja` | `560` | `jp` | ✅ | -| Korean | `ko` | `550` | `kr` | ❌ | -| Chinese | `zh` | `540` | `cn` | ❌ | -| Danish | `da` | `530` | `dk` | ❌ | -| Russian | `ru` | `520` | `ru` | ❌ | -| Italian | `it` | `510` | `it` | ❌ | -| Hindi | `hi` | `500` | `in` | ❌ | -| Telugu | `te` | `490` | `in` | ❌ | -| Farsi | `fa` | `480` | `ir` | ❌ | -| Thai | `th` | `470` | `th` | ❌ | -| Dutch | `nl` | `460` | `nl` | ❌ | -| Norwegian | `no` | `450` | `no` | ❌ | -| Icelandic | `is` | `440` | `is` | ❌ | -| Swedish | `sv` | `430` | `se` | ❌ | -| Turkish | `tr` | `420` | `tr` | ❌ | -| Polish | `pl` | `410` | `pl` | ❌ | -| Czech | `cs` | `400` | `cz` | ❌ | -| Ukrainian | `uk` | `390` | `ua` | ❌ | -| Hungarian | `hu` | `380` | `hu` | ❌ | -| Arabic | `ar` | `370` | `eg` | ❌ | -| Bulgarian | `bg` | `360` | `bg` | ❌ | -| Bengali | `bn` | `350` | `bd` | ❌ | -| Bosnian | `bs` | `340` | `ba` | ❌ | -| Catalan | `ca` | `330` | `es` | ❌ | -| Welsh | `cy` | `320` | `uk` | ❌ | -| Greek | `el` | `310` | `gr` | ❌ | -| Estonian | `et` | `300` | `ee` | ❌ | -| Basque | `eu` | `290` | `es` | ❌ | -| Finnish | `fi` | `280` | `fi` | ❌ | -| Tagalog | `tl` | `270` | `ph` | ❌ | -| Filipino | `fil`| `265` | `ph` | ❌ | -| Galician | `gl` | `260` | `es` | ❌ | -| Hebrew | `he` | `250` | `il` | ❌ | -| Croatian | `hr` | `240` | `hr` | ❌ | -| Indonesian | `id` | `230` | `id` | ❌ | -| Georgian | `ka` | `220` | `ge` | ❌ | -| Kazakh | `kk` | `210` | `kz` | ❌ | -| Kannada | `kn` | `200` | `in` | ❌ | -| Latin | `la` | `190` | `it` | ❌ | -| Lithuanian | `lt` | `180` | `lt` | ❌ | -| Latvian | `lv` | `170` | `lv` | ❌ | -| Macedonian | `mk` | `160` | `mk` | ❌ | -| Malayalam | `ml` | `150` | `in` | ❌ | -| Marathi | `mr` | `140` | `in` | ❌ | -| Malay | `ms` | `130` | `my` | ❌ | -| Norwegian Nokmål | `nb` | `120` | `no` | ❌ | -| Norwegian Nynorsk | `nn` | `110` | `no` | ❌ | -| Punjabi | `pa` | `100` | `in` | ❌ | -| Romanian | `ro` | `90` | `ro` | ❌ | -| Slovak | `sk` | `80` | `sk` | ❌ | -| Slovenian | `sl` | `70` | `si` | ❌ | -| Albanian | `sq` | `60` | `al` | ❌ | -| Serbian | `sr` | `50` | `rs` | ❌ | -| Somali | `so` | `45` | `so` | ❌ | -| Swahili | `sw` | `40` | `tz` | ❌ | -| Tamil | `ta` | `30` | `in` | ❌ | -| Urdu | `ur` | `20` | `pk` | ❌ | -| Vietnamese | `vi` | `15` | `vn` | ❌ | -| Wolof | `wo` | `10` | `sn` | ❌ | -| Mayan | `myn`| `8` | `mx` | ❌ | -| Inuktitut | `iu` | `7` | `ca` | ❌ | -| Romany | `rom`| `6` | `ro` | ❌ | -| Amharic | `am` | `5` | `et` | ❌ | -| Sundanese | `su` | `4` | `id` | ❌ | -| Zulu | `zu` | `3` | `za` | ❌ | +| Audio/Subtitle Languages | Key | Weight | Default Flag | Default Use | +|:-------------------------|:------|:-------|:-------------|:-----------:| +| English | `en` | `610` | `us` | ✅ | +| German | `de` | `600` | `de` | ✅ | +| French | `fr` | `590` | `fr` | ✅ | +| Spanish | `es` | `580` | `es` | ✅ | +| Portuguese | `pt` | `570` | `pt` | ✅ | +| Japanese | `ja` | `560` | `jp` | ✅ | +| Korean | `ko` | `550` | `kr` | ❌ | +| Chinese | `zh` | `540` | `cn` | ❌ | +| Danish | `da` | `530` | `dk` | ❌ | +| Russian | `ru` | `520` | `ru` | ❌ | +| Italian | `it` | `510` | `it` | ❌ | +| Hindi | `hi` | `500` | `in` | ❌ | +| Telugu | `te` | `490` | `in` | ❌ | +| Farsi | `fa` | `480` | `ir` | ❌ | +| Thai | `th` | `470` | `th` | ❌ | +| Dutch | `nl` | `460` | `nl` | ❌ | +| Norwegian | `no` | `450` | `no` | ❌ | +| Icelandic | `is` | `440` | `is` | ❌ | +| Swedish | `sv` | `430` | `se` | ❌ | +| Turkish | `tr` | `420` | `tr` | ❌ | +| Polish | `pl` | `410` | `pl` | ❌ | +| Czech | `cs` | `400` | `cz` | ❌ | +| Ukrainian | `uk` | `390` | `ua` | ❌ | +| Hungarian | `hu` | `380` | `hu` | ❌ | +| Arabic | `ar` | `370` | `eg` | ❌ | +| Bulgarian | `bg` | `360` | `bg` | ❌ | +| Bengali | `bn` | `350` | `bd` | ❌ | +| Bosnian | `bs` | `340` | `ba` | ❌ | +| Catalan | `ca` | `330` | `es` | ❌ | +| Welsh | `cy` | `320` | `uk` | ❌ | +| Greek | `el` | `310` | `gr` | ❌ | +| Estonian | `et` | `300` | `ee` | ❌ | +| Basque | `eu` | `290` | `es` | ❌ | +| Finnish | `fi` | `280` | `fi` | ❌ | +| Tagalog | `tl` | `270` | `ph` | ❌ | +| Filipino | `fil` | `265` | `ph` | ❌ | +| Galician | `gl` | `260` | `es` | ❌ | +| Hebrew | `he` | `250` | `il` | ❌ | +| Croatian | `hr` | `240` | `hr` | ❌ | +| Indonesian | `id` | `230` | `id` | ❌ | +| Georgian | `ka` | `220` | `ge` | ❌ | +| Kazakh | `kk` | `210` | `kz` | ❌ | +| Kannada | `kn` | `200` | `in` | ❌ | +| Latin | `la` | `190` | `it` | ❌ | +| Lithuanian | `lt` | `180` | `lt` | ❌ | +| Latvian | `lv` | `170` | `lv` | ❌ | +| Macedonian | `mk` | `160` | `mk` | ❌ | +| Malayalam | `ml` | `150` | `in` | ❌ | +| Marathi | `mr` | `140` | `in` | ❌ | +| Malay | `ms` | `130` | `my` | ❌ | +| Norwegian Nokmål | `nb` | `120` | `no` | ❌ | +| Norwegian Nynorsk | `nn` | `110` | `no` | ❌ | +| Punjabi | `pa` | `100` | `in` | ❌ | +| Romanian | `ro` | `90` | `ro` | ❌ | +| Slovak | `sk` | `80` | `sk` | ❌ | +| Slovenian | `sl` | `70` | `si` | ❌ | +| Albanian | `sq` | `60` | `al` | ❌ | +| Serbian | `sr` | `50` | `rs` | ❌ | +| Somali | `so` | `45` | `so` | ❌ | +| Swahili | `sw` | `40` | `tz` | ❌ | +| Tamil | `ta` | `30` | `in` | ❌ | +| Urdu | `ur` | `20` | `pk` | ❌ | +| Vietnamese | `vi` | `15` | `vn` | ❌ | +| Wolof | `wo` | `10` | `sn` | ❌ | +| Mayan | `myn` | `8` | `mx` | ❌ | +| Inuktitut | `iu` | `7` | `ca` | ❌ | +| Romani | `rom` | `6` | `ro` | ❌ | +| Amharic | `am` | `5` | `et` | ❌ | +| Sundanese | `su` | `4` | `id` | ❌ | +| Zulu | `zu` | `3` | `za` | ❌ | ### Square Style diff --git a/modules/operations.py b/modules/operations.py index eacd1c21..e5b1d294 100644 --- a/modules/operations.py +++ b/modules/operations.py @@ -517,8 +517,10 @@ class Operations: self.library.background_update(item, new_background, tmdb=tmdb_item.backdrop_url if tmdb_item else None) if self.library.is_show and ( - self.library.mass_poster_update["seasons"] or self.library.mass_poster_update["episodes"] or - self.library.mass_background_update["seasons"] or self.library.mass_background_update["episodes"] + (self.library.mass_poster_update and + (self.library.mass_poster_update["seasons"] or self.library.mass_poster_update["episodes"])) or + (self.library.mass_background_update and + (self.library.mass_background_update["seasons"] or self.library.mass_background_update["episodes"])) ): real_show = None try: @@ -527,7 +529,8 @@ class Operations: logger.error(e) tmdb_seasons = {s.season_number: s for s in real_show.seasons} if real_show else {} for season in self.library.query(item.seasons): - if self.library.mass_poster_update["seasons"] or self.library.mass_background_update["seasons"]: + if (self.library.mass_poster_update and self.library.mass_poster_update["seasons"]) or \ + (self.library.mass_background_update and self.library.mass_background_update["seasons"]): try: season_poster, season_background, _, _ = self.library.find_item_assets(season, item_asset_directory=item_dir, folder_name=name) except Failed: @@ -539,7 +542,8 @@ class Operations: if self.library.mass_background_update: self.library.background_update(season, season_background, title=season.title if season else None) - if self.library.mass_poster_update["episodes"] or self.library.mass_background_update["episodes"]: + 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"]): tmdb_episodes = {} if season.seasonNumber in tmdb_seasons: for episode in tmdb_seasons[season.seasonNumber].episodes: