[add-ons] sync with repo

xbmc · Aug 16, 2015 · 84818d6 · 84818d6
1 parent 6af082b
commit 84818d6
Show file tree

Hide file tree

Showing 16 changed files with 81 additions and 75 deletions.
diff --git a/addons/metadata.album.universal/addon.xml b/addons/metadata.album.universal/addon.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.album.universal"
        name="Universal Album Scraper"
-       version="2.4.1"
+       version="2.5.0"
        provider-name="Olympia, XBMC Foundation">
   <requires>
     <import addon="xbmc.metadata" version="2.1.0"/>
     <import addon="metadata.common.allmusic.com" version="3.1.0"/>
-    <import addon="metadata.common.amazon.de" version="1.0.2"/>
     <import addon="metadata.common.fanart.tv" version="3.1.0"/>
     <import addon="metadata.common.musicbrainz.org" version="2.0.2"/>
     <import addon="metadata.common.theaudiodb.com" version="1.8.1"/>

diff --git a/addons/metadata.album.universal/albumuniversal.xml b/addons/metadata.album.universal/albumuniversal.xml
@@ -61,15 +61,18 @@
 			</RegExp>
 			<!--MBID - release group-->
 			<RegExp input="$$1" output="\1" dest="4">
-				<expression>&lt;release-group type=&quot;[^&quot;]*&quot; id=&quot;([^&quot;]*)&quot;</expression>
+				<expression>&lt;release-group\stype=&quot;[^&quot;]*&quot;\sid=&quot;([^&quot;]*)&quot;</expression>
+			</RegExp>
+			<RegExp input="$$1" output="\1" dest="4+">
+				<expression>&lt;release-group\sid=&quot;([^&quot;]*)&quot;\stype=&quot;[^&quot;]*&quot;</expression>
 			</RegExp>
 			<!--Album title-->
 			<RegExp input="$$1" output="\1" dest="7">
-				<expression trim="1">&lt;release id=&quot;[^&quot;]*&quot;&gt;&lt;title&gt;([^&lt;]*)&lt;</expression>
+				<expression trim="1">&lt;release\sid=&quot;[^&quot;]*&quot;&gt;&lt;title&gt;([^&lt;]*)&lt;</expression>
 			</RegExp>
 			<!--Artist name-->
 			<RegExp input="$$1" output="\1" dest="8">
-				<expression trim="1">&lt;release id=&quot;[^&quot;]*&quot;&gt;&lt;title&gt;[^&lt;]*&lt;.*?&lt;artist id=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;([^&lt;]*)&lt;</expression>
+				<expression trim="1">&lt;release\sid=&quot;[^&quot;]*&quot;&gt;&lt;title&gt;[^&lt;]*&lt;.*?&lt;artist\sid=&quot;[^&quot;]*&quot;&gt;&lt;name&gt;([^&lt;]*)&lt;</expression>
 			</RegExp>
 			<RegExp input="$$3" output="&lt;chain function=&quot;GetMBAlbumTitleByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5">
 				<expression noclean="1">(.+)</expression>
@@ -95,9 +98,6 @@
 			<RegExp input="$INFO[albumreviewsource]" output="&lt;chain function=&quot;GetTADBAlbumReviewByMBID&quot;&gt;$$4&lt;/chain&gt;" dest="5+">
 				<expression>TheAudioDb.com</expression>
 			</RegExp>
-			<RegExp input="$INFO[albumreviewsource]" output="&lt;url function=&quot;GetAmazonDEAlbumReview&quot;&gt;http://musicbrainz.org/ws/2/release-group/$$4?inc=url-rels&lt;/url&gt;" dest="5+">
-				<expression>amazon.de</expression>
-			</RegExp>
 			<RegExp input="$INFO[albumratingsource]" output="&lt;chain function=&quot;GetMBAlbumRatingByMBID&quot;&gt;$$3&lt;/chain&gt;" dest="5+">
 				<expression>MusicBrainz</expression>
 			</RegExp>
@@ -122,14 +122,14 @@
 			<RegExp input="$INFO[albumthemessource]" output="&lt;url function=&quot;GetAMGAlbumThemes&quot; cache=&quot;mb-$$4-rg.xml&quot;&gt;http://musicbrainz.org/ws/2/release-group/$$4?inc=url-rels&lt;/url&gt;" dest="5+">
 				<expression>allmusic.com</expression>
 			</RegExp>
-			<RegExp conditional="fanarttvalbumthumbs" input="$$1" output="&lt;chain function=&quot;GetFanartTvAlbumThumbsByMBID&quot;&gt;$$4&lt;/chain&gt;" dest="5+">
-				<expression noclean="1" />
+			<RegExp conditional="fanarttvalbumthumbs" input="$$4" output="&lt;chain function=&quot;GetFanartTvAlbumThumbsByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+				<expression noclean="1">(.+)</expression>
 			</RegExp>
-			<RegExp conditional="tadbalbumthumbs" input="$$1" output="&lt;chain function=&quot;GetTADBAlbumThumbsByMBID&quot;&gt;$$4&lt;/chain&gt;" dest="5+">
-				<expression noclean="1" />
+			<RegExp conditional="tadbalbumthumbs" input="$$4" output="&lt;chain function=&quot;GetTADBAlbumThumbsByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+				<expression noclean="1">(.+)</expression>
 			</RegExp>
-			<RegExp conditional="allmusicalbumthumbs" input="$$1" output="&lt;url function=&quot;GetAMGAlbumThumbs&quot; cache=&quot;mb-$$4-rg.xml&quot;&gt;http://musicbrainz.org/ws/2/release-group/$$4?inc=url-rels&lt;/url&gt;" dest="5+">
-				<expression noclean="1" />
+			<RegExp conditional="allmusicalbumthumbs" input="$$4" output="&lt;url function=&quot;GetAMGAlbumThumbs&quot; cache=&quot;mb-\1-rg.xml&quot;&gt;http://musicbrainz.org/ws/2/release-group/\1?inc=url-rels&lt;/url&gt;" dest="5+">
+				<expression noclean="1">(.+)</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
@@ -189,13 +189,4 @@
 		</RegExp>
 	</GetAMGAlbumThumbs>
 
-	<GetAmazonDEAlbumReview dest="5">
-		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
-			<RegExp input="$$1" output="&lt;chain function=&quot;GetAmazonDEAlbumReviewByASIN&quot;&gt;\1&lt;/chain&gt;" dest="2">
-				<expression noclean="1">http://www.amazon.de/gp/product/([^&lt;]*)</expression>
-			</RegExp>
-			<expression noclean="1" />
-		</RegExp>
-	</GetAmazonDEAlbumReview>
-
 </scraper>
diff --git a/addons/metadata.album.universal/changelog.txt b/addons/metadata.album.universal/changelog.txt
@@ -1,3 +1,16 @@
+[B]2.5.0[/B]
+Removed: amazon.de review
+
+[B]2.4.4[/B]
+Fixed: Won't scrape MBID randomly
+Re-introduced: Proper scraping of "Official" releases that may have a "disambiguation" attribute in musicbrainz.
+
+[B]2.4.3[/B]
+Changed: Don't query artwork when mbid is missing (workaround - proper fix is needed)
+
+[B]2.4.2[/B]
+Fixed: Revert changes done in 2.4.1
+
 [B]2.4.1[/B]
 Fixed: Proper scraping of "Official" releases that may have a "disambiguation" attribute in musicbrainz.
 

diff --git a/addons/metadata.album.universal/resources/settings.xml b/addons/metadata.album.universal/resources/settings.xml
@@ -2,7 +2,7 @@
 <settings>
   <category label="128">
     <setting type="lsep" label="General Settings"/>
-      <setting label="30002" type="labelenum" values="TheAudioDb.com|amazon.de|None" id="albumreviewsource" default="TheAudioDb.com"/>
+      <setting label="30002" type="labelenum" values="TheAudioDb.com|None" id="albumreviewsource" default="TheAudioDb.com"/>
       <setting label="30003" type="select" values="cn|de|en|es|fr|hu|il|it|jp|nl|no|pl|pt|ru|se" id="tadbalbumlanguage" default="en" visible="eq(-1,0)"/>
       <setting type="sep"/>
       <setting label="30004" type="labelenum" values="MusicBrainz|allmusic.com|TheAudioDb.com|None" id="albumratingsource" default="MusicBrainz"/>

diff --git 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
@@ -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
@@ -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
 

diff --git a/addons/metadata.common.amazon.de/addon.xml b/addons/metadata.common.amazon.de/addon.xml
diff --git a/addons/metadata.common.amazon.de/amazonde.xml b/addons/metadata.common.amazon.de/amazonde.xml
diff --git a/addons/metadata.common.amazon.de/icon.png b/addons/metadata.common.amazon.de/icon.png
diff --git a/addons/metadata.common.musicbrainz.org/addon.xml b/addons/metadata.common.musicbrainz.org/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.common.musicbrainz.org"
        name="MusicBrainz Scraper Library"
-        version="2.0.3"
+        version="2.0.4"
        provider-name="XBMC Foundation">
   <requires>
     <import addon="xbmc.metadata" version="2.1.0"/>

diff --git a/addons/metadata.common.musicbrainz.org/musicbrainz.xml b/addons/metadata.common.musicbrainz.org/musicbrainz.xml
@@ -10,8 +10,8 @@
 			<RegExp input="" output="" dest="2">
 				<expression />
 			</RegExp>
-			<RegExp input="$$1" output="&lt;album&gt;&lt;year&gt;\4&lt;/year&gt;&lt;title&gt;\2&lt;/title&gt;&lt;label&gt;\1&lt;/label&gt;&lt;/album&gt;" dest="2">
-				<expression repeat="yes" clear="yes" fixchars="1,2,3" noclean="1,2,3"> type="Album" id="([^"]*)"&gt;&lt;title&gt;([^&lt;]*)&lt;/title&gt;&lt;first-release-date(\s/)?&gt;(\d{4})?</expression>
+			<RegExp input="$$1" output="&lt;album&gt;&lt;year&gt;\5&lt;/year&gt;&lt;title&gt;\3&lt;/title&gt;&lt;label&gt;\1\2&lt;/label&gt;&lt;/album&gt;" dest="2">
+				<expression repeat="yes" clear="yes" fixchars="1,2,3" noclean="1,2,3">(?: id="([^"]*)")? type="Album"(?: id="([^"]*)")?&gt;&lt;title&gt;([^&lt;]*)&lt;/title&gt;&lt;first-release-date(\s/)?&gt;(\d{4})?</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>

diff --git a/addons/service.xbmc.versioncheck/.gitignore b/addons/service.xbmc.versioncheck/.gitignore
diff --git a/addons/service.xbmc.versioncheck/addon.xml b/addons/service.xbmc.versioncheck/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="service.xbmc.versioncheck"
        name="Version Check"
-      version="0.3.3"
+      version="0.3.6"
       provider-name="XBMC Foundation">
     <requires>
         <import addon="xbmc.python" version="2.1.0"/>

diff --git a/addons/service.xbmc.versioncheck/changelog.txt b/addons/service.xbmc.versioncheck/changelog.txt
@@ -1,3 +1,12 @@
+v0.3.6
+- Update version list
+
+v0.3.5
+- fix list
+
+v0.3.4
+- Update version list
+
 v0.3.3
 - Updated language files from Transifex
 - Update version list

diff --git a/addons/service.xbmc.versioncheck/resources/versions.txt b/addons/service.xbmc.versioncheck/resources/versions.txt
@@ -121,6 +121,24 @@
             }
         ],
         "releasecandidate": [
+            {
+                "major": "15",
+                "minor": "0",
+                "tag": "releasecandidate",
+                "tagversion":"2",
+                "revision": "20150711-0aa930b",
+                "extrainfo": "RC2",
+                "addon_support": "yes"
+            },
+            {
+                "major": "15",
+                "minor": "0",
+                "tag": "releasecandidate",
+                "tagversion":"1",
+                "revision": "20150702-9ff25f8",
+                "extrainfo": "RC1",
+                "addon_support": "yes"
+            },
             {
                 "major": "14",
                 "minor": "0",
@@ -222,6 +240,14 @@
             }
         ],
         "beta": [
+            {
+                "major": "15",
+                "minor": "0",
+                "tag": "beta",
+                "tagversion":"2",
+                "revision": "20150614-daedd5f",
+                "addon_support": "yes"
+            },
             {
                 "major": "15",
                 "minor": "0",