diff options
15 files changed, 256 insertions, 132 deletions
diff --git a/addons/metadata.common.themoviedb.org/addon.xml b/addons/metadata.common.themoviedb.org/addon.xml index 0759c896f8..2ffc0752ac 100644 --- a/addons/metadata.common.themoviedb.org/addon.xml +++ b/addons/metadata.common.themoviedb.org/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.themoviedb.org" name="The MovieDB common scraper functions" - version="1.0.7" + version="2.0.0" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> diff --git a/addons/metadata.common.themoviedb.org/tmdb.xml b/addons/metadata.common.themoviedb.org/tmdb.xml index cbf50d029c..1e9ac725f9 100644 --- a/addons/metadata.common.themoviedb.org/tmdb.xml +++ b/addons/metadata.common.themoviedb.org/tmdb.xml @@ -1,72 +1,164 @@ <scraperfunctions> + <GetTMDBPlotByIdChain dest="4"> + <RegExp input="$$5" output="<details>\1</details>" dest="4"> + <RegExp input="$$1" output="<url function="ParseTMDBPlot" cache="tmdb-$INFO[language]-tt\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>" dest="5"> + <expression>tt([0-9]+)</expression> + </RegExp> + <RegExp input="$$1" output="<url function="ParseTMDBPlot" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/\1</url>" dest="5"> + <expression>^([0-9]+)$</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetTMDBPlotByIdChain> + <ParseTMDBPlot dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="<plot>\1</plot>" dest="2"> + <expression fixchars="1">"overview":"(.*?)",</expression> + </RegExp> + <RegExp input="$$1" output="<outline>\1</outline>" dest="2+"> + <expression fixchars="1">"overview":"(.{180,}?)[.?!]</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseTMDBPlot> + <GetTMDBCastByIdChain dest="4"> + <RegExp input="$$5" output="<details>\1</details>" dest="4"> + <RegExp input="$$1" output="<url function="ParseTMDBCast" cache="tmdb-$INFO[language]-tt\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>" dest="5"> + <expression>tt([0-9]+)</expression> + </RegExp> + <RegExp input="$$1" output="<url function="ParseTMDBCast" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/\1</url>" dest="5"> + <expression>^([0-9]+)$</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetTMDBCastByIdChain> + <ParseTMDBCast dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="<actor><name>\1</name><role>\2</role></actor>" dest="2"> + <expression repeat="yes" fixchars="1">"name":"([^"]*)","job":"Actor","department":"Actors","character":"([^"]*)</expression> + </RegExp> + <RegExp input="$$1" output="<actor><name>\1</name><role>\2</role><thumb>http://\3original\4</thumb></actor>" dest="2+"> + <expression repeat="yes" fixchars="1">"name":"([^"]*)","job":"Actor","department":"Actors","character":"([^"]*)","id":[0-9]+,"order":[0-9]*,"cast_id":[0-9]*,"url":"[^"]*","profile":"http://(.*?)w[0-9]+([^"]*)"</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseTMDBCast> + <GetTMDBGenresByIdChain dest="4"> + <RegExp input="$$5" output="<details>\1</details>" dest="4"> + <RegExp input="$$1" output="<url function="ParseTMDBGenres" cache="tmdb-$INFO[language]-tt\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>" dest="5"> + <expression>tt([0-9]+)</expression> + </RegExp> + <RegExp input="$$1" output="<url function="ParseTMDBGenres" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/\1</url>" dest="5"> + <expression>^([0-9]+)$</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetTMDBGenresByIdChain> + <ParseTMDBGenres dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="\1" dest="7"> + <expression noclean="1">"genres":\[([^\]]*)</expression> + </RegExp> + <RegExp input="$$7" output="<genre>\1</genre>" dest="2"> + <expression repeat="yes" fixchars="1">"name":"([^"]*)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseTMDBGenres> + <GetTMDBRatingByIdChain dest="4"> + <RegExp input="$$5" output="<details>\1</details>" dest="4"> + <RegExp input="$$1" output="<url function="ParseTMDBRating" cache="tmdb-$INFO[language]-tt\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>" dest="5"> + <expression>tt([0-9]+)</expression> + </RegExp> + <RegExp input="$$1" output="<url function="ParseTMDBRating" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/en/json/57983e31fb435df4df77afb854740ea9/\1</url>" dest="5"> + <expression>^([0-9]+)$</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetTMDBRatingByIdChain> + <ParseTMDBRating dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="<rating>\1</rating>" dest="2"> + <expression noclean="1">"rating":([^,]*),"</expression> + </RegExp> + <RegExp input="$$1" output="<votes>\1</votes>" dest="2+"> + <expression noclean="1">"votes":([0-9]+)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseTMDBRating> + <GetTMDBTrailerByIdChain dest="4"> + <RegExp input="$$5" output="<details>\1</details>" dest="4"> + <RegExp input="$$1" output="<url function="ParseTMDBTrailer" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/\1</url>" dest="5"> + <expression>^([0-9]+)$</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetTMDBTrailerByIdChain> + <ParseTMDBTrailer dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="<trailer>plugin://plugin.video.youtube/?action=play_video&videoid=\1</trailer>" dest="2+"> + <expression noclean="1">"trailer":".*?youtube.com/watch\?v=([^"]*)</expression> + </RegExp> + <expression noclean="1">(.+)</expression> + </RegExp> + </ParseTMDBTrailer> <GetTMDBFanartByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBFanart" cache="tmdb-images-tt\1.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/tt\1</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBFanart" cache="tmdb-images-tt\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>" dest="5"> <expression>tt([0-9]+)</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBFanart" cache="tmdb-images-\1.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/\1</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBFanart" cache="tmdb-images-\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/\1</url>" dest="5"> <expression>^([0-9]+)$</expression> </RegExp> - <expression noclean="1"/> + <expression noclean="1" /> </RegExp> </GetTMDBFanartByIdChain> <GetTMDBFanartById dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBFanart" cache="tmdb-images-tt\1.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/tt\1</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBFanart" cache="tmdb-images-tt\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>" dest="5"> <expression>/tt([0-9]+)</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBFanart" cache="tmdb-images-\1.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/\1</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBFanart" cache="tmdb-images-\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/\1</url>" dest="5"> <expression><id>([0-9]*)</id></expression> </RegExp> - <expression noclean="1"/> + <expression noclean="1" /> </RegExp> </GetTMDBFanartById> <ParseTMDBFanart dest="5"> <RegExp input="$$2" output="<details><fanart>\1</fanart></details>" dest="5"> - <RegExp input="$$1" output="<thumb>\1</thumb>" dest="3"> - <expression noclean="1" repeat="yes"><backdrop[^>]*>(.*?)</backdrop></expression> - </RegExp> - <RegExp input="$$3" output="<thumb preview="\2">\1\3</thumb>" dest="4"> - <expression noclean="1,3" repeat="yes"><thumb>(.*?)url="([^"]*)" size="poster"(.*?)</thumb></expression> - </RegExp> - <RegExp input="$$4" output="<thumb\1>\2</thumb>" dest="2"> - <expression repeat="yes" noclean="1"><thumb([^>]*)>.*?url="([^"]*)" size="original".*?</thumb></expression> + <RegExp input="$$1" output="<thumb preview="\1w780\2">\1original\2</thumb>" dest="2"> + <expression repeat="yes" noclean="1">"type":"backdrop","size":"original".*?"url":"(.*?)original([^"]*)</expression> </RegExp> <expression noclean="1">(.+)</expression> </RegExp> </ParseTMDBFanart> <GetTMDBThumbsByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-tt\1.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/tt\1</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-tt\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>" dest="5"> <expression>tt([0-9]+)</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-\1.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/\1</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/\1</url>" dest="5"> <expression>^([0-9]+)$</expression> </RegExp> - <expression noclean="1"/> + <expression noclean="1" /> </RegExp> </GetTMDBThumbsByIdChain> <GetTMDBThumbsById dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-tt\1.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/tt\1</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-tt\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/tt\1</url>" dest="5"> <expression>/tt([0-9]+)</expression> </RegExp> - <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-\1.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/\1</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-\1.json">http://api.themoviedb.org/2.1/Movie.getImages/en/json/57983e31fb435df4df77afb854740ea9/\1</url>" dest="5"> <expression><id>([0-9]*)</id></expression> </RegExp> - <expression noclean="1"/> + <expression noclean="1" /> </RegExp> </GetTMDBThumbsById> <ParseTMDBThumbs dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<thumb>\1</thumb>" dest="3"> - <expression noclean="1" repeat="yes"><poster[^>]*>(.*?)</poster></expression> - </RegExp> - <RegExp input="$$3" output="<thumb preview="\2">\1\3</thumb>" dest="4"> - <expression noclean="1,3" repeat="yes"><thumb>(.*?)url="([^"]*)" size="mid"(.*?)</thumb></expression> - </RegExp> - <RegExp input="$$4" output="<thumb\1>\2</thumb>" dest="2"> - <expression repeat="yes" noclean="1"><thumb([^>]*)>.*?url="([^"]*)" size="original".*?</thumb></expression> + <RegExp input="$$1" output="<thumb preview="\1w500\2">\1original\2</thumb>" dest="2"> + <expression repeat="yes" noclean="1">"type":"poster","size":"original".*?"url":"(.*?)original([^"]*)</expression> </RegExp> <expression noclean="1">(.+)</expression> </RegExp> diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index 209fc0c209..ecd87d1839 100644 --- a/addons/metadata.themoviedb.org/addon.xml +++ b/addons/metadata.themoviedb.org/addon.xml @@ -1,39 +1,38 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.themoviedb.org" name="The MovieDB" - version="1.2.0" + version="2.0.1" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> - <import addon="metadata.common.themoviedb.org" version="1.0.7"/> - <import addon="metadata.common.hdtrailers.net" version="1.0.4"/> - <import addon="metadata.common.imdb.com" version="2.0.5"/> + <import addon="metadata.common.themoviedb.org" version="2.0.0"/> + <import addon="metadata.common.hdtrailers.net" version="1.0.6"/> + <import addon="metadata.common.imdb.com" version="2.1.3"/> + <import addon="plugin.video.youtube" version="2.1.0"/> </requires> <extension point="xbmc.metadata.scraper.movies" language="en" library="tmdb.xml"/> <extension point="xbmc.addon.metadata"> - <summary lang="en">TMDb Movie Scraper</summary> + <summary lang="en">TMDB Movie Scraper</summary> <summary lang="de">Film-Scraper für TheMovieDB</summary> <summary lang="es">Scraper de películas de TheMovieDB</summary> <summary lang="hu">TMDB filmadat leolvasó</summary> - <summary lang="nl">TMDB Film Scraper</summary> - <summary lang="pl">Scraper filmów TMDB</summary> + <summary lang="nl">TMDb-filmscraper</summary> + <summary lang="pl">Scraper filmowy TMDB</summary> <summary lang="pt">Scraper de filmes TMDb</summary> - <summary lang="ro">Catalog de filme TMDb</summary> + <summary lang="ro">Scraper de filme TMDb</summary> <summary lang="ru">Обработчик Фильмов для TMDB</summary> - <summary lang="se">Filmskrapa för TMDB</summary> <summary lang="zh">TMDB电影刮削器</summary> <description lang="en">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 XBMC to retrieve Movie Metadata, Posters and Fanart to enrich the user's experience.</description> <description lang="de">TheMovieDB.org ist eine freie und offene Film-Datenbank. Sie wird nur User wie dir betrieben. TheMovieDB wird zur Zeit monatlich von Millionen genutzt. Mit der mächtigen API wird sie auch von vielen Media-Center, wie z.B. XBMC, genutzt um Filme-Meta-Daten, Poster und Fanrts zu beziehen, damit der User sein Media-Center verschönern kann</description> <description lang="es">themovieDB.org es una base de datos de películas gratuita y abierta. Es una página web que se basa en contenido subido por los usuarios. TMDb es usada diariamente por mucha gente gracias a su API, que es usada por más programas aparte de XBMC para descargar información de películas así como Posters o Fanart (Fondos de escritorio basados en películas usados en distintos skins) para enriquecer la experiencia de usar XBMC.</description> <description lang="hu">A themoviedb.org egy ingyenes és nyílt filmadatbázis. Teljes egészében olyan felhasználók töltik fel, mint például Te. A TMDb-t havonta emberek milliói használják és a hatékony API-n keresztül számos népszerű média center is, mint például az XBMC a filmadatok, poszterek, fanartképek letöltésére.</description> - <description lang="nl">themoviedb.org is een vrije en open film databank. Het wordt compleet aangedreven door gebruikers zoals jezelf. TMDb wordt momenteel maandelijks gebruikt door miljoenen mensen. Hun krachtige API maakt het voor mediaspelers zoals XBMC mogelijk om voor een film bijkomende informatie, posters en fanarts op te halen.</description> + <description lang="nl">Themoviedb.org is een vrije en open filmdatabank. Gebruikers zoals jij vormen de motor van deze site. Op dit moment gebruiken elke maand miljoenen mensen TMDb. De krachtige API van de site laat mediacenters zoals XBMC toe om metadata, posters en fanart op te halen en zo de gebruikerservaring te verrijken.</description> <description lang="pl">themoviedb.org jest wolną i otwartą filmową bazą danych. Jest zarządzana całkowicie przez osoby takie jak Ty. Obecnie odwiedzają ją miliony osób miesięcznie, a dzięki dostępności API jest używana w wielu media center, takich jak XBMC, do pobierania informacji o filmach, plakatów i fanartów.</description> <description lang="pt">O themoviedb.org é uma base de dados de filmes livre e aberta. É completamente actualizado por pessoas como você e usado por milhões todos os meses. Com o poderoso motor de busca disponível, também se tornou no favorito de muitos softwares média center, como o popular XBMC, para obter informação, posters e fanart que enriquecem a experiência do utilizador.</description> - <description lang="ro">themoviedb.org este o bază de date de filme deschisă și gratuită. Este actualizată de oameni ca dumneavoastră. TMDb este curent folosită de milioane de oameni în fiecare lună și datorită API-ului puternic, este de asemenea folosită de multe centre media populare ca XBMC pentru a obține informații despre filme, afișe și imagini realizate de fani (Fanart) care îmbogățesc experiența utilizatorului.</description> + <description lang="ro">themoviedb.org este o bază de date de filme gratuită și deschisă. Este actualizată de oameni ca și tine. TMDb este curent folosită de milioane de oameni în fiecare lună și datorită API-ului puternic, este de asemena folosită de multe centre media populare ca XBMC pentru a obține informații despre filme, afișe și imagini produse de fani (Fanart) care îmbogățesc experiența utilizatorului.</description> <description lang="ru">themoviedb.org это бесплатная и открытая база данных фильмов. Она полностью поддерживается такими же людьми как и ты. В данный момент TMDb используется миллионами людей каждый месяц, и, с его мощным API, используется различными популярными медиа-центрами, такими как XBMC, для получения к Фильмам мета-данных, постеров и фанарта в целях улучшения пользовательского опыта.</description> - <description lang="se">themoviedb.org är en fri och öppen filmdatabas. Den drivs helt av personer som dig. TMDb används av miljoner människor varje månad och med hjälp av deras kraftfulla API, är det också använt av många populära mediacenter som XBMC för att hämta film-metadata, omslag och fanart för att berika användarens upplevelse.</description> <description lang="zh">themoviedb.org是一个开放和自由的电影数据库。它完全由象你一样的用户来掌控。TMDb每月为上百万用户提供服务，并通过强大的API界面为许多流行的媒体中心系统如XBMC提供电影资料、封面海报和同人画以丰富用户的体验。</description> <platform>all</platform> </extension> diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index 9c889b1cdc..dfe20b4c99 100644 --- a/addons/metadata.themoviedb.org/changelog.txt +++ b/addons/metadata.themoviedb.org/changelog.txt @@ -1,3 +1,49 @@ +[B]2.0.1[/B] +- fixed: imdb url nfo not resolving tmdb id + +[B]2.0.0[/B] +- complete rewrite to use the json api + +[B]1.4.5[/B] +- added: support for IMDb.xx support for NFO scraping + +[B]1.4.4[/B] +- fixed: actor thumb scraping was broken due to API changes + +[B]1.4.3[/B] +- fixed: use imdb ID from nfo +- changed: scrape only one studio + +[B]1.4.2[/B] +- fixed: url/mixed nfo scraping + +[B]1.4.1[/B] +- fixed: IMDb rating after site change + +[B]1.4.0[/B] +- added: trailer scraping from TMDB via youtube plugin + +[B]1.3.1[/B] +- fixed: added year to search string properly + +[B]1.3.0[/B] +- added: year to search string + +[B]1.2.5[/B] +- fixed: mpaa is returning string 'Rated' if there is no rating on tmdb + +[B]1.2.4[/B] +- fixed: not scraping artwork for movies without IMDb id + +[B]1.2.3[/B] +- fixed: can't get full search results list when some have <released> message and some haven't + +[B]1.2.2[/B] +- fixed: real fix for hd-trailers.net + +[B]1.2.1[/B] +- fixed: trailer scraping from hd-trailers.net + [B]1.2.0[/B] - Added option to scrape rating from IMDb diff --git a/addons/metadata.themoviedb.org/resources/language/English/strings.xml b/addons/metadata.themoviedb.org/resources/language/English/strings.xml index 0030780683..664a610fc2 100644 --- a/addons/metadata.themoviedb.org/resources/language/English/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/English/strings.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <strings> <string id="30000">Enable Fanart</string> - <string id="30001">Enable Trailers from HD-Trailers.net</string> + <string id="30004">Enable Trailer</string> + <string id="30001">Prefer Trailer from HD-Trailers.net</string> <string id="30002">Preferred language</string> <string id="30003">Get rating from IMDb</string> + <string id="30005">Keep Original Title</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml deleted file mode 100644 index 3c6a46534b..0000000000 --- a/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<strings> - <string id="30000">Fanitaide käytössä</string> - <string id="30001">Käytä trailereita HD-Trailers.net -sivustolta</string> - <string id="30002">Kieli</string> - <string id="30003">Hae arvosana IMDb:stä</string> -</strings> diff --git a/addons/metadata.themoviedb.org/resources/language/German/strings.xml b/addons/metadata.themoviedb.org/resources/language/German/strings.xml index 02e440e481..eac664069b 100644 --- a/addons/metadata.themoviedb.org/resources/language/German/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/German/strings.xml @@ -3,4 +3,5 @@ <string id="30000">Aktiviere Fanart</string> <string id="30001">Aktiviere Trailer von HD-Trailers.net</string> <string id="30002">Bevorzugte Sprache</string> + <string id="30003">Bewertung von IMDb nutzen</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml index f1e947f20f..8d2eb32aae 100644 --- a/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <strings> <string id="30000">Fanartképek engedélyezése</string> - <string id="30001">Filmelőzetesek a HD-Trailers.net-ről</string> + <string id="30004">Filmelőzetesek engedélyezése</string> + <string id="30001">Filmelőzetesek inkább a HD-Trailers.net-ről</string> <string id="30002">Preferált nyelv</string> <string id="30003">Értékelés az IMDb-ről</string> + <string id="30005">Eredeti filmcím megtartása</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.xml b/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.xml index 5e76d6801a..61ac93be1c 100644 --- a/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.xml @@ -2,4 +2,5 @@ <strings> <string id="30000">Ligar Fanart</string> <string id="30001">Ligar trailers de HD-Trailers.net</string> + <string id="30002">Língua preferida</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Romanian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Romanian/strings.xml index a0934eb326..b035f30efb 100644 --- a/addons/metadata.themoviedb.org/resources/language/Romanian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Romanian/strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <strings> - <string id="30000">Activează imagini de fundal realizate de fani (Fanart)</string> + <string id="30000">Activează Fanart</string> <string id="30001">Activează trailere de la HD-Trailers.net</string> <string id="30002">Limbă preferată</string> - <string id="30003">Ia nota de pe IMDb</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Slovenian/strings.xml b/addons/metadata.themoviedb.org/resources/language/Slovenian/strings.xml deleted file mode 100644 index 60f311e115..0000000000 --- a/addons/metadata.themoviedb.org/resources/language/Slovenian/strings.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<strings> - <string id="30000">Vključi ozadja</string> - <string id="30001">Vključi napovednike s HD-Trailers.net</string> - <string id="30002">Jezik</string> - <string id="30003">Prenesi oceno z IMDb</string> -</strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Spanish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Spanish/strings.xml index 470993c00d..e9f411e635 100644 --- a/addons/metadata.themoviedb.org/resources/language/Spanish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Spanish/strings.xml @@ -1,7 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <strings> - <string id="30000">Activar Fanart</string> + <string id="30000">Descargar Fanart</string> <string id="30001">Activar Trailers de HD-Trailers.net</string> - <string id="30002">Idioma preferido</string> - <string id="30003">Obtener la puntuación de IMDb</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml index d97c2e2d03..a7811583ee 100644 --- a/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml @@ -2,11 +2,10 @@ <!--Language file translated with Team XBMC Translator--> <!--Translator: blittan--> <!--Email: blittan@xbmc.org--> -<!--Date of translation: 11/19/2010--> +<!--Date of translation: 09/11/2010--> <!--$Revision$--> <strings> <string id="30000">Aktivera fanart</string> <string id="30001">Aktivera trailers från HD-Trailers.net</string> <string id="30002">Föredraget språk</string> - <string id="30003">Hämta betyg från IMDb</string> </strings>
\ No newline at end of file diff --git a/addons/metadata.themoviedb.org/resources/settings.xml b/addons/metadata.themoviedb.org/resources/settings.xml index eb35274594..31ba8421ef 100644 --- a/addons/metadata.themoviedb.org/resources/settings.xml +++ b/addons/metadata.themoviedb.org/resources/settings.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <settings> + <setting label="30005" type="bool" id="keeporiginaltitle" default="false"/> <setting label="30000" type="bool" id="fanart" default="true"/> - <setting label="30001" type="labelenum" values="No|480p|720p|1080p" id="TrailerQ" default="480p"/> + <setting label="30004" type="bool" id="trailer" default="true"/> + <setting label="30001" type="labelenum" values="No|480p|720p|1080p" id="TrailerQ" default="No"/> <setting label="30002" type="labelenum" values="da|fi|nl|de|it|es|fr|pl|hu|el|tr|ru|he|ja|pt|zh|cs|sl|hr|ko|en|sv|no" id="language" default="en"/> <setting label="30003" type="bool" id="imdbrating" default="false"/> </settings> diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml index 63411b93b5..baba466877 100644 --- a/addons/metadata.themoviedb.org/tmdb.xml +++ b/addons/metadata.themoviedb.org/tmdb.xml @@ -1,139 +1,136 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <scraper framework="1.1" date="2010-10-11"> <CreateSearchUrl dest="3"> - <RegExp input="$$1" output="<url>http://api.themoviedb.org/2.1/Movie.search/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\1</url>" dest="3"> + <RegExp input="$$1" output="<url>http://api.themoviedb.org/2.1/Movie.search/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/\1$$4</url>" dest="3"> <RegExp input="$$2" output="+\1" dest="4"> <expression clear="yes">(.+)</expression> </RegExp> - <expression noclean="1"/> + <expression noclean="1" /> </RegExp> </CreateSearchUrl> <NfoUrl dest="3"> - <RegExp input="$$1" output="<url>http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\2</url><id>\2</id>" dest="3"> + <RegExp input="$$1" output="<details><url>http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/\2</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 function="GetTMDBId">http://api.themoviedb.org/2.1/Movie.imdbLookup/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/tt\2</url></details>" dest="3+"> - <expression>(imdb.com/title/tt)([0-9]*)</expression> + <RegExp input="$$1" output="<details><url function="GetTMDBId">http://api.themoviedb.org/2.1/Movie.imdbLookup/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/tt\1</url></details>" dest="3+"> + <expression>imdb....?/title/tt([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<details><url function="GetTMDBId">http://api.themoviedb.org/2.1/Movie.imdbLookup/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/tt\2</url></details>" dest="3+"> - <expression>(imdb.com/)Title\?([0-9]+)</expression> + <RegExp input="$$1" output="<details><url function="GetTMDBId">http://api.themoviedb.org/2.1/Movie.imdbLookup/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/tt\1</url></details>" dest="3+"> + <expression>imdb....?/Title\?([0-9]*)</expression> </RegExp> </NfoUrl> <GetTMDBId dest="3"> - <RegExp input="$$1" output="<url cache="tmdb-$INFO[language]-\1.xml">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\1</url><id>\1</id>" dest="3+"> - <expression><id>([0-9]*)</id></expression> + <RegExp input="$$1" output="<details><url cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/\1</url><id>\1</id></details>" dest="3+"> + <expression>"movie","id":([0-9]*),</expression> </RegExp> </GetTMDBId> <GetSearchResults dest="8"> <RegExp input="$$3" output="<results>\1</results>" dest="8"> - <RegExp input="$$1" output="<entity><title>\1</title><id>\2</id><year>\3</year><url cache="tmdb-$INFO[language]-\2.xml">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\2</url></entity>" dest="3"> - <expression repeat="yes"><movie>.*?<name>([^<]*)</name>.*?<id>([^<]*)</id>.*?<released>([0-9]+)-.*?</movie></expression> + <RegExp input="$$1" output="<entity><title>\1</title><id>\2</id><year>\3</year><url cache="tmdb-$INFO[language]-\2.json">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/\2</url></entity>" dest="3"> + <expression repeat="yes">"name":"([^"]*).*?"id":([^,]*).*?"released":"([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<entity><title>\1</title><id>\2</id><year>\3</year><url cache="tmdb-$INFO[language]-\2.xml">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\2</url></entity>" dest="3+"> - <expression repeat="yes"><movie>.*?<original_name>([^<]*)</original_name>.*?<id>([^<]*)</id>.*?<released>([0-9]+)-.*?</movie></expression> + <RegExp input="$$1" output="<entity><title>\1</title><id>\2</id><year>\3</year><url cache="tmdb-$INFO[language]-\2.json">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/\2</url></entity>" dest="3+"> + <expression repeat="yes">"original_name":"([^"]*).*?"id":([^,]*).*?"released":"([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<entity><title>\1</title><id>\2</id><year>\3</year><url cache="tmdb-$INFO[language]-\2.xml">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\2</url></entity>" dest="3+"> - <expression repeat="yes"><movie>.*?<alternative_name>([^<]*)</alternative_name>.*?<id>([^<]*)</id>.*?<released>([0-9]+)-.*?</movie></expression> + <RegExp input="$$1" output="<entity><title>\1</title><id>\2</id><year>\3</year><url cache="tmdb-$INFO[language]-\2.json">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/json/57983e31fb435df4df77afb854740ea9/\2</url></entity>" dest="3+"> + <expression repeat="yes">"alternative_name":"([^"]*).*?"id":([^,]*).*?"released":"([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<entity><title>\1</title><id>\2</id><url cache="tmdb-$INFO[language]-\2.xml">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\2</url></entity>" dest="3+"> - <expression repeat="yes"><movie>.*?<name>([^<]*)</name>.*?<id>([^<]*)</id>.*?<released></released>.*?</movie></expression> - </RegExp> - <RegExp input="$$1" output="<entity><title>\1</title><id>\2</id><url cache="tmdb-$INFO[language]-\2.xml">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\2</url></entity>" dest="3+"> - <expression repeat="yes"><movie>.*?<original_name>([^<]*)</original_name>.*?<id>([^<]*)</id>.*?<released></released>.*?</movie></expression> - </RegExp> - <RegExp input="$$1" output="<entity><title>\1</title><id>\2</id><url cache="tmdb-$INFO[language]-\2.xml">http://api.themoviedb.org/2.1/Movie.getInfo/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\2</url></entity>" dest="3+"> - <expression repeat="yes"><movie>.*?<alternative_name>([^<]*)</alternative_name>.*?<id>([^<]*)</id>.*?<released></released>.*?</movie></expression> - </RegExp> - <expression noclean="1"/> + <expression noclean="1" /> </RegExp> </GetSearchResults> <GetDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> <RegExp input="$$1" output="<id>\1</id>" dest="5"> - <expression noclean="1"><id>([^<]*)</id></expression> + <expression noclean="1">"movie","id":([0-9]*),</expression> </RegExp> <RegExp input="$$1" output="<id>\1</id>" dest="5+"> - <expression clear="yes" noclean="1"><imdb_id>([^<]*)</imdb_id></expression> + <expression clear="yes" noclean="1">"movie","id":[0-9]*,"imdb_id":"([^"]*)</expression> + </RegExp> + <RegExp conditional="keeporiginaltitle" input="$$1" output="<title>\1</title>" dest="5+"> + <expression fixchars="1">"original_name":"([^"]*)</expression> </RegExp> <RegExp input="$$1" output="<title>\1</title>" dest="5+"> - <expression noclean="1"><name>([^<]*)</name></expression> + <expression fixchars="1">"name":"([^"]*)</expression> </RegExp> <RegExp input="$$1" output="<originaltitle>\1</originaltitle>" dest="5+"> - <expression noclean="1"><original_name>([^<]*)</original_name></expression> + <expression fixchars="1">"original_name":"([^"]*)</expression> </RegExp> <RegExp input="$$1" output="<year>\1</year>" dest="5+"> - <expression noclean="1"><released>([0-9]+)-</expression> + <expression noclean="1">"released":"([0-9]+)-</expression> </RegExp> <RegExp input="$$1" output="<runtime>\1</runtime>" dest="5+"> - <expression noclean="1"><runtime>([^<]*)</runtime></expression> - </RegExp> - <RegExp conditional="!imdbrating" input="$$1" output="<rating>\1</rating>" dest="5+"> - <expression noclean="1"><rating>([^<]*)</rating></expression> - </RegExp> - <RegExp conditional="!imdbrating" input="$$1" output="<votes>\1</votes>" dest="5+"> - <expression noclean="1"><votes>([^<]*)</votes></expression> - </RegExp> - <RegExp conditional="imdbrating" input="$$1" output="<chain function="GetIMDBRatingById">\1</chain>" dest="5+"> - <expression noclean="1"><imdb_id>([^<]*)</imdb_id></expression> + <expression noclean="1">"runtime":([0-9]+)</expression> </RegExp> <RegExp input="$$1" output="<tagline>\1</tagline>" dest="5+"> - <expression noclean="1"><tagline>([^<]*)</tagline></expression> + <expression fixchars="1">"tagline":"([^"]*)</expression> </RegExp> - <RegExp input="$$1" output="<mpaa>Rated \1</mpaa>" dest="5+"> - <expression><certification>([^<]*)</certification></expression> + <RegExp input="$$1" output="\1" dest="6"> + <expression>"certification":"([^"]*)</expression> </RegExp> - <RegExp input="$$1" output="<genre>\1</genre>" dest="5+"> - <expression noclean="1" repeat="yes"><category type="genre" name="([^"]*)"</expression> + <RegExp input="$$6" output="<mpaa>Rated \1</mpaa>" dest="5+"> + <expression>(.+)</expression> </RegExp> - <RegExp input="$$1" output="<studio>\1</studio>" dest="5+"> - <expression noclean="1" repeat="yes"><studio name="([^"]*)"</expression> + <RegExp input="$$1" output="\1" dest="7"> + <expression clear="yes" noclean="1">"studios":\[([^\]]*)</expression> </RegExp> - <RegExp input="$$1" output="<country>\1</country>" dest="5+"> - <expression noclean="1" repeat="yes"><country name="([^"]*)"</expression> + <RegExp input="$$7" output="<studio>\1</studio>" dest="5+"> + <expression trim="1" fixchars="1">"name":"([^"]*)</expression> </RegExp> - <RegExp input="$$1" output="<plot>\1</plot>" dest="5+"> - <expression noclean="1"><overview>([^<]*)</overview></expression> + <RegExp input="$$1" output="\1" dest="7"> + <expression clear="yes" noclean="1">"countries":\[([^\]]*)</expression> </RegExp> - <RegExp input="$$1" output="<overview>\1</overview>" dest="5+"> - <expression noclean="1"><overview>([^<]*)</overview></expression> + <RegExp input="$$7" output="<country>\1</country>" dest="5+"> + <expression trim="1" fixchars="1">"name":"([^"]*)</expression> </RegExp> <RegExp input="$$1" output="<director>\1</director>" dest="5+"> - <expression noclean="1" repeat="yes"><person.*?name="([^"]*)" character="" job="Director"</expression> + <expression repeat="yes" fixchars="1">"name":"([^"]*)","job":"Director"</expression> </RegExp> <RegExp input="$$1" output="<credits>\1</credits>" dest="5+"> - <expression noclean="1" repeat="yes"><person.*?name="([^"]*)" character="" job="Screenplay"</expression> + <expression repeat="yes" fixchars="1">"name":"([^"]*)","job":"[^"]*","department":"Writing"</expression> + </RegExp> + <RegExp conditional="!imdbrating" input="$$2" output="<chain function="GetTMDBRatingByIdChain">$$2</chain>" dest="5+"> + <expression /> + </RegExp> + <RegExp input="$$2" output="<chain function="GetTMDBPlotByIdChain">$$2</chain>" dest="5+"> + <expression /> </RegExp> - <RegExp input="$$1" output="<actor><name>\1</name><role>\2</role></actor>" dest="5+"> - <expression noclean="1" repeat="yes"><person.*?name="([^"]*)" character="([^"]*)" job="Actor"</expression> + <RegExp input="$$2" output="<chain function="GetTMDBCastByIdChain">$$2</chain>" dest="5+"> + <expression /> </RegExp> - <RegExp input="$$1" output="<actor><name>\1</name><role>\2</role><thumb>http://\4-original\5</thumb></actor>" dest="5+"> - <expression noclean="1" repeat="yes"><person.*?name="([^"]*)" character="([^"]*)" job="Actor" id="([0-9]+)" thumb="http://(.*?)-thumb([^"]*)"</expression> + <RegExp input="$$2" output="<chain function="GetTMDBGenresByIdChain">$$2</chain>" dest="5+"> + <expression /> + </RegExp> + <RegExp conditional="imdbrating" input="$$1" output="<chain function="GetIMDBRatingById">\1</chain>" dest="5+"> + <expression noclean="1">"movie","id":[0-9]*,"imdb_id":"([^"]*)</expression> </RegExp> <RegExp input="$$2" output="<chain function="GetTMDBThumbsByIdChain">$$2</chain>" dest="5+"> - <expression/> + <expression /> </RegExp> <RegExp conditional="fanart" input="$$2" output="<chain function="GetTMDBFanartByIdChain">$$2</chain>" dest="5+"> - <expression/> + <expression /> + </RegExp> + <RegExp conditional="trailer" input="$$2" output="<chain function="GetTMDBTrailerByIdChain">$$2</chain>" dest="5+"> + <expression /> </RegExp> <RegExp input="$INFO[TrailerQ]" output="<chain function="GetHDTrailersnet480p">$$6</chain>" dest="5+"> <RegExp input="$$1" output="\1" dest="6"> - <expression noclean="1"><original_name>([^<]*)</original_name></expression> + <expression noclean="1">"original_name":"([^"]*)</expression> </RegExp> <expression>480p</expression> </RegExp> <RegExp input="$INFO[TrailerQ]" output="<chain function="GetHDTrailersnet720p">$$6</chain>" dest="5+"> <RegExp input="$$1" output="\1" dest="6"> - <expression noclean="1"><original_name>([^<]*)</original_name></expression> + <expression noclean="1">"original_name":"([^"]*)</expression> </RegExp> <expression>720p</expression> </RegExp> <RegExp input="$INFO[TrailerQ]" output="<chain function="GetHDTrailersnet1080p">$$6</chain>" dest="5+"> <RegExp input="$$1" output="\1" dest="6"> - <expression noclean="1"><original_name>([^<]*)</original_name></expression> + <expression noclean="1">"original_name":"([^"]*)</expression> </RegExp> <expression>1080p</expression> </RegExp> - <expression noclean="1"/> + <expression noclean="1" /> </RegExp> </GetDetails> </scraper> |