The branch, eden has been updated
via 496db17938643de8b6b10288d4c62905c60e8f34 (commit)
from f23fcea2a622a01b5735a3ce0ce41d54748a23fc (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=496db17938643de8b6b10288d4c62905c60e8f34
commit 496db17938643de8b6b10288d4c62905c60e8f34
Author: olympia <[email protected]>
Date: Fri Jun 1 23:01:04 2012 +0200
[metadata.artists.universal] updated to version 1.1.0
diff --git a/metadata.artists.universal/addon.xml
b/metadata.artists.universal/addon.xml
index c1d5dc5..c54b612 100644
--- a/metadata.artists.universal/addon.xml
+++ b/metadata.artists.universal/addon.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.artists.universal"
name="Universal Scraper"
- version="1.0.0"
+ version="1.1.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
<import addon="metadata.common.last.fm" version="1.1.0"/>
- <import addon="metadata.common.allmusic.com" version="1.8.2"/>
+ <import addon="metadata.common.allmusic.com" version="2.1.0"/>
<import addon="metadata.common.musicbrainz.org" version="1.0.1"/>
<import addon="metadata.common.htbackdrops.com" version="1.0.7"/>
<import addon="metadata.common.fanart.tv" version="1.0.0"/>
diff --git a/metadata.artists.universal/artistuniversal.xml
b/metadata.artists.universal/artistuniversal.xml
index 2152698..870f86e 100644
--- a/metadata.artists.universal/artistuniversal.xml
+++ b/metadata.artists.universal/artistuniversal.xml
@@ -68,9 +68,6 @@
<RegExp input="$INFO[moodssource]" output="<chain
function="GetAMGArtistMoodsByAMGID">$$9</chain>" dest="5+">
<expression>allmusic.com</expression>
</RegExp>
- <RegExp input="$INFO[instrumentssource]"
output="<chain
function="GetAMGArtistInstrumentsByAMGID">$$9</chain>"
dest="5+">
- <expression>allmusic.com</expression>
- </RegExp>
<RegExp input="$INFO[yearsasource]" output="<chain
function="GetAMGArtistYearsActiveByAMGID">$$9</chain>"
dest="5+">
<expression>allmusic.com</expression>
</RegExp>
diff --git a/metadata.artists.universal/resources/language/English/strings.xml
b/metadata.artists.universal/resources/language/English/strings.xml
index 2de83d9..0ab890c 100644
--- a/metadata.artists.universal/resources/language/English/strings.xml
+++ b/metadata.artists.universal/resources/language/English/strings.xml
@@ -13,6 +13,6 @@
<string id="30010">Get Artist Styles from</string>
<string id="30011">Get Artist Life-Span from</string>
<string id="30012">Get Artist Moods from</string>
- <string id="30013">Get Artist Instruments from</string>
<string id="30014">Get Artist Years Active from</string>
+ <string id="30015"> Preferred Language</string>
</strings>
diff --git a/metadata.artists.universal/resources/settings.xml
b/metadata.artists.universal/resources/settings.xml
index e6413b0..6349f61 100644
--- a/metadata.artists.universal/resources/settings.xml
+++ b/metadata.artists.universal/resources/settings.xml
@@ -2,12 +2,14 @@
<settings>
<category label="128">
<setting label="30006" type="labelenum" values="last.fm|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"/>
+ <setting type="sep"/>
<setting label="30009" type="labelenum"
values="last.fm|allmusic.com|None" id="genressource" default="last.fm"/>
<setting label="30010" type="labelenum"
values="last.fm|allmusic.com|None" id="stylessource" default="last.fm"/>
<setting label="30011" type="labelenum"
values="allmusic.com|MusicBrainz|None" id="lifespansource"
default="allmusic.com"/>
<setting label="30012" type="labelenum" values="allmusic.com|None"
id="moodssource" default="allmusic.com"/>
- <setting label="30013" type="labelenum" values="allmusic.com|None"
id="instrumentssource" default="allmusic.com"/>
<setting label="30014" type="labelenum" values="allmusic.com|None"
id="yearsasource" default="allmusic.com"/>
</category>
@@ -20,7 +22,6 @@
<setting type="lsep" label="Fanart Sources"/>
<setting label="30004" type="bool" id="fanarttvfanart" default="true"/>
<setting label="30000" type="bool" id="htbfanart" default="false"/>
-
-
</category>
+
</settings>
diff --git a/metadata.common.allmusic.com/addon.xml
b/metadata.common.allmusic.com/addon.xml
index 06b801c..fb3e18e 100644
--- a/metadata.common.allmusic.com/addon.xml
+++ b/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.0.2"
+ version="2.1.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.allmusic.com/allmusic.xml
b/metadata.common.allmusic.com/allmusic.xml
index 2c3d959..06fed9c 100644
--- a/metadata.common.allmusic.com/allmusic.xml
+++ b/metadata.common.allmusic.com/allmusic.xml
@@ -1,13 +1,13 @@
<scraperfunctions>
<GetAMGDiscographyByAMGID dest="5">
- <RegExp input="$$1" output="<details><url
cache="am-\1-discog.html"
function="ParseAMGDiscography">http://www.allmusic.com/artist/\1/discography</url></details>";
dest="5">
+ <RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGDiscography">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
<expression noclean="1"/>
</RegExp>
</GetAMGDiscographyByAMGID>
<ParseAMGDiscography dest="5">
<RegExp input="$$2$$3"
output="<details>\1</details>" dest="5">
<RegExp input="$$1"
output="<album><year>\1</year><title>\2</title><label>\3</label></album>"
dest="2">
- <expression repeat="yes" clear="yes"
noclean="1,3,4"><td class="sorted
cell">([^<]*)</td>.*?<td class="cell"><a
href="[^>]*>([^<]*)<.*?<td
class="cell">([^<]*)<</expression>
+ <expression repeat="yes" clear="yes"
trim="1"><td class="year "
data-sort-value="[^>]*>([^<]*)</td>[^<]*<td
class="title" data-sort-value="([^"]*)(.*?<div
class="label">([^<]*))?</expression>
</RegExp>
<RegExp input="$$2" output="\1&amp;\2" dest="3">
<expression repeat="yes"
noclean="1,2">(.*?)&(.+)</expression>
@@ -20,28 +20,28 @@
</ParseAMGDiscography>
<GetAMGFakeBiographyByAMGID dest="5">
- <RegExp input="$$1" output="<details><url
cache="am-\1-biog.html"
function="ParseAMGFakeBiography">http://www.allmusic.com/artist/\1/biography</url></details>";
dest="5">
+ <RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGFakeBiography">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
<expression noclean="1"/>
</RegExp>
</GetAMGFakeBiographyByAMGID>
<ParseAMGFakeBiography dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="<biography>Fetching
artist biography from allmusic.com is not possible due to copyright
reasons.</biography>" dest="2">
- <expression
clear="yes">Biography</h2>.*?</p>(.*?)</p></expression>
+ <expression noclean="1" />
</RegExp>
<expression noclean="1"/>
</RegExp>
</ParseAMGFakeBiography>
<GetAMGBiographyByAMGID dest="5">
- <RegExp input="$$1" output="<details><url
cache="am-\1-biog.html"
function="ParseAMGBiography">http://www.allmusic.com/artist/\1/biography</url></details>";
dest="5">
+ <RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGBiography">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
<expression noclean="1"/>
</RegExp>
</GetAMGBiographyByAMGID>
<ParseAMGBiography dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1"
output="<biography>\1</biography>" dest="2">
- <expression
clear="yes">Biography</h2>.*?</p>(.*?)</p></expression>
+ <expression clear="yes">"
itemprop="description">(.*?)div class="advertisement
leaderboard"></expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
@@ -55,7 +55,7 @@
<ParseAMGArtistName dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1"
output="<name>\1</name>" dest="2">
- <expression noclean="1"><meta
name="title" content="([^"]*)</expression>
+ <expression
noclean="1">http://schema.org/MusicGroup">[^<]*<span
itemprop="name">([^<]*)</span></expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
@@ -68,20 +68,17 @@
</GetAMGArtistLifeSpanByAMGID>
<ParseAMGArtistLifeSpan dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="<born>\1</born>" dest="2">
-
<expression><h3>Born[^>]*>[^>]*>(.*?)</p></expression>
+ <RegExp input="$$1" output="<born>\1
\2</born>" dest="2">
+ <expression
trim="1,2"><dt>\s*Born[^>]*>[^>]*>[^>]*>(.*?\d{4})\s*([^<]*)?</expression>
</RegExp>
- <RegExp input="$$1"
output="<born>\1</born>" dest="2+">
-
<expression><h3>Birth[^>]*>[^>]*>(.*?)</p></expression>
- </RegExp>
- <RegExp input="$$1"
output="<died>\1</died>" dest="2+">
-
<expression><h3>Died[^>]*>[^>]*>(.*?)</p></expression>
+ <RegExp input="$$1" output="<died>\1
\2</died>" dest="2+">
+ <expression
trim="1,2"><dt>\s*Died[^>]*>[^>]*>[^>]*>(.*?\d{4})\s*([^<]*)?</expression>
</RegExp>
<RegExp input="$$1"
output="<formed>\1</formed>" dest="2+">
-
<expression><h3>Formed[^>]*>[^>]*>(.*?)</p></expression>
+ <expression
trim="1,2"><dt>\s*Formed[^>]*>[^>]*>[^>]*>(.*?\d{4})\s*([^<]*)?</expression>
</RegExp>
<RegExp input="$$1"
output="<disbanded>\1</disbanded>" dest="2+">
-
<expression><h3>Disbanded[^>]*>[^>]*>(.*?)</p></expression>
+ <expression
trim="1,2"><dt>\s*Disbanded[^>]*>[^>]*>[^>]*>(.*?\d{4})\s*([^<]*)?</expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
@@ -94,16 +91,10 @@
</GetAMGArtistYearsActiveByAMGID>
<ParseAMGArtistYearsActive dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1"><h3>Years
Active</h3>(.*?)</p></expression>
- </RegExp>
- <RegExp input="$$6" output="\1's/" dest="7+">
- <expression repeat="yes"><span
class="active">([0-9]+)</span></expression>
- </RegExp>
- <RegExp input="$$7"
output="<yearsactive>\1</yearsactive>" dest="2">
- <expression noclean="1">(.+)/</expression>
+ <RegExp input="$$1"
output="<yearsactive>\1</yearsactive>" dest="2">
+ <expression trim="1" noclean="1"><dd
class="active">([^<]*)<</expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</ParseAMGArtistYearsActive>
@@ -115,12 +106,12 @@
<ParseAMGArtistGenres dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="6">
- <expression
noclean="1"><h3>Genres</h3>(.*?)</div></expression>
+ <expression
noclean="1"><dt>Genres</dt>(.*?)</dd></expression>
</RegExp>
<RegExp input="$$6"
output="<genre>\2</genre>" dest="2">
- <expression repeat="yes" noclean="1"><a
href="/explore/genre/[^>]*>(<strong>)?([^<]*)</expression>
+ <expression repeat="yes"
noclean="1"><li><a
href="/genre/[^"]*">(<strong>)?([^<]*)</expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</ParseAMGArtistGenres>
@@ -132,12 +123,12 @@
<ParseAMGArtistStyles dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="7">
- <expression
noclean="1"><h3>Styles</h3>(.*?)</div></expression>
+ <expression
noclean="1"><dt>Styles</dt>(.*?)</dd></expression>
</RegExp>
<RegExp input="$$7"
output="<style>\1</style>" dest="2">
- <expression repeat="yes"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
+ <expression repeat="yes"
noclean="1"><li><a
href="/style/[^"]*">([^<]*)</expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</ParseAMGArtistStyles>
@@ -149,32 +140,15 @@
<ParseAMGArtistMoods dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="\1" dest="8">
- <expression
noclean="1"><h3>Moods</h3>(.*?)</div></expression>
+ <expression noclean="1"><h4>artist
moods</h4>(.*?)</ul></expression>
</RegExp>
<RegExp input="$$8"
output="<mood>\1</mood>" dest="2">
<expression repeat="yes"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
</ParseAMGArtistMoods>
- <GetAMGArtistInstrumentsByAMGID dest="5">
- <RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGArtistInstruments">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
- <expression noclean="1"/>
- </RegExp>
- </GetAMGArtistInstrumentsByAMGID>
- <ParseAMGArtistInstruments dest="5">
- <RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1" output="\1" dest="9">
- <expression
noclean="1"><h3>Instruments</h3>(.*?)</div></expression>
- </RegExp>
- <RegExp input="$$9"
output="<instruments>\1</instruments>" dest="2">
- <expression repeat="yes"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </ParseAMGArtistInstruments>
-
<GetAMGArtistThumbsByAMGID dest="5">
<RegExp input="$$1" output="<details><url
cache="am-\1-artist.html"
function="ParseAMGArtistThumbs">http://www.allmusic.com/artist/\1</url></details>";
dest="5">
<expression noclean="1"/>
@@ -182,8 +156,11 @@
</GetAMGArtistThumbsByAMGID>
<ParseAMGArtistThumbs dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="<thumb>\1</thumb>" dest="2">
- <expression noclean="1"><img
id="artist_image" src="([^"]*)"</expression>
+ <RegExp input="$$1" output="\1" dest="9">
+ <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">
+ <expression repeat="yes" noclean="1"><img
src="http://cps-static.rovicorp.com/3/JPG_[^/]*/([^"]*)</expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
-----------------------------------------------------------------------
Summary of changes:
metadata.artists.universal/addon.xml | 4 +-
metadata.artists.universal/artistuniversal.xml | 3 -
metadata.artists.universal/changelog.txt | 5 +
.../resources/language/English/strings.xml | 2 +-
metadata.artists.universal/resources/settings.xml | 7 +-
metadata.common.allmusic.com/addon.xml | 2 +-
metadata.common.allmusic.com/allmusic.xml | 81 +++++++-------------
7 files changed, 42 insertions(+), 62 deletions(-)
create mode 100644 metadata.artists.universal/changelog.txt
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
