diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2012-11-14 21:54:32 +0100 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2012-11-14 21:54:32 +0100 |
| commit | 64d3b8e87d681c91553fa296a65f77bb3786a67e (patch) | |
| tree | f3ff630691506a64c1887ed8066e33dd351dcc2c /addons/metadata.artists.universal | |
| parent | 37e8e4ecf7fbc78dbb2c7cd338cdd0f7e8a620c9 (diff) | |
[scrapers] sync master with current scraper repo
Diffstat (limited to 'addons/metadata.artists.universal')
5 files changed, 83 insertions, 12 deletions
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> |