The branch, eden has been updated
via 2e9fb35f9c2fbd745a7df4aa02202226249e1649 (commit)
via 02d1fa4cd7e4851aa06d6374aa015dbbbc51413b (commit)
via 5e23092ebb2340b92f6c3e9892af52e6bcfd9334 (commit)
via d668c665779b78b9b0c51f653964c6846ab98b2b (commit)
via 78a1ebb7cad5276323eb33fef50983d17df06a01 (commit)
via f338427305d048bd140393ca72854dfe31c44553 (commit)
from 80c80e3df93c54b18210655fe10abca3e4c1a4c7 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=2e9fb35f9c2fbd745a7df4aa02202226249e1649
commit 2e9fb35f9c2fbd745a7df4aa02202226249e1649
Author: Lee Pollock <[email protected]>
Date: Wed Feb 6 11:28:00 2013 +0000
[metadata.album.universal] updated to version 1.7.0
diff --git a/metadata.album.universal/addon.xml
b/metadata.album.universal/addon.xml
index b4b3f17..a2221ad 100644
--- a/metadata.album.universal/addon.xml
+++ b/metadata.album.universal/addon.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.album.universal"
name="Universal Album Scraper"
- version="1.6.4"
+ version="1.7.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.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.3"/>
- <import addon="metadata.common.fanart.tv" version="2.0.0"/>
+ <import addon="metadata.common.fanart.tv" version="2.1.2"/>
<import addon="metadata.common.amazon.de" version="1.0.0"/>
- <import addon="metadata.common.theaudiodb.com" version="1.3.0"/>
+ <import addon="metadata.common.theaudiodb.com" version="1.4.0"/>
</requires>
<extension point="xbmc.metadata.scraper.albums"
language="en"
diff --git a/metadata.album.universal/changelog.txt
b/metadata.album.universal/changelog.txt
index c3dc517..4cce03a 100644
--- a/metadata.album.universal/changelog.txt
+++ b/metadata.album.universal/changelog.txt
@@ -1,3 +1,7 @@
+[B]1.7.0[/B]
+Added: option to select language from TheAudioDB.com
+Added back the option to scrape from last.fm
+
[B]1.6.4[/B]
Disable last.fm options because last.fm suspended XBMC's API account
diff --git a/metadata.album.universal/resources/settings.xml
b/metadata.album.universal/resources/settings.xml
index b77bc72..250d0f2 100644
--- a/metadata.album.universal/resources/settings.xml
+++ b/metadata.album.universal/resources/settings.xml
@@ -2,7 +2,9 @@
<settings>
<category label="128">
<setting type="lsep" label="General Settings"/>
- <setting label="30002" type="labelenum"
values="TheAudioDb.com|amazon.de|None" id="albumreviewsource"
default="TheAudioDb.com"/>
+ <setting label="30002" type="labelenum"
values="last.fm|TheAudioDb.com|amazon.de|None" id="albumreviewsource"
default="TheAudioDb.com"/>
+ <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 label="30003" type="labelenum"
values="en|de|es|fr|it|cn|jp|ru|pt|se|nl|hu" id="tadbalbumlanguage"
default="en" visible="eq(-2,1)"/>
<setting type="sep"/>
<setting label="30004" type="labelenum"
values="MusicBrainz|allmusic.com|None" id="albumratingsource"
default="MusicBrainz"/>
<setting label="30005" type="labelenum" values="allmusic.com|None"
id="albumstylessource" default="allmusic.com"/>
@@ -14,6 +16,7 @@
<setting type="lsep" label="Artwork Settings"/>
<setting label="30000" type="bool" id="fanarttvalbumthumbs"
default="true"/>
<setting label="30010" type="bool" id="tadbalbumthumbs" default="true"/>
- <setting label="30008" type="bool" id="allmusicalbumthumbs"
default="true"/>
+ <setting label="30001" type="bool" id="lastfmalbumthumbs"
default="false"/>
+ <setting label="30008" type="bool" id="allmusicalbumthumbs"
default="false"/>
</category>
</settings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=02d1fa4cd7e4851aa06d6374aa015dbbbc51413b
commit 02d1fa4cd7e4851aa06d6374aa015dbbbc51413b
Author: Lee Pollock <[email protected]>
Date: Wed Feb 6 11:23:08 2013 +0000
[metadata.artists.universal] updated to version 2.6.0
diff --git a/metadata.artists.universal/addon.xml
b/metadata.artists.universal/addon.xml
index 2fe29b9..756a07f 100644
--- a/metadata.artists.universal/addon.xml
+++ b/metadata.artists.universal/addon.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.artists.universal"
name="Universal Artist Scraper"
- version="2.4.3"
- provider-name="Team XBMC">
+ version="2.6.0"
+ provider-name="Olympia, Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <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.last.fm" version="1.6.0"/>
+ <import addon="metadata.common.allmusic.com" version="2.6.0"/>
+ <import addon="metadata.common.musicbrainz.org" version="1.3.0"/>
<import addon="metadata.common.htbackdrops.com" version="1.2.0"/>
- <import addon="metadata.common.fanart.tv" version="2.0.0"/>
- <import addon="metadata.common.theaudiodb.com" version="1.3.0"/>
+ <import addon="metadata.common.fanart.tv" version="2.1.2"/>
+ <import addon="metadata.common.theaudiodb.com" version="1.5.0"/>
</requires>
<extension point="xbmc.metadata.scraper.artists"
language="en"
diff --git a/metadata.artists.universal/artistuniversal.xml
b/metadata.artists.universal/artistuniversal.xml
index ea4c514..b24a5a1 100644
--- a/metadata.artists.universal/artistuniversal.xml
+++ b/metadata.artists.universal/artistuniversal.xml
@@ -94,6 +94,15 @@
<RegExp input="$INFO[biogsource]" output="<chain
function="GetTADBBiographyByMBID">$$8</chain>" dest="5+">
<expression>TheAudioDb.com</expression>
</RegExp>
+ <RegExp input="$INFO[genressource]" output="<chain
function="GetTADBArtistGenresByMBID">$$8</chain>" dest="5+">
+ <expression>TheAudioDb.com</expression>
+ </RegExp>
+ <RegExp input="$INFO[discogsource]" output="<chain
function="GetTADBDiscographyByMBID">$$8</chain>" dest="5+">
+ <expression>TheAudioDb.com</expression>
+ </RegExp>
+ <RegExp input="$INFO[lifespansource]" output="<chain
function="GetTADBLifeSpanByMBID">$$8</chain>" dest="5+">
+ <expression>TheAudioDb.com</expression>
+ </RegExp>
<expression noclean="1"/>
</RegExp>
</GetArtistDetails>
diff --git a/metadata.artists.universal/changelog.txt
b/metadata.artists.universal/changelog.txt
index e51222c..9c75934 100644
--- a/metadata.artists.universal/changelog.txt
+++ b/metadata.artists.universal/changelog.txt
@@ -1,3 +1,10 @@
+[B]2.6.0[/B]
+Added: option to fetch discography and artist life span from TheAudioDb.com
+
+[B]2.5.0[/B]
+Added: option to select language from TheAudioDB.com
+Added back the option to scrape from last.fm
+
[B]2.4.3[/B]
Disable last.fm options because last.fm suspended XBMC's API account
diff --git a/metadata.artists.universal/resources/settings.xml
b/metadata.artists.universal/resources/settings.xml
index 5030489..079ca63 100644
--- a/metadata.artists.universal/resources/settings.xml
+++ b/metadata.artists.universal/resources/settings.xml
@@ -1,24 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
<category label="128">
- <setting label="30006" type="labelenum" values="TheAudioDb.com|None"
id="biogsource" default="TheAudioDb.com"/>
+ <setting label="30006" type="labelenum"
values="last.fm|TheAudioDb.com|None" id="biogsource" default="TheAudioDb.com"/>
+ <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 label="30015" type="labelenum"
values="en|de|es|fr|it|cn|jp|ru|pt|se|nl|hu" id="tadbartistlanguage"
default="en" visible="eq(-2,1)"/>
<setting type="sep"/>
- <setting label="30008" type="labelenum"
values="MusicBrainz|allmusic.com|None" id="discogsource" default="MusicBrainz"/>
+ <setting label="30008" type="labelenum"
values="last.fm|MusicBrainz|allmusic.com|TheAudioDb.com|None" id="discogsource"
default="MusicBrainz"/>
<setting type="sep"/>
- <setting label="30009" type="labelenum" values="allmusic.com|None"
id="genressource" default="allmusic.com"/>
- <setting label="30010" type="labelenum" values="allmusic.com|None"
id="stylessource" default="allmusic.com"/>
- <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="30011" type="labelenum"
values="TheAudioDb.com|allmusic.com|MusicBrainz|None" id="lifespansource"
default="TheAudioDb.com"/>
<setting label="30014" type="labelenum" values="allmusic.com|None"
id="yearsasource" default="allmusic.com"/>
+ <setting type="sep"/>
+ <setting label="30009" type="labelenum"
values="last.fm|TheAudioDb.com|allmusic.com|None" id="genressource"
default="TheAudioDb.com"/>
+ <setting label="30010" type="labelenum"
values="last.fm|allmusic.com|None" id="stylessource" default="allmusic.com"/>
+ <setting label="30012" type="labelenum" values="allmusic.com|None"
id="moodssource" default="allmusic.com"/>
</category>
<category label="30021">
- <setting label="30016" type="labelenum" values="TheAudioDb.com|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 label="30015" type="labelenum"
values="en|de|es|fr|it|cn|jp|ru|pt|se|nl|hu" id="tadbartistlanguage"
default="en" visible="eq(-2,1)"/>
<setting type="sep"/>
- <setting label="30017" type="labelenum" values="MusicBrainz|None"
id="discogfbsource" default="None" visible="false"/>
- <setting label="30018" type="labelenum" values="allmusic.com|None"
id="genresfbsource" default="None"/>
- <setting label="30019" type="labelenum" values="allmusic.com|None"
id="stylesfbsource" default="None"/>
<setting label="30020" type="labelenum"
values="MusicBrainz|allmusic.com|None" id="lifespanfbsource" default="None"/>
+ <setting type="sep"/>
+ <setting label="30018" type="labelenum"
values="last.fm|TheAudioDb.com|allmusic.com|None" id="genresfbsource"
default="None"/>
+ <setting label="30019" type="labelenum"
values="last.fm|allmusic.com|None" id="stylesfbsource" default="None"/>
</category>
<category label="30007">
@@ -26,6 +31,7 @@
<setting label="30005" type="bool" id="fanarttvthumbs" default="true"/>
<setting label="30022" type="bool" id="tadbthumbs" default="true"/>
<setting label="30003" type="bool" id="htbthumbs" default="true"/>
+ <setting label="30002" type="bool" id="lastfmartistthumbs"
default="false"/>
<setting label="30001" type="bool" id="allmusicartistthumbs"
default="true"/>
<setting type="lsep" label="Fanart Sources"/>
<setting label="30004" type="bool" id="fanarttvfanart" default="true"/>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=5e23092ebb2340b92f6c3e9892af52e6bcfd9334
commit 5e23092ebb2340b92f6c3e9892af52e6bcfd9334
Author: Lee Pollock <[email protected]>
Date: Wed Feb 6 11:22:33 2013 +0000
[metadata.common.musicbrainz.org] updated to version 1.3.0
diff --git a/metadata.common.musicbrainz.org/addon.xml
b/metadata.common.musicbrainz.org/addon.xml
index 42a2635..df66d41 100644
--- a/metadata.common.musicbrainz.org/addon.xml
+++ b/metadata.common.musicbrainz.org/addon.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.musicbrainz.org"
name="musicbrainz"
- version="1.2.3"
+ version="1.3.0"
provider-name="Team XBMC">
<requires>
- <import addon="xbmc.metadata" version="1.0"/>
+ <import addon="xbmc.metadata" version="2.1.0"/>
</requires>
<extension point="xbmc.metadata.scraper.library"
library="musicbrainz.xml"/>
diff --git a/metadata.common.musicbrainz.org/musicbrainz.xml
b/metadata.common.musicbrainz.org/musicbrainz.xml
index 16e539b..5ee46d5 100644
--- a/metadata.common.musicbrainz.org/musicbrainz.xml
+++ b/metadata.common.musicbrainz.org/musicbrainz.xml
@@ -45,6 +45,9 @@
<RegExp input="$INFO[lifespanfbsource]"
output="<chain
function="GetAMGFallbackArtistLifeSpanByAMGID">$$9</chain>"
dest="12">
<expression>allmusic.com</expression>
</RegExp>
+ <RegExp input="$INFO[lifespanfbsource]"
output="<chain
function="GetTADBFallbackLifeSpanByMBID">$$8</chain>"
dest="12">
+ <expression>TheAudioDb.com</expression>
+ </RegExp>
<expression>^$</expression>
</RegExp>
<RegExp input="$$11" output="$$11" dest="2">
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=d668c665779b78b9b0c51f653964c6846ab98b2b
commit d668c665779b78b9b0c51f653964c6846ab98b2b
Author: Lee Pollock <[email protected]>
Date: Wed Feb 6 11:21:41 2013 +0000
[metadata.common.last.fm] updated to version 1.6.0
diff --git a/metadata.common.last.fm/addon.xml
b/metadata.common.last.fm/addon.xml
index 561026f..181eac6 100644
--- a/metadata.common.last.fm/addon.xml
+++ b/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.5.1"
+ version="1.6.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.last.fm/lastfm.xml
b/metadata.common.last.fm/lastfm.xml
index c47a42e..364e707 100644
--- a/metadata.common.last.fm/lastfm.xml
+++ b/metadata.common.last.fm/lastfm.xml
@@ -87,6 +87,9 @@
<RegExp input="$INFO[genresfbsource]"
output="<chain
function="GetAMGFallbackArtistGenresByAMGID">$$9</chain>"
dest="12">
<expression>allmusic.com</expression>
</RegExp>
+ <RegExp input="$INFO[genresfbsource]"
output="<chain
function="GetTADBFallbackArtistGenresByMBID">$$8</chain>"
dest="12">
+ <expression>TheAudioDb.com</expression>
+ </RegExp>
<expression><genre></genre></expression>
</RegExp>
<RegExp input="$$11" output="$$11" dest="4">
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=78a1ebb7cad5276323eb33fef50983d17df06a01
commit 78a1ebb7cad5276323eb33fef50983d17df06a01
Author: Lee Pollock <[email protected]>
Date: Wed Feb 6 11:20:51 2013 +0000
[metadata.common.theaudiodb.com] updated to version 1.5.0
diff --git a/metadata.common.theaudiodb.com/addon.xml
b/metadata.common.theaudiodb.com/addon.xml
index dbf44f6..b8b4eab 100644
--- a/metadata.common.theaudiodb.com/addon.xml
+++ b/metadata.common.theaudiodb.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.theaudiodb.com"
name="TheAudioDb Common Scraper Functions"
- version="1.3.0"
+ version="1.5.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.theaudiodb.com/tadb.xml
b/metadata.common.theaudiodb.com/tadb.xml
index 5cce462..0f192c0 100644
--- a/metadata.common.theaudiodb.com/tadb.xml
+++ b/metadata.common.theaudiodb.com/tadb.xml
@@ -64,8 +64,14 @@
<RegExp input="" output="" dest="2">
<expression />
</RegExp>
+ <RegExp input="" output="" dest="11">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression
fixchars="1">strBiographyEN":"(.*?)","</expression>
+ </RegExp>
<RegExp input="$$1" output="\1" dest="11">
- <expression clear="yes"
fixchars="1">strBiography":"(.*?)","</expression>
+ <expression
fixchars="1">strBiography$INFO[tadbartistlanguage]":"(.*?)","</expression>
</RegExp>
<RegExp input="$$11" output="$$12" dest="2">
<RegExp input="$INFO[biogfbsource]"
output="<chain
function="GetLastFMFallbackBiographyByMBID">$$8</chain>"
dest="12">
@@ -94,7 +100,10 @@
<expression />
</RegExp>
<RegExp input="$$1"
output="<biography>\1</biography>" dest="2">
- <expression clear="yes"
fixchars="1">strBiography":"(.*?)","</expression>
+ <expression
fixchars="1">strBiographyen":"(.*?)","</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="2">
+ <expression
fixchars="1">strBiography$INFO[tadbartistlanguage]":"(.*?)","</expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
@@ -105,6 +114,11 @@
<expression noclean="1" />
</RegExp>
</GetTADBDiscographyByID>
+ <GetTADBDiscographyByMBID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
function="ParseTADBDiscography">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/discography-mb.php?s=\1</url></details>";
dest="5">
+ <expression noclean="1" />
+ </RegExp>
+ </GetTADBDiscographyByMBID>
<ParseTADBDiscography dest="5" clearbuffers="no">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="" output="" dest="2">
@@ -122,6 +136,11 @@
<expression noclean="1" />
</RegExp>
</GetTADBLifeSpanByID>
+ <GetTADBLifeSpanByMBID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
function="ParseTADBLifeSpan"
cache="tadb-\1-artist.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/artist-mb.php?i=\1</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetTADBLifeSpanByMBID>
<ParseTADBLifeSpan dest="5" clearbuffers="no">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="" output="" dest="2">
@@ -130,18 +149,27 @@
<RegExp input="" output="" dest="11">
<expression />
</RegExp>
- <RegExp input="$$1"
output="<formed>\1</formed>" dest="11">
- <expression
noclean="1">intFormedYear":"([^"]*)</expression>
+ <RegExp input="$$1" output="<formed>\2
(\1)</formed>" dest="11">
+ <expression
noclean="1">intFormedYear":"([^"]*).*?strCountry":"([^"]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<disbanded>\1</disbanded>" dest="11+">
<expression
noclean="1">strDisbanded":"([^"]*)</expression>
</RegExp>
- <RegExp input="$$1"
output="<born>\1</born>" dest="11">
- <expression
noclean="1">intBornYear":"([^"]*)</expression>
+ <RegExp input="$$1" output="<born>\2
(\1)</born>" dest="11">
+ <expression
noclean="1">intBornYear":"([^"]*).*?strCountry":"([^"]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<died>\1</died>" dest="11+">
<expression
noclean="1">intDiedYear":"([^"]*)</expression>
</RegExp>
+ <RegExp input="$$11" output="$$12" dest="2">
+ <RegExp input="$INFO[lifespanfbsource]"
output="<chain
function="GetMBFallbackLafeSpanByMBID">$$8</chain>"
dest="12">
+ <expression>MusicBrainz</expression>
+ </RegExp>
+ <RegExp input="$INFO[lifespanfbsource]"
output="<chain
function="GetAMGFallbackArtistLifeSpanByAMGID">$$9</chain>"
dest="12">
+ <expression>allmusic.com</expression>
+ </RegExp>
+ <expression>^$</expression>
+ </RegExp>
<RegExp input="$$11" output="$$11" dest="2">
<expression
noclean="1"><(?:born|formed)*>(.+)</(?:born|formed)*></expression>
</RegExp>
@@ -149,23 +177,92 @@
</RegExp>
</ParseTADBLifeSpan>
+ <GetTADBFallbackLifeSpanByMBID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
function="ParseTADBFallbackLifeSpan"
cache="tadb-\1-artist.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/artist-mb.php?i=\1</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetTADBFallbackLifeSpanByMBID>
+ <ParseTADBFallbackLifeSpan dest="5" clearbuffers="no">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
+ <RegExp input="" output="" dest="11">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="<formed>\2
(\1)</formed>" dest="11">
+ <expression
noclean="1">intFormedYear":"([^"]*).*?strCountry":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<disbanded>\1</disbanded>" dest="11+">
+ <expression
noclean="1">strDisbanded":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="<born>\2
(\1)</born>" dest="11">
+ <expression
noclean="1">intBornYear":"([^"]*).*?strCountry":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<died>\1</died>" dest="11+">
+ <expression
noclean="1">intDiedYear":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$11" output="$$11" dest="2">
+ <expression
noclean="1"><(?:born|formed)*>(.+)</(?:born|formed)*></expression>
+ </RegExp>
+ <expression noclean="1"/>
+ </RegExp>
+ </ParseTADBFallbackLifeSpan>
+
<GetTADBArtistGenresByID dest="5" clearbuffers="no">
<RegExp input="$$1" output="<details><url
function="ParseTADBArtistGenres"
cache="tadb-\1-artist.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/artist.php?i=\1</url></details>";
dest="5">
<expression noclean="1"/>
</RegExp>
</GetTADBArtistGenresByID>
+ <GetTADBArtistGenresByMBID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
function="ParseTADBArtistGenres"
cache="tadb-\1-artist.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/artist-mb.php?i=\1</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetTADBArtistGenresByMBID>
<ParseTADBArtistGenres dest="5" clearbuffers="no">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="" output="" dest="2">
<expression />
</RegExp>
- <RegExp input="$$1"
output="<genre>\1</genre>" dest="2">
- <expression
noclean="1">strGenre":"([^"]*)</expression>
+ <RegExp input="" output="" dest="11">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <expression
fixchars="1">strSubGenre":"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$11" output="$$12" dest="2">
+ <RegExp input="$INFO[genresfbsource]"
output="<chain
function="GetLastFMFallbackArtistGenresByMBID">$$8</chain>"
dest="12">
+ <expression>last.fm</expression>
+ </RegExp>
+ <RegExp input="$INFO[genresfbsource]"
output="<chain
function="GetAMGFallbackArtistGenresByAMGID">$$9</chain>"
dest="12">
+ <expression>allmusic.com</expression>
+ </RegExp>
+ <expression>^$</expression>
+ </RegExp>
+ <RegExp input="$$11"
output="<genre>\1</genre>" dest="2">
+ <expression>(.+)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</ParseTADBArtistGenres>
+ <GetTADBFallbackArtistGenresByMBID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
function="ParseTADBArtistGenres"
cache="tadb-\1-artist.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/artist-mb.php?i=\1</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetTADBFallbackArtistGenresByMBID>
+ <ParseTADBFallbackArtistGenres dest="5" clearbuffers="no">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="2">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1"
output="<genre>\1</genre>" dest="2">
+ <expression
noclean="1">strSubGenre":"([^"]*)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseTADBFallbackArtistGenres>
+
<GetTADBAlbumReviewByID dest="5">
<RegExp input="$$1" output="<details><url
function="ParseTADBAlbumReview"
cache="tadb-\1-album.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/album.php?m=\1</url></details>";
dest="5">
@@ -180,7 +277,10 @@
<ParseTADBAlbumReview dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1"
output="<review>\1</review>" dest="2">
- <expression
fixchars="1">strDescription":"(.*?)","</expression>
+ <expression
fixchars="1">strDescriptionEN":"(.*?)","</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<review>\1</review>" dest="2">
+ <expression
fixchars="1">strDescription$INFO[tadbalbumlanguage]":"(.*?)","</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=f338427305d048bd140393ca72854dfe31c44553
commit f338427305d048bd140393ca72854dfe31c44553
Author: Lee Pollock <[email protected]>
Date: Wed Feb 6 11:19:12 2013 +0000
[metadata.common.allmusic.com] updated to version 2.6.0
diff --git a/metadata.common.allmusic.com/addon.xml
b/metadata.common.allmusic.com/addon.xml
index 68f2b21..dc98b3f 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.5.2"
+ version="2.6.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 edcd508..51d57fb 100644
--- a/metadata.common.allmusic.com/allmusic.xml
+++ b/metadata.common.allmusic.com/allmusic.xml
@@ -105,6 +105,9 @@
<RegExp input="$INFO[lifespanfbsource]"
output="<chain
function="GetMBFallbackLafeSpanByMBID">$$8</chain>"
dest="12">
<expression>MusicBrainz</expression>
</RegExp>
+ <RegExp input="$INFO[lifespanfbsource]"
output="<chain
function="GetTADBFallbackLifeSpanByMBID">$$8</chain>"
dest="12">
+ <expression>TheAudioDb.com</expression>
+ </RegExp>
<expression>^$</expression>
</RegExp>
<RegExp input="$$11" output="$$11" dest="2">
@@ -180,6 +183,9 @@
<RegExp input="$INFO[genresfbsource]"
output="<chain
function="GetLastFMFallbackArtistGenresByMBID">$$8</chain>"
dest="12">
<expression>last.fm</expression>
</RegExp>
+ <RegExp input="$INFO[genresfbsource]"
output="<chain
function="GetTADBFallbackArtistGenresByMBID">$$8</chain>"
dest="12">
+ <expression>TheAudioDb.com</expression>
+ </RegExp>
<expression><genre></genre></expression>
</RegExp>
<RegExp input="$$11" output="$$11" dest="2">
@@ -277,10 +283,10 @@
<RegExp input="" output="" dest="2">
<expression />
</RegExp>
- <RegExp input="$$1" output="\1" dest="8">
+ <RegExp input="$$1" output="\1" dest="10">
<expression noclean="1"><h4>artist
moods</h4>(.*?)</ul></expression>
</RegExp>
- <RegExp input="$$8"
output="<mood>\1</mood>" dest="2">
+ <RegExp input="$$10"
output="<mood>\1</mood>" dest="2">
<expression repeat="yes"
noclean="1"><li>[^>]*>([^<]*)</a></li></expression>
</RegExp>
<expression noclean="1" />
-----------------------------------------------------------------------
Summary of changes:
metadata.album.universal/addon.xml | 10 +-
metadata.album.universal/changelog.txt | 4 +
metadata.album.universal/resources/settings.xml | 7 +-
metadata.artists.universal/addon.xml | 14 ++--
metadata.artists.universal/artistuniversal.xml | 9 ++
metadata.artists.universal/changelog.txt | 7 ++
metadata.artists.universal/resources/settings.xml | 26 +++--
metadata.common.allmusic.com/addon.xml | 2 +-
metadata.common.allmusic.com/allmusic.xml | 10 ++-
metadata.common.last.fm/addon.xml | 2 +-
metadata.common.last.fm/lastfm.xml | 3 +
metadata.common.musicbrainz.org/addon.xml | 4 +-
metadata.common.musicbrainz.org/musicbrainz.xml | 3 +
metadata.common.theaudiodb.com/addon.xml | 2 +-
metadata.common.theaudiodb.com/tadb.xml | 118 +++++++++++++++++++--
15 files changed, 181 insertions(+), 40 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
