diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2012-12-01 13:00:30 +0100 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2012-12-01 13:00:30 +0100 |
| commit | af7102d32c19dc511f51767731686d042a1da691 (patch) | |
| tree | 49c58af217ee511cfe188e1358c9e85e9b849df3 /addons/metadata.artists.universal | |
| parent | c81334142cdd64b7d5b1db7e6336588d472452d7 (diff) | |
[addons] sync packaged addons/scrapers with Frodo repo
Diffstat (limited to 'addons/metadata.artists.universal')
5 files changed, 20 insertions, 4 deletions
diff --git a/addons/metadata.artists.universal/addon.xml b/addons/metadata.artists.universal/addon.xml index b141a4ea43..a17e11aeba 100644 --- a/addons/metadata.artists.universal/addon.xml +++ b/addons/metadata.artists.universal/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.artists.universal" name="Universal Artist Scraper" - version="2.2.0" + version="2.4.0" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> @@ -10,7 +10,7 @@ <import addon="metadata.common.musicbrainz.org" version="1.2.1"/> <import addon="metadata.common.htbackdrops.com" version="1.2.0"/> <import addon="metadata.common.fanart.tv" version="2.0.0"/> - <import addon="metadata.common.theaudiodb.com" version="1.2.0"/> + <import addon="metadata.common.theaudiodb.com" version="1.3.0"/> </requires> <extension point="xbmc.metadata.scraper.artists" language="en" diff --git a/addons/metadata.artists.universal/artistuniversal.xml b/addons/metadata.artists.universal/artistuniversal.xml index 2f8e84f1c3..ea4c514351 100644 --- a/addons/metadata.artists.universal/artistuniversal.xml +++ b/addons/metadata.artists.universal/artistuniversal.xml @@ -49,6 +49,9 @@ <RegExp input="$$8" conditional="fanarttvthumbs" output="<chain function="GetFanartTvArtistThumbsByMBID">\1</chain>" dest="5+"> <expression/> </RegExp> + <RegExp input="$$8" conditional="tadbthumbs" output="<chain function="GetTADBArtistThumbsByMBID">$$8</chain>" dest="5+"> + <expression/> + </RegExp> <RegExp input="$$8" conditional="htbthumbs" output="<chain function="GetHTBThumbsByMBID">\1</chain>" dest="5+"> <expression/> </RegExp> @@ -58,6 +61,9 @@ <RegExp input="$$8" conditional="fanarttvfanart" output="<chain function="GetFanartTvArtistFanartsByMBID">\1</chain>" dest="5+"> <expression/> </RegExp> + <RegExp input="$$8" conditional="tadbfanart" output="<chain function="GetTADBArtistFanartsByMBID">$$8</chain>" dest="5+"> + <expression/> + </RegExp> <RegExp input="$$8" conditional="htbfanart" output="<chain function="GetHTBFanartByMBID">\1</chain>" dest="5+"> <expression/> </RegExp> diff --git a/addons/metadata.artists.universal/changelog.txt b/addons/metadata.artists.universal/changelog.txt index c3d169712c..3d62f8ae24 100644 --- a/addons/metadata.artists.universal/changelog.txt +++ b/addons/metadata.artists.universal/changelog.txt @@ -1,3 +1,9 @@ +[B]2.4.0[/B] +Re-enable fanart.tv scraping by default + +[B]2.3.0[/B] +Added: Scraping artist thumbs and fanarts from theaudiodb.com + [B]2.2.0[/B] Added back fanart.tv scraping via JSON API. Still off by default. diff --git a/addons/metadata.artists.universal/resources/language/English/strings.xml b/addons/metadata.artists.universal/resources/language/English/strings.xml index ae97b7900c..cfbec4de51 100644 --- a/addons/metadata.artists.universal/resources/language/English/strings.xml +++ b/addons/metadata.artists.universal/resources/language/English/strings.xml @@ -21,4 +21,6 @@ <string id="30019">Fallback to Artist Styles from</string> <string id="30020">Fallback to Artist Life-Span from</string> <string id="30021">Fallbacks</string> + <string id="30022">Enable Artist Thumbs from theaudiodb.com</string> + <string id="30023">Enable Artist Fanarts from theaudiodb.com</string> </strings> diff --git a/addons/metadata.artists.universal/resources/settings.xml b/addons/metadata.artists.universal/resources/settings.xml index bd78dd204b..cea6299b11 100644 --- a/addons/metadata.artists.universal/resources/settings.xml +++ b/addons/metadata.artists.universal/resources/settings.xml @@ -25,12 +25,14 @@ <category label="30007"> <setting type="lsep" label="Thumb Sources"/> - <setting label="30005" type="bool" id="fanarttvthumbs" default="false"/> + <setting label="30005" type="bool" id="fanarttvthumbs" default="true"/> + <setting label="30022" type="bool" id="tadbthumbs" default="true"/> <setting label="30003" type="bool" id="htbthumbs" default="true"/> <setting label="30002" type="bool" id="lastfmartistthumbs" default="true"/> <setting label="30001" type="bool" id="allmusicartistthumbs" default="true"/> <setting type="lsep" label="Fanart Sources"/> - <setting label="30004" type="bool" id="fanarttvfanart" default="false"/> + <setting label="30004" type="bool" id="fanarttvfanart" default="true"/> + <setting label="30023" type="bool" id="tadbfanart" default="true"/> <setting label="30000" type="bool" id="htbfanart" default="true"/> </category> |