diff options
| author | DaveTBlake <oak99sky@yahoo.co.uk> | 2021-02-18 16:09:30 +0000 |
|---|---|---|
| committer | DaveTBlake <oak99sky@yahoo.co.uk> | 2021-02-18 16:09:30 +0000 |
| commit | 6c38e3aac87ac2659d8946ad4a42b31d0c8dcbb8 (patch) | |
| tree | c23dab92d7caad69bb4a1d0e26bb62b62d5610b0 /addons/metadata.themoviedb.org | |
| parent | a877cc223670d7e4a1b50ea0e558bf2044d62271 (diff) | |
Sync scrapers with recent versions in scraper repo
Diffstat (limited to 'addons/metadata.themoviedb.org')
6 files changed, 83 insertions, 27 deletions
diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index 5bacdeb8c7..9ff116f12f 100644 --- a/addons/metadata.themoviedb.org/addon.xml +++ b/addons/metadata.themoviedb.org/addon.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.themoviedb.org" name="The Movie Database" - version="5.1.7" + version="5.2.6" provider-name="Team Kodi"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> <import addon="metadata.common.imdb.com" version="2.9.2"/> - <import addon="metadata.common.themoviedb.org" version="3.1.0"/> + <import addon="metadata.common.themoviedb.org" version="3.2.6"/> <import addon="plugin.video.youtube" version="4.4.10" optional="true"/> </requires> <extension point="xbmc.metadata.scraper.movies" @@ -17,7 +17,7 @@ <summary lang="be_BY">TMDB Movie Scraper</summary> <summary lang="bg_BG">Сваля инф. за филми от TMDB</summary> <summary lang="ca_ES">Arreplegador de pel·lícules TMDB</summary> - <summary lang="cs_CZ">Zdroj zisku dat k filmům TMDB</summary> + <summary lang="cs_CZ">Stahovač informací k filmům z TMDB</summary> <summary lang="cy_GB">Crafwr Ffilmiau TMDB</summary> <summary lang="da_DK">TMDB Scraper til Film</summary> <summary lang="de_DE">TMDB Filmscraper</summary> @@ -68,7 +68,7 @@ <description lang="be_BY">themoviedb.org is a free and open movie database. It's completely user driven by people like you. TMDb is currently used by millions of people every month and with their powerful API, it is also used by many popular media centers like Kodi to retrieve Movie Metadata, Posters and Fanart to enrich the user's experience.</description> <description lang="bg_BG">themoviedb.org е безплатна и отворена филмова база данни. Задвижва се изцяло от потребителите си, от хора като вас. Милиони хора по света всеки месец ползват TMDb. Благодарение на многофункционално API може да се ползва от най-различни и популярни медийни центрове като Kodi, които извличат метаданни, постери и фанарт за филми с цел за красивото оформяне на интерфейса.</description> <description lang="ca_ES">themoviedb.org és una base de dades oberta i lliure. Es manté completament per usuaris, per gent com tu. TMDb s'utilitza actualment per milions de persones cada mes i amb la seva potent API també és utilitzada per molts centre media populas com l'Kodi per obtenir les meta-dades de pel·lícules, pósters i fanart per enriquir l'experiència d'usuari.</description> - <description lang="cs_CZ">themoviedb.org je otevřená a svobodná databáze filmů. Je řízena uživateli, tedy lidmi jako vy. TMDB je každý měsíc používána milióny lidí a se svým výborným API je také používano mnoha populárními mediálními centry jako je Kodi, k získávání metadat, plagátů a fanartu filmů pro obohacení uživatelského zážitku.</description> + <description lang="cs_CZ">themoviedb.org je bezplatná a otevřená databáze filmů a seriálů. Je celá řízena uživateli, tedy lidmi jako vy. TMDb je aktuálně používána každý měsíc milióny lidí a se svým výborným API je také používána mnoha oblíbenými multimediálními centry, jako je Kodi, k získávání metadat, plakátů a fanartů filmů a seriálů pro obohacení uživatelského zážitku.</description> <description lang="cy_GB">Mae themoviedb.org yn gronfa ddata ffilmiau rhydd ac agored. Mae'n cael ei yrru gan ddefnyddwyr fel chi. Mae TMDb yn cael ei ddefnyddio gan filiynau o bobl bob mis a gyda'i API pwerus, mae'n cael ei ddefnyddio gan lawer o'r canolfannau cyfrwng fel Kodi i estyn metadata ffilmiau, posteri a chelf er mwyn cyfoethogi profiad defnyddwyr.</description> <description lang="da_DK">themoviedb.org er en fri og åben filmdatabase. Den er helt og aldeles brugerdrevet af folk som dig. TMDb bruges i dag af millioner af mennesker hver måned, og med deres kraftfulde API er den også brugt af mange populære mediecentre såsom Kodi til at hente metadata, plakater og fankunst til film, for at berige brugerens oplevelse.</description> <description lang="de_DE">TheMovieDB.org ist eine freie und offene Filmdatenbank. Sie wird von Benutzern wie dir angetrieben. TheMovieDB wird zur Zeit von millionen Nutzern jeden Monat genutzt und dank ihrer mächtigen API ist sie auch von vielen Media-Center, wie z.B. Kodi, implementiert, um Film-Metadaten, -Poster und -Fanarts zu beziehen, die das Benutzererlebnis verbessern.</description> @@ -116,9 +116,8 @@ <description lang="zh_TW">themoviedb.org是一個免費和開放的電影資料庫。它是完全由與您一樣的廣大使用者來更新資訊。 TMDb目前擁有數以百萬計的使用人次並且有著強大的API，許多受歡迎的媒體中心平台像Kodi藉由TMDb獲取電影的數據資料庫，海報和影片資訊，以豐富使用者體驗。</description> <platform>all</platform> <license>GPL v2.0</license> - <forum></forum> + <forum>https://forum.kodi.tv/showthread.php?tid=339672</forum> <website>https://www.themoviedb.org</website> - <email></email> <assets> <icon>icon.png</icon> </assets> diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index 46838d132b..8ff6e72736 100644 --- a/addons/metadata.themoviedb.org/changelog.txt +++ b/addons/metadata.themoviedb.org/changelog.txt @@ -1,3 +1,33 @@ +[B]5.2.6[/B] +- changed: Updated de and zh language codes to match tmdb - these codes needs to be reset by the users + +[B]5.2.4[/B] +- fixed: trying to workaround the search results issue + +[B]5.2.3[/B] +- fixed: search results + +[B]5.2.2[/B] +- fixed: fr-FR and it-IT language parameter + +[B]5.2.1[/B] +- added: Estonian language option + +[B]5.2.0[/B] +- added: Landscape scraping from tmdb + +[B]5.1.11[/B] +- added: belarusian language option + +[B]5.1.10[/B] +- improved: search results to handle articles and the end of title + +[B]5.1.9[/B] +- fixed: search results + +[B]5.1.8[/B] +- updated: CZ language + [B]5.1.6&5.1.7[/B] - changed: fixes for Chinese language diff --git a/addons/metadata.themoviedb.org/resources/language/resource.language.cs_cz/strings.po b/addons/metadata.themoviedb.org/resources/language/resource.language.cs_cz/strings.po index d303eb2d48..b1e887a28e 100644 --- a/addons/metadata.themoviedb.org/resources/language/resource.language.cs_cz/strings.po +++ b/addons/metadata.themoviedb.org/resources/language/resource.language.cs_cz/strings.po @@ -29,8 +29,8 @@ msgid "Preferred Language" msgstr "Upřednostňovaný jazyk" msgctxt "#30003" -msgid "Get Rating from" -msgstr "Získat hodnocení z" +msgid "Default Rating from" +msgstr "Výchozí hodnocení z" msgctxt "#30004" msgid "Enable Trailer (YouTube)" @@ -43,3 +43,7 @@ msgstr "Ponechat původní název" msgctxt "#30006" msgid "Preferred Certification Country" msgstr "Upřednostňovaný stát poskytující certifikaci" + +msgctxt "#30007" +msgid "Add also IMDb ratings" +msgstr "Přidat také hodnocení z IMDb" diff --git a/addons/metadata.themoviedb.org/resources/language/resource.language.en_gb/strings.po b/addons/metadata.themoviedb.org/resources/language/resource.language.en_gb/strings.po index 9cd97f6c36..6bce43f79e 100644 --- a/addons/metadata.themoviedb.org/resources/language/resource.language.en_gb/strings.po +++ b/addons/metadata.themoviedb.org/resources/language/resource.language.en_gb/strings.po @@ -47,3 +47,7 @@ msgstr "" msgctxt "#30007" msgid "Add also IMDb ratings" msgstr "" + +msgctxt "#30008" +msgid "Enable Landscape" +msgstr "" diff --git a/addons/metadata.themoviedb.org/resources/settings.xml b/addons/metadata.themoviedb.org/resources/settings.xml index 80b155b2e0..9c5ddb641a 100644 --- a/addons/metadata.themoviedb.org/resources/settings.xml +++ b/addons/metadata.themoviedb.org/resources/settings.xml @@ -2,9 +2,10 @@ <settings> <setting label="30005" type="bool" id="keeporiginaltitle" default="false"/> <setting label="30000" type="bool" id="fanart" default="true"/> + <setting label="30008" type="bool" id="landscape" default="false"/> <setting label="30004" type="bool" id="trailer" default="true"/> - <setting label="30002" type="select" values="ar-AE|ar-SA|bg|bn-BD|ca-ES|ch-GU|cs|da|de|el|en|eo-EO|es|es-MX|eu-ES|fa|fa-ir|fi|fr|fr-CA|gl|he|hi-IN|hr|hu|id-ID|it|ja|ka-GE|ko|lt-LT|lv-LV|ml-IN|nb|nl|no|pl|pt|pt-br|ro|ru|sk|sl|sr|sv|ta-IN|th|tr|uk|vi-VN|zh|zh-tw|zh-hk" id="language" default="en"/> - <setting label="30006" type="select" values="au|bg|br|ca|cz|ge|de|dk|ee|es|fi|fr|gb|gr|hr|hu|id|il|in|it|ir|jp|kr|lt|lv|mx|nl|no|pl|pt|ru|si|sv|th|tr|ua|us|vn|zh" id="tmdbcertcountry" default="us"/> + <setting label="30002" type="select" values="ar-AE|ar-SA|be-BY|bg|bn-BD|ca-ES|ch-GU|cs|da|de-DE|el|en|eo-EO|es|es-MX|et-EE|eu-ES|fa|fa-ir|fi|fr-FR|fr-CA|gl|he|hi-IN|hr|hu|id-ID|it-IT|ja|ka-GE|ko|lt-LT|lv-LV|ml-IN|nb|nl|no|pl|pt|pt-br|ro|ru|sk|sl|sr|sv|ta-IN|th|tr|uk|vi-VN|zh-CN|zh-HK|zh-TW" id="language" default="en"/> + <setting label="30006" type="select" values="au|bg|br|by|ca|cz|ge|de|dk|ee|es|fi|fr|gb|gr|hr|hu|id|il|in|it|ir|jp|kr|lt|lv|mx|nl|no|pl|pt|ru|si|sv|th|tr|ua|us|vn|zh" id="tmdbcertcountry" default="us"/> <setting label="30003" type="labelenum" values="TMDb|IMDb" id="RatingS" default="TMDb"/> <setting label="30007" type="bool" id="imdbanyway" visible="eq(-1,0)" default="false"/> <setting label="certprefix" type="text" id="certprefix" default="Rated " visible="false"/> diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml index f37bfce1bb..600202e6e7 100644 --- a/addons/metadata.themoviedb.org/tmdb.xml +++ b/addons/metadata.themoviedb.org/tmdb.xml @@ -1,43 +1,58 @@ <?xml version="1.0" encoding="UTF-8"?> <scraper framework="1.1" date="2012-01-16"> <CreateSearchUrl dest="3"> - <RegExp input="$$1" output="<url>https://api.tmdb.org/3/search/movie?api_key=f090bb54758cabf231fb605d3e3e0468&amp;query=\1&amp;year=$$4&amp;language=$INFO[language]</url>" dest="3"> + <RegExp input="$$7" output="<url>https://api.themoviedb.org/3/search/movie?api_key=f090bb54758cabf231fb605d3e3e0468&amp;query=\1&amp;year=$$4&amp;language=$INFO[language]</url>" dest="3"> <RegExp input="$$2" output="\1" dest="4"> <expression clear="yes">(.+)</expression> </RegExp> + <RegExp input="$$1" output="\1" dest="7"> + <expression clear="yes">(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="6"> + <expression noclean="1">(.+)(?:%20the$|%20an$|%20a$|%2Cthe$|%2Can$|%2Ca$)</expression> + </RegExp> + <RegExp input="$$6" output="\1" dest="7"> + <expression>(.+)</expression> + </RegExp> <expression noclean="1" /> </RegExp> </CreateSearchUrl> <NfoUrl dest="3"> - <RegExp input="$$1" output="<details><url>https://api.tmdb.org/3/movie/\2?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url><id>\2</id></details>" dest="3"> + <RegExp input="$$1" output="<details><url>https://api.themoviedb.org/3/movie/\2?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url><id>\2</id></details>" dest="3"> <expression clear="yes" noclean="1">(themoviedb.org/movie/)([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<details><url cache="tmdb-$INFO[language]-tt\1.json">https://api.tmdb.org/3/movie/tt\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url><id>tt\1</id></details>" dest="3"> + <RegExp input="$$1" output="<details><url cache="tmdb-$INFO[language]-tt\1.json">https://api.themoviedb.org/3/movie/tt\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url><id>tt\1</id></details>" dest="3"> <expression>imdb....?/title/tt([0-9]+)</expression> </RegExp> - <RegExp input="$$1" output="<details><url cache="tmdb-$INFO[language]-tt\1.json">https://api.tmdb.org/3/movie/tt\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url><id>tt\1</id></details>" dest="3"> + <RegExp input="$$1" output="<details><url cache="tmdb-$INFO[language]-tt\1.json">https://api.themoviedb.org/3/movie/tt\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url><id>tt\1</id></details>" dest="3"> <expression>imdb....?/Title\?t{0,2}([0-9]+)</expression> </RegExp> </NfoUrl> <GetSearchResults dest="8"> <RegExp input="$$3" output="<results>\1</results>" dest="8"> - <RegExp input="$$1" output="<entity><title>\3</title><id>\2</id><year>\1</year><url cache="tmdb-$INFO[language]-\2.json">https://api.tmdb.org/3/movie/\2?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url></entity>" dest="3"> - <expression repeat="yes">"release_date":"([0-9]+)-.*?"id":([0-9]*),"original_title":"[^"]*","original_language":"[^"]*","title":"([^"]*)"</expression> + <RegExp input="$$1" output="<entity><title>\1</title><id>\4</id><year>\3</year><url cache="tmdb-$INFO[language]-\4.json">https://api.themoviedb.org/3/movie/\4?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url></entity>" dest="3+"> + <expression repeat="yes">{(?:(?!}).)*"title":"([^"]*)"(?:(?!}).)*"release_date":"(([0-9]+)-)?(?:(?!}).)*"id":([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<entity><title>\3</title><id>\2</id><year>\1</year><url cache="tmdb-$INFO[language]-\2.json">https://api.tmdb.org/3/movie/\2?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url></entity>" dest="3+"> - <expression repeat="yes">"release_date":"([0-9]+)-.*?"id":([0-9]*),"original_title":"([^"]*)","original_language":"[^"]*"</expression> + <RegExp input="$$1" output="<entity><title>\4</title><id>\3</id><year>\2</year><url cache="tmdb-$INFO[language]-\3.json">https://api.themoviedb.org/3/movie/\3?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url></entity>" dest="3+"> + <expression repeat="yes">{(?:(?!}).)*"release_date":"(([0-9]+)-)?(?:(?!}).)*"id":([0-9]*)(?:(?!}).)*"title":"([^"]*)"</expression> </RegExp> - <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><url cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url></entity>" dest="3+"> - <expression repeat="yes">"release_date":null.*?"id":([0-9]*),"original_title":"([^"]*)","original_language":"[^"]*"</expression> + <RegExp input="$$1" output="<entity><title>\4</title><id>\1</id><year>\3</year><url cache="tmdb-$INFO[language]-\1.json">https://api.themoviedb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url></entity>" dest="3+"> + <expression repeat="yes">{(?:(?!}).)*"id":([0-9]*)(?:(?!}).)*"release_date":"(([0-9]+)-)?(?:(?!}).)*"title":"([^"]*)"</expression> </RegExp> - <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><year>\3</year><url cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url></entity>" dest="3+"> - <expression repeat="yes">"id":([0-9]*).*?title":"[^"]*".*?original_title":"([^"]*)".*?"release_date":"([0-9]+)-</expression> + <RegExp input="$$1" output="<entity><title>\3</title><id>\4</id><year>\2</year><url cache="tmdb-$INFO[language]-\4.json">https://api.themoviedb.org/3/movie/\4?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url></entity>" dest="3+"> + <expression repeat="yes">{(?:(?!}).)*"release_date":"(([0-9]+)-)?(?:(?!}).)*"title":"([^"]*)"(?:(?!}).)*"id":([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><year>\3</year><url cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url></entity>" dest="3+"> - <expression repeat="yes">"id":([0-9]*).*?title":"([^"]*)".*?original_title":"[^"]*".*?"release_date":"([0-9]+)-</expression> + <RegExp input="$$1" output="<entity><title>\1</title><id>\4</id><year>\3</year><url cache="tmdb-$INFO[language]-\4.json">https://api.themoviedb.org/3/movie/\4?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url></entity>" dest="3+"> + <expression repeat="yes">{(?:(?!}).)*"original_title":"([^"]*)"(?:(?!}).)*"release_date":"(([0-9]+)-)?(?:(?!}).)*"id":([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><url cache="tmdb-$INFO[language]-\1.json">https://api.tmdb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url></entity>" dest="3+"> - <expression repeat="yes">"id":([0-9]*).*?title":"([^"]*)".*?original_title":"[^"]*".*?"release_date":null</expression> + <RegExp input="$$1" output="<entity><title>\4</title><id>\3</id><year>\2</year><url cache="tmdb-$INFO[language]-\3.json">https://api.themoviedb.org/3/movie/\3?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url></entity>" dest="3+"> + <expression repeat="yes">{(?:(?!}).)*"release_date":"(([0-9]+)-)?(?:(?!}).)*"id":([0-9]*)(?:(?!}).)*"original_title":"([^"]*)"</expression> + </RegExp> + <RegExp input="$$1" output="<entity><title>\4</title><id>\1</id><year>\3</year><url cache="tmdb-$INFO[language]-\1.json">https://api.themoviedb.org/3/movie/\1?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url></entity>" dest="3+"> + <expression repeat="yes">{(?:(?!}).)*"id":([0-9]*)(?:(?!}).)*"release_date":"(([0-9]+)-)?(?:(?!}).)*"original_title":"([^"]*)"</expression> + </RegExp> + <RegExp input="$$1" output="<entity><title>\3</title><id>\4</id><year>\2</year><url cache="tmdb-$INFO[language]-\4.json">https://api.themoviedb.org/3/movie/\4?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=$INFO[language]</url></entity>" dest="3+"> + <expression repeat="yes">{(?:(?!}).)*"release_date":"(([0-9]+)-)?(?:(?!}).)*"original_title":"([^"]*)"(?:(?!}).)*"id":([0-9]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -74,7 +89,7 @@ <RegExp input="$$1" output="\1" dest="10"> <expression clear="yes" noclean="1">"runtime":([0-9]+)</expression> </RegExp> - <RegExp input="$$10" output="<url function="ParseFallbackTMDBRuntime" cache="tmdb-en-$$2.json">https://api.tmdb.org/3/movie/$$2?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=en</url>" dest="5+"> + <RegExp input="$$10" output="<url function="ParseFallbackTMDBRuntime" cache="tmdb-en-$$2.json">https://api.themoviedb.org/3/movie/$$2?api_key=f090bb54758cabf231fb605d3e3e0468&amp;language=en</url>" dest="5+"> <expression>^$</expression> </RegExp> <RegExp input="$$10" output="<runtime>\1</runtime>" dest="5+"> @@ -122,6 +137,9 @@ <RegExp conditional="fanart" input="$$2" output="<chain function="GetTMDBFanartByIdChain">$$2::$INFO[language]</chain>" dest="5+"> <expression /> </RegExp> + <RegExp conditional="landscape" input="$$2" output="<chain function="GetTMDBLandscapeByIdChain">$$2::$INFO[language]</chain>" dest="5+"> + <expression /> + </RegExp> <RegExp conditional="trailer" input="$$2" output="<chain function="GetTMDBTrailerByIdChain">$$2::$INFO[language]</chain>" dest="5+"> <expression /> </RegExp> |