The branch, eden has been updated
via e42c666c33dbda2a3b53caaacb80dfbbc97f960d (commit)
from 7afd4177ffca0b0a43dfdc90f313d70972a16995 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=e42c666c33dbda2a3b53caaacb80dfbbc97f960d
commit e42c666c33dbda2a3b53caaacb80dfbbc97f960d
Author: olympia <[email protected]>
Date: Wed Nov 14 20:52:26 2012 +0100
re-activated fanart.tv scraping via JSON API
diff --git a/metadata.album.universal/addon.xml
b/metadata.album.universal/addon.xml
index ad8289a..fc63660 100644
--- a/metadata.album.universal/addon.xml
+++ b/metadata.album.universal/addon.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.album.universal"
name="Universal Album Scraper"
- version="1.3.7"
+ 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>
diff --git a/metadata.album.universal/changelog.txt
b/metadata.album.universal/changelog.txt
index 65ef20e..e4c8f55 100644
--- a/metadata.album.universal/changelog.txt
+++ b/metadata.album.universal/changelog.txt
@@ -1,3 +1,6 @@
+[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
diff --git a/metadata.album.universal/resources/settings.xml
b/metadata.album.universal/resources/settings.xml
index 9ef0e16..bc64d0e 100644
--- a/metadata.album.universal/resources/settings.xml
+++ b/metadata.album.universal/resources/settings.xml
@@ -13,7 +13,7 @@
<category label="30009">
<setting type="lsep" label="Artwork Settings"/>
- <setting label="30000" type="bool" id="fanarttvalbumthumbs"
default="None" visible="false"/>
+ <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>
diff --git a/metadata.artists.universal/addon.xml
b/metadata.artists.universal/addon.xml
index 77bbabc..b141a4e 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.1.9"
+ version="2.2.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -9,7 +9,7 @@
<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"
diff --git a/metadata.artists.universal/changelog.txt
b/metadata.artists.universal/changelog.txt
index 45c7dc8..c3d1697 100644
--- a/metadata.artists.universal/changelog.txt
+++ b/metadata.artists.universal/changelog.txt
@@ -1,3 +1,6 @@
+[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
diff --git a/metadata.artists.universal/resources/settings.xml
b/metadata.artists.universal/resources/settings.xml
index 58b3a00..bd78dd2 100644
--- a/metadata.artists.universal/resources/settings.xml
+++ b/metadata.artists.universal/resources/settings.xml
@@ -25,12 +25,12 @@
<category label="30007">
<setting type="lsep" label="Thumb Sources"/>
- <setting label="30005" type="bool" id="fanarttvthumbs" default="None"
visible="false"/>
+ <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="None"
visible="false"/>
+ <setting label="30004" type="bool" id="fanarttvfanart" default="false"/>
<setting label="30000" type="bool" id="htbfanart" default="true"/>
</category>
diff --git a/metadata.common.fanart.tv/addon.xml
b/metadata.common.fanart.tv/addon.xml
index 64d1999..aef91fc 100644
--- a/metadata.common.fanart.tv/addon.xml
+++ b/metadata.common.fanart.tv/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.fanart.tv"
name="fanart.tv"
- version="1.1.1"
+ version="2.0.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.fanart.tv/fanarttv.xml
b/metadata.common.fanart.tv/fanarttv.xml
index bf5ee44..d837a1b 100644
--- a/metadata.common.fanart.tv/fanarttv.xml
+++ b/metadata.common.fanart.tv/fanarttv.xml
@@ -1,26 +1,32 @@
<scraperfunctions>
- <GetFanartTvArtistThumbsByMBIDDisabled dest="5" clearbuffers="no">
- <RegExp input="$$1" output="<details><url
function="ParseFanartTvArtistThumbs"
cache="fanarttv-artistimages-\1.xml">http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/xml/</url></details>";
dest="5">
+ <GetFanartTvArtistThumbsByMBID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
function="ParseFanartTvArtistThumbs"
cache="fanarttv-artistimages-\1.json">http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/json/</url></details>";
dest="5">
<expression noclean="1" />
</RegExp>
- </GetFanartTvArtistThumbsByMBIDDisabled>
+ </GetFanartTvArtistThumbsByMBID>
<ParseFanartTvArtistThumbs dest="5" clearbuffers="no">
<RegExp input="$$13" output="<details>\1</details>"
dest="5">
<RegExp input="" output="" dest="13">
<expression />
</RegExp>
- <RegExp input="$$1" output="<thumb
preview="\1/preview">\1</thumb>" dest="13">
- <expression repeat="yes"
noclean="1"><artistthumb id="[^"]*"
url="([^"]*)</expression>
+ <RegExp input="" output="" dest="16">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="16">
+ <expression
noclean="1">"artistthumb":\[(.*?)\],"</expression>
+ </RegExp>
+ <RegExp input="$$16" output="<thumb
preview="\1/preview">\1</thumb>" dest="13">
+ <expression repeat="yes"
noclean="1">"id":"\d*","url":"([^"]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</ParseFanartTvArtistThumbs>
- <GetFanartTvArtistFanartsByMBIDDisabled dest="5" clearbuffers="no">
- <RegExp input="$$1" output="<details><url
function="ParseFanartTvArtistFanarts"
cache="fanarttv-artistimages-\1.xml">http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/xml/</url></details>";
dest="5">
+ <GetFanartTvArtistFanartsByMBID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
function="ParseFanartTvArtistFanarts"
cache="fanarttv-artistimages-\1.json">http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/json/</url></details>";
dest="5">
<expression noclean="1" />
</RegExp>
- </GetFanartTvArtistFanartsByMBIDDisabled>
+ </GetFanartTvArtistFanartsByMBID>
<ParseFanartTvArtistFanarts dest="5" clearbuffers="no">
<RegExp input="$$13"
output="<details><fanart>\1</fanart></details>"
dest="5">
<RegExp input="" output="" dest="13">
@@ -29,8 +35,14 @@
<RegExp input="" output="" dest="14">
<expression />
</RegExp>
- <RegExp input="$$1" output="<thumb
preview="\1/preview">\1</thumb>" dest="14">
- <expression repeat="yes"
noclean="1"><artistbackground id="[^"]*"
url="([^"]*)</expression>
+ <RegExp input="" output="" dest="16">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="16">
+ <expression
noclean="1">"artistbackground":\[(.*?)\],"</expression>
+ </RegExp>
+ <RegExp input="$$16" output="<thumb
preview="\1/preview">\1</thumb>" dest="14">
+ <expression repeat="yes"
noclean="1">"id":"\d*","url":"([^"]*)</expression>
</RegExp>
<RegExp input="$$14" output="\1" dest="13">
<expression noclean="1">(.+)</expression>
@@ -39,18 +51,24 @@
</RegExp>
</ParseFanartTvArtistFanarts>
- <GetFanartTvAlbumThumbsByMBIDDisabled dest="5" clearbuffers="no">
- <RegExp input="$$1" output="<details><url
function="ParseFanartTvAlbumThumbs"
cache="fanarttv-albumimages-\1.xml">http://fanart.tv/webservice/album/ed4b784f97227358b31ca4dd966a04f1/\1/xml/</url></details>";
dest="5">
+ <GetFanartTvAlbumThumbsByMBID dest="5" clearbuffers="no">
+ <RegExp input="$$1" output="<details><url
function="ParseFanartTvAlbumThumbs"
cache="fanarttv-albumimages-\1.json">http://fanart.tv/webservice/album/ed4b784f97227358b31ca4dd966a04f1/\1/json/</url></details>";
dest="5">
<expression noclean="1" />
</RegExp>
- </GetFanartTvAlbumThumbsByMBIDDisabled>
+ </GetFanartTvAlbumThumbsByMBID>
<ParseFanartTvAlbumThumbs dest="5" clearbuffers="no">
<RegExp input="$$13" output="<details>\1</details>"
dest="5">
<RegExp input="" output="" dest="13">
<expression />
</RegExp>
- <RegExp input="$$1" output="<thumb
preview="\1/preview">\1</thumb>" dest="13">
- <expression repeat="yes"
noclean="1"><albumcover id="[^"]*"
url="([^"]*)</expression>
+ <RegExp input="" output="" dest="16">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="16">
+ <expression
noclean="1">"albumcover":\[(.*?)\]\}</expression>
+ </RegExp>
+ <RegExp input="$$16" output="<thumb
preview="\1/preview">\1</thumb>" dest="13">
+ <expression repeat="yes"
noclean="1">"id":"\d*","url":"([^"]*)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
-----------------------------------------------------------------------
Summary of changes:
metadata.album.universal/addon.xml | 4 +-
metadata.album.universal/changelog.txt | 3 +
metadata.album.universal/resources/settings.xml | 2 +-
metadata.artists.universal/addon.xml | 4 +-
metadata.artists.universal/changelog.txt | 3 +
metadata.artists.universal/resources/settings.xml | 4 +-
metadata.common.fanart.tv/addon.xml | 2 +-
metadata.common.fanart.tv/fanarttv.xml | 48 ++++++++++++++------
8 files changed, 47 insertions(+), 23 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
