diff options
Diffstat (limited to 'addons/metadata.album.universal')
5 files changed, 62 insertions, 7 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> |