The branch, eden-pre has been updated
via a19222b5a485eeec1e4c72cd3726f5b62d778bf4 (commit)
from 70e8da4b46ec25782cc7263c2a88da7f6e6fa219 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=a19222b5a485eeec1e4c72cd3726f5b62d778bf4
commit a19222b5a485eeec1e4c72cd3726f5b62d778bf4
Author: ronie <[email protected]>
Date: Sat Dec 17 14:31:27 2011 +0100
[weather.weatherplus] -v3.0.0
Multi-threading supported
diff --git a/weather.weatherplus/addon.xml b/weather.weatherplus/addon.xml
index 595b84a..699ad00 100644
--- a/weather.weatherplus/addon.xml
+++ b/weather.weatherplus/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="weather.weatherplus"
name="Weather Plus"
- version="2.7.2"
+ version="3.0.0"
provider-name="Brightsr">
<requires>
<import addon="xbmc.python" version="2.0"/>
@@ -9,7 +9,7 @@
<extension point="xbmc.python.weather" library="default.py"/>
<extension point="xbmc.addon.metadata">
<summary lang="en">Current weather conditions and colorful
forecasts.</summary>
- <description lang="en">Originally by Nuka1195.[CR][CR]This is the advanced
weather source.[CR][CR]It provides not only current weather conditions but also
extended forecasts and information including forecast videos and weather
alerts.[CR][CR]Default weather provider is Weather.com, and you can use
alternative providers such as Accuweather.com or NOAA. </description>
+ <description lang="en">(Originally by Nuka1195)[CR][CR]This is the
advanced weather source.[CR]It provides not only current weather conditions but
also extended forecasts and information including forecast videos and weather
alerts.[CR]Default weather provider is Weather.com, and you can use alternative
providers such as Accuweather.com or NOAA. [CR][CR]For any information,
http://forum.xbmc.org/showthread.php?t=95329</description>
<platform>all</platform>
</extension>
</addon>
diff --git a/weather.weatherplus/changelog.txt
b/weather.weatherplus/changelog.txt
index 3ae7a58..23d98dc 100644
--- a/weather.weatherplus/changelog.txt
+++ b/weather.weatherplus/changelog.txt
@@ -1,3 +1,33 @@
+v.3.0.0 (v.2.8.0)
+- Added : Multi-threading supported
+- Added : [Video] Bulgaria - Meteotv.bg
+- Added : [Video] Poland - TVN
+- Added : [Video] Ireland - TV3
+- Added : [Video] Germany - ZDF.de
+- Added : [Video] Spain - tve
+- Added : [Video] Belgium - RTL.be, Deredactie.be
+- Added : [Video] Netherlands - Weer.nl
+- Added : [Video] Romania - Antenna 1
+- Added : [Video] Hungary - RTL Klub
+- Added : [Translator] Google Translation
+- Added : [Accuweather.com] "Auto" language option
+- Added : [Accuweather.com] Hourly forcast - Wind direction translation (by
Google)
+- Added : [Accuweather.com] 10 day forcast - Wind speed & direction with
Translation (by Google)
+- Added : [Accuweather.com] Weekend forecast - Wind, UVindex, Sunrise & Sunset
time
+- Added : [NOAA.gov] Hourly forecast - Feels Like, Condition Icon, Outlook
(generated by script)
+- Added : [NOAA.gov] US Severe weather alert
+- Added : [NOAA.gov] Weekend forecast
+- Added : [Dharma] Window(Weather).Property(Update) - Last updated time
+- Fixed : [NOAA.gov] Extended forecast - Gust speed issue
+- Fixed : [Weather.com] Current.FanartCode
+- Fixed : [Weather.com] Duplicated alerts, Alert color issue
+- Fixed : [Video] ABC 4 (Hawaii)
+- Fixed : Static image of map was not shown
+- Fixed : Local maps of South America, Australia, New Zealand
+- Fixed : Location name was not refreshed
+- Fixed : Minor bugs
+
+
v.2.7.2
- Version changed for eden-pre repo
diff --git a/weather.weatherplus/default.py b/weather.weatherplus/default.py
index 1d334de..56b0c6f 100644
--- a/weather.weatherplus/default.py
+++ b/weather.weatherplus/default.py
@@ -1,25 +1,22 @@
-"""
- Weather plugin
-"""
+# coding: utf-8
-#main imports
-import sys
-import urllib, os.path, xbmc, re, htmlentitydefs, time
+#***********************************************************
+#
+# Weather Plus XBMC Addon
+#
+# created by brightsr
+# - based on Nuka1195's script
+#
+#***********************************************************
-# Script constants
-__plugin__ = "Weather Plus"
-__pluginname__ = "Weather Plus"
-__author__ = "brightsr (original sources by nuka1195)"
-__url__ = "http://code.google.com/p/xbmc-addons/";
-__svn_url__ =
"http://xbmc-addons.googlecode.com/svn/branches/eden-pre/weather.weatherplus";
-__version__ = "2.7.2"
+import xbmc
-# Start the main plugin
+__plugin__ = "Weather Plus"
+__version__ = "3.0.0"
xbmc.log( "[PLUGIN] '%s: Version - %s' initialized!" % ( __plugin__,
__version__ ), xbmc.LOGNOTICE )
if ( __name__ == "__main__" ):
- from xbmcplugin_weather import Main
- argv = len(sys.argv[1])
- Main( argv == 1 ) # argv > 1 : guisettings has areacode ( so sys.argv[1]
has areacode )
+ from main import Main
+ Main()
diff --git a/weather.weatherplus/resources/language/English/strings.xml
b/weather.weatherplus/resources/language/English/strings.xml
index 7e378de..3523787 100644
--- a/weather.weatherplus/resources/language/English/strings.xml
+++ b/weather.weatherplus/resources/language/English/strings.xml
@@ -2,7 +2,7 @@
<strings>
<!-- Title/Credit strings -->
<string id="32000">%s Addon Manager</string>
- <string id="32002">nuka1195</string>
+ <string id="32002">brightsr, nuka1195</string>
<!-- Alert messages -->
<string id="32100">Weather Alert</string>
@@ -41,8 +41,11 @@
<string id="32450">Video</string>
<!-- Settings strings -->
- <string id="32500">Translate text (Babelfish)</string>
- <string id="32510">Map List #1 category</string>
+ <string id="32500">Translation</string>
+ <string id="32501">Translator</string>
+ <string id="32502">Babelfish</string>
+ <string id="32503">Google</string>
+ <string id="32510">Map List #1 category</string>
<string id="32520">Map List #2 category</string>
<string id="32530">Map List #3 category</string>
<string id="32540">User defined maps/radars file</string>
@@ -200,18 +203,19 @@
<string id="32863">Fitness</string>
<string id="32864">User Defined</string>
- <!-- Alternative Provider strings -->
- <string id="32901">Location #1</string>
+ <!-- Alternative Provider strings -->
+ <string id="32901">Location 1</string>
<string id="32902">Provider</string>
<string id="32903">Location Name</string>
<string id="32904">Run Location Selector</string>
- <string id="32905">Location #2</string>
- <string id="32906">Location #3</string>
+ <string id="32905">Location 2</string>
+ <string id="32906">Location 3</string>
<!-- Alternative Provider Lists -->
<string id="32951">Accuweather.com Global</string>
<string id="32952">NOAA (US Only)</string>
<string id="32953">Weather.com</string>
+ <string id="32954">Wunderground.com</string>
<!-- Video Option -->
<string id="32961">Run Video Selector (Only for US)</string>
@@ -255,5 +259,6 @@
<string id="32729">Spanish(Latin)</string>
<string id="32730">Swedish</string>
<string id="32731">Turkish</string>
+ <string id="32732">Auto</string>
-</strings>
\ No newline at end of file
+</strings>
diff --git a/weather.weatherplus/resources/language/Korean/strings.xml
b/weather.weatherplus/resources/language/Korean/strings.xml
index a8c883f..d88acf2 100644
--- a/weather.weatherplus/resources/language/Korean/strings.xml
+++ b/weather.weatherplus/resources/language/Korean/strings.xml
@@ -2,7 +2,7 @@
<strings>
<!-- Title/Credit strings -->
<string id="32000">%s ì ëì¨ ê´ë¦¬ì</string>
- <string id="32002">nuka1195, brightsr</string>
+ <string id="32002">brightsr, nuka1195</string>
<!-- Alert messages -->
<string id="32100">기ì í¹ë³´</string>
@@ -39,7 +39,8 @@
<string id="32430">기ììë³´ ì¤ì </string>
<!-- Settings strings -->
- <string id="32500">í
ì¤í¸ ë²ì (Babelfish)</string>
+ <string id="32500">ë²ì</string>
+ <string id="32501">ë²ì기</string>
<string id="32510">ì§ë 리ì¤í¸ #1 ì¢
ë¥</string>
<string id="32520">ì§ë 리ì¤í¸ #2 ì¢
ë¥</string>
<string id="32530">ì§ë 리ì¤í¸ #3 ì¢
ë¥</string>
@@ -196,20 +197,25 @@
<string id="32864">User Defined</string>
<!-- Alternative Provider strings -->
- <string id="32901">Location #1</string>
- <string id="32902">Provider</string>
- <string id="32903">Location</string>
- <string id="32904">Change Location</string>
- <string id="32905">Location #2</string>
- <string id="32906">Location #3</string>
+ <string id="32901">ìì¹ 1</string>
+ <string id="32902">ì ê³µì</string>
+ <string id="32903">ìì¹</string>
+ <string id="32904">ìì¹ ì¤ì í기</string>
+ <string id="32905">ìì¹ 2</string>
+ <string id="32906">ìì¹ 3</string>
<!-- Alternative Provider Lists -->
<string id="32951">Accuweather.com Global</string>
- <string id="32952">NOAA (US Only)</string>
+ <string id="32952">NOAA (ë¯¸êµ ì§ìë§ ê°ë¥)</string>
+ <!-- Video Option -->
+ <string id="32961">ë¹ëì¤ ì í기 ì¤í(미êµë§ í´ë¹)</string>
+ <string id="32962">ë¹ëì¤ #1</string>
+ <string id="32963">ë¹ëì¤ #2</string>
+ <string id="32964">ë¹ëì¤ #3</string>
<!-- Misc. -->
- <string id="32981">Accuweather.com ì¸ì´</string>
+ <string id="32981">Accuweather.com ì¸ì´ ì¤ì </string>
<!-- Languages -->
<string id="32701">Arabic</string>
@@ -232,7 +238,7 @@
<string id="32717">Hungarian</string>
<string id="32718">Italian</string>
<string id="32719">Japanese</string>
- <string id="32720">Korean</string>
+ <string id="32720">íêµì´</string>
<string id="32721">Norwegian</string>
<string id="32722">Polish</string>
<string id="32723">Portuguese(Brazil)</string>
diff --git a/weather.weatherplus/resources/language/Portuguese
(Brazil)/strings.xml b/weather.weatherplus/resources/language/Portuguese
(Brazil)/strings.xml
index ea7fe66..73c483a 100644
--- a/weather.weatherplus/resources/language/Portuguese (Brazil)/strings.xml
+++ b/weather.weatherplus/resources/language/Portuguese (Brazil)/strings.xml
@@ -39,7 +39,8 @@
<string id="32430">Opções para Previsão</string>
<!-- Settings strings -->
- <string id="32500">Traduzir textos (Babelfish)</string>
+ <string id="32500">Tradução</string>
+ <string id="32501">Tradutor</string>
<string id="32510">Lista Mapa #1 categoria</string>
<string id="32520">Lista Mapa #2 categoria</string>
<string id="32530">Lista Mapa #3 categoria</string>
@@ -196,12 +197,12 @@
<string id="32864">Definido pelo Usuário</string>
<!-- Alternative Provider strings -->
- <string id="32901">Location #1</string>
- <string id="32902">Provider</string>
- <string id="32903">Location</string>
- <string id="32904">Change Location</string>
- <string id="32905">Location #2</string>
- <string id="32906">Location #3</string>
+ <string id="32901">localização #1</string>
+ <string id="32902">fornecedor</string>
+ <string id="32903">localização</string>
+ <string id="32904">Definição de localização</string>
+ <string id="32905">localização #2</string>
+ <string id="32906">localização #3</string>
<!-- Alternative Provider Lists -->
<string id="32951">Accuweather.com Global</string>
diff --git a/weather.weatherplus/resources/language/Spanish/strings.xml
b/weather.weatherplus/resources/language/Spanish/strings.xml
index 8f9d5f4..3468fad 100644
--- a/weather.weatherplus/resources/language/Spanish/strings.xml
+++ b/weather.weatherplus/resources/language/Spanish/strings.xml
@@ -39,7 +39,8 @@
<string id="32430">Opciones de pronóstico</string>
<!-- Settings strings -->
- <string id="32500">Traducir texto (Babelfish)</string>
+ <string id="32500">Traducción</string>
+ <string id="32501">Traductor</string>
<string id="32510">Lista de mapas categorÃa #1</string>
<string id="32520">Lista de mapas categorÃa #2</string>
<string id="32530">Lista de mapas categorÃa #3</string>
@@ -196,12 +197,12 @@
<string id="32864">Definido por el usuario</string>
<!-- Alternative Provider strings -->
- <string id="32901">Location #1</string>
- <string id="32902">Provider</string>
- <string id="32903">Location</string>
- <string id="32904">Change Location</string>
- <string id="32905">Location #2</string>
- <string id="32906">Location #3</string>
+ <string id="32901">Ubicación #1</string>
+ <string id="32902">Proveedor</string>
+ <string id="32903">Ubicación</string>
+ <string id="32904">Configuración de la ubicación</string>
+ <string id="32905">Ubicación #2</string>
+ <string id="32906">Ubicación #3</string>
<!-- Alternative Provider Lists -->
<string id="32951">Accuweather.com Global</string>
diff --git a/weather.weatherplus/resources/lib/Location_Selector.py
b/weather.weatherplus/resources/lib/Location_Selector.py
index 7c099d1..62598ba 100644
--- a/weather.weatherplus/resources/lib/Location_Selector.py
+++ b/weather.weatherplus/resources/lib/Location_Selector.py
@@ -40,7 +40,7 @@ def _fetch_data( base_url, cookie=None ):
return ""
except:
# oops print error message
- print "ERROR: %s::%s (%d) - %s" % ( self.__class__.__name__,
sys.exc_info()[ 2 ].tb_frame.f_code.co_name, sys.exc_info()[ 2 ].tb_lineno,
sys.exc_info()[ 1 ], )
+ print "ERROR: %s (%d) - %s" % ( sys.exc_info()[ 2
].tb_frame.f_code.co_name, sys.exc_info()[ 2 ].tb_lineno, sys.exc_info()[ 1 ], )
# some unknown error, return ""
return ""
@@ -68,6 +68,8 @@ class Main:
location_name += [ loca[2] ]
elif ( provider == "1" or provider ==
"2" ):
location_name += [ loca[1] ]
+ elif ( provider == "3" ):
+ location_name += [ loca[0] ]
select =
dialog.select(xbmc.getLocalizedString(396), location_name)
if ( select != -1 ):
self.location = location[ select ]
@@ -76,7 +78,9 @@ class Main:
__Settings__.setSetting(
"code%s_%s" % ( loc, int(provider)+1 ), self.location[0] + " " +
self.location[1] )
elif ( provider == "1" or provider ==
"2" ):
__Settings__.setSetting(
"code%s_%s" % ( loc, int(provider)+1 ), self.location[0] )
- __Settings__.openSettings()
+ elif ( provider == "3" ):
+ __Settings__.setSetting(
"code%s_%s" % ( loc, int(provider)+1 ), self.location[1] )
+ # __Settings__.openSettings()
def _fetch_location(self, userInput, provider):
location = []
@@ -102,6 +106,13 @@ class Main:
pattern_location = "id=\"(.+?)\"
type=\"[0-9]\">(.+?)</loc>"
xmlSource = _fetch_data (
"http://xoap.weather.com/search/search?where=%s"; % userInput.replace(" ","+") )
location = re.findall( pattern_location, xmlSource )
+ elif (provider == "3"):
+ pattern_name = "name\"[:] \"(.+?)\""
+ pattern_code = "l\"[:] \"(.+?)\""
+ htmlSource = _fetch_data (
"http://autocomplete.wunderground.com/aq?query=%s"; % userInput.replace(" ","+")
)
+ name = re.findall( pattern_name, htmlSource )
+ code = re.findall( pattern_code, htmlSource )
+ location = [ ( name[i], code[i] ) for i in range(0,
len(name)) ]
return location
Main( loc=sys.argv[ 1 ].split( "=" )[ 1 ] )
diff --git a/weather.weatherplus/resources/lib/video_selector.py
b/weather.weatherplus/resources/lib/video_selector.py
index fe88020..4737d30 100644
--- a/weather.weatherplus/resources/lib/video_selector.py
+++ b/weather.weatherplus/resources/lib/video_selector.py
@@ -23,7 +23,7 @@ class Main:
if ( video_num != -1 ):
slot = video_num + 1
else:
- __Settings__.openSettings()
+ #__Settings__.openSettings()
return
channel = dialog.select("Choose a Channel", ["Weather.com",
"ABC", "CBS", "FOX", "NBC"])
if ( channel == 0 ):
@@ -179,7 +179,7 @@ class Main:
__Settings__.setSetting( "video%d" % slot,
video_list[video] )
__Settings__.setSetting( "video%d_url" % slot, "" )
- __Settings__.openSettings()
+ #__Settings__.openSettings()
Main()
diff --git a/weather.weatherplus/resources/settings.xml
b/weather.weatherplus/resources/settings.xml
index 0f53c0e..b46bda2 100644
--- a/weather.weatherplus/resources/settings.xml
+++ b/weather.weatherplus/resources/settings.xml
@@ -6,63 +6,69 @@
<setting id="alert_notify_time" type="enum" enable="eq(-1,0)"
lvalues="32581|32582|32583|32584|32585|32586|32587|32588" label="32580"
default="2" />
<setting id="alert_notify_once" type="bool" enable="eq(-2,0)"
label="32560" default="false" />
<setting id="translate" type="bool" label="32500" default="true" />
- <setting id="maplist_user_file" type="files" mask=".udm" label="32540"
default="" />
+ <setting id="translator" type="enum" subsetting="true"
visible="eq(-1,true)" label="32501" lvalues="32502|32503" default="1" />
<setting type="lsep" label="32450" />
- <setting id="video_selector" type="action" label="32961" option="close"
action="RunScript($CWD/resources/lib/video_selector.py)" />
+ <setting id="video_selector" type="action" label="32961"
action="RunScript($CWD/resources/lib/video_selector.py)" />
<setting id="video1" type="text" label="32962" subsetting="true"
default="A National Look at the Next 3 Days" enable="false" />
<setting id="video1_url" type="text" visible="false"
default="http://v.imwx.com/v/wxcom/national.mov"; />
<setting id="video2" type="text" label="32963" subsetting="true"
default="Today's top forecasts" enable="false" />
- <setting id="video3_url" type="text" visible="false"
default="http://v.imwx.com/v/wxcom/topstory.mov"; />
+ <setting id="video2_url" type="text" visible="false"
default="http://v.imwx.com/v/wxcom/topstory.mov"; />
<setting id="video3" type="text" label="32964" subsetting="true"
default="Weekly Planner" enable="false" />
<setting id="video3_url" type="text" visible="false"
default="http://v.imwx.com/v/wxcom/weekly.mov"; />
<setting type="lsep" label="32420" />
- <setting id="maplist1" type="enum"
lvalues="32600|32601|32602|32603|32604|32605|32606|32607|32608|32609|32610|32611|32612|32613|32614|32615|32616|32617|32618|32619|32620|32621|32622|32623|32624|32625|32626|32627|32628|32629|32630|32631|32632|32633|32634|32635|32636|32637|32638|32639|32640|32641|32642|32643|32644|32645|32646|32647|32648|32649|32650|32651|32652|32653|32654|32655|32656|32657|32658|32659|32660|32661|32662|32663|32664"
label="32510" default="1" />
- <setting id="maplist2" type="enum"
lvalues="32600|32601|32602|32603|32604|32605|32606|32607|32608|32609|32610|32611|32612|32613|32614|32615|32616|32617|32618|32619|32620|32621|32622|32623|32624|32625|32626|32627|32628|32629|32630|32631|32632|32633|32634|32635|32636|32637|32638|32639|32640|32641|32642|32643|32644|32645|32646|32647|32648|32649|32650|32651|32652|32653|32654|32655|32656|32657|32658|32659|32660|32661|32662|32663|32664"
label="32520" default="3" />
- <setting id="maplist3" type="enum"
lvalues="32600|32601|32602|32603|32604|32605|32606|32607|32608|32609|32610|32611|32612|32613|32614|32615|32616|32617|32618|32619|32620|32621|32622|32623|32624|32625|32626|32627|32628|32629|32630|32631|32632|32633|32634|32635|32636|32637|32638|32639|32640|32641|32642|32643|32644|32645|32646|32647|32648|32649|32650|32651|32652|32653|32654|32655|32656|32657|32658|32659|32660|32661|32662|32663|32664"
label="32530" default="38" />
+ <setting id="maplist1" type="enum"
lvalues="32600|32601|32602|32603|32604|32605|32606|32607|32608|32609|32610|32611|32612|32613|32614|32615|32616|32617|32618|32619|32620|32621|32622|32623|32624|32625|32626|32627|32628|32629|32630|32631|32632|32633|32634|32635|32636|32637|32638|32639|32640|32641|32642|32643|32644|32645|32646|32647|32648|32649|32650|32651|32652|32653|32654|32655|32656|32657|32658|32659|32660|32661|32662|32663"
label="32510" default="1" />
+ <setting id="maplist2" type="enum"
lvalues="32600|32601|32602|32603|32604|32605|32606|32607|32608|32609|32610|32611|32612|32613|32614|32615|32616|32617|32618|32619|32620|32621|32622|32623|32624|32625|32626|32627|32628|32629|32630|32631|32632|32633|32634|32635|32636|32637|32638|32639|32640|32641|32642|32643|32644|32645|32646|32647|32648|32649|32650|32651|32652|32653|32654|32655|32656|32657|32658|32659|32660|32661|32662|32663"
label="32520" default="3" />
+ <setting id="maplist3" type="enum"
lvalues="32600|32601|32602|32603|32604|32605|32606|32607|32608|32609|32610|32611|32612|32613|32614|32615|32616|32617|32618|32619|32620|32621|32622|32623|32624|32625|32626|32627|32628|32629|32630|32631|32632|32633|32634|32635|32636|32637|32638|32639|32640|32641|32642|32643|32644|32645|32646|32647|32648|32649|32650|32651|32652|32653|32654|32655|32656|32657|32658|32659|32660|32661|32662|32663"
label="32530" default="38" />
<setting type="lsep" label="32400" />
- <setting id="install_mappack" type="action" label="32570" option="close"
action="RunScript($CWD/resources/lib/addon_manager.py,package=mappack)"
default="" />
+ <setting id="install_mappack" type="action" label="32570"
action="RunScript($CWD/resources/lib/addon_manager.py,package=mappack)"
default="" />
</category>
- <category label="Location 1">
- <setting id="newbuild" type="bool" label="32902" visible="false" />
+ <category label="32901">
<setting id="provider1" type="enum" label="32902"
lvalues="32951|32952|32953" default="2" />
- <setting id="accu_translate1" type="enum" label="32981" default="9"
lvalues="32701|32702|32703|32704|32705|32706|32707|32708|32709|32799|32710|32711|32712|32713|32714|32715|32716|32717|32718|32719|32720|32721|32722|32723|32724|32725|32726|32727|32728|32729|32730|32731"
subsetting="true" visible="eq(-1,0)" />
- <setting id="change_location1_1" type="action" subsetting="true"
option="close" label="32904" visible="eq(-2,0)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=1|0)"/>
- <setting id="change_location1_2" type="action" subsetting="true"
option="close" label="32904" visible="eq(-3,1)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=1|1)"/>
- <setting id="change_location1_3" type="action" subsetting="true"
option="close" label="32904" visible="eq(-4,2)+eq(-5,true)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=1|2)"/>
- <setting id="location1_1" type="text" subsetting="true" label="32903"
default="" visible="eq(-5,0)" />
- <setting id="location1_2" type="text" subsetting="true" label="32903"
default="" visible="eq(-6,1)" />
- <setting id="location1_3" type="text" subsetting="true" label="32903"
default="" visible="eq(-7,2)+eq(-8,true)" />
+ <setting id="accu_translate1" type="enum" label="32981" default="32"
lvalues="32701|32702|32703|32704|32705|32706|32707|32708|32709|32799|32710|32711|32712|32713|32714|32715|32716|32717|32718|32719|32720|32721|32722|32723|32724|32725|32726|32727|32728|32729|32730|32731|32732"
subsetting="true" visible="eq(-1,0)" />
+ <setting id="change_location1_1" type="action" subsetting="true"
label="32904" visible="eq(-2,0)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=1|0)"/>
+ <setting id="change_location1_2" type="action" subsetting="true"
label="32904" visible="eq(-3,1)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=1|1)"/>
+ <setting id="change_location1_3" type="action" subsetting="true"
label="32904" visible="eq(-4,2)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=1|2)"/>
+ <setting id="change_location1_4" type="action" subsetting="true"
label="32904" visible="eq(-5,3)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=1|3)"/>
+ <setting id="location1_1" type="text" subsetting="true" label="32903"
default="" visible="eq(-6,0)" />
+ <setting id="location1_2" type="text" subsetting="true" label="32903"
default="" visible="eq(-7,1)" />
+ <setting id="location1_3" type="text" subsetting="true" label="32903"
default="" visible="eq(-8,2)" />
+ <setting id="location1_4" type="text" subsetting="true" label="32903"
default="" visible="eq(-9,3)" />
<setting id="code1_1" type="text" visible="false" default=""
enable="false" />
<setting id="code1_2" type="text" visible="false" default=""
enable="false" />
<setting id="code1_3" type="text" visible="false" default=""
enable="false" />
+ <setting id="code1_4" type="text" visible="false" default=""
enable="false" />
</category>
- <category label="Location 2">
- <setting id="newbuild" type="bool" label="32902" visible="false" />
+ <category label="32905">
<setting id="provider2" type="enum" label="32902"
lvalues="32951|32952|32953" default="2" />
- <setting id="accu_translate2" type="enum" label="32981" default="9"
lvalues="32701|32702|32703|32704|32705|32706|32707|32708|32709|32799|32710|32711|32712|32713|32714|32715|32716|32717|32718|32719|32720|32721|32722|32723|32724|32725|32726|32727|32728|32729|32730|32731"
subsetting="true" visible="eq(-1,0)" />
- <setting id="change_location2_1" type="action" subsetting="true"
option="close" label="32904" visible="eq(-2,0)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=2|0)"/>
- <setting id="change_location2_2" type="action" subsetting="true"
option="close" label="32904" visible="eq(-3,1)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=2|1)"/>
- <setting id="change_location2_3" type="action" subsetting="true"
option="close" label="32904" visible="eq(-4,2)+eq(-5,true)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=2|2)"/>
- <setting id="location2_1" type="text" subsetting="true" label="32903"
default="" visible="eq(-5,0)" />
- <setting id="location2_2" type="text" subsetting="true" label="32903"
default="" visible="eq(-6,1)" />
- <setting id="location2_3" type="text" subsetting="true" label="32903"
default="" visible="eq(-7,2)+eq(-8,true)" />
+ <setting id="accu_translate2" type="enum" label="32981" default="32"
lvalues="32701|32702|32703|32704|32705|32706|32707|32708|32709|32799|32710|32711|32712|32713|32714|32715|32716|32717|32718|32719|32720|32721|32722|32723|32724|32725|32726|32727|32728|32729|32730|32731|32732"
subsetting="true" visible="eq(-1,0)" />
+ <setting id="change_location2_1" type="action" subsetting="true"
label="32904" visible="eq(-2,0)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=2|0)"/>
+ <setting id="change_location2_2" type="action" subsetting="true"
label="32904" visible="eq(-3,1)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=2|1)"/>
+ <setting id="change_location2_3" type="action" subsetting="true"
label="32904" visible="eq(-4,2)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=2|2)"/>
+ <setting id="change_location2_4" type="action" subsetting="true"
label="32904" visible="eq(-5,3)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=2|3)"/>
+ <setting id="location2_1" type="text" subsetting="true" label="32903"
default="" visible="eq(-6,0)" />
+ <setting id="location2_2" type="text" subsetting="true" label="32903"
default="" visible="eq(-7,1)" />
+ <setting id="location2_3" type="text" subsetting="true" label="32903"
default="" visible="eq(-8,2)" />
+ <setting id="location2_4" type="text" subsetting="true" label="32903"
default="" visible="eq(-9,3)" />
<setting id="code2_1" type="text" visible="false" default=""
enable="false" />
<setting id="code2_2" type="text" visible="false" default=""
enable="false" />
- <setting id="code3_3" type="text" visible="false" default=""
enable="false" />
+ <setting id="code2_3" type="text" visible="false" default=""
enable="false" />
+ <setting id="code2_4" type="text" visible="false" default=""
enable="false" />
</category>
- <category label="Location 3">
- <setting id="newbuild" type="bool" label="32902" visible="false" />
+ <category label="32906">
<setting id="provider3" type="enum" label="32902"
lvalues="32951|32952|32953" default="2" />
- <setting id="accu_translate3" type="enum" label="32981" default="9"
lvalues="32701|32702|32703|32704|32705|32706|32707|32708|32709|32799|32710|32711|32712|32713|32714|32715|32716|32717|32718|32719|32720|32721|32722|32723|32724|32725|32726|32727|32728|32729|32730|32731"
subsetting="true" visible="eq(-1,0)" />
- <setting id="change_location3_1" type="action" subsetting="true"
option="close" label="32904" visible="eq(-2,0)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=3|0)"/>
- <setting id="change_location3_2" type="action" subsetting="true"
option="close" label="32904" visible="eq(-3,1)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=3|1)"/>
- <setting id="change_location3_3" type="action" subsetting="true"
option="close" label="32904" visible="eq(-4,2)+eq(-5,true)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=3|2)"/>
- <setting id="location3_1" type="text" subsetting="true" label="32903"
default="" visible="eq(-5,0)" />
- <setting id="location3_2" type="text" subsetting="true" label="32903"
default="" visible="eq(-6,1)" />
- <setting id="location3_3" type="text" subsetting="true" label="32903"
default="" visible="eq(-7,2)+eq(-8,true)" />
+ <setting id="accu_translate3" type="enum" label="32981" default="32"
lvalues="32701|32702|32703|32704|32705|32706|32707|32708|32709|32799|32710|32711|32712|32713|32714|32715|32716|32717|32718|32719|32720|32721|32722|32723|32724|32725|32726|32727|32728|32729|32730|32731|32732"
subsetting="true" visible="eq(-1,0)" />
+ <setting id="change_location3_1" type="action" subsetting="true"
label="32904" visible="eq(-2,0)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=3|0)"/>
+ <setting id="change_location3_2" type="action" subsetting="true"
label="32904" visible="eq(-3,1)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=3|1)"/>
+ <setting id="change_location3_3" type="action" subsetting="true"
label="32904" visible="eq(-4,2)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=3|2)"/>
+ <setting id="change_location2_4" type="action" subsetting="true"
label="32904" visible="eq(-5,3)"
action="RunScript($CWD/resources/lib/Location_Selector.py,loc=3|3)"/>
+ <setting id="location3_1" type="text" subsetting="true" label="32903"
default="" visible="eq(-6,0)" />
+ <setting id="location3_2" type="text" subsetting="true" label="32903"
default="" visible="eq(-7,1)" />
+ <setting id="location3_3" type="text" subsetting="true" label="32903"
default="" visible="eq(-8,2)" />
+ <setting id="location3_4" type="text" subsetting="true" label="32903"
default="" visible="eq(-9,3)" />
<setting id="code3_1" type="text" visible="false" default=""
enable="false" />
<setting id="code3_2" type="text" visible="false" default=""
enable="false" />
<setting id="code3_3" type="text" visible="false" default=""
enable="false" />
+ <setting id="code3_4" type="text" visible="false" default=""
enable="false" />
</category>
</settings>
-----------------------------------------------------------------------
Summary of changes:
weather.weatherplus/WeatherClient.py | 4874 --------------------
weather.weatherplus/addon.xml | 4 +-
weather.weatherplus/changelog.txt | 30 +
weather.weatherplus/default.py | 31 +-
.../{xbmcplugin_weather.py => main.py} | 2305 +++++-----
weather.weatherplus/properties.txt | 154 -
.../resources/language/English/strings.xml | 21 +-
.../resources/language/Korean/strings.xml | 28 +-
.../language/Portuguese (Brazil)/strings.xml | 15 +-
.../resources/language/Spanish/strings.xml | 15 +-
.../resources/lib/Location_Selector.py | 15 +-
weather.weatherplus/resources/lib/accuweather.py | 572 +++
weather.weatherplus/resources/lib/noaa.py | 673 +++
weather.weatherplus/resources/lib/utilities.py | 717 +++
weather.weatherplus/resources/lib/video_non_us.py | 509 ++
.../resources/lib/video_selector.py | 4 +-
weather.weatherplus/resources/lib/video_us.py | 1204 +++++
weather.weatherplus/resources/lib/weather.py | 886 ++++
weather.weatherplus/resources/settings.xml | 76 +-
19 files changed, 5788 insertions(+), 6345 deletions(-)
delete mode 100644 weather.weatherplus/WeatherClient.py
rename weather.weatherplus/{xbmcplugin_weather.py => main.py} (67%)
delete mode 100644 weather.weatherplus/properties.txt
create mode 100644 weather.weatherplus/resources/lib/accuweather.py
create mode 100644 weather.weatherplus/resources/lib/noaa.py
create mode 100644 weather.weatherplus/resources/lib/utilities.py
create mode 100644 weather.weatherplus/resources/lib/video_non_us.py
create mode 100644 weather.weatherplus/resources/lib/video_us.py
create mode 100644 weather.weatherplus/resources/lib/weather.py
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Learn Windows Azure Live! Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for
developers. It will provide a great way to learn Windows Azure and what it
provides. You can attend the event by watching it streamed LIVE online.
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
