The branch, eden-pre has been updated
via 36b97efcdba923a419a5e5e7e0b4c2bc560eff9d (commit)
via e63e14aba70872da7d440d6557187162cc5b6506 (commit)
from a8de267624b5596eb236ab2ca4445c4fb08df492 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=36b97efcdba923a419a5e5e7e0b4c2bc560eff9d
commit 36b97efcdba923a419a5e5e7e0b4c2bc560eff9d
Author: vdrfan <[email protected]>
Date: Thu Nov 24 19:40:03 2011 +0100
[metadata.albums.freebase.com] updated to version 1.1.0
diff --git a/metadata.albums.freebase.com/addon.xml
b/metadata.albums.freebase.com/addon.xml
index 8734cee..693dd8f 100644
--- a/metadata.albums.freebase.com/addon.xml
+++ b/metadata.albums.freebase.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.albums.freebase.com"
name="FreeBase"
- version="1.0.5"
+ version="1.1.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.albums.freebase.com/freebase.xml
b/metadata.albums.freebase.com/freebase.xml
index dc0630f..191fa10 100644
--- a/metadata.albums.freebase.com/freebase.xml
+++ b/metadata.albums.freebase.com/freebase.xml
@@ -1,19 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<scraper framework="1.1" date="2009-09-16">
- <NfoUrl dest="3">
- <RegExp input="$$1"
output="<url>http://api.freebase.com/api/service/mqlread?query={%22query%22:{%22type%22:%22/music/artist%22,%22name%22:null,%22genre%22:[],%22album%22:[{%22id%22:%22/\2%22,%22/common/topic/article%22:[{%22guid%22:null,%22optional%22:true,%22limit%22:1}],%22/common/topic/image%22:[{%22guid%22:null,%22optional%22:true,%22limit%22:1}],%22label%22:[],%22engineer%22:[],%22producer%22:[],%22release_type%22:null,%22artist%22:null,%22name%22:null,%22release_date%22:null,%22track%22:[{%22name%22:null,%22length%22:null,%22index%22:null,%22sort%22:%22index%22,%22optional%22:true}],%22sort%22:%22release_date%22}]}}</url>";
dest="3+">
-
<expression>(http://www.freebase.com/view/)(.*)</expression>
- </RegExp>
- </NfoUrl>
<CreateAlbumSearchUrl dest="3">
- <RegExp input="$$1"
output="http://api.freebase.com/api/service/mqlread?query={%22query%22:{%22type%22:%22/music/artist%22,%22name~=%22:%22$$2%22,%22album%22:[{%22guid%22:null,%22artist%22:null,%22name%22:null,%22name~=%22:%22\1%22}]}}";
dest="3">
+ <RegExp input="$$1"
output="<url>https://www.googleapis.com/freebase/v1/mqlread?query={%22type%22:%22/music/artist%22,%22name~=%22:%22$$2%22,%22album%22:[{%22mid%22:null,%22artist%22:null,%22name%22:null,%22name~=%22:%22\1%22}]}</url>";
dest="3">
<expression/>
</RegExp>
</CreateAlbumSearchUrl>
<GetAlbumSearchResults dest="8">
<RegExp input="$$5" output="<results>\1</results>"
dest="8">
- <RegExp input="$$1"
output="<entity><artist>\1</artist><title>\3</title><url>http://api.freebase.com/api/service/mqlread?query={%22query%22:{%22type%22:%22/music/artist%22,%22name%22:null,%22genre%22:[],%22album%22:[{%22id%22:%22/guid/\2%22,%22/common/topic/article%22:[{%22guid%22:null,%22optional%22:true,%22limit%22:1}],%22/common/topic/image%22:[{%22guid%22:null,%22optional%22:true,%22limit%22:1}],%22label%22:[],%22engineer%22:[],%22producer%22:[],%22release_type%22:null,%22artist%22:null,%22name%22:null,%22release_date%22:null,%22track%22:[{%22name%22:null,%22length%22:null,%22index%22:null,%22sort%22:%22index%22,%22optional%22:true}],%22sort%22:%22release_date%22}]}}</url></entity>";
dest="5+">
- <expression repeat="yes">"artist":
"([^"]*)".*?"guid":
"#([^"]*)".*?"name":
"([^"]*)"</expression>
+ <RegExp input="$$1"
output="<entity><artist>\1</artist><title>\3</title><url
cache="freebase-\2-album">https://www.googleapis.com/freebase/v1/mqlread?query={%22type%22:%22/music/artist%22,%22name%22:null,%22/music/artist/label%22:[],%22genre%22:[],%22album%22:[{%22id%22:%22/m/\2%22,%22release_type%22:null,%22artist%22:null,%22name%22:null,%22release_date%22:null,%22sort%22:%22release_date%22,%22primary_release%22:[{%22track%22:[{%22name%22:[],%22length%22:null,%22index%22:null,%22sort%22:%22index%22,%22optional%22:true}]}]}]}</url></entity>";
dest="5+">
+ <expression repeat="yes"
fixchars="1,3">"artist":
"([^"]*)"[^"]*"mid":
"/m/([^"]*)"[^"]*"name":
"([^"]*)"</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<entity><artist>\2</artist><title>\3</title><url
cache="freebase-\1-album">https://www.googleapis.com/freebase/v1/mqlread?query={%22type%22:%22/music/artist%22,%22name%22:null,%22/music/artist/label%22:[],%22genre%22:[],%22album%22:[{%22id%22:%22/m/\1%22,%22release_type%22:null,%22artist%22:null,%22name%22:null,%22release_date%22:null,%22sort%22:%22release_date%22,%22primary_release%22:[{%22track%22:[{%22name%22:[],%22length%22:null,%22index%22:null,%22sort%22:%22index%22,%22optional%22:true}]}]}]}</url></entity>";
dest="5+">
+ <expression repeat="yes"
fixchars="2,3">"mid":
"/m/([^"]*)"[^"]*"artist":
"([^"]*)"[^"]*"name":
"([^"]*)"</expression>
+ </RegExp>
+ <RegExp input="$$1"
output="<entity><artist>\3</artist><title>\2</title><url
cache="freebase-\1-album">https://www.googleapis.com/freebase/v1/mqlread?query={%22type%22:%22/music/artist%22,%22name%22:null,%22/music/artist/label%22:[],%22genre%22:[],%22album%22:[{%22id%22:%22/m/\1%22,%22release_type%22:null,%22artist%22:null,%22name%22:null,%22release_date%22:null,%22sort%22:%22release_date%22,%22primary_release%22:[{%22track%22:[{%22name%22:[],%22length%22:null,%22index%22:null,%22sort%22:%22index%22,%22optional%22:true}]}]}]}</url></entity>";
dest="5+">
+ <expression repeat="yes"
fixchars="2,3">"mid":
"/m/([^"]*)"[^"]*"name":
"([^"]*)"[^"]*"artist":
"([^"]*)"</expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
@@ -27,7 +28,7 @@
<expression noclean="1">"name":
"([^"]*)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="6">
- <expression trim="1">"label":
(.*?)\]</expression>
+ <expression
noclean="1">"/music/artist/label": (.*?)\]</expression>
</RegExp>
<RegExp input="$$6"
output="<label>\1</label>" dest="5+">
<expression noclean="1"
repeat="yes">"([^"]*)"</expression>
@@ -39,30 +40,33 @@
<expression
noclean="1">"release_date": "([^"]*)</expression>
</RegExp>
<RegExp input="$$1"
output="<year>\1</year>" dest="5+">
- <expression
noclean="1">"release_date": "([0-9]+)</expression>
+ <expression
noclean="1">"release_date": "([0-9]{4})</expression>
</RegExp>
- <RegExp input="$$1" output="\1" dest="6+">
+ <RegExp input="$$1" output="\1" dest="6">
<expression trim="1">"genre":
(.*?)\]</expression>
</RegExp>
<RegExp input="$$6"
output="<genre>\1</genre>" dest="5+">
<expression noclean="1"
repeat="yes">"([^"]*)"</expression>
</RegExp>
- <RegExp input="$$1"
output="<track><position>\1</position><title>\3</title><duration>\2</duration></track>"
dest="5+">
- <expression repeat="yes">"index":
([0-9]+).*?"length": ([0-9]+).*?"name":
"([^"]*)"</expression>
+ <RegExp input="$$1" output="\1" dest="6">
+ <expression trim="1">"track":
(.*?)\],</expression>
</RegExp>
- <RegExp input="$$1"
output="<thumb>http://www.freebase.com/api/trans/raw/guid/\1</thumb>";
dest="5+">
- <expression
noclean="1">image":.*?"guid":
"#([^"]*)"</expression>
+ <RegExp input="$$6"
output="<track><position>\1</position><title>\3</title><duration>\2</duration></track>"
dest="5+">
+ <expression repeat="yes">"index":
([0-9]+).*?"length":
([0-9]+).*?"name":.*?"([^"]*)</expression>
</RegExp>
- <RegExp input="$$1" output="<url
function="GetAlbumReview">http://www.freebase.com/api/trans/raw/guid/\1</url>";
dest="5+">
- <expression
noclean="1">article":.*?"guid":
"#([^"]*)"</expression>
+ <RegExp input="$$1" output="<thumb
preview="https://www.googleapis.com/freebase/v1/image\1?maxheight=200&amp;fallbackid=/m/none">https://www.googleapis.com/freebase/v1/image\1?maxheight=4096&amp;fallbackid=/m/none</thumb>";
dest="5+">
+ <expression noclean="1">"id":
"([^"]*)</expression>
</RegExp>
- <expression noclean="1"/>
+ <RegExp input="$$1" output="<url
function="GetAlbumReview">https://www.googleapis.com/freebase/v1/text\1</url>";
dest="5+">
+ <expression noclean="1">"id":
"([^"]*)</expression>
+ </RegExp>
+ <expression noclean="1" fixchars="1"/>
</RegExp>
</GetAlbumDetails>
<GetAlbumReview dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
<RegExp input="$$1"
output="<review>\1</review>" dest="2">
- <expression
noclean="1"><p>([^<]*)</expression>
+ <expression fixchars="1">"result":
"(.*?)"\n\}</expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=e63e14aba70872da7d440d6557187162cc5b6506
commit e63e14aba70872da7d440d6557187162cc5b6506
Author: vdrfan <[email protected]>
Date: Thu Nov 24 19:39:15 2011 +0100
[metadata.artists.freebase.com] updated to version 1.1.0
diff --git a/metadata.artists.freebase.com/addon.xml
b/metadata.artists.freebase.com/addon.xml
index 48cc659..7d2b35f 100644
--- a/metadata.artists.freebase.com/addon.xml
+++ b/metadata.artists.freebase.com/addon.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.artists.freebase.com"
name="FreeBase"
- version="1.0.6"
+ version="1.1.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.htbackdrops.com" version="1.0.1"/>
+ <import addon="metadata.common.htbackdrops.com" version="1.0.7"/>
</requires>
<extension point="xbmc.metadata.scraper.artists"
language="en"
diff --git a/metadata.artists.freebase.com/freebase.xml
b/metadata.artists.freebase.com/freebase.xml
index 6d3b87f..c921f9a 100644
--- a/metadata.artists.freebase.com/freebase.xml
+++ b/metadata.artists.freebase.com/freebase.xml
@@ -1,65 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2009-09-16">
- <NfoUrl dest="3">
- <RegExp input="$$1"
output="<url>http://api.freebase.com/api/service/mqlread?query={%22query%22:{%22type%22:%22/music/artist%22,%22name%22:null,%22genre%22:[],%22album%22:[{%22id%22:%22/\2%22,%22/common/topic/article%22:[{%22guid%22:null,%22optional%22:true,%22limit%22:1}],%22/common/topic/image%22:[{%22guid%22:null,%22optional%22:true,%22limit%22:1}],%22label%22:[],%22engineer%22:[],%22producer%22:[],%22release_type%22:null,%22artist%22:null,%22name%22:null,%22release_date%22:null,%22track%22:[{%22name%22:null,%22length%22:null,%22index%22:null,%22sort%22:%22index%22,%22optional%22:true}],%22sort%22:%22release_date%22}]}}</url>";
dest="3+">
-
<expression>(http://www.freebase.com/view/)(.*)</expression>
- </RegExp>
- </NfoUrl>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<scraper framework="1.1" date="2011-11-21">
<CreateArtistSearchUrl dest="3">
- <RegExp input="$$1"
output="<url>http://www.freebase.com/api/service/search?query=\1&amp;type=/music/artist&amp;indent=1</url>";
dest="3">
+ <RegExp input="$$1"
output="<url>https://www.googleapis.com/freebase/v1/search?query=\1&amp;type=/music/artist</url>";
dest="3">
<expression/>
</RegExp>
</CreateArtistSearchUrl>
<GetArtistSearchResults dest="8">
<RegExp input="$$5" output="<results>\1</results>"
dest="8">
- <RegExp input="$$1"
output="<entity><title>\2</title><url>http://api.freebase.com/api/service/mqlread?query={%22query%22:{%22type%22:%22/music/artist%22,%22id%22:%22/guid/\1%22,%22/common/topic/article%22:[{%22guid%22:null,%22optional%22:true,%22limit%22:1}],%22/common/topic/image%22:[{%22guid%22:null,%22optional%22:true,%22limit%22:1}],%22name%22:null,%22genre%22:[],%22album%22:[],%22active_start%22:null,%22active_end%22:null,%22instruments_played%22:[]}}</url></entity>";
dest="5+">
- <expression repeat="yes">"guid":
"#([^"]*)".*?"name":
"([^"]*)"</expression>
- </RegExp>
+ <RegExp input="$$1"
output="<entity><title>\2</title><url
cache="freebase-\1-artist">https://www.googleapis.com/freebase/v1/mqlread?query={%22type%22:%22/music/artist%22,%22id%22:%22/m/\1%22,%22name%22:null,%22genre%22:[],%22album%22:[],%22active_start%22:null,%22active_end%22:null,%22/people/person/date_of_birth%22:null,%22/people/deceased_person/date_of_death%22:null,%22/music/group_member/instruments_played%22:[]}</url></entity>";
dest="5+">
+ <expression repeat="yes"
fixchars="2">"mid":"/m/([^"]*)","name":"([^"]*)"</expression>
+ </RegExp>
<expression noclean="1"/>
</RegExp>
</GetArtistSearchResults>
<GetArtistDetails dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
+ <!-- Title -->
<RegExp input="$$1"
output="<name>\1</name>" dest="5">
<expression noclean="1">"name":
"([^"]*)</expression>
</RegExp>
+ <!-- Born -->
+ <RegExp input="$$1"
output="<born>\1</born>" dest="5+">
+ <expression noclean="1">date_of_birth":
"([0-9]{4})</expression>
+ </RegExp>
+ <!-- Formed -->
<RegExp input="$$1"
output="<formed>\1</formed>" dest="5+">
- <expression
noclean="1">"active_start": "([^"]*)</expression>
+ <expression noclean="1">active_start":
"([0-9]{4})</expression>
</RegExp>
+ <!-- Disbanded -->
<RegExp input="$$1"
output="<disbanded>\1</disbanded>" dest="5+">
- <expression noclean="1">"active_end":
"([^"]*)</expression>
+ <expression noclean="1">active_end":
"([^"]*)</expression>
+ </RegExp>
+ <!-- Died -->
+ <RegExp input="$$1"
output="<died>\1</died>" dest="5+">
+ <expression noclean="1">date_of_death":
"([0-9]{4})</expression>
</RegExp>
+ <!-- Instruments -->
+ <RegExp input="$$1" output="\1" dest="6">
+ <expression trim="1">instruments_played":
(.*?)\]</expression>
+ </RegExp>
+ <RegExp input="$$6"
output="<instruments>\1</instruments>" dest="5+">
+ <expression repeat="yes"
noclean="1">"([^"]*)"</expression>
+ </RegExp>
+ <!-- Genres -->
<RegExp input="$$1" output="\1" dest="6">
<expression trim="1">"genre":
(.*?)\]</expression>
</RegExp>
<RegExp input="$$6"
output="<genre>\1</genre>" dest="5+">
<expression
repeat="yes">"([^"]*)"</expression>
</RegExp>
+ <!-- Albums -->
<RegExp input="$$1" output="\1" dest="6">
- <expression trim="1">"album":
(.*?)\]</expression>
+ <expression noclean="1"
trim="1">"album": (.*?)\]</expression>
</RegExp>
<RegExp input="$$6"
output="<album><title>\1</title></album>" dest="5+">
- <expression noclean="1"
repeat="yes">"([^"]*)"</expression>
+ <expression noclean="1"
repeat="yes">"(.*?)",</expression>
</RegExp>
- <RegExp input="$$1"
output="<thumb>http://www.freebase.com/api/trans/raw/guid/\1</thumb>";
dest="5+">
- <expression
noclean="1">image":.*?"guid":
"#([^"]*)"</expression>
+ <!-- Freebase Thumb -->
+ <RegExp input="$$1" output="<thumb
preview="https://www.googleapis.com/freebase/v1/image\1?maxheight=200&amp;fallbackid=/m/none">https://www.googleapis.com/freebase/v1/image\1?maxheight=4096&amp;fallbackid=/m/none</thumb>";
dest="5+">
+ <expression>"id":
"([^"]*)</expression>
</RegExp>
+ <!-- HTB Thumbs -->
<RegExp input="$$2" conditional="htbthumbs"
output="<chain function="GetHTBThumbs">\1</chain>"
dest="5+">
<expression/>
</RegExp>
+ <!-- HTB Fanart -->
<RegExp input="$$2" conditional="htbfanart"
output="<chain function="GetHTBFanart">\1</chain>"
dest="5+">
<expression/>
</RegExp>
- <RegExp input="$$1" output="<url
function="GetBiography">http://www.freebase.com/api/trans/raw/guid/\1</url>";
dest="5+">
- <expression
noclean="1">article":.*?"guid":
"#([^"]*)"</expression>
+ <!-- Biography -->
+ <RegExp input="$$1" output="<url
function="GetBiography">https://www.googleapis.com/freebase/v1/text\1</url>";
dest="5+">
+ <expression noclean="1">"id":
"([^"]*)</expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" fixchars="1"/>
</RegExp>
</GetArtistDetails>
<GetBiography dest="5">
- <RegExp input="$$2" output="<details>\1</details>"
dest="5">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="5+">
<RegExp input="$$1"
output="<biography>\1</biography>" dest="2">
- <expression
noclean="1"><p>([^<]*)</expression>
+ <expression fixchars="1">"result":
"(.*?)"\n\}</expression>
</RegExp>
<expression noclean="1"/>
</RegExp>
-----------------------------------------------------------------------
Summary of changes:
metadata.albums.freebase.com/addon.xml | 2 +-
metadata.albums.freebase.com/freebase.xml | 42 ++++++++++--------
metadata.artists.freebase.com/addon.xml | 4 +-
metadata.artists.freebase.com/freebase.xml | 63 ++++++++++++++++++----------
4 files changed, 67 insertions(+), 44 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
