diff options
Diffstat (limited to 'addons')
41 files changed, 665 insertions, 123 deletions
diff --git a/addons/metadata.album.universal/addon.xml b/addons/metadata.album.universal/addon.xml index e25ee4a547..fc63660fc8 100644 --- a/addons/metadata.album.universal/addon.xml +++ b/addons/metadata.album.universal/addon.xml @@ -1,24 +1,29 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.album.universal" name="Universal Album Scraper" - version="1.2.2" + version="1.4.0" provider-name="Olympia, Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> <import addon="metadata.common.last.fm" version="1.3.2"/> <import addon="metadata.common.allmusic.com" version="2.3.1"/> <import addon="metadata.common.musicbrainz.org" version="1.2.3"/> - <import addon="metadata.common.fanart.tv" version="1.0.1"/> + <import addon="metadata.common.fanart.tv" version="2.0.0"/> <import addon="metadata.common.amazon.de" version="1.0.0"/> + <import addon="metadata.common.theaudiodb.com" version="1.1.0"/> </requires> <extension point="xbmc.metadata.scraper.albums" language="en" library="albumuniversal.xml"/> <extension point="xbmc.addon.metadata"> <summary lang="en">Universal Scraper for Albums</summary> + <summary lang="zh">通用音乐专辑信息刮削器</summary> <description lang="en">This scraper collects information from the following supported sites: MusicBrainz, last.fm, allmusic.com and amazon.de, while grabs artwork from: fanart.tv, last.fm and allmusic.com. It can be set field by field that from which site you want that specific information. The initial search is always done on MusicBrainz. In case allmusic and/or amazon.de links are not added on the MusicBrainz site, fields from allmusic.com and/or amazon.de cannot be fetched (very easy to add those missing links though).</description> + <description lang="zh">本刮削器支持从以下网站获取信息：MusicBrainz、last.fm、allmusic.com和amazon.de，并从以下网站获取艺术图片：fanart.tv、last.fm和allmusic.com。你可以指定每一项内容的来源网站。 + +初始结果总是先从MusicBrainz获取。如果MusicBrainz网站没有到allmusic和/或amazon.de的外部链接，则无法获取allmusic.com的/或amazon.de的信息（当然你能很容易地加入缺失的链接）。</description> <platform>all</platform> </extension> </addon> diff --git a/addons/metadata.album.universal/albumuniversal.xml b/addons/metadata.album.universal/albumuniversal.xml index 9a90ff04c5..fadd4bdcfc 100644 --- a/addons/metadata.album.universal/albumuniversal.xml +++ b/addons/metadata.album.universal/albumuniversal.xml @@ -6,12 +6,12 @@ </RegExp> </NfoUrl> <CreateAlbumSearchUrl dest="3"> - <RegExp input="$$1" output="<url>http://search.musicbrainz.org/ws/2/release/?fmt=xml&query=release:"\1"%20AND%20artist:"$$2"</url>" dest="3"> + <RegExp input="$$1" output="<url>http://search.musicbrainz.org/ws/2/release/?fmt=xml&query=release:\1%20AND%20artist:$$4</url>" dest="3"> <RegExp input="$$2" output="\1" dest="4"> <expression noclean="1">(.+)</expression> </RegExp> <RegExp input="$$2" output="\1" dest="6"> - <expression noclean="1">(.+)(?:Ft%2e|Feat%2e|Ft.|Feat.|%20and%20)</expression> + <expression noclean="1">(.+)(?:Ft%2e|Feat%2e|%20Ft\.|%20Feat\.|%20and%20)</expression> </RegExp> <RegExp input="$$6" output="\1" dest="4"> <expression>(.+)</expression> @@ -27,6 +27,12 @@ <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> <expression repeat="yes">id="([^"]*)"><title>([^<]*)</title><status>Official</status><text-representation><language>[^<]*</language><script>[^<]*</script></text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>)*</artist-credit><release-group(?:\stype="[^"]*")*\sid="[^"]*">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list><secondary-type>[^<]*</secondary-type></secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> </RegExp> + <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5"> + <expression repeat="yes">id="([^"]*)" ext:score="[^"]*"><title>([^<]*)</title><status>Official</status><text-representation><language>[^<]*</language><script>[^<]*</script></text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"\stype="Album">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list><secondary-type>[^<]*</secondary-type></secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> + </RegExp> + <RegExp input="$$1" output="<entity><year>\5-\4-T#\6</year><artist>\3</artist><title>\2</title><url cache="mb-\1-album.xml">http://musicbrainz.org/ws/2/release/\1?inc=recordings+release-groups+artists+labels+ratings</url></entity>" dest="5+"> + <expression repeat="yes">id="([^"]*)" ext:score="[^"]*"><title>([^<]*)</title><status>Official</status><text-representation><language>[^<]*</language><script>[^<]*</script></text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>.*?</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"(?:\stype="[^"]*")*>(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list><secondary-type>[^<]*</secondary-type></secondary-type-list>)*</release-group><date>(\d{4})[^<]*</date>(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+)</expression> + </RegExp> <expression noclean="1" /> </RegExp> </GetAlbumSearchResults> @@ -69,6 +75,9 @@ <RegExp input="$INFO[albumreviewsource]" output="<chain function="GetLastFMAlbumReviewByAlbumAndArtist">$$7::$$8::$$7::$$8</chain>" dest="5+"> <expression>last.fm</expression> </RegExp> + <RegExp input="$INFO[albumreviewsource]" output="<chain function="GetTADBAlbumReviewByMBID">$$4</chain>" dest="5+"> + <expression>TheAudioDb.com</expression> + </RegExp> <RegExp input="$INFO[albumreviewsource]" output="<url function="GetAmazonDEAlbumReview">http://musicbrainz.org/ws/2/release-group/$$4?inc=url-rels</url>" dest="5+"> <expression>amazon.de</expression> </RegExp> diff --git a/addons/metadata.album.universal/changelog.txt b/addons/metadata.album.universal/changelog.txt index 10cbfbfe72..e4c8f55ef0 100644 --- a/addons/metadata.album.universal/changelog.txt +++ b/addons/metadata.album.universal/changelog.txt @@ -1,3 +1,31 @@ +[B]1.4.0[/B] +Added back fanart.tv scraping via JSON API. Still off by default. + +[B]1.3.7[/B] +Temporarily disable fanarttv.com scraping due to site load issues + +[B]1.3.6[/B] +Fixed: Scraper now works with both API layout + +[B]1.3.5[/B] +Added: Chinese translation + +[B]1.3.4[/B] +Fixed: MusicBrainz reverted back previous API layout changes so scraper needs to be reverted too + +[B]1.3.3[/B] +Fixed: Broken search after API result layout changes + +[B]1.3.2[/B] +Changed: Loosen up search results + +[B]1.3.1[/B] +Tuned: Artist Splitter + +[B]1.3.0[/B] +Added: scraping album review from TheAudioDb.com +Fixed: Artist Splitter + [B]1.2.2[/B] Fixed: accommodate new Frodo style URL encoding diff --git a/addons/metadata.album.universal/resources/language/Chinese (Simple)/strings.xml b/addons/metadata.album.universal/resources/language/Chinese (Simple)/strings.xml new file mode 100644 index 0000000000..adb7534d38 --- /dev/null +++ b/addons/metadata.album.universal/resources/language/Chinese (Simple)/strings.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<strings> + <string id="30000">启用fanart.tv专辑图片</string> + <string id="30001">启用Last.fm专辑图片</string> + <string id="30002">专辑评论获取于</string> + <string id="30003"> 首选语言</string> + <string id="30004">专辑评分获取于</string> + <string id="30005">专辑风格获取于</string> + <string id="30006">专辑心情获取于</string> + <string id="30007">专辑主题获取于</string> + <string id="30008">启用allmusic.com专辑图片</string> + <string id="30009">艺术图片</string> +</strings> diff --git a/addons/metadata.album.universal/resources/settings.xml b/addons/metadata.album.universal/resources/settings.xml index 8b2a8a9905..bc64d0e50c 100644 --- a/addons/metadata.album.universal/resources/settings.xml +++ b/addons/metadata.album.universal/resources/settings.xml @@ -2,7 +2,7 @@ <settings> <category label="128"> <setting type="lsep" label="General Settings"/> - <setting label="30002" type="labelenum" values="last.fm|amazon.de|None" id="albumreviewsource" default="last.fm"/> + <setting label="30002" type="labelenum" values="last.fm|TheAudioDb.com|amazon.de|None" id="albumreviewsource" default="last.fm"/> <setting label="30003" type="labelenum" values="en|de|es|fr|it|jp|pl|pt|ru|sv|tr|zh" id="lastfmlanguage" default="en" visible="eq(-1,0)"/> <setting type="sep"/> <setting label="30004" type="labelenum" values="MusicBrainz|allmusic.com|None" id="albumratingsource" default="MusicBrainz"/> @@ -13,7 +13,7 @@ <category label="30009"> <setting type="lsep" label="Artwork Settings"/> - <setting label="30000" type="bool" id="fanarttvalbumthumbs" default="true"/> + <setting label="30000" type="bool" id="fanarttvalbumthumbs" default="false"/> <setting label="30001" type="bool" id="lastfmalbumthumbs" default="true"/> <setting label="30008" type="bool" id="allmusicalbumthumbs" default="true"/> </category> diff --git a/addons/metadata.artists.universal/addon.xml b/addons/metadata.artists.universal/addon.xml index 2d94544ae6..b141a4ea43 100644 --- a/addons/metadata.artists.universal/addon.xml +++ b/addons/metadata.artists.universal/addon.xml @@ -1,24 +1,29 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.artists.universal" name="Universal Artist Scraper" - version="2.0.6" + version="2.2.0" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> - <import addon="metadata.common.last.fm" version="1.4.1"/> - <import addon="metadata.common.allmusic.com" version="2.4.1"/> + <import addon="metadata.common.last.fm" version="1.5.1"/> + <import addon="metadata.common.allmusic.com" version="2.5.2"/> <import addon="metadata.common.musicbrainz.org" version="1.2.1"/> <import addon="metadata.common.htbackdrops.com" version="1.2.0"/> - <import addon="metadata.common.fanart.tv" version="1.1.0"/> + <import addon="metadata.common.fanart.tv" version="2.0.0"/> + <import addon="metadata.common.theaudiodb.com" version="1.2.0"/> </requires> <extension point="xbmc.metadata.scraper.artists" language="en" library="artistuniversal.xml"/> <extension point="xbmc.addon.metadata"> <summary lang="en">Universal Scraper for Artists</summary> - <description lang="en">This scraper collects information from the following supported sites: MusicBrainz, last.fm, and allmusic.com, while grabs artwork from: fanart.tv, htbackdrops.com, last.fm and allmusic.com. It can be set field by field that from which site you want that specific information. + <summary lang="zh">通用艺术家信息刮削器</summary> + <description lang="en">This scraper collects information from the following supported sites: TheAudioDb.com, MusicBrainz, last.fm, and allmusic.com, while grabs artwork from: fanart.tv, htbackdrops.com, last.fm and allmusic.com. It can be set field by field that from which site you want that specific information. The initial search is always done on MusicBrainz. In case allmusic link is not added on the MusicBrainz site fields from allmusic.com cannot be fetched (very easy to add those missing links though).</description> + <description lang="zh">本刮削器支持从以下网站获取信息：TheAudioDb.com、MusicBrainz、last.fm和allmusic.com，并从以下网站获取艺术图片：fanart.tv、htbackdrops.com、last.fm和allmusic.com。你可以指定每一项内容的来源网站。 + +初始结果总是先从MusicBrainz获取，如果MusicBrainz网站未加入到allmusic的外部链接，则无法获取allmusic.com的信息（当然你能很容易地加入缺失的链接）。</description> <platform>all</platform> </extension> </addon> diff --git a/addons/metadata.artists.universal/artistuniversal.xml b/addons/metadata.artists.universal/artistuniversal.xml index ec474e1e70..2f8e84f1c3 100644 --- a/addons/metadata.artists.universal/artistuniversal.xml +++ b/addons/metadata.artists.universal/artistuniversal.xml @@ -6,12 +6,12 @@ </RegExp> </NfoUrl> <CreateArtistSearchUrl dest="3"> - <RegExp input="$$1" output="<url>http://search.musicbrainz.org/ws/2/artist/?fmt=xml&query=artist:"$$4"&limit=100</url>" dest="3"> + <RegExp input="$$1" output="<url>http://search.musicbrainz.org/ws/2/artist/?fmt=xml&query=artist:$$4&limit=100</url>" dest="3"> <RegExp input="$$1" output="\1" dest="4"> <expression noclean="1">(.+)</expression> </RegExp> <RegExp input="$$1" output="\1" dest="6"> - <expression noclean="1">(.+)(?:Ft%2e|Feat%2e|Ft.|Feat.|%20and%20)</expression> + <expression noclean="1">(.+)(?:Ft%2e|Feat%2e|%20Ft\.|%20Feat\.|%20and%20)</expression> </RegExp> <RegExp input="$$6" output="\1" dest="4"> <expression>(.+)</expression> @@ -22,6 +22,9 @@ <GetArtistSearchResults dest="8"> <RegExp input="$$5" output="<results>\1</results>" dest="8"> <RegExp input="$$1" output="<entity><title>\2</title><genre>\7</genre><url cache="mb-\1-artist.xml">http://www.musicbrainz.org/ws/2/artist/\1?inc=url-rels</url></entity>" dest="9"> + <expression repeat="yes" noclean="1">artist id="([^"]*)"(?:\stype="[^"]*")* ext:score="[^"]*"><name>([^<]*)</name>(<sort-name>[^<]*</sort-name>)?(<gender>[^<]*</gender>)?(<country>[^<]*</country>)?(<disambiguation>([^<]*))?</expression> + </RegExp> + <RegExp input="$$1" output="<entity><title>\2</title><genre>\7</genre><url cache="mb-\1-artist.xml">http://www.musicbrainz.org/ws/2/artist/\1?inc=url-rels</url></entity>" dest="9"> <expression repeat="yes" noclean="1">artist ext:score="[^"]*"(?:\stype="[^"]*")* id="([^"]*)"><name>([^<]*)</name>(<sort-name>[^<]*</sort-name>)?(<gender>[^<]*</gender>)?(<country>[^<]*</country>)?(<disambiguation>([^<]*))?</expression> </RegExp> <RegExp input="$$9" output="\1" dest="5"> @@ -40,6 +43,9 @@ <RegExp input="$$1" output="\2" dest="9"> <expression noclean="1">><relation type="allmusic"><target>http://(www.)?allmusic.com/artist/([^<]*)</expression> </RegExp> + <RegExp input="$$1" output="<name>\1</name>" dest="5"> + <expression noclean="1"><artist(?:\stype="[^"]*")* id="[^"]*"><name>([^<]*)</expression> + </RegExp> <RegExp input="$$8" conditional="fanarttvthumbs" output="<chain function="GetFanartTvArtistThumbsByMBID">\1</chain>" dest="5+"> <expression/> </RegExp> @@ -79,6 +85,9 @@ <RegExp input="$INFO[stylessource]" output="<chain function="GetLastFMArtistStylesByMBID">$$8</chain>" dest="5+"> <expression>last.fm</expression> </RegExp> + <RegExp input="$INFO[biogsource]" output="<chain function="GetTADBBiographyByMBID">$$8</chain>" dest="5+"> + <expression>TheAudioDb.com</expression> + </RegExp> <expression noclean="1"/> </RegExp> </GetArtistDetails> diff --git a/addons/metadata.artists.universal/changelog.txt b/addons/metadata.artists.universal/changelog.txt index 961ee0b989..c3d169712c 100644 --- a/addons/metadata.artists.universal/changelog.txt +++ b/addons/metadata.artists.universal/changelog.txt @@ -1,3 +1,36 @@ +[B]2.2.0[/B] +Added back fanart.tv scraping via JSON API. Still off by default. + +[B]2.1.9[/B] +Temporarily disable fanarttv.com scraping due to site load issues + +[B]2.1.8[/B] +Fixed: Scraper now works with both API layouts + +[B]2.1.7[/B] +Added: Chinese translation + +[B]2.1.6[/B] +Fixed: MusicBrainz reverted back previous API layout changes so scraper needs to be reverted too + +[B]2.1.5[/B] +Fixed: Broken search after API result layout changes + +[B]2.1.4[/B] +Added: correctly populate the artist name into MusicInfoArtist + +[B]2.1.3[/B] +Fixed: fallback from last.fm + +[B]2.1.2[/B] +Changed: Loosen up search results + +[B]2.1.1[/B] +Tuned: Artist Splitter + +[B]2.1.0[/B] +Added: scraping Biography from TheAudioDb.com + [B]2.0.6[/B] Fixed: accommodate new Frodo style URL encoding diff --git a/addons/metadata.artists.universal/resources/language/Chinese (Simple)/strings.xml b/addons/metadata.artists.universal/resources/language/Chinese (Simple)/strings.xml new file mode 100644 index 0000000000..13ec67ab6e --- /dev/null +++ b/addons/metadata.artists.universal/resources/language/Chinese (Simple)/strings.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<strings> + <string id="30000">启用HTBackdrops.com艺人同人画</string> + <string id="30001">启用allmusic.com艺人图片</string> + <string id="30002">启用last.fm艺人图片</string> + <string id="30003">启用HTBackdrops.com艺人图片</string> + <string id="30004">启用fanart.tv艺人同人画</string> + <string id="30005">启用fanart.tv艺人图片</string> + <string id="30006">艺人传记获取于</string> + <string id="30007">艺术图片</string> + <string id="30008">艺人唱片目录获取于</string> + <string id="30009">艺人类型获取于</string> + <string id="30010">艺人风格获取于</string> + <string id="30011">艺人生卒年月获取于</string> + <string id="30012">艺人心情获取于</string> + <string id="30014">艺人活跃期获取于</string> + <string id="30015"> 首选语言</string> + <string id="30016">备选艺人传记获取于</string> + <string id="30017">备选艺人唱片目录获取于</string> + <string id="30018">备选艺人类型获取于</string> + <string id="30019">备选艺人风格获取于</string> + <string id="30020">备选艺人生卒年月获取于</string> + <string id="30021">备选</string> +</strings> diff --git a/addons/metadata.artists.universal/resources/settings.xml b/addons/metadata.artists.universal/resources/settings.xml index c91d6c548a..bd78dd204b 100644 --- a/addons/metadata.artists.universal/resources/settings.xml +++ b/addons/metadata.artists.universal/resources/settings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <settings> <category label="128"> - <setting label="30006" type="labelenum" values="last.fm|None" id="biogsource" default="last.fm"/> + <setting label="30006" type="labelenum" values="last.fm|TheAudioDb.com|None" id="biogsource" default="last.fm"/> <setting label="30015" type="labelenum" values="en|de|es|fr|it|jp|pl|pt|ru|sv|tr|zh" id="lastfmlanguage" default="en" visible="eq(-1,0)"/> <setting type="sep"/> <setting label="30008" type="labelenum" values="last.fm|MusicBrainz|allmusic.com|None" id="discogsource" default="MusicBrainz"/> @@ -14,7 +14,7 @@ </category> <category label="30021"> - <setting label="30016" type="labelenum" values="last.fm|None" id="biogfbsource" default="None"/> + <setting label="30016" type="labelenum" values="last.fm|TheAudioDb.com|None" id="biogfbsource" default="None"/> <setting label="30015" type="labelenum" values="en|de|es|fr|it|jp|pl|pt|ru|sv|tr|zh" id="lastfmlanguage" default="en" visible="eq(-1,0)"/> <setting type="sep"/> <setting label="30017" type="labelenum" values="last.fm|MusicBrainz|None" id="discogfbsource" default="None" visible="false"/> @@ -25,12 +25,12 @@ <category label="30007"> <setting type="lsep" label="Thumb Sources"/> - <setting label="30005" type="bool" id="fanarttvthumbs" default="true"/> + <setting label="30005" type="bool" id="fanarttvthumbs" default="false"/> <setting label="30003" type="bool" id="htbthumbs" default="true"/> <setting label="30002" type="bool" id="lastfmartistthumbs" default="true"/> <setting label="30001" type="bool" id="allmusicartistthumbs" default="true"/> <setting type="lsep" label="Fanart Sources"/> - <setting label="30004" type="bool" id="fanarttvfanart" default="true"/> + <setting label="30004" type="bool" id="fanarttvfanart" default="false"/> <setting label="30000" type="bool" id="htbfanart" default="true"/> </category> diff --git a/addons/metadata.common.allmusic.com/addon.xml b/addons/metadata.common.allmusic.com/addon.xml index 8a990a9a1e..68f2b21da7 100644 --- a/addons/metadata.common.allmusic.com/addon.xml +++ b/addons/metadata.common.allmusic.com/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.allmusic.com" name="AllMusic" - version="2.4.3" + version="2.5.2" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> diff --git a/addons/metadata.common.allmusic.com/allmusic.xml b/addons/metadata.common.allmusic.com/allmusic.xml index fa593d6167..edcd5081a9 100644 --- a/addons/metadata.common.allmusic.com/allmusic.xml +++ b/addons/metadata.common.allmusic.com/allmusic.xml @@ -33,6 +33,9 @@ <RegExp input="$INFO[biogfbsource]" output="<chain function="GetLastFMFallbackBiographyByMBID">$$8</chain>" dest="12"> <expression>last.fm</expression> </RegExp> + <RegExp input="$INFO[biogfbsource]" output="<chain function="GetTADBFMFallbackBiographyByMBID">$$8</chain>" dest="12"> + <expression>TheAudioDb.com</expression> + </RegExp> <expression>^$</expression> </RegExp> <RegExp input="$$11" output="<biography>\1</biography>" dest="2"> @@ -52,7 +55,7 @@ <RegExp input="" output="" dest="2"> <expression /> </RegExp> - <RegExp input="$$1" output="\1" dest="2"> + <RegExp input="$$1" output="<biography>\1</biography>" dest="2"> <expression clear="yes">" itemprop="description">(.*?)div class="advertisement leaderboard"></expression> </RegExp> <expression noclean="1"/> @@ -294,10 +297,13 @@ <RegExp input="" output="" dest="2"> <expression /> </RegExp> - <RegExp input="$$1" output="\1" dest="9"> + <RegExp input="" output="" dest="4"> + <expression /> + </RegExp> + <RegExp input="$$1" output="\1" dest="4"> <expression noclean="1"><h4>photo gallery</h4>(.*?)<h4></expression> </RegExp> - <RegExp input="$$9" output="<thumb>http://cps-static.rovicorp.com/3/JPG_1080/\1</thumb>" dest="2"> + <RegExp input="$$4" output="<thumb>http://cps-static.rovicorp.com/3/JPG_1080/\1</thumb>" dest="2"> <expression repeat="yes" noclean="1"><img src="http://cps-static.rovicorp.com/3/JPG_[^/]*/([^"]*)</expression> </RegExp> <expression noclean="1"/> @@ -436,10 +442,10 @@ </GetAMGAlbumThemesByAMGID> <ParseAMGAlbumThemes dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="\1" dest="9"> + <RegExp input="$$1" output="\1" dest="4"> <expression noclean="1"><h4>album themes</h4>(.*?)</ul></expression> </RegExp> - <RegExp input="$$9" output="<theme>\1</theme>" dest="2"> + <RegExp input="$$4" output="<theme>\1</theme>" dest="2"> <expression repeat="yes" noclean="1"><li>[^>]*>([^<]*)</a></li></expression> </RegExp> <expression noclean="1" /> diff --git a/addons/metadata.common.fanart.tv/addon.xml b/addons/metadata.common.fanart.tv/addon.xml index 0d605468e9..aef91fcc3e 100644 --- a/addons/metadata.common.fanart.tv/addon.xml +++ b/addons/metadata.common.fanart.tv/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.fanart.tv" name="fanart.tv" - version="1.1.0" + version="2.0.0" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> diff --git a/addons/metadata.common.fanart.tv/fanarttv.xml b/addons/metadata.common.fanart.tv/fanarttv.xml index f5b6faf364..d837a1bf80 100644 --- a/addons/metadata.common.fanart.tv/fanarttv.xml +++ b/addons/metadata.common.fanart.tv/fanarttv.xml @@ -1,6 +1,6 @@ <scraperfunctions> <GetFanartTvArtistThumbsByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseFanartTvArtistThumbs" cache="fanarttv-artistimages-\1.xml">http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/xml/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseFanartTvArtistThumbs" cache="fanarttv-artistimages-\1.json">http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/json/</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetFanartTvArtistThumbsByMBID> @@ -9,15 +9,21 @@ <RegExp input="" output="" dest="13"> <expression /> </RegExp> - <RegExp input="$$1" output="<thumb preview="\1/preview">\1</thumb>" dest="13"> - <expression repeat="yes" noclean="1"><artistthumb id="[^"]*" url="([^"]*)</expression> + <RegExp input="" output="" dest="16"> + <expression /> + </RegExp> + <RegExp input="$$1" output="\1" dest="16"> + <expression noclean="1">"artistthumb":\[(.*?)\],"</expression> + </RegExp> + <RegExp input="$$16" output="<thumb preview="\1/preview">\1</thumb>" dest="13"> + <expression repeat="yes" noclean="1">"id":"\d*","url":"([^"]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseFanartTvArtistThumbs> <GetFanartTvArtistFanartsByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseFanartTvArtistFanarts" cache="fanarttv-artistimages-\1.xml">http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/xml/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseFanartTvArtistFanarts" cache="fanarttv-artistimages-\1.json">http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/json/</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetFanartTvArtistFanartsByMBID> @@ -29,8 +35,14 @@ <RegExp input="" output="" dest="14"> <expression /> </RegExp> - <RegExp input="$$1" output="<thumb preview="\1/preview">\1</thumb>" dest="14"> - <expression repeat="yes" noclean="1"><artistbackground id="[^"]*" url="([^"]*)</expression> + <RegExp input="" output="" dest="16"> + <expression /> + </RegExp> + <RegExp input="$$1" output="\1" dest="16"> + <expression noclean="1">"artistbackground":\[(.*?)\],"</expression> + </RegExp> + <RegExp input="$$16" output="<thumb preview="\1/preview">\1</thumb>" dest="14"> + <expression repeat="yes" noclean="1">"id":"\d*","url":"([^"]*)</expression> </RegExp> <RegExp input="$$14" output="\1" dest="13"> <expression noclean="1">(.+)</expression> @@ -40,7 +52,7 @@ </ParseFanartTvArtistFanarts> <GetFanartTvAlbumThumbsByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseFanartTvAlbumThumbs" cache="fanarttv-albumimages-\1.xml">http://fanart.tv/webservice/album/ed4b784f97227358b31ca4dd966a04f1/\1/xml/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseFanartTvAlbumThumbs" cache="fanarttv-albumimages-\1.json">http://fanart.tv/webservice/album/ed4b784f97227358b31ca4dd966a04f1/\1/json/</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetFanartTvAlbumThumbsByMBID> @@ -49,8 +61,14 @@ <RegExp input="" output="" dest="13"> <expression /> </RegExp> - <RegExp input="$$1" output="<thumb preview="\1/preview">\1</thumb>" dest="13"> - <expression repeat="yes" noclean="1"><albumcover id="[^"]*" url="([^"]*)</expression> + <RegExp input="" output="" dest="16"> + <expression /> + </RegExp> + <RegExp input="$$1" output="\1" dest="16"> + <expression noclean="1">"albumcover":\[(.*?)\]\}</expression> + </RegExp> + <RegExp input="$$16" output="<thumb preview="\1/preview">\1</thumb>" dest="13"> + <expression repeat="yes" noclean="1">"id":"\d*","url":"([^"]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> diff --git a/addons/metadata.common.hdtrailers.net/addon.xml b/addons/metadata.common.hdtrailers.net/addon.xml index b2f13a272e..199d3a6da1 100644 --- a/addons/metadata.common.hdtrailers.net/addon.xml +++ b/addons/metadata.common.hdtrailers.net/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.hdtrailers.net" name="HD-Trailers common scraper functions" - version="1.0.7" + version="1.0.8" provider-name="Bence Nádas (olympia)"> <requires> <import addon="xbmc.metadata" version="1.0"/> @@ -9,31 +9,25 @@ <extension point="xbmc.metadata.scraper.library" library="hdtrailers.xml"/> <extension point="xbmc.addon.metadata"> - <summary lang="bg">Библиотека за сваляне на инф. от HD-Trailers.net</summary> <summary lang="en">HD-Trailers.net Scraper Library</summary> <summary lang="de">Scraper für Trailer von HD-Trailers.net</summary> <summary lang="es">Scraper de Trailers de HD-Trailers.net</summary> - <summary lang="fi">HD-Trailers.net trailerilataajan kirjasto</summary> <summary lang="fr">Scraper HD-Trailers.net pour les bande-annonces</summary> <summary lang="hu">HD-Trailers.net leolvasó-könyvtár</summary> <summary lang="nl">HD-Trailers.net Scraper Collectie</summary> <summary lang="pl">Scraper zwiastunów HD-Trailers.net</summary> <summary lang="pt">Scraper de trailers de HD-Trailers.net</summary> <summary lang="ru">Обработчик для трейлеров с HD-Trailers.net</summary> - <summary lang="se">Skrapa för HD-Trailers.net</summary> <summary lang="zh">HD-Trailers.net刮削器代码库</summary> - <description lang="bg">Сваля трейлъри на филми от www.hd-trailers.net</description> <description lang="en">Download Movie Trailers from www.hd-trailers.net</description> <description lang="de">Downloade Trailer von www.hd-trailers.net</description> <description lang="es">Descarga trailers de www.hd-trailers.net</description> - <description lang="fi">Lataa elokuvien trailereita osoitteesta www.hd-trailers.net</description> <description lang="fr">Télécharge les bande-annonces de films depuis www.hd-trailers.net</description> <description lang="hu">Filmelőzetesek letöltése a www.hd-trailers.net-ről</description> <description lang="nl">Download trailers van www.hd-trailers.net</description> <description lang="pl">Pobieraj zwiastuny filmowe z www.hd-trailers.net</description> <description lang="pt">Descarregar trailers de www.hd-trailers.net</description> <description lang="ru">Загружать трейлеры с www.hd-trailers.net</description> - <description lang="se">Ladda ner filmtrailers från www.hd-trailers.net</description> <description lang="zh">从www.hd-trailers.net下载电影预告片</description> <minversion>20000</minversion> <platform>all</platform> diff --git a/addons/metadata.common.hdtrailers.net/hdtrailers.xml b/addons/metadata.common.hdtrailers.net/hdtrailers.xml index 89cac1559a..98a179e115 100644 --- a/addons/metadata.common.hdtrailers.net/hdtrailers.xml +++ b/addons/metadata.common.hdtrailers.net/hdtrailers.xml @@ -24,9 +24,15 @@ </RegExp> </GetHDTrailersnet1080p> <Parse480pTrailer dest="5"> - <!--Fetch 480p trailer link from hdtrailers.net--> - <RegExp input="$$1" output="<details><trailer>http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2</trailer></details>" dest="5"> - <expression noclean="1">">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> + <RegExp input="$$6" output="<details><trailer>\1</trailer></details>" dest="5"> + <!--fetch 480p trailer link from hdtrailers.net--> + <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6"> + <expression noclean="1">">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> + </RegExp> + <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6+"> + <expression noclean="1">">(Teaser )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> + </RegExp> + <expression noclean="1" /> </RegExp> </Parse480pTrailer> <Parse720pTrailer dest="5"> @@ -35,10 +41,16 @@ <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6"> <expression noclean="1">">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> </RegExp> + <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6+"> + <expression noclean="1">">(Teaser )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> + </RegExp> <!--Fetch 720p trailer link from hdtrailers.net--> <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6"> <expression noclean="1">">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res720p</expression> </RegExp> + <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6+"> + <expression noclean="1">">(Teaser )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res720p</expression> + </RegExp> <expression noclean="1" /> </RegExp> </Parse720pTrailer> @@ -48,14 +60,23 @@ <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6"> <expression noclean="1">">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> </RegExp> + <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6+"> + <expression noclean="1">">(Teaser )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res480p</expression> + </RegExp> <!--Fallback to fetch 720p trailer link if 1080p is not available--> <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6"> <expression noclean="1">">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res720p</expression> </RegExp> + <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6+"> + <expression noclean="1">">(Teaser )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res720p</expression> + </RegExp> <!--Fetch 1080p trailer link from hdtrailers.net--> <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6"> <expression noclean="1">">(Theatrical )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res1080p</expression> </RegExp> + <RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2" dest="6+"> + <expression noclean="1">">(Teaser )?Trailer</td>.*?sid=(\d*)" rel="lightbox\[res1080p</expression> + </RegExp> <expression noclean="1" /> </RegExp> </Parse1080pTrailer> diff --git a/addons/metadata.common.hdtrailers.net/icon.png b/addons/metadata.common.hdtrailers.net/icon.png Binary files differnew file mode 100644 index 0000000000..e8982f9864 --- /dev/null +++ b/addons/metadata.common.hdtrailers.net/icon.png diff --git a/addons/metadata.common.imdb.com/addon.xml b/addons/metadata.common.imdb.com/addon.xml index 59a43028d4..f4d66cdb03 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 common scraper functions" - version="2.1.9" + version="2.4.0" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> diff --git a/addons/metadata.common.imdb.com/changelog.txt b/addons/metadata.common.imdb.com/changelog.txt index a19b89efe5..4e0c80198f 100644 --- a/addons/metadata.common.imdb.com/changelog.txt +++ b/addons/metadata.common.imdb.com/changelog.txt @@ -1,3 +1,22 @@ +[B]2.4.0[/B] +- added: aspect tag to imdb poster + +[B]2.3.0[/B] +- added: option to scrape rating from MetaCritic (via IMDb) + +[B]2.2.3[/B] +- fixed: still to address some html encode issues, now in plots + +[B]2.2.2[/B] +- fixed: still to address html encode issues + +[B]2.2.1[/B] +- fixed: hopefully fixed issue with html encodes + +[B]2.2.0[/B] +- factored out GetIMDBAKATitlesById +- factored out scraping certifications + [B]2.1.9[/B] - fixed: plot when contains html links (once again) diff --git a/addons/metadata.common.imdb.com/icon.png b/addons/metadata.common.imdb.com/icon.png Binary files differnew file mode 100644 index 0000000000..1e45477728 --- /dev/null +++ b/addons/metadata.common.imdb.com/icon.png diff --git a/addons/metadata.common.imdb.com/imdb.xml b/addons/metadata.common.imdb.com/imdb.xml index 5633908756..2ae432516c 100644 --- a/addons/metadata.common.imdb.com/imdb.xml +++ b/addons/metadata.common.imdb.com/imdb.xml @@ -27,6 +27,20 @@ </RegExp> </ParseIMDBRating> + <GetMetaCriticRatingById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseMetaCriticRating">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetMetaCriticRatingById> + <ParseMetaCriticRating dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="<rating>\1.\2</rating>" dest="2"> + <expression><a href="criticreviews">(\d)(\d*)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseMetaCriticRating> + <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" /> @@ -35,7 +49,7 @@ <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>(.*?)<[^a/]</expression> + <expression fixchars="1" trim="1"><h2>Storyline</h2>\n+<p>(.*?)<[^a/]</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -51,7 +65,7 @@ <RegExp input="$$1" output="\1" dest="6"> <expression noclean="1"><table class="cast_list">(.*?)</table></expression> </RegExp> - <RegExp input="$$6" output="<actor><thumb>\2_SX512_SY512_\3</thumb><name>\1</name><role>\5</role></actor>" dest="7"> + <RegExp input="$$6" output="<actor><thumb>\2_SX1024_SY1024_\3</thumb><name>\1</name><role>\5</role></actor>" dest="7"> <expression repeat="yes" clear="yes" trim="3,4" noclean="1,2"><noscript><img \n[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:([^"]*\.)[^"]*(\.jpg))[^>]*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)?</expression> </RegExp> <RegExp input="$$6" output="<actor><thumb></thumb><name>\1</name><role>\3</role></actor>" dest="7+"> @@ -131,7 +145,7 @@ <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"> + <RegExp input="$$6" output="<actor><thumb>\1_SX1024_SY1024_\2</thumb><name>\3</name><role>\5</role></actor>" dest="7"> <expression repeat="yes" clear="yes" fixchars="3,5" 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+"> @@ -205,10 +219,143 @@ <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"> + <RegExp input="$$4" output="<thumb aspect="poster">\1</thumb>" dest="6"> <expression noclean="1">(.*?_SX[0-9]+_SY[0-9]+_.jpg)</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseIMDBThumbs> + + <GetIMDBUSACert dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-main.html" function="ParseIMDBUSACert">http://akas.imdb.com/title/$$1/</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBUSACert> + <ParseIMDBUSACert dest="5"> + <RegExp input="$$1" output="<details><mpaa>$INFO[certprefix]\1</mpaa></details>" dest="5"> + <expression>MPAA</a>\)</h4>\n?<span itemprop="contentRating">Rated\s([^<]*)</expression> + </RegExp> + </ParseIMDBUSACert> + + <GetIMDBCountryCert dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBCountryCert">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBCountryCert> + <ParseIMDBCountryCert dest="5"> + <RegExp input="$$1" output="<details><mpaa>$INFO[certprefix]\1</mpaa></details>" dest="5"> + <expression>>\s*$INFO[imdbcertcountry]:([^<]+)</a></expression> + </RegExp> + </ParseIMDBCountryCert> + + <GetIMDBAKATitlesById dest="5"> + <RegExp input="$$1" output="<details><url cache="$$1-combined.html" function="ParseIMDBAKATitles">http://akas.imdb.com/title/$$1/combined</url></details>" dest="5"> + <expression noclean="1" /> + </RegExp> + </GetIMDBAKATitlesById> + <ParseIMDBAKATitles dest="5"> + <RegExp input="$$2" output="<details><title>\1</title></details>" dest="5"> + <RegExp input="$$1" output="\1" dest="2"> + <expression fixchars="1"><h1>([^<]*)</expression> + </RegExp> + <RegExp input="$$10" output="\1" dest="4"> + <RegExp input="$$1" output="\2" dest="9"> + <expression fixchars="2"><meta name="title" content="(IMDb - )?(?:&#x22;)?([^"]*?)(?:&#x22;)? \([^\(]*?([0-9]{4})\)</expression> + </RegExp> + <RegExp input="$$9" output="\1" dest="10"> + <expression /> + </RegExp> + <RegExp input="$$1" output="\1" dest="11"> + <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+Hong Kong [<em>][^"]+English</expression> + </RegExp> + <RegExp input="$$11" output="\1" dest="10"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="11"> + <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+((Canada)\s(<em>)?\((English|imdb))</expression> + </RegExp> + <RegExp input="$$11" output="\1" dest="10"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="11"> + <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+(UK(<em>)?<br>)</expression> + </RegExp> + <RegExp input="$$11" output="\1" dest="10"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="11"> + <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^"]+International\s(<em>)?\(English title\)(</em>)?(,|<)( |b)</expression> + </RegExp> + <RegExp input="$$11" output="\1" dest="10"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="11"> + <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^"]+International\s(<em>)?\(English title\)(</em>)? (<em>)?\(imdb</expression> + </RegExp> + <RegExp input="$$11" output="\1" dest="10"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="12"> + <expression fixchars="1" clear="yes"><a href="/country/[^>]+>(UK</a></div>)</expression> + </RegExp> + <RegExp input="$$12" output="$$9" dest="10"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="12"> + <expression clear="yes"><a href="/country/[^>]+>(USA</a></div>)</expression> + </RegExp> + <RegExp input="$$12" output="$$9" dest="10"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="11"> + <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+(USA(<em>)?<br>)</expression> + </RegExp> + <RegExp input="$$11" output="\1" dest="10"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="11"> + <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+((USA)\s(<em>)?\((English|imdb))</expression> + </RegExp> + <RegExp input="$$11" output="\1" dest="10"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="11"> + <expression fixchars="1" clear="yes">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+((USA)\s(<em>)?\((new title))</expression> + </RegExp> + <RegExp input="$$11" output="\1" dest="10"> + <expression>(.+)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + <RegExp input="$$4" output="\1" dest="2"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="4"> + <expression fixchars="1">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+$INFO[imdbakatitles]</expression> + </RegExp> + <RegExp input="$$4" output="\1" dest="2"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="4"> + <expression fixchars="1">>\s*?"([^<]+)"[^<]+[<em>]?[^"]+$INFO[imdbakatitles]\s(<em>)?\((imdb display)</expression> + </RegExp> + <RegExp input="$$4" output="\1" dest="2"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="5"> + <expression><a href="/country/[^>]+>($INFO[imdbakatitles])</expression> + </RegExp> + <RegExp input="$$5" output="$$9" dest="4"> + <expression>($INFO[imdbakatitles])</expression> + </RegExp> + <RegExp input="$INFO[imdbakatitles]" output="$$9" dest="4"> + <expression>Keep Original</expression> + </RegExp> + <RegExp input="$$4" output="\1" dest="2"> + <expression>(.+)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseIMDBAKATitles> + </scraperfunctions> diff --git a/addons/metadata.common.last.fm/addon.xml b/addons/metadata.common.last.fm/addon.xml index 8bece1a63e..561026f8f1 100644 --- a/addons/metadata.common.last.fm/addon.xml +++ b/addons/metadata.common.last.fm/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.last.fm" name="Last.FM" - version="1.4.1" + version="1.5.1" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> diff --git a/addons/metadata.common.last.fm/lastfm.xml b/addons/metadata.common.last.fm/lastfm.xml index e8c8ee214c..c47a42e32b 100644 --- a/addons/metadata.common.last.fm/lastfm.xml +++ b/addons/metadata.common.last.fm/lastfm.xml @@ -37,10 +37,13 @@ <RegExp input="$$1" output="\1" dest="11"> <expression fixchars="1"><content><!\[CDATA\[(.*?)\]\]</expression> </RegExp> - <RegExp input="$$11" output="$$12" dest="2"> + <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"> diff --git a/addons/metadata.common.themoviedb.org/addon.xml b/addons/metadata.common.themoviedb.org/addon.xml index be0684dc27..1d5f1b3e11 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="2.1.4" + version="2.6.0" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> diff --git a/addons/metadata.common.themoviedb.org/icon.png b/addons/metadata.common.themoviedb.org/icon.png Binary files differnew file mode 100644 index 0000000000..b95037a3e0 --- /dev/null +++ b/addons/metadata.common.themoviedb.org/icon.png diff --git a/addons/metadata.common.themoviedb.org/tmdb.xml b/addons/metadata.common.themoviedb.org/tmdb.xml index a270f4cbe2..aaa3afed4f 100644 --- a/addons/metadata.common.themoviedb.org/tmdb.xml +++ b/addons/metadata.common.themoviedb.org/tmdb.xml @@ -2,7 +2,7 @@ <GetTMDBCertificationsByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBCertifications" cache="tmdb-cert-\1.json">http://api.themoviedb.org/3/movie/\1/releases?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBCertifications" cache="tmdb-cert-\1.json">http://api.themoviedb.org/3/movie/\1/releases?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbcertcountry]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -10,30 +10,66 @@ </GetTMDBCertificationsByIdChain> <ParseTMDBCertifications dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<mpaa>Rated \1</mpaa>" dest="2"> - <expression fixchars="1">"US","certification":"([^"]*)</expression> + <RegExp input="$$1" output="<mpaa>$INFO[certprefix]\1</mpaa>" dest="2"> + <expression fixchars="1">"$INFO[tmdbcertcountry]","certification":"([^"]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseTMDBCertifications> + <GetTMDBTitleByIdChain dest="4"> + <RegExp input="$$5" output="<details>\1</details>" dest="4"> + <RegExp input="$$1" output="<url function="ParseTMDBTitle" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> + <expression /> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetTMDBTitleByIdChain> + <GetTMDBLangTitleByIdChain dest="4"> + <RegExp input="$$5" output="<details>\1</details>" dest="4"> + <RegExp input="$$1" output="<url function="ParseTMDBTitle" cache="tmdb-$INFO[tmdbtitlelanguage]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbtitlelanguage]</url>" dest="5"> + <expression /> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetTMDBLangTitleByIdChain> + <ParseTMDBTitle dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="<title>\1</title>" dest="2"> + <expression fixchars="1">"title":"([^"]*)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseTMDBTitle> + <GetTMDBPlotByIdChain clearbuffers="no" dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> <RegExp input="$$1" output="\1" dest="8"> <expression clear="yes" noclean="1" /> </RegExp> - <RegExp input="$$8" output="<url function="ParseTMDBPlot" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url>" dest="5"> + <RegExp input="$$8" output="<url function="ParseTMDBPlot" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> </RegExp> </GetTMDBPlotByIdChain> + <GetTMDBLangPlotByIdChain clearbuffers="no" dest="4"> + <RegExp input="$$5" output="<details>\1</details>" dest="4"> + <RegExp input="$$1" output="\1" dest="8"> + <expression clear="yes" noclean="1" /> + </RegExp> + <RegExp input="$$8" output="<url function="ParseTMDBPlot" cache="tmdb-$INFO[tmdbplotlanguage]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbplotlanguage]</url>" dest="5"> + <expression /> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetTMDBLangPlotByIdChain> <ParseTMDBPlot dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="9"> <expression clear="yes" fixchars="1">"overview":"(.*?)","</expression> </RegExp> - <RegExp input="$$9" output="<url function="ParseFallbackTMDBPlot" cache="tmdb-en-$$8.json">http://api.themoviedb.org/3/movie/$$8?api_key=57983e31fb435df4df77afb854740ea9&language=en</url>" dest="2"> + <RegExp input="$$9" output="<url function="ParseFallbackTMDBPlot" cache="tmdb-en-$$8.json">http://api.themoviedb.org/3/movie/$$8?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="2"> <expression>^$</expression> </RegExp> <RegExp input="$$9" output="<plot>\1</plot>" dest="2"> @@ -53,16 +89,24 @@ <GetTMDBSetByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBSet" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBSet" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> </RegExp> </GetTMDBSetByIdChain> + <GetTMDBLangSetByIdChain dest="4"> + <RegExp input="$$5" output="<details>\1</details>" dest="4"> + <RegExp input="$$1" output="<url function="ParseTMDBSet" cache="tmdb-$INFO[tmdbsetlanguage]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbsetlanguage]</url>" dest="5"> + <expression /> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetTMDBLangSetByIdChain> <ParseTMDBSet dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<set>\1</set>" dest="2"> - <expression noclean="1">"belongs_to_collection":{"id":[0-9]+,"name":"([^"]*)</expression> + <expression noclean="1">"belongs_to_collection":\{"id":[0-9]+,"name":"([^"]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -85,7 +129,7 @@ <expression repeat="yes" fixchars="1">"name":"([^"]*)","character":"([^"]*)</expression> </RegExp> <RegExp input="$$7" output="<actor><name>\1</name><role>\2</role><thumb>http://cf2.imgobject.com/t/p/original\3</thumb></actor>" dest="2+"> - <expression repeat="yes" fixchars="1">"name":"([^"]*)","character":"([^"]*)","order":[0-9]*,"profile_path":"([^"]*)"</expression> + <expression repeat="yes" fixchars="1">"name":"([^"]*)","character":"([^"]*)","order":[0-9]*,"cast_id":[0-9]*,"profile_path":"([^"]*)"</expression> </RegExp> <expression noclean="1" /> </RegExp> @@ -133,12 +177,20 @@ <GetTMDBGenresByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBGenres" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBGenres" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> </RegExp> </GetTMDBGenresByIdChain> + <GetTMDBLangGenresByIdChain dest="4"> + <RegExp input="$$5" output="<details>\1</details>" dest="4"> + <RegExp input="$$1" output="<url function="ParseTMDBGenres" cache="tmdb-$INFO[tmdbgenreslanguage]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbgenreslanguage]</url>" dest="5"> + <expression /> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetTMDBLangGenresByIdChain> <ParseTMDBGenres dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="7"> @@ -153,7 +205,7 @@ <GetTMDBRatingByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBRating" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBRating" cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -173,23 +225,71 @@ <GetTMDBTrailerByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBTrailer" cache="tmdb-trailer-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1/trailers?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBTrailer" cache="tmdb-trailer-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1/trailers?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> </RegExp> </GetTMDBTrailerByIdChain> + <GetTMDBLangTrailerByIdChain dest="4"> + <RegExp input="$$5" output="<details>\1</details>" dest="4"> + <RegExp input="$$1" output="<url function="ParseTMDBTrailer" cache="tmdb-trailer-$INFO[tmdbtrailerlanguage]-\1.json">http://api.themoviedb.org/3/movie/\1/trailers?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbtrailerlanguage]</url>" dest="5"> + <expression /> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetTMDBLangTrailerByIdChain> <ParseTMDBTrailer dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="\1" dest="8"> + <expression noclean="1">"id":([0-9]*),</expression> + </RegExp> <RegExp input="$$1" output="\1" dest="7"> - <expression clear="yes" noclean="1">"youtube":\[{([^\]]*)</expression> + <expression clear="yes" noclean="1">"youtube":\[\{([^\}]*)</expression> </RegExp> - <RegExp input="$$7" output="<trailer>plugin://plugin.video.youtube/?action=play_video&videoid=\1</trailer>" dest="2"> + <RegExp input="$$7" output="<trailer>plugin://plugin.video.youtube/?action=play_video&amp;videoid=\1</trailer>" dest="9"> <expression noclean="1">"source":"([^"]*)</expression> </RegExp> + <RegExp input="$$9" output="<url function="ParseTMDBEnTrailer" cache="tmdb-trailer-en-$$8.json">http://api.themoviedb.org/3/movie/$$8/trailers?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="2"> + <expression>^$</expression> + </RegExp> + <RegExp input="$$9" output="$$9" dest="2"> + <expression>(.+)</expression> + </RegExp> <expression noclean="1">(.+)</expression> </RegExp> </ParseTMDBTrailer> + <ParseTMDBEnTrailer dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="\1" dest="8"> + <expression noclean="1">"id":([0-9]*),</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="7"> + <expression clear="yes" noclean="1">"youtube":\[\{([^\}]*)</expression> + </RegExp> + <RegExp input="$$7" output="<trailer>plugin://plugin.video.youtube/?action=play_video&amp;videoid=\1</trailer>" dest="9"> + <expression noclean="1">"source":"([^"]*)</expression> + </RegExp> + <RegExp input="$$9" output="<url function="ParseTMDBAllTrailer" cache="tmdb-trailer-$$8.json">http://api.themoviedb.org/3/movie/$$8/trailers?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="5"> + <expression>^$</expression> + </RegExp> + <RegExp input="$$9" output="$$9" dest="2"> + <expression>(.+)</expression> + </RegExp> + <expression noclean="1">(.+)</expression> + </RegExp> + </ParseTMDBEnTrailer> + <ParseTMDBAllTrailer dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="\1" dest="7"> + <expression clear="yes" noclean="1">"youtube":\[\{([^\}]*)</expression> + </RegExp> + <RegExp input="$$7" output="<trailer>plugin://plugin.video.youtube/?action=play_video&amp;videoid=\1</trailer>" dest="2"> + <expression noclean="1">"source":"([^"]*)</expression> + </RegExp> + <expression noclean="1">(.+)</expression> + </RegExp> + </ParseTMDBAllTrailer> <GetTMDBFanartByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> @@ -210,7 +310,7 @@ <ParseTMDBFanart dest="5"> <RegExp input="$$2" output="<details><fanart>\1</fanart></details>" dest="5"> <RegExp input="$$1" output="\1" dest="7"> - <expression clear="yes" noclean="1">"backdrops":\[{([^\]]*)</expression> + <expression clear="yes" noclean="1">"backdrops":\[\{([^\]]*)</expression> </RegExp> <RegExp input="$$7" output="<thumb preview="http://cf2.imgobject.com/t/p/w780\1">http://cf2.imgobject.com/t/p/original\1</thumb>" dest="2"> <expression repeat="yes" noclean="1">"file_path":"([^"]*)</expression> @@ -221,15 +321,23 @@ <GetTMDBThumbsByIdChain dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> </RegExp> </GetTMDBThumbsByIdChain> + <GetTMDBLangThumbsByIdChain dest="4"> + <RegExp input="$$5" output="<details>\1</details>" dest="4"> + <RegExp input="$$1" output="<url function="ParseTMDBLangThumbs" cache="tmdb-images-$INFO[tmdbthumblanguage]-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[tmdbthumblanguage]</url>" dest="5"> + <expression /> + </RegExp> + <expression noclean="1" /> + </RegExp> + </GetTMDBLangThumbsByIdChain> <GetTMDBThumbsById dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> - <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url>" dest="5"> + <RegExp input="$$1" output="<url function="ParseTMDBThumbs" cache="tmdb-images-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url>" dest="5"> <expression /> </RegExp> <expression noclean="1" /> @@ -237,24 +345,82 @@ </GetTMDBThumbsById> <ParseTMDBThumbs dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<url function="ParseTMDBAllThumbs" cache="tmdb-images-\1.json">http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="2"> + <RegExp input="$$1" output="\1" dest="8"> <expression noclean="1">"id":([0-9]*),</expression> </RegExp> <RegExp input="$$1" output="\1" dest="7"> - <expression clear="yes" noclean="1">"posters":\[{([^\]]*)</expression> + <expression clear="yes" noclean="1">"posters":\[\{([^\]]*)</expression> </RegExp> - <RegExp input="$$7" output="<thumb preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>" dest="2+"> + <RegExp input="$$7" output="<thumb aspect="poster"preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>" dest="9"> <expression repeat="yes" noclean="1">"file_path":"([^"]*)</expression> </RegExp> + <RegExp input="$$9" output="$$12" dest="2+"> + <RegExp input="$INFO[language]" output="<url function="ParseTMDBAllThumbs" cache="tmdb-images-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="12"> + <expression>en</expression> + </RegExp> + <expression>^$</expression> + </RegExp> + <RegExp input="$$9" output="$$9" dest="2+"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$INFO[language]" output="<url function="ParseTMDBEnThumbs" cache="tmdb-images-en-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="2+"> + <expression>^((?!en).)*$</expression> + </RegExp> <expression noclean="1">(.+)</expression> </RegExp> </ParseTMDBThumbs> + <ParseTMDBLangThumbs dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="\1" dest="8"> + <expression noclean="1">"id":([0-9]*),</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="7"> + <expression clear="yes" noclean="1">"posters":\[\{([^\]]*)</expression> + </RegExp> + <RegExp input="$$7" output="<thumb aspect="poster"preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>" dest="9"> + <expression repeat="yes" noclean="1">"file_path":"([^"]*)</expression> + </RegExp> + <RegExp input="$$9" output="$$12" dest="2+"> + <RegExp input="$INFO[tmdbthumblanguage]" output="<url function="ParseTMDBAllThumbs" cache="tmdb-images-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="12"> + <expression>en</expression> + </RegExp> + <expression>^$</expression> + </RegExp> + <RegExp input="$$9" output="$$9" dest="2+"> + <expression>(.+)</expression> + </RegExp> + <RegExp input="$INFO[tmdbthumblanguage]" output="<url function="ParseTMDBEnThumbs" cache="tmdb-images-en-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="2+"> + <expression>^((?!en).)*$</expression> + </RegExp> + <expression noclean="1">(.+)</expression> + </RegExp> + </ParseTMDBLangThumbs> + <ParseTMDBEnThumbs dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="\1" dest="8"> + <expression noclean="1">"id":([0-9]*),</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="7"> + <expression clear="yes" noclean="1">"posters":\[\{([^\]]*)</expression> + </RegExp> + <RegExp input="$$7" output="<thumb aspect="poster"preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>" dest="9"> + <expression repeat="yes" noclean="1">"file_path":"([^"]*)</expression> + </RegExp> + <RegExp input="$$9" output="<url function="ParseTMDBAllThumbs" cache="tmdb-images-$$8.json">http://api.themoviedb.org/3/movie/$$8/images?api_key=57983e31fb435df4df77afb854740ea9</url>" dest="2"> + <expression>^$</expression> + </RegExp> + <RegExp input="$$9" output="$$9" dest="2"> + <expression>(.+)</expression> + </RegExp> + <expression noclean="1">(.+)</expression> + </RegExp> + </ParseTMDBEnThumbs> <ParseTMDBAllThumbs dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="\1" dest="7"> - <expression clear="yes" noclean="1">"posters":\[{([^\]]*)</expression> + <expression clear="yes" noclean="1">"posters":\[\{([^\]]*)</expression> </RegExp> - <RegExp input="$$7" output="<thumb preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>" dest="2"> + <RegExp input="$$7" output="<thumb aspect="poster"preview="http://cf2.imgobject.com/t/p/w500\1">http://cf2.imgobject.com/t/p/original\1</thumb>" dest="2"> <expression repeat="yes" noclean="1">"file_path":"([^"]*)</expression> </RegExp> <expression noclean="1">(.+)</expression> diff --git a/addons/metadata.musicvideos.last.fm/addon.xml b/addons/metadata.musicvideos.last.fm/addon.xml index b687aa98a3..6c3a6980af 100644 --- a/addons/metadata.musicvideos.last.fm/addon.xml +++ b/addons/metadata.musicvideos.last.fm/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.musicvideos.last.fm" name="Last.fm for Music Videos" - version="1.0.0" + version="1.0.1" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> @@ -20,6 +20,7 @@ <summary lang="pl">Scraper teledysków Last.fm</summary> <summary lang="pt">Scraper de música Last.fm</summary> <summary lang="se">Skrapa för Last.fm musik</summary> + <summary lang="zh">Last.fm音乐电视刮削器</summary> <description lang="bg">Сваля информация за музикални клипове</description> <description lang="en">Download Music Video information</description> <description lang="fi">Lataa musiikkivideoiden tiedot</description> @@ -28,5 +29,6 @@ <description lang="pl">Pobieraj informacje o teledyskach z last.fm</description> <description lang="pt">Descarregar informação de filmes de last.fm</description> <description lang="se">Ladda ner musikvideoinformation från last.fm</description> + <description lang="zh">从Last.fm下载音乐电视信息</description> </extension> </addon> diff --git a/addons/metadata.musicvideos.last.fm/resources/language/Chinese (Simple)/strings.xml b/addons/metadata.musicvideos.last.fm/resources/language/Chinese (Simple)/strings.xml new file mode 100644 index 0000000000..f37b42dd1b --- /dev/null +++ b/addons/metadata.musicvideos.last.fm/resources/language/Chinese (Simple)/strings.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<strings> + <string id="30000">从fanart.tv获取专辑图片</string> + <string id="30001">从Last.fm获取专辑图片</string> +</strings> diff --git a/addons/metadata.themoviedb.org/addon.xml b/addons/metadata.themoviedb.org/addon.xml index d8b5cb553b..694e5f2002 100644 --- a/addons/metadata.themoviedb.org/addon.xml +++ b/addons/metadata.themoviedb.org/addon.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.themoviedb.org" name="The MovieDB" - version="3.0.9" + version="3.5.0" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> - <import addon="metadata.common.themoviedb.org" version="2.1.2"/> + <import addon="metadata.common.themoviedb.org" version="2.6.0"/> <import addon="metadata.common.hdtrailers.net" version="1.0.7"/> <import addon="metadata.common.imdb.com" version="2.1.9"/> - <import addon="plugin.video.youtube" version="2.1.4" optional="true"/> + <import addon="plugin.video.youtube" version="2.9.1" optional="true"/> </requires> <extension point="xbmc.metadata.scraper.movies" language="en" diff --git a/addons/metadata.themoviedb.org/changelog.txt b/addons/metadata.themoviedb.org/changelog.txt index 1386211adc..63784acd54 100644 --- a/addons/metadata.themoviedb.org/changelog.txt +++ b/addons/metadata.themoviedb.org/changelog.txt @@ -1,3 +1,23 @@ +[B]3.5.0[/B] +- added: aspect tag and reorder languages according to the alphabet + +[B]3.4.1[/B] +- updated chinese translation + +[B]3.4.0[/B] +- added: prefer trailer language according to the selected language + +[B]3.3.0[/B] +- updated: improve CreateSearchUrl according to TMDb API changes + +[B]3.2.0[/B] +- fixed: keep Originaltitle +- fixed: &'s needs double escaping +- added: option to scrape certification from selected country + +[B]3.1.0[/B] +- updated: factored out title scraping to common library + [B]3.0.9[/B] - fixed: missing language parameter name in NfoUrl diff --git a/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml b/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml index e7151afdc7..0410f5114c 100644 --- a/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <strings> <string id="30000">启用同人画</string> - <string id="30001">首选HD-Trailers.net预告片</string> + <string id="30001">备选HD-Trailers.net预告片</string> <string id="30002">首选语言</string> - <string id="30003">获取评价信息于</string> + <string id="30003">获取评分于</string> <string id="30004">启用预告片（YouTube）</string> - <string id="30005">保留原片名</string> + <string id="30005">使用未翻译片名</string> + <string id="30006">首选电影分级国别</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml b/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml index 7711a7feda..2eacfd6731 100644 --- a/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml @@ -3,7 +3,4 @@ <string id="30000">Fanart inschakelen</string> <string id="30001">Trailers van HD-Trailers.net inschakelen</string> <string id="30002">Voorkeurstaal</string> - <string id="30003">Verkrijg waardering van IMDb</string> - <string id="30004">Trailer inschakelen (YouTube)</string> - <string id="30005">Behoud originele titel</string> </strings> diff --git a/addons/metadata.themoviedb.org/resources/language/English/strings.xml b/addons/metadata.themoviedb.org/resources/language/English/strings.xml index d61eda00f5..cad339333e 100644 --- a/addons/metadata.themoviedb.org/resources/language/English/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/English/strings.xml @@ -3,7 +3,8 @@ <string id="30000">Enable Fanart</string> <string id="30004">Enable Trailer (YouTube)</string> <string id="30001">Prefer Trailer from HD-Trailers.net</string> - <string id="30002">Preferred language</string> - <string id="30003">Get rating from</string> + <string id="30002">Preferred Language</string> + <string id="30003">Get Rating from</string> <string id="30005">Keep Original Title</string> + <string id="30006">Preferred Certification Country</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 a3ae5113f8..eac664069b 100644 --- a/addons/metadata.themoviedb.org/resources/language/German/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/German/strings.xml @@ -4,6 +4,4 @@ <string id="30001">Aktiviere Trailer von HD-Trailers.net</string> <string id="30002">Bevorzugte Sprache</string> <string id="30003">Bewertung von IMDb nutzen</string> - <string id="30004">Aktiviere Trailer (YouTube)</string> - <string id="30005">Behalte original Filmtitel bei</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 d5e3f07af5..054e5a1f51 100644 --- a/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml @@ -6,4 +6,5 @@ <string id="30002">Preferált nyelv</string> <string id="30003">Értékelés letöltése innen</string> <string id="30005">Eredeti filmcím megtartása</string> + <string id="30006">Preferált korhatár-besorolás innen</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 59406fddd9..a7811583ee 100644 --- a/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml +++ b/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml @@ -2,13 +2,10 @@ <!--Language file translated with Team XBMC Translator--> <!--Translator: blittan--> <!--Email: blittan@xbmc.org--> -<!--Date of translation: 12/26/2011--> +<!--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> - <string id="30004">Aktivera trailers (YouTube)</string> - <string id="30005">Behåll originaltitel</string> -</strings> +</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 d711325a3c..cefac25256 100644 --- a/addons/metadata.themoviedb.org/resources/settings.xml +++ b/addons/metadata.themoviedb.org/resources/settings.xml @@ -4,6 +4,8 @@ <setting label="30000" type="bool" id="fanart" default="true"/> <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="30002" type="labelenum" values="bg|cs|da|de|el|en|es|fi|fr|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|th|tr|zh" id="language" default="en"/> + <setting label="30006" type="labelenum" values="au|bg|cs|da|de|el|es|fi|fr|gb|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|th|tr|us|zh" id="tmdbcertcountry" default="us"/> <setting label="30003" type="labelenum" values="TMDb|IMDb" id="RatingS" default="TMDb"/> + <setting label="certprefix" type="text" id="certprefix" default="Rated " visible="false"/> </settings> diff --git a/addons/metadata.themoviedb.org/tmdb.xml b/addons/metadata.themoviedb.org/tmdb.xml index a60cf39580..20bf719a8b 100644 --- a/addons/metadata.themoviedb.org/tmdb.xml +++ b/addons/metadata.themoviedb.org/tmdb.xml @@ -1,33 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <scraper framework="1.1" date="2012-01-16"> <CreateSearchUrl dest="3"> - <RegExp input="$$1" output="<url>http://api.themoviedb.org/3/search/movie?api_key=57983e31fb435df4df77afb854740ea9&query=\1$$4&language=$INFO[language]</url>" dest="3"> - <RegExp input="$$2" output="+\1" dest="4"> + <RegExp input="$$1" output="<url>http://api.themoviedb.org/3/search/movie?api_key=57983e31fb435df4df77afb854740ea9&amp;query=\1&amp;year=$$4&amp;language=$INFO[language]</url>" dest="3"> + <RegExp input="$$2" output="\1" dest="4"> <expression clear="yes">(.+)</expression> </RegExp> <expression noclean="1" /> </RegExp> </CreateSearchUrl> <NfoUrl dest="3"> - <RegExp input="$$1" output="<details><url>http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url><id>\2</id></details>" dest="3"> + <RegExp input="$$1" output="<details><url>http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url><id>\2</id></details>" dest="3"> <expression clear="yes" noclean="1">(themoviedb.org/movie/)([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<details><url>http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url><id>tt\1</id></details>" dest="3"> + <RegExp input="$$1" output="<details><url>http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url><id>tt\1</id></details>" dest="3"> <expression>imdb....?/title/tt([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<details><url>http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url><id>tt\1</id></details>" dest="3"> + <RegExp input="$$1" output="<details><url>http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url><id>tt\1</id></details>" dest="3"> <expression>imdb....?/Title\?([0-9]*)</expression> </RegExp> </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.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url></entity>" dest="3"> + <RegExp input="$$1" output="<entity><title>\4</title><id>\1</id><year>\3</year><url cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url></entity>" dest="3"> <expression repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":"([0-9]+)-.*?"title":"([^"]*)</expression> </RegExp> - <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><year>\3</year><url cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url></entity>" dest="3+"> + <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><year>\3</year><url cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url></entity>" dest="3+"> <expression repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":"([0-9]+)-</expression> </RegExp> - <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><url cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&language=$INFO[language]</url></entity>" dest="3+"> + <RegExp input="$$1" output="<entity><title>\2</title><id>\1</id><url cache="tmdb-$INFO[language]-\1.json">http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]</url></entity>" dest="3+"> <expression repeat="yes">"id":([0-9]*),"original_title":"([^"]*)","release_date":null</expression> </RegExp> <expression noclean="1" /> @@ -47,8 +47,8 @@ <RegExp conditional="keeporiginaltitle" input="$$9" output="<title>\1</title>" dest="5+"> <expression/> </RegExp> - <RegExp input="$$1" output="<title>\1</title>" dest="5+"> - <expression fixchars="1">"title":"([^"]*)</expression> + <RegExp conditional="!keeporiginaltitle" input="$$2" output="<chain function="GetTMDBTitleByIdChain">$$2</chain>" dest="5+"> + <expression /> </RegExp> <RegExp input="$$9" output="<originaltitle>\1</originaltitle>" dest="5+"> <expression/> @@ -59,7 +59,7 @@ <RegExp input="$$1" output="\1" dest="10"> <expression clear="yes" noclean="1">"runtime":([0-9]+)</expression> </RegExp> - <RegExp input="$$10" output="<url function="ParseFallbackTMDBRuntime" cache="tmdb-en-$$2.json">http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&language=en</url>" dest="5+"> + <RegExp input="$$10" output="<url function="ParseFallbackTMDBRuntime" cache="tmdb-en-$$2.json">http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="5+"> <expression>^$</expression> </RegExp> <RegExp input="$$10" output="<runtime>\1</runtime>" dest="5+"> @@ -68,7 +68,7 @@ <RegExp input="$$1" output="\1" dest="10"> <expression clear="yes" fixchars="1">"tagline":"([^"]*)</expression> </RegExp> - <RegExp input="$$10" output="<url function="ParseFallbackTMDBTagline" cache="tmdb-en-$$2.json">http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&language=en</url>" dest="5+"> + <RegExp input="$$10" output="<url function="ParseFallbackTMDBTagline" cache="tmdb-en-$$2.json">http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en</url>" dest="5+"> <expression>^$</expression> </RegExp> <RegExp input="$$10" output="<tagline>\1</tagline>" dest="5+"> diff --git a/addons/metadata.tvdb.com/addon.xml b/addons/metadata.tvdb.com/addon.xml index 86e69c854a..cd441d37ff 100644 --- a/addons/metadata.tvdb.com/addon.xml +++ b/addons/metadata.tvdb.com/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.tvdb.com" name="The TVDB" - version="1.2.4" + version="1.4.2" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> diff --git a/addons/metadata.tvdb.com/changelog.txt b/addons/metadata.tvdb.com/changelog.txt index dc8444df95..5d29a50ac0 100644 --- a/addons/metadata.tvdb.com/changelog.txt +++ b/addons/metadata.tvdb.com/changelog.txt @@ -1,3 +1,18 @@ +[B]1.4.2[/B] +- Added: cache to GetTVDBId + +[B]1.4.1[/B] +- Fixed: missing xml tag in GetTVDBId + +[B]1.4.0[/B] +- Added: scraping of EpisodeID + +[B]1.3.1[/B] +- Added: added back non-intentional removal of the imdb id lookup + +[B]1.3.0[/B] +- Added: return the aspect attribute for thumb fields as banner or poster + [B]1.2.4[/B] - Added: support for imdb url nfo's diff --git a/addons/metadata.tvdb.com/tvdb.xml b/addons/metadata.tvdb.com/tvdb.xml index 64a368d97b..5335f4560e 100644 --- a/addons/metadata.tvdb.com/tvdb.xml +++ b/addons/metadata.tvdb.com/tvdb.xml @@ -5,16 +5,16 @@ <RegExp input="$$1" output="<url cache="\1.xml">http://www.thetvdb.com/api/1D62F2F90030C444/series/\1/all/$INFO[language].zip</url><id>\1</id>" dest="3"> <expression>http://(?:www\.)?thetvdb.com/(?:index\.php)?\?tab=series&id=([0-9]+)</expression> </RegExp> - <RegExp input="$$1" output="<details><url function="GetTVDBId">http://www.thetvdb.com/api/GetSeriesByRemoteID.php?imdbid=tt\1&amp;language=$INFO[language]</url></details>" dest="3+"> + <RegExp input="$$1" output="<details><url cache="tt\1.xml" function="GetTVDBId">http://www.thetvdb.com/api/GetSeriesByRemoteID.php?imdbid=tt\1&amp;language=$INFO[language]</url></details>" dest="3+"> <expression>imdb....?/title/tt([0-9]*)</expression> </RegExp> - <RegExp input="$$1" output="<details><url function="GetTVDBId">http://www.thetvdb.com/api/GetSeriesByRemoteID.php?imdbid=tt\1&amp;language=$INFO[language]</url></details>" dest="3+"> + <RegExp input="$$1" output="<details><url cache="tt\1.xml" function="GetTVDBId">http://www.thetvdb.com/api/GetSeriesByRemoteID.php?imdbid=tt\1&amp;language=$INFO[language]</url></details>" dest="3+"> <expression>imdb....?/Title\?([0-9]*)</expression> </RegExp> </NfoUrl> <GetTVDBId dest="3"> - <RegExp input="$$1" output="<details><url cache="\1.xml">http://www.thetvdb.com/api/1D62F2F90030C444/series/\1/all/$INFO[language].zip</url><id>\1</id>" dest="3"> + <RegExp input="$$1" output="<details><url cache="\1.xml">http://www.thetvdb.com/api/1D62F2F90030C444/series/\1/all/$INFO[language].zip</url><id>\1</id></details>" dest="3"> <expression><seriesid>([0-9]*)</seriesid></expression> </RegExp> </GetTVDBId> @@ -99,40 +99,40 @@ <RegExp input="$$5" output="<actor><name>\2</name><role>\3</role></actor>" dest="4+"> <expression repeat="yes" noclean="1,2,3"><Actor>.*?<Image>([^<]*)</Image>.*?<Name>([^<]*)</Name>.*?<Role>([^<]*)</expression> </RegExp> - <RegExp conditional="posters" output="<thumb>http://thetvdb.com/banners/\1</thumb>" dest="4+"> + <RegExp conditional="posters" output="<thumb aspect="poster">http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>poster</BannerType></expression> </RegExp> - <RegExp input="$$5" output="<thumb>http://thetvdb.com/banners/\1</thumb>" dest="4+"> + <RegExp input="$$5" output="<thumb aspect="banner">http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>series</BannerType>[^<]*<BannerType2>graphical</BannerType2>[^<]*<Language>$INFO[language]</Language></expression> </RegExp> - <RegExp input="$$5" output="<thumb>http://thetvdb.com/banners/\1</thumb>" dest="4+"> + <RegExp input="$$5" output="<thumb aspect="banner">http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>series</BannerType>[^<]*<BannerType2>graphical</BannerType2>[^<]*<Language>((?!$INFO[language])[a-z])*</Language></expression> </RegExp> - <RegExp input="$$5" output="<thumb>http://thetvdb.com/banners/\1</thumb>" dest="4+"> + <RegExp input="$$5" output="<thumb aspect="banner">http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>series</BannerType>[^<]*<BannerType2>text</BannerType2>[^<]*<Language>$INFO[language]</Language></expression> </RegExp> - <RegExp input="$$5" output="<thumb>http://thetvdb.com/banners/\1</thumb>" dest="4+"> + <RegExp input="$$5" output="<thumb aspect="banner">http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>series</BannerType>[^<]*<BannerType2>text</BannerType2>[^<]*<Language>((?!$INFO[language])[a-z])*</Language></expression> </RegExp> - <RegExp input="$$5" output="<thumb>http://thetvdb.com/banners/\1</thumb>" dest="4+"> + <RegExp input="$$5" output="<thumb aspect="banner">http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>series</BannerType>[^<]*<BannerType2>blank</BannerType2>[^<]*<Language></Language></expression> </RegExp> - <RegExp input="$$5" output="<thumb type="season" season="\2">http://thetvdb.com/banners/\1</thumb>" dest="4+"> + <RegExp input="$$5" output="<thumb aspect="poster" type="season" season="\2">http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>season</BannerType>[^<]*<BannerType2>season</BannerType2>[^<]*<Language>$INFO[language]</Language>[^<]*[^S]*Season>([0-9]+)</Season></expression> </RegExp> - <RegExp input="$$5" output="<thumb type="season" season="\3">http://thetvdb.com/banners/\1</thumb>" dest="4+"> + <RegExp input="$$5" output="<thumb aspect="poster" type="season" season="\3">http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>season</BannerType>[^<]*<BannerType2>season</BannerType2>[^<]*<Language>((?!$INFO[language])[a-z])*</Language>[^<]*[^S]*Season>([0-9]+)</Season></expression> </RegExp> - <RegExp input="$$5" output="<thumb type="season" season="\2">http://thetvdb.com/banners/\1</thumb>" dest="4+"> + <RegExp input="$$5" output="<thumb aspect="banner" type="season" season="\2">http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>season</BannerType>[^<]*<BannerType2>seasonwide</BannerType2>[^<]*<Language>$INFO[language]</Language>[^<]*[^S]*Season>([0-9]+)</Season></expression> </RegExp> - <RegExp input="$$5" output="<thumb type="season" season="\3">http://thetvdb.com/banners/\1</thumb>" dest="4+"> + <RegExp input="$$5" output="<thumb aspect="banner" type="season" season="\3">http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>season</BannerType>[^<]*<BannerType2>seasonwide</BannerType2>[^<]*<Language>((?!$INFO[language])[a-z])*</Language>[^<]*[^S]*Season>([0-9]+)</Season></expression> </RegExp> - <RegExp input="$$5" conditional="!posters" output="<thumb>http://thetvdb.com/banners/\1</thumb>" dest="4+"> + <RegExp input="$$5" conditional="!posters" output="<thumb aspect="poster">http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>poster</BannerType></expression> </RegExp> - <RegExp input="$$5" output="<thumb type="season" season="-1">http://thetvdb.com/banners/\1</thumb>" dest="4+"> + <RegExp input="$$5" output="<thumb aspect="poster" type="season" season="-1">http://thetvdb.com/banners/\1</thumb>" dest="4+"> <expression repeat="yes"><BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>poster</BannerType></expression> </RegExp> <RegExp conditional="fanart" input="$$7" output="<fanart url="http://thetvdb.com/banners/">\1</fanart>" dest="4+"> @@ -188,7 +188,10 @@ <RegExp input="$$1" output="\1" dest="8"> <expression noclean="1"><Episode>.*?<id>$$2</id>(.*?)</Episode></expression> </RegExp> - <RegExp input="$$8" output="<plot>\1</plot>" dest="4"> + <RegExp input="$$1" output="<uniqueid>$$2</uniqueid>" dest="4"> + <expression/> + </RegExp> + <RegExp input="$$8" output="<plot>\1</plot>" dest="4+"> <expression><Overview>([^<]*)</Overview></expression> </RegExp> <RegExp input="$$8" output="\1" dest="6"> |
