The branch, eden has been updated
via 744cf004de11c7689a3634d3ec91471a973382c2 (commit)
from e42c666c33dbda2a3b53caaacb80dfbbc97f960d (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=744cf004de11c7689a3634d3ec91471a973382c2
commit 744cf004de11c7689a3634d3ec91471a973382c2
Author: olympia <[email protected]>
Date: Sat Nov 17 15:32:03 2012 +0100
updated universal music scrapers to scrap artwork from theaudiodb.com
diff --git a/metadata.album.universal/addon.xml
b/metadata.album.universal/addon.xml
index fc63660..470dc61 100644
--- a/metadata.album.universal/addon.xml
+++ b/metadata.album.universal/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.album.universal"
name="Universal Album Scraper"
- version="1.4.0"
+ version="1.5.0"
provider-name="Olympia, Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -10,7 +10,7 @@
<import addon="metadata.common.musicbrainz.org" version="1.2.3"/>
<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"/>
+ <import addon="metadata.common.theaudiodb.com" version="1.3.0"/>
</requires>
<extension point="xbmc.metadata.scraper.albums"
language="en"
diff --git a/metadata.album.universal/albumuniversal.xml
b/metadata.album.universal/albumuniversal.xml
index fadd4bd..05afe2a 100644
--- a/metadata.album.universal/albumuniversal.xml
+++ b/metadata.album.universal/albumuniversal.xml
@@ -99,6 +99,9 @@
<RegExp conditional="fanarttvalbumthumbs" input="$$1"
output="<chain
function="GetFanartTvAlbumThumbsByMBID">$$4</chain>"
dest="5+">
<expression noclean="1" />
</RegExp>
+ <RegExp conditional="tadbalbumthumbs" input="$$1"
output="<chain
function="GetTADBAlbumThumbsByMBID">$$4</chain>" dest="5+">
+ <expression noclean="1" />
+ </RegExp>
<RegExp conditional="allmusicalbumthumbs" input="$$1"
output="<url function="GetAMGAlbumThumbs"
cache="mb-$$4-rg.xml">http://musicbrainz.org/ws/2/release-group/$$4?inc=url-rels</url>";
dest="5+">
<expression noclean="1" />
</RegExp>
diff --git a/metadata.album.universal/changelog.txt
b/metadata.album.universal/changelog.txt
index e4c8f55..adb5ce3 100644
--- a/metadata.album.universal/changelog.txt
+++ b/metadata.album.universal/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.5.0[/B]
+Added: Scraping album thumbs from theaudiodb.com
+
[B]1.4.0[/B]
Added back fanart.tv scraping via JSON API. Still off by default.
diff --git a/metadata.album.universal/resources/language/English/strings.xml
b/metadata.album.universal/resources/language/English/strings.xml
index 9777a09..bbbcce5 100644
--- a/metadata.album.universal/resources/language/English/strings.xml
+++ b/metadata.album.universal/resources/language/English/strings.xml
@@ -10,4 +10,5 @@
<string id="30007">Get Album Themes from</string>
<string id="30008">Grab Album Thumbs from allmusic.com</string>
<string id="30009">Artwork</string>
+ <string id="30010">Grab Album Thumbs from theaudiodb.com</string>
</strings>
diff --git a/metadata.album.universal/resources/settings.xml
b/metadata.album.universal/resources/settings.xml
index bc64d0e..8732231 100644
--- a/metadata.album.universal/resources/settings.xml
+++ b/metadata.album.universal/resources/settings.xml
@@ -14,6 +14,7 @@
<category label="30009">
<setting type="lsep" label="Artwork Settings"/>
<setting label="30000" type="bool" id="fanarttvalbumthumbs"
default="false"/>
+ <setting label="30010" type="bool" id="tadbalbumthumbs" default="true"/>
<setting label="30001" type="bool" id="lastfmalbumthumbs"
default="true"/>
<setting label="30008" type="bool" id="allmusicalbumthumbs"
default="true"/>
</category>
diff --git a/metadata.artists.universal/addon.xml
b/metadata.artists.universal/addon.xml
index b141a4e..5660681 100644
--- a/metadata.artists.universal/addon.xml
+++ b/metadata.artists.universal/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.artists.universal"
name="Universal Artist Scraper"
- version="2.2.0"
+ version="2.3.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -10,7 +10,7 @@
<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="2.0.0"/>
- <import addon="metadata.common.theaudiodb.com" version="1.2.0"/>
+ <import addon="metadata.common.theaudiodb.com" version="1.3.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 2f8e84f..ea4c514 100644
--- a/metadata.artists.universal/artistuniversal.xml
+++ b/metadata.artists.universal/artistuniversal.xml
@@ -49,6 +49,9 @@
<RegExp input="$$8" conditional="fanarttvthumbs"
output="<chain
function="GetFanartTvArtistThumbsByMBID">\1</chain>"
dest="5+">
<expression/>
</RegExp>
+ <RegExp input="$$8" conditional="tadbthumbs"
output="<chain
function="GetTADBArtistThumbsByMBID">$$8</chain>" dest="5+">
+ <expression/>
+ </RegExp>
<RegExp input="$$8" conditional="htbthumbs"
output="<chain function="GetHTBThumbsByMBID">\1</chain>"
dest="5+">
<expression/>
</RegExp>
@@ -58,6 +61,9 @@
<RegExp input="$$8" conditional="fanarttvfanart"
output="<chain
function="GetFanartTvArtistFanartsByMBID">\1</chain>"
dest="5+">
<expression/>
</RegExp>
+ <RegExp input="$$8" conditional="tadbfanart"
output="<chain
function="GetTADBArtistFanartsByMBID">$$8</chain>" dest="5+">
+ <expression/>
+ </RegExp>
<RegExp input="$$8" conditional="htbfanart"
output="<chain function="GetHTBFanartByMBID">\1</chain>"
dest="5+">
<expression/>
</RegExp>
diff --git a/metadata.artists.universal/changelog.txt
b/metadata.artists.universal/changelog.txt
index c3d1697..1675b6d 100644
--- a/metadata.artists.universal/changelog.txt
+++ b/metadata.artists.universal/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.3.0[/B]
+Added: Scraping artist thumbs and fanarts from theaudiodb.com
+
[B]2.2.0[/B]
Added back fanart.tv scraping via JSON API. Still off by default.
diff --git a/metadata.artists.universal/resources/language/English/strings.xml
b/metadata.artists.universal/resources/language/English/strings.xml
index ae97b79..cfbec4d 100644
--- a/metadata.artists.universal/resources/language/English/strings.xml
+++ b/metadata.artists.universal/resources/language/English/strings.xml
@@ -21,4 +21,6 @@
<string id="30019">Fallback to Artist Styles from</string>
<string id="30020">Fallback to Artist Life-Span from</string>
<string id="30021">Fallbacks</string>
+ <string id="30022">Enable Artist Thumbs from theaudiodb.com</string>
+ <string id="30023">Enable Artist Fanarts from theaudiodb.com</string>
</strings>
diff --git a/metadata.artists.universal/resources/settings.xml
b/metadata.artists.universal/resources/settings.xml
index bd78dd2..0171649 100644
--- a/metadata.artists.universal/resources/settings.xml
+++ b/metadata.artists.universal/resources/settings.xml
@@ -26,11 +26,13 @@
<category label="30007">
<setting type="lsep" label="Thumb Sources"/>
<setting label="30005" type="bool" id="fanarttvthumbs" default="false"/>
+ <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="true"/>
<setting label="30001" type="bool" id="allmusicartistthumbs"
default="true"/>
<setting type="lsep" label="Fanart Sources"/>
<setting label="30004" type="bool" id="fanarttvfanart" default="false"/>
+ <setting label="30023" type="bool" id="tadbfanart" default="true"/>
<setting label="30000" type="bool" id="htbfanart" default="true"/>
</category>
diff --git a/metadata.common.theaudiodb.com/addon.xml
b/metadata.common.theaudiodb.com/addon.xml
index a6fdfaa..dbf44f6 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.2.0"
+ version="1.3.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 a51edeb..5cce462 100644
--- a/metadata.common.theaudiodb.com/tadb.xml
+++ b/metadata.common.theaudiodb.com/tadb.xml
@@ -4,6 +4,11 @@
<expression noclean="1" />
</RegExp>
</GetTADBArtistThumbsByID>
+ <GetTADBArtistThumbsByMBID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
function="ParseTADBArtistThumbs"
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>
+ </GetTADBArtistThumbsByMBID>
<ParseTADBArtistThumbs dest="5" clearbuffers="no">
<RegExp input="$$13" output="<details>\1</details>"
dest="5">
<RegExp input="" output="" dest="13">
@@ -21,6 +26,11 @@
<expression noclean="1" />
</RegExp>
</GetTADBArtistFanartsByID>
+ <GetTADBArtistFanartsByMBID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
function="ParseTADBArtistFanarts"
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>
+ </GetTADBArtistFanartsByMBID>
<ParseTADBArtistFanarts dest="5" clearbuffers="no">
<RegExp input="$$13"
output="<details><fanart>\1</fanart></details>"
dest="5">
<RegExp input="" output="" dest="13">
@@ -251,6 +261,11 @@
<expression noclean="1"/>
</RegExp>
</GetTADBAlbumThumbsByID>
+ <GetTADBAlbumThumbsByMBID dest="5">
+ <RegExp input="$$1" output="<details><url
function="ParseTADBAlbumThumbs"
cache="tadb-\1-album.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/album-mb.php?i=\1</url></details>";
dest="5">
+ <expression noclean="1"/>
+ </RegExp>
+ </GetTADBAlbumThumbsByMBID>
<ParseTADBAlbumThumbs dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="<thumb
preview="\1/preview">\1</thumb>" dest="2">
-----------------------------------------------------------------------
Summary of changes:
metadata.album.universal/addon.xml | 4 ++--
metadata.album.universal/albumuniversal.xml | 3 +++
metadata.album.universal/changelog.txt | 3 +++
.../resources/language/English/strings.xml | 1 +
metadata.album.universal/resources/settings.xml | 1 +
metadata.artists.universal/addon.xml | 4 ++--
metadata.artists.universal/artistuniversal.xml | 6 ++++++
metadata.artists.universal/changelog.txt | 3 +++
.../resources/language/English/strings.xml | 2 ++
metadata.artists.universal/resources/settings.xml | 2 ++
metadata.common.theaudiodb.com/addon.xml | 2 +-
metadata.common.theaudiodb.com/tadb.xml | 15 +++++++++++++++
12 files changed, 41 insertions(+), 5 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
