[addons] sync addons with repo

sonach · Dec 30, 2012 · 5040880 · 5040880
1 parent d1b68fb
commit 5040880
Show file tree

Hide file tree

Showing 53 changed files with 162 additions and 136 deletions.
diff --git a/addons/metadata.common.imdb.com/addon.xml b/addons/metadata.common.imdb.com/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.common.imdb.com"
        name="IMDB common scraper functions"
-       version="2.6.1"
+       version="2.6.2"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>

diff --git a/addons/metadata.common.imdb.com/changelog.txt b/addons/metadata.common.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.6.2[/B]
+- fixed: director(s) and writer(s) scraping in case of IMDbFull is selected
+
 [B]2.6.1[/B]
 - fixed: will scrape director(s) as writer(s)
 

diff --git a/addons/metadata.common.imdb.com/imdb.xml b/addons/metadata.common.imdb.com/imdb.xml
@@ -139,7 +139,7 @@
 				<expression repeat="yes" clear="yes" trim="3,4" noclean="1,2">&lt;noscript&gt;&lt;img \n[^a]*alt=&quot;([^&quot;]*)&quot;[^&quot;]*&quot;[^&quot;]*&quot;[^s]*src=&quot;(?:([^&quot;]*\.)[^&quot;]*(\.jpg))[^&gt;]*.*?ter"&gt;[^&gt;]*&gt;\n\s*(&lt;[^&gt;]*&gt;)?([^&lt;\(]*)?</expression>
 			</RegExp>
 			<RegExp input="$$6" output="&lt;actor&gt;&lt;thumb&gt;&lt;/thumb&gt;&lt;name&gt;\1&lt;/name&gt;&lt;role&gt;\3&lt;/role&gt;&lt;/actor&gt;" dest="7+">
-				<expression repeat="yes" trim="1,2" noclean="1,2">&lt;img \n[^a]*alt=&quot;([^&quot;]*)&quot;[^&quot;]*&quot;[^&quot;]*&quot;[^s]*src=&quot;(?:[^&quot;]*\.[^&quot;]*\.png)&quot; class=&quot;&quot; /&gt;*.*?ter"&gt;[^&gt;]*&gt;\n\s*(&lt;[^&gt;]*&gt;)?([^&lt;\(]*)?</expression>
+				<expression repeat="yes" trim="1,2,3" fixchars="3" noclean="1,2">&lt;img \n[^a]*alt=&quot;([^&quot;]*)&quot;[^&quot;]*&quot;[^&quot;]*&quot;[^s]*src=&quot;(?:[^&quot;]*\.[^&quot;]*\.png)&quot; class=&quot;&quot; /&gt;*.*?ter"&gt;[^&gt;]*&gt;\n\s*(&lt;[^&gt;]*&gt;)?([^&lt;\(]*)?</expression>
 			</RegExp>
 			<RegExp input="$$7" output="&lt;actor&gt;&lt;thumb&gt;\1&lt;/thumb&gt;\2&lt;/actor&gt;" dest="2+">
 				<expression repeat="yes" clear="yes" noclean="1,2,3">&lt;actor&gt;&lt;thumb&gt;(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)?&lt;/thumb&gt;(.*?)&lt;/actor&gt;</expression>
@@ -148,29 +148,6 @@
 		</RegExp>
 	</ParseIMDBCast>
 
-	<GetIMDBScaledCastById dest="5">
-		<RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;$$1-main.html&quot; function=&quot;ParseIMDBScaledCast&quot;&gt;http://akas.imdb.com/title/$$1/&lt;/url&gt;&lt;/details&gt;" dest="5">
-			<expression noclean="1" />
-		</RegExp>
-	</GetIMDBScaledCastById>
-	<ParseIMDBScaledCast dest="5">
-		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
-			<RegExp input="$$1" output="\1" dest="6">
-				<expression noclean="1">&lt;table class=&quot;cast_list&quot;&gt;(.*?)&lt;/table&gt;</expression>
-			</RegExp>
-			<RegExp input="$$6" output="&lt;actor&gt;&lt;thumb&gt;\2_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\3&lt;/thumb&gt;&lt;name&gt;\1&lt;/name&gt;&lt;role&gt;\5&lt;/role&gt;&lt;/actor&gt;" dest="7">
-				<expression repeat="yes" clear="yes" trim="3,4" noclean="1,2">&lt;noscript&gt;&lt;img \n[^a]*alt=&quot;([^&quot;]*)&quot;[^&quot;]*&quot;[^&quot;]*&quot;[^s]*src=&quot;(?:([^&quot;]*\.)[^&quot;]*(\.jpg))[^&gt;]*.*?ter"&gt;[^&gt;]*&gt;\n\s*(&lt;[^&gt;]*&gt;)?([^&lt;\(]*)?</expression>
-			</RegExp>
-			<RegExp input="$$6" output="&lt;actor&gt;&lt;thumb&gt;&lt;/thumb&gt;&lt;name&gt;\1&lt;/name&gt;&lt;role&gt;\3&lt;/role&gt;&lt;/actor&gt;" dest="7+">
-				<expression repeat="yes" trim="1,2" noclean="1,2">&lt;img \n[^a]*alt=&quot;([^&quot;]*)&quot;[^&quot;]*&quot;[^&quot;]*&quot;[^s]*src=&quot;(?:[^&quot;]*\.[^&quot;]*\.png)&quot; class=&quot;&quot; /&gt;*.*?ter"&gt;[^&gt;]*&gt;\n\s*(&lt;[^&gt;]*&gt;)?([^&lt;\(]*)?</expression>
-			</RegExp>
-			<RegExp input="$$7" output="&lt;actor&gt;&lt;thumb&gt;\1&lt;/thumb&gt;\2&lt;/actor&gt;" dest="2+">
-				<expression repeat="yes" clear="yes" noclean="1,2,3">&lt;actor&gt;&lt;thumb&gt;(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)?&lt;/thumb&gt;(.*?)&lt;/actor&gt;</expression>
-			</RegExp>
-			<expression noclean="1" />
-		</RegExp>
-	</ParseIMDBScaledCast>
-
 	<GetIMDBDirectorsById dest="5">
 		<RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;$$1-main.html&quot; function=&quot;ParseIMDBDirectors&quot;&gt;http://akas.imdb.com/title/$$1/&lt;/url&gt;&lt;/details&gt;" dest="5">
 			<expression noclean="1" />
@@ -225,38 +202,18 @@
 		</RegExp>
 	</ParseIMDBFullCast>
 
-	<GetIMDBScaledFullCastById dest="5">
-		<RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;$$1-combined.html&quot; function=&quot;ParseIMDBScaledFullCast&quot;&gt;http://akas.imdb.com/title/$$1/combined&lt;/url&gt;&lt;/details&gt;" dest="5">
-			<expression noclean="1" />
-		</RegExp>
-	</GetIMDBScaledFullCastById>
-	<ParseIMDBScaledFullCast dest="5">
-		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
-			<RegExp input="$$1" output="\1" dest="6">
-				<expression noclean="1">&lt;table class=&quot;cast&quot;&gt;(.*?)&lt;/table&gt;</expression>
-			</RegExp>
-			<RegExp input="$$6" output="&lt;actor&gt;&lt;thumb&gt;\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2&lt;/thumb&gt;&lt;name&gt;\3&lt;/name&gt;&lt;role&gt;\5&lt;/role&gt;&lt;/actor&gt;" dest="7">
-				<expression repeat="yes" clear="yes" fixchars="3,5" trim="3,5" noclean="1,2">&lt;img src=&quot;(?:([^&quot;]*\.)[^&quot;]*(\.jpg))?[^&gt;]*[^&quot;]*&quot;nm&quot;&gt;&lt;a href=&quot;[^&quot;]*[^&gt;]*&gt;([^&lt;]*)&lt;[^&quot;]*&quot;ddd&quot;&gt;([^&lt;]&lt;)?[^&quot;]*&quot;char&quot;&gt;(.*?)&lt;/td&gt;</expression>
-			</RegExp>
-			<RegExp input="$$7" output="&lt;actor&gt;&lt;thumb&gt;\1&lt;/thumb&gt;\2&lt;/actor&gt;" dest="2+">
-				<expression repeat="yes" clear="yes" noclean="1,2,3">&lt;actor&gt;&lt;thumb&gt;(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)&lt;/thumb&gt;(.*?)&lt;/actor&gt;</expression>
-			</RegExp>
-			<expression noclean="1" />
-		</RegExp>
-	</ParseIMDBScaledFullCast>
-
 	<GetIMDBFullDirectorsById dest="5">
 		<RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;$$1-combined.html&quot; function=&quot;ParseIMDBFullDirectors&quot;&gt;http://akas.imdb.com/title/$$1/combined&lt;/url&gt;&lt;/details&gt;" dest="5">
 			<expression noclean="1" />
 		</RegExp>
 	</GetIMDBFullDirectorsById>
 	<ParseIMDBFullDirectors dest="5">
 		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
-			<RegExp conditional="fullcredits" input="$$1" output="\1" dest="6">
-				<expression clear="yes" noclean="1">Director[s]?:&lt;/h5&gt;[^&gt;]*&gt;(.*?)&lt;/div</expression>
+			<RegExp input="$$1" output="\1" dest="6">
+				<expression clear="yes" noclean="1">Director(?:s)?:.*?&lt;/h5&gt;[^&gt;]*&gt;(.*?)&lt;/div</expression>
 			</RegExp>
-			<RegExp input="$$6" output="&lt;director&gt;\1&lt;/director&gt;" dest="2+">
-				<expression repeat="yes" fixchars="1" clear="yes">&lt;a href=&quot;/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
+			<RegExp input="$$6" output="&lt;director&gt;\1&lt;/director&gt;" dest="2">
+				<expression repeat="yes" fixchars="1">&lt;a href=&quot;/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
@@ -269,10 +226,10 @@
 	</GetIMDBFullWritersById>
 	<ParseIMDBFullWriters dest="5">
 		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
-			<RegExp conditional="fullcredits" input="$$1" output="\1" dest="6">
+			<RegExp input="$$1" output="\1" dest="6">
 				<expression noclean="1">Writing credits(.*?)name="</expression>
 			</RegExp>
-			<RegExp input="$$6" output="&lt;credits&gt;\1&lt;/credits&gt;" dest="2+">
+			<RegExp input="$$6" output="&lt;credits&gt;\1&lt;/credits&gt;" dest="2">
 				<expression repeat="yes" fixchars="1">&lt;a href=&quot;/name/[^&gt;]*&gt;([^&lt;]*)&lt;</expression>
 			</RegExp>
 			<expression noclean="1" />
@@ -286,7 +243,7 @@
 	</GetIMDBThumbsById>
 	<ParseIMDBThumbs dest="5">
 		<RegExp input="$$6" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
-			<RegExp input="$$1" output="\1_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\2" dest="4">
+			<RegExp input="$$1" output="\1_SX1024_SY1024_\2" dest="4">
 				<expression noclean="1,2">&lt;a name=&quot;poster&quot;.*?src=&quot;(.*?)_S.*?(.jpg)&quot;.*?&lt;/a&gt;</expression>
 			</RegExp>
 			<RegExp input="$$4" output="&lt;thumb aspect=&quot;poster&quot;&gt;\1&lt;/thumb&gt;" dest="6">

diff --git a/addons/metadata.common.themoviedb.org/addon.xml b/addons/metadata.common.themoviedb.org/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.common.themoviedb.org"
        name="The MovieDB common scraper functions"
-       version="2.8.0"
+       version="2.9.0"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>

diff --git a/addons/metadata.common.themoviedb.org/tmdb.xml b/addons/metadata.common.themoviedb.org/tmdb.xml
@@ -150,12 +150,26 @@
 	</GetTMDBLangSetByIdChain>
 	<ParseTMDBSet dest="5">
 		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
-			<RegExp input="$$1" output="&lt;set&gt;\1&lt;/set&gt;" dest="2">
+			<RegExp input="$$1" output="\1" dest="9">
 				<expression noclean="1">&quot;belongs_to_collection&quot;:\{&quot;id&quot;:[0-9]+,&quot;name&quot;:&quot;([^&quot;]*)</expression>
 			</RegExp>
+			<RegExp input="$$9" output="&lt;url function=&quot;ParseFallbackTMDBSet&quot; cache=&quot;tmdb-en-$$8.json&quot;&gt;http://api.themoviedb.org/3/movie/$$8?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=en&lt;/url&gt;" dest="2">
+				<expression>^$</expression>
+			</RegExp>
+			<RegExp input="$$9" output="&lt;set&gt;\1&lt;/set&gt;" dest="2">
+				<expression>(.+)</expression>
+			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
 	</ParseTMDBSet>
+	<ParseFallbackTMDBSet dest="5">
+		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
+			<RegExp input="$$1" output="&lt;set&gt;\1&lt;/set&gt;" dest="2">
+				<expression noclean="1">&quot;belongs_to_collection&quot;:\{&quot;id&quot;:[0-9]+,&quot;name&quot;:&quot;([^&quot;]*)</expression>
+			</RegExp>
+			<expression noclean="1" />
+		</RegExp>
+	</ParseFallbackTMDBSet>	
 
 	<GetTMDBCastByIdChain dest="4">
 		<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
@@ -384,14 +398,6 @@
 			<expression noclean="1" />
 		</RegExp>
 	</GetTMDBFanartByIdChain>
-	<GetTMDBFanartById dest="4">
-		<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
-			<RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBFanart&quot; cache=&quot;tmdb-images-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&lt;/url&gt;" dest="5">
-				<expression />
-			</RegExp>
-			<expression noclean="1" />
-		</RegExp>
-	</GetTMDBFanartById>
 	<ParseTMDBFanart dest="5">
 		<RegExp input="$$2" output="&lt;details&gt;&lt;fanart&gt;\1&lt;/fanart&gt;&lt;/details&gt;" dest="5">
 			<RegExp input="$$1" output="\1" dest="7">
@@ -420,14 +426,6 @@
 			<expression noclean="1" />
 		</RegExp>
 	</GetTMDBLangThumbsByIdChain>
-	<GetTMDBThumbsById dest="4">
-		<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
-			<RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBThumbs&quot; cache=&quot;tmdb-images-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/images?api_key=57983e31fb435df4df77afb854740ea9&amp;amp;language=$INFO[language]&lt;/url&gt;" dest="5">
-				<expression />
-			</RegExp>
-			<expression noclean="1" />
-		</RegExp>
-	</GetTMDBThumbsById>
 	<ParseTMDBThumbs dest="5">
 		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
 			<RegExp input="$$1" output="\1" dest="8">

diff --git a/addons/weather.wunderground/addon.xml b/addons/weather.wunderground/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="weather.wunderground" name="Weather Underground" version="1.0.6" provider-name="Team XBMC">
+<addon id="weather.wunderground" name="Weather Underground" version="1.0.8" provider-name="Team XBMC">
 	<requires>
 		<import addon="xbmc.python" version="2.1.0"/>
 		<import addon="script.module.simplejson" version="2.0.10"/>

diff --git a/addons/weather.wunderground/changelog.txt b/addons/weather.wunderground/changelog.txt
@@ -1,4 +1,8 @@
+v1.0.8
+- language update
+
 v1.0.7
+- fixed failed to run when there's a special char in username
 - switch to 2 day weekend forecast
 
 v1.0.6

diff --git a/addons/weather.wunderground/default.py b/addons/weather.wunderground/default.py
@@ -30,9 +30,9 @@
 __cwd__        = __addon__.getAddonInfo('path').decode("utf-8")
 __version__    = __addon__.getAddonInfo('version')
 __language__   = __addon__.getLocalizedString
-__resource__   = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
+__resource__   = xbmc.translatePath( os.path.join( __cwd__, 'resources', 'lib' ).encode("utf-8") ).decode("utf-8")
 
-sys.path.append (__resource__)
+sys.path.append(__resource__)
 
 from utilities import *
 from wunderground import wundergroundapi
@@ -533,7 +533,7 @@ def properties(data,loc):
     set_property('Map.IsFetched', 'true')
     filelist = []
     locid = base64.b16encode(loc)
-    addondir = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'logo'))
+    addondir = os.path.join(__cwd__, 'resources', 'logo')
     mapdir = xbmc.translatePath('special://profile/addon_data/%s/map' % __addonid__)
     set_property('MapPath', addondir)
     if not xbmcvfs.exists(mapdir):
@@ -567,7 +567,7 @@ def properties(data,loc):
         log('satellite image downloaded failed')
     if response != '':
         timestamp = time.strftime('%Y%m%d%H%M%S')
-        mapfile = xbmc.translatePath('special://profile/addon_data/%s/map/%s-%s.png' % (__addonid__,locid,timestamp))
+        mapfile = xbmc.translatePath('special://profile/addon_data/%s/map/%s-%s.png' % (__addonid__,locid,timestamp)).decode("utf-8")
         try:
             tmpmap = open(mapfile, 'wb')
             tmpmap.write(response)

diff --git a/addons/weather.wunderground/resources/language/Afrikaans/strings.po b/addons/weather.wunderground/resources/language/Afrikaans/strings.po
@@ -1,7 +1,7 @@
 # XBMC Media Center language file
 # Addon Name: Weather Underground
 # Addon id: weather.wunderground
-# Addon version: 1.0.6
+# Addon version: 1.0.8
 # Addon Provider: Team XBMC
 msgid ""
 msgstr ""

diff --git a/addons/weather.wunderground/resources/language/Arabic/strings.po b/addons/weather.wunderground/resources/language/Arabic/strings.po
@@ -1,7 +1,7 @@
 # XBMC Media Center language file
 # Addon Name: Weather Underground
 # Addon id: weather.wunderground
-# Addon version: 1.0.6
+# Addon version: 1.0.8
 # Addon Provider: Team XBMC
 msgid ""
 msgstr ""

diff --git a/addons/weather.wunderground/resources/language/Basque/strings.po b/addons/weather.wunderground/resources/language/Basque/strings.po
@@ -1,7 +1,7 @@
 # XBMC Media Center language file
 # Addon Name: Weather Underground
 # Addon id: weather.wunderground
-# Addon version: 1.0.6
+# Addon version: 1.0.8
 # Addon Provider: Team XBMC
 msgid ""
 msgstr ""

diff --git a/addons/weather.wunderground/resources/language/Belarusian/strings.po b/addons/weather.wunderground/resources/language/Belarusian/strings.po
@@ -1,7 +1,7 @@
 # XBMC Media Center language file
 # Addon Name: Weather Underground
 # Addon id: weather.wunderground
-# Addon version: 1.0.6
+# Addon version: 1.0.8
 # Addon Provider: Team XBMC
 msgid ""
 msgstr ""

diff --git a/addons/weather.wunderground/resources/language/Bosnian/strings.po b/addons/weather.wunderground/resources/language/Bosnian/strings.po
@@ -1,7 +1,7 @@
 # XBMC Media Center language file
 # Addon Name: Weather Underground
 # Addon id: weather.wunderground
-# Addon version: 1.0.6
+# Addon version: 1.0.8
 # Addon Provider: Team XBMC
 msgid ""
 msgstr ""

diff --git a/addons/weather.wunderground/resources/language/Bulgarian/strings.po b/addons/weather.wunderground/resources/language/Bulgarian/strings.po
@@ -1,7 +1,7 @@
 # XBMC Media Center language file
 # Addon Name: Weather Underground
 # Addon id: weather.wunderground
-# Addon version: 1.0.6
+# Addon version: 1.0.8
 # Addon Provider: Team XBMC
 msgid ""
 msgstr ""

diff --git a/addons/weather.wunderground/resources/language/Catalan/strings.po b/addons/weather.wunderground/resources/language/Catalan/strings.po
@@ -1,7 +1,7 @@
 # XBMC Media Center language file
 # Addon Name: Weather Underground
 # Addon id: weather.wunderground
-# Addon version: 1.0.6
+# Addon version: 1.0.8
 # Addon Provider: Team XBMC
 msgid ""
 msgstr ""

diff --git a/addons/weather.wunderground/resources/language/Chinese (Simple)/strings.po b/addons/weather.wunderground/resources/language/Chinese (Simple)/strings.po
@@ -1,7 +1,7 @@
 # XBMC Media Center language file
 # Addon Name: Weather Underground
 # Addon id: weather.wunderground
-# Addon version: 1.0.6
+# Addon version: 1.0.8
 # Addon Provider: Team XBMC
 msgid ""
 msgstr ""

diff --git a/addons/weather.wunderground/resources/language/Chinese (Traditional)/strings.po b/addons/weather.wunderground/resources/language/Chinese (Traditional)/strings.po
@@ -1,7 +1,7 @@
 # XBMC Media Center language file
 # Addon Name: Weather Underground
 # Addon id: weather.wunderground
-# Addon version: 1.0.6
+# Addon version: 1.0.8
 # Addon Provider: Team XBMC
 msgid ""
 msgstr ""

diff --git a/addons/weather.wunderground/resources/language/Croatian/strings.po b/addons/weather.wunderground/resources/language/Croatian/strings.po
@@ -1,7 +1,7 @@
 # XBMC Media Center language file
 # Addon Name: Weather Underground
 # Addon id: weather.wunderground
-# Addon version: 1.0.6
+# Addon version: 1.0.8
 # Addon Provider: Team XBMC
 msgid ""
 msgstr ""

diff --git a/addons/weather.wunderground/resources/language/Czech/strings.po b/addons/weather.wunderground/resources/language/Czech/strings.po
@@ -1,7 +1,7 @@
 # XBMC Media Center language file
 # Addon Name: Weather Underground
 # Addon id: weather.wunderground
-# Addon version: 1.0.6
+# Addon version: 1.0.8
 # Addon Provider: Team XBMC
 msgid ""
 msgstr ""