[add-ons] sync with repo

3 files changed, 15 insertions, 9 deletions

diff --git a/addons/metadata.artists.universal/addon.xml b/addons/metadata.artists.universal/addon.xml
index 89d1cad601..73d5d2eae2 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="3.6.0"
+       version="3.6.1"
        provider-name="Olympia, XBMC Foundation">
   <requires>
     <import addon="xbmc.metadata" version="2.1.0"/>
diff --git a/addons/metadata.artists.universal/artistuniversal.xml b/addons/metadata.artists.universal/artistuniversal.xml
index b67027f780..7328695964 100644
--- a/addons/metadata.artists.universal/artistuniversal.xml
+++ b/addons/metadata.artists.universal/artistuniversal.xml
@@ -49,7 +49,10 @@
 		<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="3">
 			<!--MBID - Artist-->
 			<RegExp input="$$1" output="\1" dest="8">
-				<expression noclean="1">&lt;artist(?:\stype=&quot;[^&quot;]*&quot;)* id=&quot;([^&quot;]*)&quot;&gt;&lt;name&gt;([^&lt;]*)</expression>
+				<expression noclean="1">&lt;artist(?:\stype=&quot;[^&quot;]*&quot;)*\sid=&quot;([^&quot;]*)&quot;&gt;&lt;name&gt;([^&lt;]*)</expression>
+			</RegExp>
+			<RegExp input="$$1" output="\1" dest="8+">
+				<expression noclean="1">&lt;artist\sid=&quot;([^&quot;]*)&quot;(?:\stype=&quot;[^&quot;]*&quot;)*&gt;&lt;name&gt;([^&lt;]*)</expression>
 			</RegExp>
 			<!--AMGID - Artist-->
 			<RegExp input="$$1" output="\2" dest="9">
@@ -59,22 +62,22 @@
 				<expression noclean="1">&lt;artist(?:\stype=&quot;[^&quot;]*&quot;)* id=&quot;([^&quot;]*)&quot;&gt;&lt;name&gt;([^&lt;]*)</expression>
 			</RegExp>
 			<RegExp input="$$8" conditional="fanarttvthumbs" output="&lt;chain function=&quot;GetFanartTvArtistThumbsByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
-				<expression/>
+				<expression noclean="1">(.+)</expression>
 			</RegExp>
 			<RegExp input="$$8" conditional="tadbthumbs" output="&lt;chain function=&quot;GetTADBArtistThumbsByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="5+">
-				<expression/>
+				<expression noclean="1">(.+)</expression>
 			</RegExp>
 			<RegExp input="$$8" conditional="htbthumbs" output="&lt;chain function=&quot;GetHTBThumbsByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
-				<expression/>
+				<expression noclean="1">(.+)</expression>
 			</RegExp>
 			<RegExp input="$$8" conditional="fanarttvfanart" output="&lt;chain function=&quot;GetFanartTvArtistFanartsByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
-				<expression/>
+				<expression noclean="1">(.+)</expression>
 			</RegExp>
 			<RegExp input="$$8" conditional="tadbfanart" output="&lt;chain function=&quot;GetTADBArtistFanartsByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="5+">
-				<expression/>
+				<expression noclean="1">(.+)</expression>
 			</RegExp>
 			<RegExp input="$$8" conditional="htbfanart" output="&lt;chain function=&quot;GetHTBFanartByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
-				<expression/>
+				<expression noclean="1">(.+)</expression>
 			</RegExp>
 			<RegExp input="$$9" output="&lt;chain function=&quot;GetAMGData&quot;&gt;\1&lt;/chain&gt;" dest="5+">
 				<expression noclean="1">(.+)</expression>
@@ -140,7 +143,7 @@
 				<expression>allmusic.com</expression>
 			</RegExp>
 			<RegExp input="$$9" conditional="allmusicartistthumbs" output="&lt;chain function=&quot;GetAMGArtistThumbsByAMGID&quot;&gt;\1&lt;/chain&gt;" dest="2+">
-				<expression/>
+				<expression noclean="1">(.+)</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
diff --git a/addons/metadata.artists.universal/changelog.txt b/addons/metadata.artists.universal/changelog.txt
index 5b6ef2877e..7c3cd46b48 100644
--- a/addons/metadata.artists.universal/changelog.txt
+++ b/addons/metadata.artists.universal/changelog.txt
@@ -1,3 +1,6 @@
+[B]3.6.1[/B]
+Fixed: Won't scrape MBID randomly
+
 [B]3.6.0[/B]
 Changed: Language is now a selection list