diff options
| author | nadasb <nadasb@svn> | 2010-10-11 20:54:58 +0000 |
|---|---|---|
| committer | nadasb <nadasb@svn> | 2010-10-11 20:54:58 +0000 |
| commit | af1ff210aae1cd6f988566ac885b412adcba61d0 (patch) | |
| tree | 4c4a712cac0ef71b2ca1fcc29d99989c7157101e | |
| parent | cdb3cd1216967a33c8eb722f0f05086b6d22d89c (diff) | |
sync with scrapers git
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@34693 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
17 files changed, 300 insertions, 29 deletions
diff --git a/addons/metadata.albums.allmusic.com/addon.xml b/addons/metadata.albums.allmusic.com/addon.xml index 7423b3772a..284d2e61f6 100644 --- a/addons/metadata.albums.allmusic.com/addon.xml +++ b/addons/metadata.albums.allmusic.com/addon.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.albums.allmusic.com" name="AllMusic" - version="1.0.8" + version="1.0.10" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> <import addon="metadata.common.last.fm" version="1.0"/> - <import addon="metadata.common.allmusic.com" version="1.0"/> - <import addon="metadata.common.htbackdrops.com" version="1.0"/> + <import addon="metadata.common.allmusic.com" version="1.0.3"/> + <import addon="metadata.common.htbackdrops.com" version="1.0.7"/> </requires> <extension point="xbmc.metadata.scraper.albums" language="en" diff --git a/addons/metadata.albums.allmusic.com/allmusic.xml b/addons/metadata.albums.allmusic.com/allmusic.xml index 6681244a68..7a64a15fe2 100644 --- a/addons/metadata.albums.allmusic.com/allmusic.xml +++ b/addons/metadata.albums.allmusic.com/allmusic.xml @@ -16,10 +16,13 @@ <expression repeat="yes" noclean="1"><TITLE>allmusic[ (]+ ([^>]*) > Overview</expression> </RegExp> <RegExp input="$$1" output="<entity><year>\1</year><artist>\2</artist><title>\4</title><url cache="am-\2-\4-album.html">http://www.allmusic.com/cg/amg.dll?p=amg&amp;SQL=\3</url></entity>" dest="5+"> - <expression repeat="yes" noclean="1,2,3">>([0-9]+)</.*?>([a-zA-Z0-9].*?)<.*?sql=([0-9:a-z]*)">(.*?)<.</expression> + <expression repeat="yes" noclean="1,2,3">>([0-9]+)?[^>]*>[^>]*>([^<]*)</TD><td class="cell-img.*?sql=([0-9:a-z]*)">(.*?)<.</expression> </RegExp> - <expression noclean="1"/> - </RegExp> + <RegExp input="$$1" output="<entity><year>\1</year><artist>\2</artist><title>\4</title><url cache="am-\2-\4-album.html">http://www.allmusic.com/cg/amg.dll?p=amg&amp;SQL=\3</url></entity>" dest="5+"> + <expression repeat="yes" noclean="1,2,3">>([0-9]+)?</.*?>([a-zA-Z0-9].*?)<.*?sql=([0-9:a-z]*)">(.*?)<.</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> </GetAlbumSearchResults> <GetAlbumDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> diff --git a/addons/metadata.artists.allmusic.com/addon.xml b/addons/metadata.artists.allmusic.com/addon.xml index 2b4f9ab5e8..04b1ea1812 100644 --- a/addons/metadata.artists.allmusic.com/addon.xml +++ b/addons/metadata.artists.allmusic.com/addon.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.artists.allmusic.com" name="AllMusic" - version="1.0.7" + version="1.0.8" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> <import addon="metadata.common.last.fm" version="1.0"/> <import addon="metadata.common.allmusic.com" version="1.0"/> - <import addon="metadata.common.htbackdrops.com" version="1.0.5"/> + <import addon="metadata.common.htbackdrops.com" version="1.0.7"/> </requires> <extension point="xbmc.metadata.scraper.artists" language="en" library="allmusic.xml"/> <extension point="xbmc.addon.metadata"> - <summary lang="en">AllMusic artist information</summary> + <summary lang="en">AllMusic artist information + HTBackdrops artist images</summary> <summary lang="de">Scraper für Künstler-Informationen von AllMusic.com</summary> <summary lang="es">Descarga información de Artistas de AllMusic</summary> <summary lang="fr">Scraper d'artistes musicaux AllMusic</summary> @@ -24,9 +24,9 @@ <summary lang="ru">Информация об исполнителе из AllMusic</summary> <summary lang="zh">AllMusic艺术家信息</summary> <description lang="en">Use AllMusic.com to fill your libray metadata information. -The allmusic website was created in 1995 as a place for music fans to indulge their passion. -The AMG editorial staff, along with hundreds of expert contributors (all music fanatics in their own right), has made allmusic the most comprehensive music reference source on the planet. They are all dedicated to creating and maintaining the knowledgeable, spirited content that music lovers and industry professionals have come to expect from AMG. -All genres and styles of music are covered here, ranging from the most commercially popular to the most obscure. We critique albums and artists within the context of their own genres - from opera to garage rock to traditional country. This ensures that fans of any style of music can depend on us to keep them up-to-date with their favorite artists as well as introduce them to new sounds.</description> +The allmusic website was created in 1995 as a place for music fans to indulge their passion. All genres and styles of music are covered here, ranging from the most commercially popular to the most obscure. We critique albums and artists within the context of their own genres - from opera to garage rock to traditional country. + +Home Theater Backdrops (HTBackdrops.com) is a community driven image database for high quality artist images like thumbs and fanarts. All images have been created or sourced by its members. Please consider uploading your own images of your favorite musician.</description> <description lang="de">Benutze den AllMusic.com-Scraper um deine Musik-Bibliothek mit Metadaten zu füllen. AllMusic.com wurde 1995 gegründet, um Musikliebhabern einen Platz zu geben, Ihre Leidenschaft auszuleben. Die AMG Redaktion, zusammen mit hunderten Experten (alles Fachmänner auf Ihrem Gebiet) als Beitragende, machte AllMusic.com zur umfangreichsten Quelle für Musikinformationen auf dem Planeten. Sie sind alle engagiert, um den lebhaften Inhalt, welcher von Musikliebhabern und der Musikindustrie von AMG erwartet wird, zu Erstellen und Pflegen. diff --git a/addons/metadata.artists.allmusic.com/resources/language/English/strings.xml b/addons/metadata.artists.allmusic.com/resources/language/English/strings.xml index d9effb9c54..7534b41ad2 100644 --- a/addons/metadata.artists.allmusic.com/resources/language/English/strings.xml +++ b/addons/metadata.artists.allmusic.com/resources/language/English/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <strings> - <string id="30000">Enable Fanart</string> + <string id="30000">Download Fanarts from HTBackdrops.com</string> <string id="30001">Grab artist thumbs from Allmusic.com</string> <string id="30002">Grab artist thumbs from Last.fm</string> - <string id="30003">Grab artist thumbs from HTBackdrops</string> + <string id="30003">Grab artist thumbs from HTBackdrops.com</string> </strings> diff --git a/addons/metadata.artists.allmusic.com/resources/language/Hungarian/strings.xml b/addons/metadata.artists.allmusic.com/resources/language/Hungarian/strings.xml index a184c92a6d..35021088e9 100644 --- a/addons/metadata.artists.allmusic.com/resources/language/Hungarian/strings.xml +++ b/addons/metadata.artists.allmusic.com/resources/language/Hungarian/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <strings> - <string id="30000">Fanartképek engedélyezése</string> + <string id="30000">Fanartképek letöltése a HTBackdrops.com-ról</string> <string id="30001">Előadó bélyegkép letöltése az Allmusic.com-ról</string> <string id="30002">Előadó bélyegkép letöltése a Last.fm-ről</string> - <string id="30003">Előadó bélyegkép letöltése a HTBackdrops-ról</string> + <string id="30003">Előadó bélyegkép letöltése a HTBackdrops.com-ról</string> </strings> diff --git a/addons/metadata.common.imdb.com/addon.xml b/addons/metadata.common.imdb.com/addon.xml new file mode 100644 index 0000000000..4b08fd17a4 --- /dev/null +++ b/addons/metadata.common.imdb.com/addon.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<addon id="metadata.common.imdb.com" + name="IMDB common scraper functions" + version="2.0.5" + provider-name="Team XBMC"> + <requires> + <import addon="xbmc.metadata" version="1.0"/> + </requires> + <extension point="xbmc.metadata.scraper.library" + library="imdb.xml"/> + <extension point="xbmc.addon.metadata"> + <platform>all</platform> + <minversion>20000</minversion> + <summary lang="en">IMDB Scraper Library</summary> + <summary lang="hu">IMDB leolvasó-könyvtár</summary> + <summary lang="kr">IMDB 스크래퍼 라이브러리</summary> + <summary lang="nl">IMDB Scraper Bibliotheek</summary> + <summary lang="pl">Scraper IMDb</summary> + <summary lang="pt">Scraper de filmes IMDb</summary> + <summary lang="se">IMDB Skrapbibliotek</summary> + <description lang="en">Download Movie information from www.imdb.com</description> + <description lang="hu">Film információk letöltése a www.imdb.com webhelyről</description> + <description lang="kr">www.imdb.com 에서 영화 정보 다운로드</description> + <description lang="nl">Download film informatie van www.imdb.com</description> + <description lang="pl">Pobieraj informacje o filmach z www.imdb.com</description> + <description lang="pt">Descarregar informação de filmes de www.imdb.com</description> + <description lang="se">Ladda ner filminformation från www.imdb.com</description> + </extension> +</addon> diff --git a/addons/metadata.common.imdb.com/changelog.txt b/addons/metadata.common.imdb.com/changelog.txt new file mode 100644 index 0000000000..cd4bd77c6d --- /dev/null +++ b/addons/metadata.common.imdb.com/changelog.txt @@ -0,0 +1,20 @@ +[B]2.0.5[/B] +- changed: move scraping of IMDb rating out to IMDb scraper library + +[B]2.0.4[/B] +- reverted: purge fixchars from all functions, since it cause convert fails on Beta2 and Linux + +[B]2.0.3[/B] +- reverted: fixchars removed from cast parsing, leads to Dharma Beta2 hanging, will be added back once next Beta is out + +[B]2.0.2[/B] +- fixed: some more cast won't get scraped under certain circumtances + +[B]2.0.1[/B] +- fixed: cast won't get scraped under certain circumtances + +[B]2.0.0[/B] +- changed: adapted new IMDb layout + +[B]1.0.5[/B] +- fixed: tack /combined onto the end of the url to work around the new layout of IMDb
\ No newline at end of file diff --git a/addons/metadata.common.imdb.com/imdb.xml b/addons/metadata.common.imdb.com/imdb.xml new file mode 100644 index 0000000000..24a3a4f422 --- /dev/null +++ b/addons/metadata.common.imdb.com/imdb.xml @@ -0,0 +1,205 @@ +<scraperfunctions> + <GetIMDBRatingById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBRating">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBRatingById> + <GetIMDBPlotById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBPlot">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBPlotById> + <GetIMDBCastById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBCast">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBCastById> + <GetIMDBScaledCastById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBScaledCast">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBScaledCastById> + <GetIMDBDirectorsById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBDirectors">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBDirectorsById> + <GetIMDBWritersById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBWriters">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBWritersById> + <GetIMDBFullCastById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBFullCast">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBFullCastById> + <GetIMDBScaledFullCastById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBScaledFullCast">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBScaledFullCastById> + <GetIMDBFullDirectorsById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBFullDirectors">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBFullDirectorsById> + <GetIMDBFullWritersById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBFullWriters">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBFullWritersById> + <GetIMDBThumbsById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-posters.html" function="ParseIMDBThumbs">http://akas.imdb.com/title/$$1/posters</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBThumbsById> + <GetIMDBTrailerById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="GetIMDBTrailerPage">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBTrailerById> + <ParseIMDBRating dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="<rating>\1</rating><votes>\2</votes>" dest="2"> + <expression><span class="rating-rating">([0-9.]+).*?>([0-9,]+) votes</a></expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseIMDBRating> + <ParseIMDBPlot dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="<plot>\1</plot>" dest="2"> + <expression trim="1"><h2>Storyline</h2>\n+<p>([^<]+)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseIMDBPlot> + <ParseIMDBCast dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="\1" dest="6"> + <expression noclean="1"><table class="cast_list">(.*?)</table></expression> + </RegExp> + <RegExp input="$$6" output="<actor><thumb>\1_SX512_SY512_\2</thumb><name>\3</name><role>\4</role></actor>" dest="7"> + <expression repeat="yes" clear="yes" trim="3,4" noclean="1,2"><img\n[^\n]*\n[^\n]*\n\s+src="(?:([^"]*\.)[^"]*(\.jpg))?[^>]*[^"]*"[^"]*">[^>]*>([^<]*).*?<td class="character">[^>]*>[^>]*>([^<]*)?</expression> + </RegExp> + <RegExp input="$$7" output="<actor><thumb>\1</thumb>\2</actor>" dest="2+"> + <expression repeat="yes" clear="yes" noclean="1,2,3"><actor><thumb>(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)</thumb>(.*?)</actor></expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseIMDBCast> + <ParseIMDBScaledCast dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="\1" dest="6"> + <expression noclean="1"><table class="cast_list">(.*?)</table></expression> + </RegExp> + <RegExp input="$$6" output="<actor><thumb>\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2</thumb><name>\3</name><role>\4</role></actor>" dest="7"> + <expression repeat="yes" clear="yes" trim="3,4" noclean="1,2"><img\n[^\n]*\n[^\n]*\n\s+src="(?:([^"]*\.)[^"]*(\.jpg))?[^>]*[^"]*"[^"]*">[^>]*>([^<]*).*?<td class="character">[^>]*>[^>]*>([^<]*)?</expression> + </RegExp> + <RegExp input="$$7" output="<actor><thumb>\1</thumb>\2</actor>" dest="2+"> + <expression repeat="yes" clear="yes" noclean="1,2,3"><actor><thumb>(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)</thumb>(.*?)</actor></expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseIMDBScaledCast> + <ParseIMDBDirectors dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="\1" dest="6"> + <expression clear="yes" noclean="1">Director[s]?.*?</h4>(.*?)<div class</expression> + </RegExp> + <RegExp input="$$6" output="<director>\1</director>" dest="2+"> + <expression repeat="yes" clear="yes"><a href="/name[^>]*>([^<]*)<</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseIMDBDirectors> + <ParseIMDBWriters dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="\1" dest="6"> + <expression noclean="1">Writer[s]?.*?</h4>(.*?)<div class</expression> + </RegExp> + <RegExp input="$$6" output="<credits>\1</credits>" dest="2+"> + <expression repeat="yes"><a href="/name[^>]*>([^<]*)<</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseIMDBWriters> + <ParseIMDBFullCast dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="\1" dest="6"> + <expression noclean="1"><table class="cast">(.*?)</table></expression> + </RegExp> + <RegExp input="$$6" output="<actor><thumb>\1_SX512_SY512_\2</thumb><name>\3</name><role>\5</role></actor>" dest="7"> + <expression repeat="yes" clear="yes" trim="3,5" noclean="1,2"><img src="(?:([^"]*\.)[^"]*(\.jpg))?[^>]*[^"]*"nm"><a href="[^"]*[^>]*>([^<]*)<[^"]*"ddd">([^<]<)?[^"]*"char">(.*?)</td></expression> + </RegExp> + <RegExp input="$$7" output="<actor><thumb>\1</thumb>\2</actor>" dest="2+"> + <expression repeat="yes" clear="yes" noclean="1,2,3"><actor><thumb>(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)</thumb>(.*?)</actor></expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseIMDBFullCast> + <ParseIMDBScaledFullCast dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="\1" dest="6"> + <expression noclean="1"><table class="cast">(.*?)</table></expression> + </RegExp> + <RegExp input="$$6" output="<actor><thumb>\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2</thumb><name>\3</name><role>\5</role></actor>" dest="7"> + <expression repeat="yes" clear="yes" trim="3,5" noclean="1,2"><img src="(?:([^"]*\.)[^"]*(\.jpg))?[^>]*[^"]*"nm"><a href="[^"]*[^>]*>([^<]*)<[^"]*"ddd">([^<]<)?[^"]*"char">(.*?)</td></expression> + </RegExp> + <RegExp input="$$7" output="<actor><thumb>\1</thumb>\2</actor>" dest="2+"> + <expression repeat="yes" clear="yes" noclean="1,2,3"><actor><thumb>(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)</thumb>(.*?)</actor></expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseIMDBScaledFullCast> + <ParseIMDBFullDirectors dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp conditional="fullcredits" input="$$1" output="\1" dest="6"> + <expression clear="yes" noclean="1">Director[s]?:</h5>[^>]*>(.*?)</div</expression> + </RegExp> + <RegExp input="$$6" output="<director>\1</director>" dest="2+"> + <expression repeat="yes" clear="yes"><a href="/name/[^>]*>([^<]*)<</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseIMDBFullDirectors> + <ParseIMDBFullWriters dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp conditional="fullcredits" input="$$1" output="\1" dest="6"> + <expression noclean="1">Writing credits(.*?)name="</expression> + </RegExp> + <RegExp input="$$6" output="<credits>\1</credits>" dest="2+"> + <expression repeat="yes"><a href="/name/[^>]*>([^<]*)<</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseIMDBFullWriters> + <ParseIMDBThumbs dest="5"> + <RegExp input="$$6" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2" dest="4"> + <expression noclean="1,2"><a name="poster".*?src="(.*?)_S.*?(.jpg)".*?</a></expression> + </RegExp> + <RegExp input="$$4" output="<thumb>\1</thumb>" dest="6"> + <expression noclean="1">(.*?_SX[0-9]+_SY[0-9]+_.jpg)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseIMDBThumbs> + <GetIMDBTrailerPage dest="5"> + <RegExp input="$$1" output="<details><url function="ParseIMDBTrailer">http://akas.imdb.com/video/imdb/vi\1/player</url></details>" dest="5"> + <expression>/vi([0-9]*)/</expression> + </RegExp> + </GetIMDBTrailerPage> + <ParseIMDBTrailer dest="5"> + <RegExp input="$$2" output="<details><trailer urlencoded="yes">\1</trailer></details>" dest="5"> + <RegExp input="$$1" output="\1" dest="2"> + <expression noclean="1">"file"[^"]*"([^"]*)</expression> + </RegExp> + <RegExp input="$$1" output="$$2/\1" dest="2"> + <expression noclean="1">"id"[^"]*"([^"]*)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseIMDBTrailer> +</scraperfunctions> diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index 89aed9dc32..35d701b03c 100644 --- a/addons/metadata.themoviedb.org/addon.xml +++ b/addons/metadata.themoviedb.org/addon.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.themoviedb.org" name="The MovieDB" - version="1.1.5" + version="1.2.0" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> - <import addon="metadata.common.themoviedb.org" version="1.0.3"/> - <import addon="metadata.common.hdtrailers.net" version="1.0.2"/> + <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"/> </requires> <extension point="xbmc.metadata.scraper.movies" language="en" @@ -16,7 +17,7 @@ <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-filmscraper</summary> <!--Themoviedb.org gebruikt zelf als afkorting TMDb en niet TMDB.--> + <summary lang="nl">TMDb-filmscraper</summary> <!--Themoviedb.org gebruikt zelf als afkorting TMDb en niet TMDB.--> <summary lang="pl">Scraper filmowy TMDB</summary> <summary lang="pt">Scraper de filmes TMDb</summary> <summary lang="ro">Scraper de filme TMDb</summary> diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index e1b5b56772..9c889b1cdc 100644 --- a/addons/metadata.themoviedb.org/changelog.txt +++ b/addons/metadata.themoviedb.org/changelog.txt @@ -1,3 +1,9 @@ +[B]1.2.0[/B] +- Added option to scrape rating from IMDb + +[B]1.1.6[/B] +- Fix rating images to show up on default skins + [B]1.1.5[/B] - Fix decimal separator diff --git a/addons/metadata.themoviedb.org/icon.png b/addons/metadata.themoviedb.org/icon.png Binary files differindex 39016c0bd8..b95037a3e0 100644 --- a/addons/metadata.themoviedb.org/icon.png +++ b/addons/metadata.themoviedb.org/icon.png diff --git a/addons/metadata.themoviedb.org/resources/language/English/strings.xml b/addons/metadata.themoviedb.org/resources/language/English/strings.xml index 41dda11014..0030780683 100644 --- a/addons/metadata.themoviedb.org/resources/language/English/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/English/strings.xml @@ -3,4 +3,5 @@ <string id="30000">Enable Fanart</string> <string id="30001">Enable Trailers from HD-Trailers.net</string> <string id="30002">Preferred language</string> + <string id="30003">Get rating from IMDb</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 c77c6ffd41..f1e947f20f 100644 --- a/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml @@ -3,4 +3,5 @@ <string id="30000">Fanartképek engedélyezése</string> <string id="30001">Filmelőzetesek 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> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Polish/strings.xml b/addons/metadata.themoviedb.org/resources/language/Polish/strings.xml index 0714b9ef87..644859af5d 100644 --- a/addons/metadata.themoviedb.org/resources/language/Polish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Polish/strings.xml @@ -1,5 +1,6 @@ <?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="30000">Włącz fanart</string> + <string id="30001">Włącz zwiastuny z HD-Trailers.net</string> + <string id="30002">Preferowany język</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/settings.xml b/addons/metadata.themoviedb.org/resources/settings.xml index b9ed5ad667..eb35274594 100644 --- a/addons/metadata.themoviedb.org/resources/settings.xml +++ b/addons/metadata.themoviedb.org/resources/settings.xml @@ -3,4 +3,5 @@ <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="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"/> - </settings> + <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 d45f36311c..63411b93b5 100644 --- a/addons/metadata.themoviedb.org/tmdb.xml +++ b/addons/metadata.themoviedb.org/tmdb.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<scraper framework="1.1" date="2010-09-11"> +<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="$$2" output="%20(\1)" dest="4"> + <RegExp input="$$2" output="+\1" dest="4"> <expression clear="yes">(.+)</expression> </RegExp> <expression noclean="1"/> @@ -67,16 +67,19 @@ <RegExp input="$$1" output="<runtime>\1</runtime>" dest="5+"> <expression noclean="1"><runtime>([^<]*)</runtime></expression> </RegExp> - <RegExp input="$$1" output="<rating>\1</rating>" dest="5+"> + <RegExp conditional="!imdbrating" input="$$1" output="<rating>\1</rating>" dest="5+"> <expression noclean="1"><rating>([^<]*)</rating></expression> </RegExp> - <RegExp input="$$1" output="<votes>\1</votes>" dest="5+"> + <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> + </RegExp> <RegExp input="$$1" output="<tagline>\1</tagline>" dest="5+"> <expression noclean="1"><tagline>([^<]*)</tagline></expression> </RegExp> - <RegExp input="$$1" output="<mpaa>\1</mpaa>" dest="5+"> + <RegExp input="$$1" output="<mpaa>Rated \1</mpaa>" dest="5+"> <expression><certification>([^<]*)</certification></expression> </RegExp> <RegExp input="$$1" output="<genre>\1</genre>" dest="5+"> diff --git a/addons/metadata.tvdb.com/resources/language/Hungarian/strings.xml b/addons/metadata.tvdb.com/resources/language/Hungarian/strings.xml index cdedfe8da5..91178143f6 100644 --- a/addons/metadata.tvdb.com/resources/language/Hungarian/strings.xml +++ b/addons/metadata.tvdb.com/resources/language/Hungarian/strings.xml @@ -5,4 +5,4 @@ <string id="30002">Fanartképek engedélyezése</string> <string id="30003">Poszterek előnyben részesítése</string> <string id="30004">Nyelv</string> -</strings>
\ No newline at end of file +</strings> |
