The branch, frodo has been updated
via 1033aaed6fd2b413dc2e35a13c9620b53ce776aa (commit)
from 9b973d15e9aba1a3c54260e546eeee53262289de (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=1033aaed6fd2b413dc2e35a13c9620b53ce776aa
commit 1033aaed6fd2b413dc2e35a13c9620b53ce776aa
Author: olympia <[email protected]>
Date: Wed Feb 6 11:12:18 2013 +0100
[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 9adcd50..d92bf60 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.4.0"
+ version="1.5.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="2.1.0"/>
diff --git a/metadata.common.theaudiodb.com/tadb.xml
b/metadata.common.theaudiodb.com/tadb.xml
index f4af09d..0f192c0 100644
--- a/metadata.common.theaudiodb.com/tadb.xml
+++ b/metadata.common.theaudiodb.com/tadb.xml
@@ -68,11 +68,11 @@
<expression />
</RegExp>
<RegExp input="$$1" output="\1" dest="11">
- <expression
fixchars="1">strBiography$INFO[tadbartistlanguage]":"(.*?)","</expression>
- </RegExp>
- <RegExp input="$$1" output="\1" dest="11+">
<expression
fixchars="1">strBiographyEN":"(.*?)","</expression>
</RegExp>
+ <RegExp input="$$1" output="\1" dest="11">
+ <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">
<expression>last.fm</expression>
@@ -99,12 +99,12 @@
<RegExp input="" output="" dest="2">
<expression />
</RegExp>
+ <RegExp input="$$1"
output="<biography>\1</biography>" dest="2">
+ <expression
fixchars="1">strBiographyen":"(.*?)","</expression>
+ </RegExp>
<RegExp input="$$1" output="\1" dest="2">
<expression
fixchars="1">strBiography$INFO[tadbartistlanguage]":"(.*?)","</expression>
</RegExp>
- <RegExp input="$$1"
output="<biography>\1</biography>" dest="2+">
- <expression
fixchars="1">strBiographyen":"(.*?)","</expression>
- </RegExp>
<expression noclean="1"/>
</RegExp>
</ParseTADBFallbackBiography>
@@ -114,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">
@@ -131,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">
@@ -139,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>
@@ -158,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">
@@ -189,11 +277,11 @@
<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$INFO[tadbalbumlanguage]":"(.*?)","</expression>
- </RegExp>
- <RegExp input="$$1"
output="<review>\1</review>" dest="2+">
<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>
</ParseTADBAlbumReview>
-----------------------------------------------------------------------
Summary of changes:
metadata.common.theaudiodb.com/addon.xml | 2 +-
metadata.common.theaudiodb.com/tadb.xml | 118 ++++++++++++++++++++++++++----
2 files changed, 104 insertions(+), 16 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
