diff options
| author | nadasb <nadasb@svn> | 2010-09-26 17:54:37 +0000 |
|---|---|---|
| committer | nadasb <nadasb@svn> | 2010-09-26 17:54:37 +0000 |
| commit | 7b3ab8d1f19bc95bfa3db3d600c1c4dd21e68ae6 (patch) | |
| tree | 04dc1f24f6c918f5361d025b37062ff8a4bcc1a4 | |
| parent | 08bf094818964a6066f335deed10d8c03398300a (diff) | |
sync with scraper git
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@34207 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
4 files changed, 15 insertions, 15 deletions
diff --git a/addons/metadata.artists.allmusic.com/addon.xml b/addons/metadata.artists.allmusic.com/addon.xml index eb40a095bc..2b4f9ab5e8 100644 --- a/addons/metadata.artists.allmusic.com/addon.xml +++ b/addons/metadata.artists.allmusic.com/addon.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.artists.allmusic.com" name="AllMusic" - version="1.0.6" + version="1.0.7" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> <import addon="metadata.common.last.fm" version="1.0"/> <import addon="metadata.common.allmusic.com" version="1.0"/> - <import addon="metadata.common.htbackdrops.com" version="1.0"/> + <import addon="metadata.common.htbackdrops.com" version="1.0.5"/> </requires> <extension point="xbmc.metadata.scraper.artists" language="en" diff --git a/addons/metadata.artists.allmusic.com/allmusic.xml b/addons/metadata.artists.allmusic.com/allmusic.xml index 8dc0126a26..4ad7674af7 100644 --- a/addons/metadata.artists.allmusic.com/allmusic.xml +++ b/addons/metadata.artists.allmusic.com/allmusic.xml @@ -23,12 +23,12 @@ </GetArtistSearchResults> <GetArtistDetails dest="3"> <RegExp input="$$5" output="<details>\1</details>" dest="3"> - <RegExp input="$$1" output="<url cache="am-$$2-artist.html" function="ParseAMGArtist">http://www.allmusic.com/cg/amg.dll?p=amg&amp;sql=\1</url>" dest="5"> - <expression noclean="1">sql=([^"]*)">Biography</expression> - </RegExp> - <RegExp input="$$2" conditional="htbthumbs" output="<chain function="GetHTBThumbs">1</chain>" dest="5+"> + <RegExp input="$$2" conditional="htbthumbs" output="<chain function="GetHTBThumbs">\1</chain>" dest="5"> <expression/> </RegExp> + <RegExp input="$$1" output="<url cache="am-$$2-artist.html" function="ParseAMGArtist">http://www.allmusic.com/cg/amg.dll?p=amg&amp;sql=\1</url>" dest="5+"> + <expression noclean="1">sql=([^"]*)">Biography</expression> + </RegExp> <RegExp input="$$2" conditional="lastfmartistthumbs" output="<chain function="GetLastFMArtistThumbs">\1</chain>" dest="5+"> <expression/> </RegExp> diff --git a/addons/metadata.common.htbackdrops.com/addon.xml b/addons/metadata.common.htbackdrops.com/addon.xml index 22bd8c3d9e..dd8af20257 100644 --- a/addons/metadata.common.htbackdrops.com/addon.xml +++ b/addons/metadata.common.htbackdrops.com/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.htbackdrops.com" name="HTBackdrops" - version="1.0.4" + version="1.0.5" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> diff --git a/addons/metadata.common.htbackdrops.com/htbackdrops.xml b/addons/metadata.common.htbackdrops.com/htbackdrops.xml index bd717a8a6f..3c8f3038c6 100644 --- a/addons/metadata.common.htbackdrops.com/htbackdrops.xml +++ b/addons/metadata.common.htbackdrops.com/htbackdrops.xml @@ -1,26 +1,26 @@ <scraperfunctions> <GetHTBThumbs dest="5"> - <RegExp input="$$1" output="<details><url function="ParseHTBThumbs" post="yes">http://www.htbackdrops.com/search.php?search_terms=all&amp;search_keywords=\1</url</details>" dest="5"> - <expression noclean="1"/> + <RegExp input="$$1" output="<details><url function="ParseHTBThumbs" post="yes">http://htbackdrops.com/api/7681a907c805e0670330c694e788e8e8/searchXML?keywords=\1&default_operator=and&aid=5</url>/details>" dest="5"> + <expression noclean="1" /> </RegExp> </GetHTBThumbs> <ParseHTBThumbs dest="5"> <RegExp input="$$13" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<thumb preview="http://www.htbackdrops.com/data/thumbnails/\2">http://www.htbackdrops.com/data/media/\2</thumb>" dest="13"> - <expression noclean="1" repeat="yes"><td.*?mode=search(&amp;sessionid=[^"]*)?"><img src="./data/thumbnails/([^"]+)".*?<br>Music Artist Thumbnails<br>.*?</td></expression> + <RegExp input="$$1" output="<thumb preview="http://www.htbackdrops.com/api/7681a907c805e0670330c694e788e8e8/download/\1/thumbnail">http://www.htbackdrops.com/api/7681a907c805e0670330c694e788e8e8/download/\1/fullsize</thumb>" dest="13"> + <expression repeat="yes" noclean="1"><id>([^<]+)</expression> </RegExp> <expression noclean="1">(.+)</expression> </RegExp> </ParseHTBThumbs> <GetHTBFanart dest="5"> - <RegExp input="$$1" output="<details><url function="ParseHTBFanart" post="yes">http://www.htbackdrops.com/search.php?search_terms=all&amp;search_keywords=\1</url>lt;/details>" dest="5"> - <expression noclean="1"/> + <RegExp input="$$1" output="<details><url function="ParseHTBFanart" post="yes">http://htbackdrops.com/api/7681a907c805e0670330c694e788e8e8/searchXML?keywords=\1&default_operator=and&aid=1</url>/details>" dest="5"> + <expression noclean="1" /> </RegExp> </GetHTBFanart> <ParseHTBFanart dest="5"> <RegExp input="$$13" output="<details><fanart url="http://www.htbackdrops.com/">\1</fanart></details>" dest="5"> - <RegExp input="$$1" output="<thumb preview="data/thumbnails/\2">data/media/\2</thumb>" dest="13"> - <expression noclean="1" repeat="yes"><td.*?mode=search(&amp;sessionid=[^"]*)?"><img src="./data/thumbnails/([^"]+)".*?<br>Music Artist Backdrops<br>.*?</td></expression> + <RegExp input="$$1" output="<thumb preview="api/7681a907c805e0670330c694e788e8e8/download/\1/thumbnail">api/7681a907c805e0670330c694e788e8e8/download/\1/fullsize</thumb>" dest="13"> + <expression repeat="yes" noclean="1"><id>([^<]+)</expression> </RegExp> <expression noclean="1">(.+)</expression> </RegExp> |