diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2014-12-07 22:15:29 +0100 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2014-12-07 22:15:31 +0100 |
| commit | 9290bdba663be4dc40b88af5f08f622dac62f328 (patch) | |
| tree | a8ec8c7489c83adca6707d7a91a1965620c987c1 /addons/metadata.common.theaudiodb.com | |
| parent | a7c17181b7a1e928513995b98d29c9a9e6d78392 (diff) | |
[addons] sync with repo
Diffstat (limited to 'addons/metadata.common.theaudiodb.com')
| -rw-r--r-- | addons/metadata.common.theaudiodb.com/addon.xml | 2 | ||||
| -rw-r--r-- | addons/metadata.common.theaudiodb.com/tadb.xml | 161 |
2 files changed, 157 insertions, 6 deletions
diff --git a/addons/metadata.common.theaudiodb.com/addon.xml b/addons/metadata.common.theaudiodb.com/addon.xml index ed0d03d6f7..17ebc6dc06 100644 --- a/addons/metadata.common.theaudiodb.com/addon.xml +++ b/addons/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 Scraper Library" - version="1.7.4" + version="1.8.0" provider-name="XBMC Foundation"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> diff --git a/addons/metadata.common.theaudiodb.com/tadb.xml b/addons/metadata.common.theaudiodb.com/tadb.xml index e3052a2dcd..7d5f3c07ec 100644 --- a/addons/metadata.common.theaudiodb.com/tadb.xml +++ b/addons/metadata.common.theaudiodb.com/tadb.xml @@ -241,7 +241,7 @@ <expression /> </RegExp> <RegExp input="$$1" output="\1" dest="11"> - <expression fixchars="1">strSubGenre":"([^"]*)</expression> + <expression fixchars="1">strGenre":"([^"]*)</expression> </RegExp> <RegExp input="$$11" output="$$12" dest="2"> <RegExp input="$INFO[genresfbsource]" output="<chain function="GetLastFMFallbackArtistGenresByMBID">$$8</chain>" dest="12"> @@ -260,7 +260,7 @@ </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"> + <RegExp input="$$1" output="<details><url function="ParseTADBFallbackArtistGenres" 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> @@ -270,12 +270,125 @@ <expression /> </RegExp> <RegExp input="$$1" output="<genre>\1</genre>" dest="2"> - <expression noclean="1">strSubGenre":"([^"]*)</expression> + <expression noclean="1">strGenre":"([^"]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseTADBFallbackArtistGenres> + <GetTADBArtistMoodsByID dest="5" clearbuffers="no"> + <RegExp input="$$1" output="<details><url function="ParseTADBArtistMoods" 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> + </GetTADBArtistMoodsByID> + <GetTADBArtistMoodsByMBID dest="5" clearbuffers="no"> + <RegExp input="$$1" output="<details><url function="ParseTADBArtistMoods" 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> + </GetTADBArtistMoodsByMBID> + <ParseTADBArtistMoods 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="" output="" dest="12"> + <expression /> + </RegExp> + <RegExp input="$$1" output="\1" dest="11"> + <expression fixchars="1">strMood":"([^"]*)</expression> + </RegExp> + <RegExp input="$$11" output="$$12" dest="2"> + <RegExp input="$INFO[moodsfbsource]" output="<chain function="GetLastFMFallbackArtistMoodsByMBID">$$8</chain>" dest="12"> + <expression>last.fm</expression> + </RegExp> + <RegExp input="$INFO[moodsfbsource]" output="<chain function="GetAMGFallbackArtistMoodsByAMGID">$$9</chain>" dest="12"> + <expression>allmusic.com</expression> + </RegExp> + <expression>^$</expression> + </RegExp> + <RegExp input="$$11" output="<mood>\1</mood>" dest="2"> + <expression>(.+)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseTADBArtistMoods> + + <GetTADBFallbackArtistMoodsByMBID dest="5" clearbuffers="no"> + <RegExp input="$$1" output="<details><url function="ParseTADBFallbackArtistMoods" 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> + </GetTADBFallbackArtistMoodsByMBID> + <ParseTADBFallbackArtistMoods dest="5" clearbuffers="no"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="" output="" dest="2"> + <expression /> + </RegExp> + <RegExp input="$$1" output="<mood>\1</mood>" dest="2"> + <expression noclean="1">strMood":"([^"]*)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseTADBFallbackArtistMoods> + + <GetTADBArtistStylesByID dest="5" clearbuffers="no"> + <RegExp input="$$1" output="<details><url function="ParseTADBArtistStyles" 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> + </GetTADBArtistStylesByID> + <ParseTADBArtistStyles dest="5" clearbuffers="no"> + <RegExp input="$$1" output="<details><url function="ParseTADBArtistStyles" 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> + </ParseTADBArtistStyles> + <ParseTADBArtistStyles 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="" output="" dest="12"> + <expression /> + </RegExp> + <RegExp input="$$1" output="\1" dest="11"> + <expression fixchars="1">strStyle":"([^"]*)</expression> + </RegExp> + <RegExp input="$$11" output="$$12" dest="2"> + <RegExp input="$INFO[stylesfbsource]" output="<chain function="GetLastFMFallbackArtistStylesByMBID">$$8</chain>" dest="12"> + <expression>last.fm</expression> + </RegExp> + <RegExp input="$INFO[stylesfbsource]" output="<chain function="GetAMGFallbackArtistStylesByAMGID">$$9</chain>" dest="12"> + <expression>allmusic.com</expression> + </RegExp> + <expression>^$</expression> + </RegExp> + <RegExp input="$$11" output="<style>\1</style>" dest="2"> + <expression>(.+)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseTADBArtistStyles> + + <GetTADBFallbackArtistStylesByMBID dest="5" clearbuffers="no"> + <RegExp input="$$1" output="<details><url function="ParseTADBFallbackArtistStyles" 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> + </GetTADBFallbackArtistStylesByMBID> + <ParseTADBFallbackArtistStyles dest="5" clearbuffers="no"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="" output="" dest="2"> + <expression /> + </RegExp> + <RegExp input="$$1" output="<style>\1</style>" dest="2"> + <expression noclean="1">strStyle":"([^"]*)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseTADBFallbackArtistStyles> <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"> @@ -311,7 +424,7 @@ </GetTADBAlbumRatingByMBID> <ParseTADBAlbumRating dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> - <RegExp input="$$1" output="<rating max="10.0">\1</rating>" dest="2"> + <RegExp input="$$1" output="<rating>\1</rating>" dest="2"> <expression fixchars="1">intScore":"(.*?)","</expression> </RegExp> <expression noclean="1" /> @@ -378,12 +491,50 @@ <ParseTADBAlbumGenres dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<genre>\1</genre>" dest="2"> - <expression noclean="1">strSubGenre":"([^"]*)</expression> + <expression noclean="1">strGenre":"([^"]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseTADBAlbumGenres> + <GetTADBAlbumMoodsByID dest="5"> + <RegExp input="$$1" output="<details><url function="ParseTADBAlbumMoods" cache="tadb-\1-album.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/album.php?m=\1</url></details>" dest="5"> + <expression noclean="1"/> + </RegExp> + </GetTADBAlbumMoodsByID> + <GetTADBAlbumMoodsByMBID dest="5"> + <RegExp input="$$1" output="<details><url function="ParseTADBAlbumMoods" 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> + </GetTADBAlbumMoodsByMBID> + <ParseTADBAlbumMoods dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="<mood>\1</mood>" dest="2"> + <expression noclean="1">strMood":"([^"]*)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseTADBAlbumMoods> + + <GetTADBAlbumStylesByID dest="5"> + <RegExp input="$$1" output="<details><url function="ParseTADBAlbumStyles" cache="tadb-\1-album.json">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/album.php?m=\1</url></details>" dest="5"> + <expression noclean="1"/> + </RegExp> + </GetTADBAlbumStylesByID> + <GetTADBAlbumStylesByMBID dest="5"> + <RegExp input="$$1" output="<details><url function="ParseTADBAlbumStyles" 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> + </GetTADBAlbumStylesByMBID> + <ParseTADBAlbumStyles dest="5"> + <RegExp input="$$2" output="<details>\1</details>" dest="5"> + <RegExp input="$$1" output="<style>\1</style>" dest="2"> + <expression noclean="1">strStyle":"([^"]*)</expression> + </RegExp> + <expression noclean="1" /> + </RegExp> + </ParseTADBAlbumStyles> + <GetTADBAlbumTracksByID dest="5"> <RegExp input="$$1" output="<details><url function="ParseTADBAlbumTracks">http://www.theaudiodb.com/api/v1/json/58424d43204d6564696120/track.php?m=\1</details>" dest="5"> <expression noclean="1"/> |