[addons] sync with repo

2 files changed, 40 insertions, 2 deletions

diff --git a/addons/metadata.common.allmusic.com/addon.xml b/addons/metadata.common.allmusic.com/addon.xml
index 3bbe674d8d..423264dd9d 100644
--- a/addons/metadata.common.allmusic.com/addon.xml
+++ b/addons/metadata.common.allmusic.com/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.common.allmusic.com"
        name="AllMusic Scraper Library"
-        version="3.0.3"
+        version="3.1.0"
        provider-name="XBMC Foundation">
   <requires>
     <import addon="xbmc.metadata" version="2.1.0"/>
diff --git a/addons/metadata.common.allmusic.com/allmusic.xml b/addons/metadata.common.allmusic.com/allmusic.xml
index a1c074987b..20e9ee38ed 100644
--- a/addons/metadata.common.allmusic.com/allmusic.xml
+++ b/addons/metadata.common.allmusic.com/allmusic.xml
@@ -228,6 +228,9 @@
 				<RegExp input="$INFO[stylesfbsource]" output="&lt;chain function=&quot;GetLastFMFallbackArtistStylesByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="12">
 					<expression>last.fm</expression>
 				</RegExp>
+				<RegExp input="$INFO[stylesfbsource]" output="&lt;chain function=&quot;GetTADBFallbackArtistStylesByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="12">
+					<expression>TheAudioDb.com</expression>
+				</RegExp>
 				<expression>&lt;style&gt;&lt;/style&gt;</expression>
 			</RegExp>
 			<RegExp input="$$11" output="$$11" dest="2">
@@ -270,16 +273,51 @@
 			<RegExp input="" output="" dest="2">
 				<expression />
 			</RegExp>
+			<RegExp input="" output="" dest="10">
+				<expression />
+			</RegExp>
 			<RegExp input="$$1" output="\1" dest="10">
 				<expression noclean="1">&gt;Artists\sMoods&lt;/h\d*&gt;(.*?)&lt;/ul&gt;</expression>
 			</RegExp>
-			<RegExp input="$$10" output="&lt;mood&gt;\1&lt;/mood&gt;" dest="2">
+			<RegExp input="$$10" output="&lt;mood&gt;\1&lt;/mood&gt;" dest="11">
 				<expression repeat="yes" noclean="1">&lt;li&gt;[^&gt;]*&gt;([^&lt;]*)&lt;/a&gt;\s*&lt;/li&gt;</expression>
 			</RegExp>
+			<RegExp input="$$11" output="$$12" dest="2">
+				<RegExp input="$INFO[moodsfbsource]" output="&lt;chain function=&quot;GetTADBFallbackArtistMoodsByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="12">
+					<expression>TheAudioDb.com</expression>
+				</RegExp>
+				<expression>&lt;mood&gt;&lt;/mood&gt;</expression>
+			</RegExp>
+			<RegExp input="$$11" output="$$11" dest="2">
+				<expression>&lt;mood&gt;(.+)&lt;/mood&gt;</expression>
+			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
 	</ParseAMGArtistMoods>
 
+	<GetAMGFallbackArtistMoodsByAMGID dest="5" clearbuffers="no">
+		<RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;am-\1-artist.html&quot; function=&quot;ParseAMGFallbackArtistMoods&quot;&gt;http://www.allmusic.com/artist/\1&lt;/url&gt;&lt;/details&gt;" dest="5">
+			<expression noclean="1"/>
+		</RegExp>
+	</GetAMGFallbackArtistMoodsByAMGID>
+	<ParseAMGFallbackArtistMoods dest="5" clearbuffers="no">
+		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+			<RegExp input="" output="" dest="2">
+				<expression />
+			</RegExp>
+			<RegExp input="" output="" dest="10">
+				<expression />
+			</RegExp>
+			<RegExp input="$$1" output="\1" dest="10">
+				<expression noclean="1">&gt;Artists\sMoods&lt;/h\d*&gt;(.*?)&lt;/ul&gt;</expression>
+			</RegExp>
+			<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;\s*&lt;/li&gt;</expression>
+			</RegExp>
+			<expression noclean="1" />
+		</RegExp>
+	</ParseAMGFallbackArtistMoods>
+
 	<GetAMGArtistThumbsByAMGID dest="5" clearbuffers="no">
 		<RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;am-\1-artist.html&quot; function=&quot;ParseAMGArtistThumbs&quot;&gt;http://www.allmusic.com/artist/\1&lt;/url&gt;&lt;/details&gt;" dest="5">
 			<expression noclean="1"/>