diff options
| -rw-r--r-- | addons/metadata.common.imdb.com/addon.xml | 2 | ||||
| -rw-r--r-- | addons/metadata.common.imdb.com/changelog.txt | 3 | ||||
| -rw-r--r-- | addons/metadata.common.imdb.com/imdb.xml | 2 | ||||
| -rw-r--r-- | addons/metadata.common.last.fm/addon.xml | 40 | ||||
| -rw-r--r-- | addons/metadata.common.last.fm/icon.png | bin | 7350 -> 0 bytes | |||
| -rw-r--r-- | addons/metadata.common.last.fm/lastfm.xml | 306 | ||||
| -rw-r--r-- | addons/metadata.themoviedb.org/addon.xml | 2 | ||||
| -rw-r--r-- | addons/metadata.themoviedb.org/changelog.txt | 6 | ||||
| -rw-r--r-- | addons/metadata.themoviedb.org/tmdb.xml | 10 |
9 files changed, 17 insertions, 354 deletions
diff --git a/addons/metadata.common.imdb.com/addon.xml b/addons/metadata.common.imdb.com/addon.xml index 89cef20ae2..19ff5490fa 100644 --- a/addons/metadata.common.imdb.com/addon.xml +++ b/addons/metadata.common.imdb.com/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.imdb.com" name="IMDB Scraper Library" - version="2.7.9" + version="2.8.0" provider-name="XBMC Foundation"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> diff --git a/addons/metadata.common.imdb.com/changelog.txt b/addons/metadata.common.imdb.com/changelog.txt index d310c4a047..38b9169b8b 100644 --- a/addons/metadata.common.imdb.com/changelog.txt +++ b/addons/metadata.common.imdb.com/changelog.txt @@ -1,3 +1,6 @@ +[B]2.8.0[/B] +- fixed: won't scrape IMDb TOP250 + [B]2.7.8[/B] - fixed: add xml header diff --git a/addons/metadata.common.imdb.com/imdb.xml b/addons/metadata.common.imdb.com/imdb.xml index 0ea0e5f457..c1a0a9cacc 100644 --- a/addons/metadata.common.imdb.com/imdb.xml +++ b/addons/metadata.common.imdb.com/imdb.xml @@ -36,7 +36,7 @@ <ParseIMDBTOP250 dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<top250>\1</top250>" dest="2"> - <expression>Top\s250\s#([0-9]*)</</expression> + <expression>Top\sRated\sMovies\s#([0-9]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> diff --git a/addons/metadata.common.last.fm/addon.xml b/addons/metadata.common.last.fm/addon.xml deleted file mode 100644 index e1aabd9398..0000000000 --- a/addons/metadata.common.last.fm/addon.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<addon id="metadata.common.last.fm" - name="Last.FM Scraper Library" - version="1.6.2" - provider-name="XBMC Foundation"> - <requires> - <import addon="xbmc.metadata" version="2.1.0"/> - </requires> - <extension point="xbmc.metadata.scraper.library" - library="lastfm.xml"/> - <extension point="xbmc.addon.metadata"> - <platform>all</platform> - <summary lang="bg">Библиотека за сваляне на инф. от LastFM</summary> - <summary lang="en">LastFM Scraper Library</summary> - <summary lang="de">Musik-Scraper für LastFM</summary> - <summary lang="es">Scraper de música de LastFM</summary> - <summary lang="fi">LastFM musiikkitietojen lataaja</summary> - <summary lang="fr">Scraper LastFM</summary> - <summary lang="hu">LastFM leolvasó-könyvtár</summary> - <summary lang="nl">LastFM-scraperfuncties</summary> - <summary lang="pl">Scraper biblioteki LastFM</summary> - <summary lang="pt">Scraper de música LastFM</summary> - <summary lang="ru">Обработчик для LastFM</summary> - <summary lang="se">Skrapebibliotek för LastFM</summary> - <summary lang="zh">LastFM刮削器代码库</summary> - <description lang="bg">Извлича инф. за музикални файлове от www.last.fm</description> - <description lang="en">Download Music information from www.last.fm</description> - <description lang="de">Downloade Musik informationen von www.last.fm</description> - <description lang="es">Descargar información musical de www.last.fm</description> - <description lang="fi">Lataa musiikkitietoja osoitteesta www.last.fm</description> - <description lang="fr">Télécharge les infos musicales depuis www.last.fm</description> - <description lang="hu">Zene információk letöltése a www.last.fm webhelyről</description> - <description lang="nl">Muziekinfo ophalen van LastFM</description> - <description lang="pl">Pobieraj informacje o muzyce z www.last.fm</description> - <description lang="pt">Descarregar informação de música de www.last.fm</description> - <description lang="ru">Загружать информацию о Музыке с www.last.fm</description> - <description lang="se">Ladda ner musikinformation från www.last.fm</description> - <description lang="zh">从www.last.fm下载音乐信息</description> - </extension> -</addon> diff --git a/addons/metadata.common.last.fm/icon.png b/addons/metadata.common.last.fm/icon.png Binary files differdeleted file mode 100644 index 95692bec7b..0000000000 --- a/addons/metadata.common.last.fm/icon.png +++ /dev/null diff --git a/addons/metadata.common.last.fm/lastfm.xml b/addons/metadata.common.last.fm/lastfm.xml deleted file mode 100644 index 0c5b26341b..0000000000 --- a/addons/metadata.common.last.fm/lastfm.xml +++ /dev/null @@ -1,306 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<scraperfunctions> - <GetLastFMDiscographyByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseLastFMDiscography" cache="lastfmdiscog-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.gettopalbums&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>" dest="5"> - <expression noclean="1"/> - </RegExp> - </GetLastFMDiscographyByMBID> - <GetLastFMDiscography dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseLastFMDiscography">http://ws.audioscrobbler.com/2.0/?method=artist.gettopalbums&amp;artist=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b</url></details>" dest="5"> - <expression noclean="1"/> - </RegExp> - </GetLastFMDiscography> - <ParseLastFMDiscography dest="5" clearbuffers="no"> - <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="" output="" dest="2"> - <expression /> - </RegExp> - <RegExp input="$$1" output="<album><title>\1</title></album>" dest="2"> - <expression repeat="yes"><album[^>]*>[^<]*<name>([^<]*?)</name></expression> - </RegExp> - <expression noclean="1"/> - </RegExp> - </ParseLastFMDiscography> - - <GetLastFMBiographyByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseLastFMBiography" cache="lastfmartistinfo-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression noclean="1"/> - </RegExp> - </GetLastFMBiographyByMBID> - <ParseLastFMBiography dest="5" clearbuffers="no"> - <RegExp input="$$6" output="<details>\1</details>" dest="5"> - <RegExp input="" output="" dest="6"> - <expression /> - </RegExp> - <RegExp input="" output="" dest="11"> - <expression /> - </RegExp> - <RegExp input="$$1" output="\1" dest="11"> - <expression fixchars="1"><content><!\[CDATA\[(.*?)\]\]</expression> - </RegExp> - <RegExp input="$$11" output="$$12" dest="6"> - <RegExp input="$INFO[biogfbsource]" output="<chain function="GetAMGFallbackBiographyByAMGID">$$9</chain>" dest="12"> - <expression>allmusic.com</expression> - </RegExp> - <RegExp input="$INFO[biogfbsource]" output="<chain function="GetTADBFMFallbackBiographyByMBID">$$9</chain>" dest="12"> - <expression>TheAudioDb.com</expression> - </RegExp> - <expression>^$</expression> - </RegExp> - <RegExp input="$$11" output="<biography>\1</biography>" dest="6"> - <expression>(.+)</expression> - </RegExp> - <expression noclean="1"/> - </RegExp> - </ParseLastFMBiography> - - <GetLastFMFallbackBiographyByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseLastFMFallbackBiography" cache="lastfmartistinfo-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.getinfo&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression noclean="1"/> - </RegExp> - </GetLastFMFallbackBiographyByMBID> - <ParseLastFMFallbackBiography dest="5" clearbuffers="no"> - <RegExp input="$$6" output="<details>\1</details>" dest="5"> - <RegExp input="" output="" dest="6"> - <expression /> - </RegExp> - <RegExp input="$$1" output="<biography>\1</biography>" dest="6"> - <expression fixchars="1"><content><!\[CDATA\[(.*?)\]\]</expression> - </RegExp> - <expression noclean="1"/> - </RegExp> - </ParseLastFMFallbackBiography> - - <GetLastFMArtistGenresByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseLastFMArtistGenres" cache="lastfmgenres-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.gettoptags&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression noclean="1"/> - </RegExp> - </GetLastFMArtistGenresByMBID> - <ParseLastFMArtistGenres dest="5" clearbuffers="no"> - <RegExp input="$$4" output="<details>\1</details>" dest="5"> - <RegExp input="" output="" dest="4"> - <expression /> - </RegExp> - <RegExp input="$$1" output="<genre>\1</genre>" dest="11"> - <expression noclean="1"><tag>.*?<name>([^/lt;]*)</name></expression> - </RegExp> - <RegExp input="$$11" output="$$12" dest="4"> - <RegExp input="$INFO[genresfbsource]" output="<chain function="GetAMGFallbackArtistGenresByAMGID">$$9</chain>" dest="12"> - <expression>allmusic.com</expression> - </RegExp> - <RegExp input="$INFO[genresfbsource]" output="<chain function="GetTADBFallbackArtistGenresByMBID">$$8</chain>" dest="12"> - <expression>TheAudioDb.com</expression> - </RegExp> - <expression><genre></genre></expression> - </RegExp> - <RegExp input="$$11" output="$$11" dest="4"> - <expression><genre>(.+)</genre></expression> - </RegExp> - <expression noclean="1" /> - </RegExp> - </ParseLastFMArtistGenres> - - <GetLastFMFallbackArtistGenresByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseLastFMFallbackArtistGenres" cache="lastfmgenres-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.gettoptags&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression noclean="1"/> - </RegExp> - </GetLastFMFallbackArtistGenresByMBID> - <ParseLastFMFallbackArtistGenres dest="5" clearbuffers="no"> - <RegExp input="$$4" output="<details>\1</details>" dest="5"> - <RegExp input="" output="" dest="4"> - <expression /> - </RegExp> - <RegExp input="$$1" output="<genre>\1</genre>" dest="4"> - <expression noclean="1"><tag>.*?<name>([^/lt;]*)</name></expression> - </RegExp> - <expression noclean="1"/> - </RegExp> - </ParseLastFMFallbackArtistGenres> - - <GetLastFMArtistStylesByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseLastFMArtistStyles" cache="lastfmgenres-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.gettoptags&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression noclean="1"/> - </RegExp> - </GetLastFMArtistStylesByMBID> - <ParseLastFMArtistStyles dest="5" clearbuffers="no"> - <RegExp input="$$4" output="<details>\1</details>" dest="5"> - <RegExp input="" output="" dest="4"> - <expression /> - </RegExp> - <RegExp input="$$1" output="<style>\1</style>" dest="11"> - <expression repeat="yes" noclean="1"><tag>.*?<name>([^/lt;]*)</name></expression> - </RegExp> - <RegExp input="$$11" output="$$12" dest="4"> - <RegExp input="$INFO[genresfbsource]" output="<chain function="GetAMGFallbackArtistStylesByAMGID">$$9</chain>" dest="12"> - <expression>allmusic.com</expression> - </RegExp> - <expression><style></style></expression> - </RegExp> - <RegExp input="$$11" output="$$11" dest="4"> - <expression><style>(.+)</style></expression> - </RegExp> - <expression noclean="1" /> - </RegExp> - </ParseLastFMArtistStyles> - - <GetLastFMFallbackArtistStylesByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseLastFMFallbackArtistStyles" cache="lastfmgenres-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.gettoptags&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression noclean="1"/> - </RegExp> - </GetLastFMFallbackArtistStylesByMBID> - <ParseLastFMFallbackArtistStyles dest="5" clearbuffers="no"> - <RegExp input="$$4" output="<details>\1</details>" dest="5"> - <RegExp input="" output="" dest="4"> - <expression /> - </RegExp> - <RegExp input="$$1" output="<style>\1</style>" dest="4"> - <expression repeat="yes" noclean="1"><tag>.*?<name>([^/lt;]*)</name></expression> - </RegExp> - <expression noclean="1" /> - </RegExp> - </ParseLastFMFallbackArtistStyles> - - <GetLastFMArtistThumbsByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseLastFMArtistThumbs" cache="lastfmartistimages-\1.xml">http://ws.audioscrobbler.com/2.0/?method=artist.getimages&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression noclean="1" /> - </RegExp> - </GetLastFMArtistThumbsByMBID> - <GetLastFMArtistThumbsByName dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseLastFMArtistThumbs">http://ws.audioscrobbler.com/2.0/?method=artist.getimages&amp;artist=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression noclean="1" /> - </RegExp> - </GetLastFMArtistThumbsByName> - <ParseLastFMArtistThumbs dest="5" clearbuffers="no"> - <RegExp input="$$6" output="<details>\1</details>" dest="5"> - <RegExp input="" output="" dest="6"> - <expression /> - </RegExp> - <RegExp input="$$1" output="<thumb preview="\2">\1</thumb>" dest="6"> - <expression repeat="yes" noclean="1"><size name="original"[^>]*>([^<]*)<[^<]*<size name="large"[^>]*>([^<]*)<</expression> - </RegExp> - <expression noclean="1" /> - </RegExp> - </ParseLastFMArtistThumbs> - - - <GetLastFMAlbumTitleByMBID dest="5"> - <RegExp input="$$1" output="<details><url function="ParseLastFMAlbumTitle" cache="lastfmalbum-\1.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression noclean="1"/> - </RegExp> - </GetLastFMAlbumTitleByMBID> - <GetLastFMAlbumTitleByAlbumAndArtist dest="5"> - <RegExp input="$$1" output="<details><url function="ParseLastFMAlbumTitle" cache="lastfmalbum-\4-\3.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&artist=\2&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression encode="1,2">(.+)::(.+)::(.+)::(.+)</expression> - </RegExp> - </GetLastFMAlbumTitleByAlbumAndArtist> - <ParseLastFMAlbumTitle dest="5"> - <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<title>\1</title>" dest="2"> - <expression noclean="1"><name>(.*?)</name></expression> - </RegExp> - <expression noclean="1">(.+)</expression> - </RegExp> - </ParseLastFMAlbumTitle> - - <GetLastFMAlbumArtistByMBID dest="5"> - <RegExp input="$$1" output="<details><url function="ParseLastFMAlbumArtist" cache="lastfmalbum-\1.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression noclean="1"/> - </RegExp> - </GetLastFMAlbumArtistByMBID> - <GetLastFMAlbumArtistByAlbumAndArtist dest="5"> - <RegExp input="$$1" output="<details><url function="ParseLastFMAlbumArtist" cache="lastfmalbum-\4-\3.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&artist=\2&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression encode="1,2">(.+)::(.+)::(.+)::(.+)</expression> - </RegExp> - </GetLastFMAlbumArtistByAlbumAndArtist> - <ParseLastFMAlbumArtist dest="5"> - <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<artist>\1</artist>" dest="2"> - <expression noclean="1"><artist>(.*?)</artist></expression> - </RegExp> - <expression noclean="1">(.+)</expression> - </RegExp> - </ParseLastFMAlbumArtist> - - <GetLastFMAlbumDateByMBID dest="5"> - <RegExp input="$$1" output="<details><url function="ParseLastFMAlbumDate" cache="lastfmalbum-\1.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression noclean="1"/> - </RegExp> - </GetLastFMAlbumDateByMBID> - <GetLastFMAlbumDateByAlbumAndArtist dest="5"> - <RegExp input="$$1" output="<details><url function="ParseLastFMAlbumDate" cache="lastfmalbum-\4-\3.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&artist=\2&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression encode="1,2">(.+)::(.+)::(.+)::(.+)</expression> - </RegExp> - </GetLastFMAlbumDateByAlbumAndArtist> - <ParseLastFMAlbumDate dest="5"> - <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<releasedate>\1</releasedate>" dest="2"> - <expression trim="1"><releasedate>([^,]*)?([^<]*)?</releasedate></expression> - </RegExp> - <RegExp input="$$1" output="<year>\1</year>" dest="2+"> - <expression trim="1"><releasedate>.*?([0-9]{4})[^<]*</releasedate></expression> - </RegExp> - <expression noclean="1">(.+)</expression> - </RegExp> - </ParseLastFMAlbumDate> - - <GetLastFMAlbumTracksByMBID dest="5"> - <RegExp input="$$1" output="<details><url function="ParseLastFMAlbumTracks" cache="lastfmalbum-\1.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression noclean="1"/> - </RegExp> - </GetLastFMAlbumTracksByMBID> - <GetLastFMAlbumTracksByAlbumAndArtist dest="5"> - <RegExp input="$$1" output="<details><url function="ParseLastFMAlbumTracks" cache="lastfmalbum-\4-\3.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&artist=\2&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression encode="1,2">(.+)::(.+)::(.+)::(.+)</expression> - </RegExp> - </GetLastFMAlbumTracksByAlbumAndArtist> - <ParseLastFMAlbumTracks dest="5"> - <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<track><position>\1</position><title>\2</title></track>" dest="2"> - <expression repeat="yes" noclean="1"><track rank="(.*?)".*?<name>(.*?)</name></expression> - </RegExp> - <expression noclean="1">(.+)</expression> - </RegExp> - </ParseLastFMAlbumTracks> - - <GetLastFMAlbumReviewByMBID dest="5"> - <RegExp input="$$1" output="<details><url function="ParseLastFMAlbumReview" cache="lastfmalbum-\1.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression noclean="1"/> - </RegExp> - </GetLastFMAlbumReviewByMBID> - <GetLastFMAlbumReviewByAlbumAndArtist dest="5"> - <RegExp input="$$1" output="<details><url function="ParseLastFMAlbumReview" cache="lastfmalbum-\4-\3.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&artist=\2&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression encode="1,2">(.+)::(.+)::(.+)::(.+)</expression> - </RegExp> - </GetLastFMAlbumReviewByAlbumAndArtist> - <ParseLastFMAlbumReview dest="5"> - <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<review>\1</review>" dest="2"> - <expression fixchars="1"><content><!\[CDATA\[(.*?)(User-|\]\])</expression> - </RegExp> - <expression noclean="1">(.+)</expression> - </RegExp> - </ParseLastFMAlbumReview> - - <GetLastFMAlbumThumbsByMBID dest="5"> - <RegExp input="$$1" output="<details><url function="ParseLastFMAlbumThumbs" cache="lastfmalbum-\1.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&amp;mbid=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression noclean="1"/> - </RegExp> - </GetLastFMAlbumThumbsByMBID> - <GetLastFMAlbumThumbs dest="5"> - <RegExp input="$$1" output="<details><url function="ParseLastFMAlbumThumbs" cache="lastfmalbum-\4-\3.xml">http://ws.audioscrobbler.com/2.0/?method=album.getinfo&artist=\2&amp;album=\1&amp;api_key=71e468a84c1f40d4991ddccc46e40f1b&lang=$INFO[lastfmlanguage]</url></details>" dest="5"> - <expression encode="1,2">(.+)::(.+)::(.+)::(.+)</expression> - </RegExp> - </GetLastFMAlbumThumbs> - <ParseLastFMAlbumThumbs dest="5"> - <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<thumb>\1</thumb>" dest="2"> - <expression noclean="1"><image size="extralarge">([^<]*)</image></expression> - </RegExp> - <RegExp input="$$1" output="<thumb>\1</thumb>" dest="2+"> - <expression noclean="1"><image size="large">([^<]*)</image></expression> - </RegExp> - <expression noclean="1">(.+)</expression> - </RegExp> - </ParseLastFMAlbumThumbs> - -</scraperfunctions> diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index 0ba464c889..2dd60e933c 100644 --- a/addons/metadata.themoviedb.org/addon.xml +++ b/addons/metadata.themoviedb.org/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.themoviedb.org" name="The Movie Database" - version="3.8.4" + version="3.8.7" provider-name="XBMC Foundation"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index 5eeae098f0..33e98e7baf 100644 --- a/addons/metadata.themoviedb.org/changelog.txt +++ b/addons/metadata.themoviedb.org/changelog.txt @@ -1,3 +1,9 @@ +[B]3.8.7[/B] +- fixed: caching + +[B]3.8.6[/B] +- fixed: broken search results due to API changes + [B]3.8.4[/B] - removed: option to scrape trailers from hd-trailers.net (it was broken) diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml index e256edcc10..8a9222d44a 100644 --- a/addons/metadata.themoviedb.org/tmdb.xml +++ b/addons/metadata.themoviedb.org/tmdb.xml @@ -21,14 +21,14 @@ </NfoUrl> <GetSearchResults dest="8"> <RegExp input="$$3" output="<results>\1</results>" dest="8"> - <RegExp input="$$1" output="<entity><title>\4</title><id>\1</id><year>\3</year><url cache="tmdb-$INFO[language]-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url></entity>" dest="3"> - <expression repeat="yes">"id":([0-9]*),"original_language":"[^"]*","original_title":"([^"]*)","overview":.*?,"release_date":"([0-9]+)-.*?"title":"([^"]*)</expression> + <RegExp input="$$1" output="<entity><title>\3</title><id>\2</id><year>\1</year><url cache="tmdb-$INFO[language]-\2.json">http://api.tmdb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&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> - <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><year>\3</year><url cache="tmdb-$INFO[language]-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url></entity>" dest="3+"> - <expression repeat="yes">"id":([0-9]*),"original_language":"[^"]*","original_title":"([^"]*)","overview":.*?,"release_date":"([0-9]+)-</expression> + <RegExp input="$$1" output="<entity><title>\3</title><id>\2</id><year>\1</year><url cache="tmdb-$INFO[language]-\2.json">http://api.tmdb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url></entity>" dest="3+"> + <expression repeat="yes">"release_date":"([0-9]+)-.*?"id":([0-9]*),"original_title":"([^"]*)","original_language":"[^"]*"</expression> </RegExp> <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><url cache="tmdb-$INFO[language]-\1.json">http://api.tmdb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url></entity>" dest="3+"> - <expression repeat="yes">"id":([0-9]*),"original_language":"[^"]*","original_title":"([^"]*)","overview":.*?,"release_date":null</expression> + <expression repeat="yes">"release_date":null.*?"id":([0-9]*),"original_title":"([^"]*)","original_language":"[^"]*"</expression> </RegExp> <expression noclean="1" /> </RegExp> |
