diff options
| author | M. Kaijser <mcm.kaijser@gmail.com> | 2013-04-29 08:55:45 +0200 |
|---|---|---|
| committer | M. Kaijser <mcm.kaijser@gmail.com> | 2013-04-29 08:55:45 +0200 |
| commit | a172857d9d71104797a6856b2658563bc0a8ba71 (patch) | |
| tree | e6bd48da36384e27883757fc228945b010c4fc86 /addons/metadata.common.theaudiodb.com | |
| parent | 977a4bad811624f2be76b0664f1e9217ad05a206 (diff) | |
[addons] sync scrapers with repo
Diffstat (limited to 'addons/metadata.common.theaudiodb.com')
| -rw-r--r-- | addons/metadata.common.theaudiodb.com/addon.xml | 4 | ||||
| -rw-r--r-- | addons/metadata.common.theaudiodb.com/tadb.xml | 130 |
2 files changed, 122 insertions, 12 deletions
diff --git a/addons/metadata.common.theaudiodb.com/addon.xml b/addons/metadata.common.theaudiodb.com/addon.xml index dbf44f6f8f..432763702a 100644 --- a/addons/metadata.common.theaudiodb.com/addon.xml +++ b/addons/metadata.common.theaudiodb.com/addon.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.common.theaudiodb.com" name="TheAudioDb Common Scraper Functions" - version="1.3.0" + version="1.6.1" provider-name="Team XBMC"> <requires> - <import addon="xbmc.metadata" version="1.0"/> + <import addon="xbmc.metadata" version="2.1.0"/> </requires> <extension point="xbmc.metadata.scraper.library" library="tadb.xml"/> diff --git a/addons/metadata.common.theaudiodb.com/tadb.xml b/addons/metadata.common.theaudiodb.com/tadb.xml index 5cce462cea..7c1a807a05 100644 --- a/addons/metadata.common.theaudiodb.com/tadb.xml +++ b/addons/metadata.common.theaudiodb.com/tadb.xml @@ -64,8 +64,14 @@ <RegExp input="" output="" dest="2"> <expression /> </RegExp> + <RegExp input="" output="" dest="11"> + <expression /> + </RegExp> + <RegExp input="$$1" output="\1" dest="11"> + <expression fixchars="1">strBiographyEN":"(.*?)","</expression> + </RegExp> <RegExp input="$$1" output="\1" dest="11"> - <expression clear="yes" fixchars="1">strBiography":"(.*?)","</expression> + <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"> @@ -94,7 +100,10 @@ <expression /> </RegExp> <RegExp input="$$1" output="<biography>\1</biography>" dest="2"> - <expression clear="yes" fixchars="1">strBiography":"(.*?)","</expression> + <expression fixchars="1">strBiographyen":"(.*?)","</expression> + </RegExp> + <RegExp input="$$1" output="\1" dest="2"> + <expression fixchars="1">strBiography$INFO[tadbartistlanguage]":"(.*?)","</expression> </RegExp> <expression noclean="1"/> </RegExp> @@ -105,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"> @@ -122,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"> @@ -130,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 fixchars="2" 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 fixchars="2" 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> @@ -149,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 fixchars="2" 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 fixchars="2" 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"> @@ -180,7 +277,10 @@ <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":"(.*?)","</expression> + <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> @@ -219,6 +319,11 @@ <expression noclean="1"/> </RegExp> </GetTADBAlbumDateByID> + <GetTADBAlbumDateByMBID dest="5"> + <RegExp input="$$1" output="<details><url function="ParseTADBAlbumDate" 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> + </GetTADBAlbumDateByMBID> <ParseTADBAlbumDate dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<year>\1</year>" dest="2"> @@ -233,10 +338,15 @@ <expression noclean="1"/> </RegExp> </GetTADBAlbumGenresByID> + <GetTADBAlbumGenresByMBID dest="5"> + <RegExp input="$$1" output="<details><url function="ParseTADBAlbumGenres" 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> + </GetTADBAlbumGenresByMBID> <ParseTADBAlbumGenres dest="5"> <RegExp input="$$2" output="<details>\1</details>" dest="5"> <RegExp input="$$1" output="<genre>\1</genre>" dest="2"> - <expression noclean="1">strGenre":"([^"]*)</expression> + <expression noclean="1">strSubGenre":"([^"]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> |