[addons] sync scrapers with repo

2 files changed, 10 insertions, 4 deletions

diff --git a/addons/metadata.common.allmusic.com/addon.xml b/addons/metadata.common.allmusic.com/addon.xml
index 68f2b21da7..750870ebbd 100644
--- a/addons/metadata.common.allmusic.com/addon.xml
+++ b/addons/metadata.common.allmusic.com/addon.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.common.allmusic.com"
        name="AllMusic"
-        version="2.5.2"
+        version="2.6.0"
        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="allmusic.xml"/>
diff --git a/addons/metadata.common.allmusic.com/allmusic.xml b/addons/metadata.common.allmusic.com/allmusic.xml
index edcd5081a9..51d57fbaf3 100644
--- a/addons/metadata.common.allmusic.com/allmusic.xml
+++ b/addons/metadata.common.allmusic.com/allmusic.xml
@@ -105,6 +105,9 @@
 				<RegExp input="$INFO[lifespanfbsource]" output="&lt;chain function=&quot;GetMBFallbackLafeSpanByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="12">
 					<expression>MusicBrainz</expression>
 				</RegExp>
+				<RegExp input="$INFO[lifespanfbsource]" output="&lt;chain function=&quot;GetTADBFallbackLifeSpanByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="12">
+					<expression>TheAudioDb.com</expression>
+				</RegExp>
 			<expression>^$</expression>
 			</RegExp>
 			<RegExp input="$$11" output="$$11" dest="2">
@@ -180,6 +183,9 @@
 				<RegExp input="$INFO[genresfbsource]" output="&lt;chain function=&quot;GetLastFMFallbackArtistGenresByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="12">
 					<expression>last.fm</expression>
 				</RegExp>
+				<RegExp input="$INFO[genresfbsource]" output="&lt;chain function=&quot;GetTADBFallbackArtistGenresByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="12">
+					<expression>TheAudioDb.com</expression>
+				</RegExp>
 				<expression>&lt;genre&gt;&lt;/genre&gt;</expression>
 			</RegExp>
 			<RegExp input="$$11" output="$$11" dest="2">
@@ -277,10 +283,10 @@
 			<RegExp input="" output="" dest="2">
 				<expression />
 			</RegExp>
-			<RegExp input="$$1" output="\1" dest="8">
+			<RegExp input="$$1" output="\1" dest="10">
 				<expression noclean="1">&lt;h4&gt;artist moods&lt;/h4&gt;(.*?)&lt;/ul&gt;</expression>
 			</RegExp>
-			<RegExp input="$$8" output="&lt;mood&gt;\1&lt;/mood&gt;" dest="2">
+			<RegExp input="$$10" output="&lt;mood&gt;\1&lt;/mood&gt;" dest="2">
 				<expression repeat="yes" noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;&lt;/li&gt;</expression>
 			</RegExp>
 			<expression noclean="1" />