The branch, frodo has been updated
via 131772e749e50d9948487b27bfe4878e850d198e (commit)
from 0a6e393f6ebbac4214473bea5720d0e1abc0fc08 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=131772e749e50d9948487b27bfe4878e850d198e
commit 131772e749e50d9948487b27bfe4878e850d198e
Author: sphere <[email protected]>
Date: Mon Mar 17 13:16:09 2014 +0100
[weather.ozweather] updated to version 0.7.2
diff --git a/weather.ozweather/README.md b/weather.ozweather/README.md
index b1be177..d1bd7d9 100644
--- a/weather.ozweather/README.md
+++ b/weather.ozweather/README.md
@@ -1,8 +1,8 @@
-Script for XBMC for Australian weather. Available from XBMC master repository.
+Script for XBMC for Australian weather. Available from XBMC master repository
(i.e. don't install from here - just go to Addons -> Get Addons -> Weather ->
OzWeather)
Uses BOM data and retrieves current conditions, 7 day forecast, and radar
images.
-Script works fine standalone for standard XBMC weather data, but you need to
make skin changes for radar support. See wiki page for full details.
+Script works fine standalone for standard high quality Australian weather
data, but you need to make skin changes for the best bit which is BOM radar
support. See wiki page for full details.
http://wiki.xbmc.org/index.php?title=Add-on:Oz_Weather
diff --git a/weather.ozweather/addon.xml b/weather.ozweather/addon.xml
index b0ded5a..62351da 100644
--- a/weather.ozweather/addon.xml
+++ b/weather.ozweather/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="weather.ozweather" name="Oz Weather" version="0.7.1"
provider-name="Bossanova808">
+<addon id="weather.ozweather" name="Oz Weather" version="0.7.2"
provider-name="Bossanova808">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.parsedom" version="1.2.0"/>
@@ -10,5 +10,11 @@
<description lang="en">Weather forecast data scraped from the
Australian Bureau of Meteorology via WeatherZone - www.bom.gov.au and
www.weatherzone.com.au. For full features (e.g. radar) make sure you install
the skin file you can find in the addon directory. Contributed files for other
skins welcome.</description>
<disclaimer lang="en">Use of this addon implies you agree to
the following terms and conditions -
http://reg.bom.gov.au/other/copyright.shtml and
http://reg.bom.gov.au/other/disclaimer.shtml</disclaimer>
<platform>all</platform>
+ <language>en</language>
+ <license>GNU GENERAL PUBLIC LICENSE. Version 2, June
1991</license>
+ <forum>http://forum.xbmc.org/showthread.php?tid=116905</forum>
+
<website>http://wiki.xbmc.org/index.php?title=Add-on:Oz_Weather</website>
+ <email></email>
+ <source></source>
</extension>
</addon>
diff --git a/weather.ozweather/default.py b/weather.ozweather/default.py
index cb8cfab..e514207 100644
--- a/weather.ozweather/default.py
+++ b/weather.ozweather/default.py
@@ -365,12 +365,11 @@ def prepareBackgrounds(radarCode):
log("Called prepareBackgrounds()")
downloadBackground(radarCode, "IDR.legend.0.png")
- if radarCode != "IDR00004":
- downloadBackground(radarCode, "background.png")
- downloadBackground(radarCode, "locations.png")
- downloadBackground(radarCode, "range.png")
- downloadBackground(radarCode, "topography.png")
- downloadBackground(radarCode, "catchments.png")
+ downloadBackground(radarCode, "background.png")
+ downloadBackground(radarCode, "locations.png")
+ downloadBackground(radarCode, "range.png")
+ downloadBackground(radarCode, "topography.png")
+ downloadBackground(radarCode, "catchments.png")
################################################################################
@@ -524,8 +523,6 @@ def propertiesPDOM(page, extendedFeatures):
#get the 7 day max min forecasts
maxMin = common.parseDOM(ret, "td")
#log( "maxmin is " + str(maxMin))
- #for count, element in enumerate(maxMin):
- # print "********" , count , "^^^" , str(element)
maxList = stripList(maxMin[7:14],'°C')
minList = stripList(maxMin[14:21],'°C')
rainChanceList = stripList(maxMin[21:28],'')
@@ -675,7 +672,7 @@ socket.setdefaulttimeout(100)
#the being called from the settings section where the user enters their
postcodes
if sys.argv[1].startswith('Location'):
- keyboard = xbmc.Keyboard('', LANGUAGE(30195), False)
+ keyboard = xbmc.Keyboard('', LANGUAGE(32195), False)
keyboard.doModal()
if (keyboard.isConfirmed() and keyboard.getText() != ''):
text = keyboard.getText()
diff --git a/weather.ozweather/resources/language/English/strings.xml
b/weather.ozweather/resources/language/English/strings.xml
index 9dba57a..745932a 100644
--- a/weather.ozweather/resources/language/English/strings.xml
+++ b/weather.ozweather/resources/language/English/strings.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
- <string id="30101">OzWeather Settings</string>
- <string id="30111">Change Suburb 1</string>
- <string id="30112">Change Suburb 2</string>
- <string id="30113">Change Suburb 3</string>
- <string id="30155">Change Radar ID for Suburb 1 (e.g. IDR022)</string>
- <string id="30156">Change Radar ID for Suburb 2</string>
- <string id="30157">Change Radar ID for Suburb 3</string>
- <string id="30194">Use extended features (long forecast, radar
loop)</string>
- <string id="30195">Enter suburb name, or your 4 digit postcode e.g.
3051</string>
- <string id="30196">ABC Weather Video Quality Level</string>
+ <string id="32101">OzWeather Settings</string>
+ <string id="32111">Change Suburb 1</string>
+ <string id="32112">Change Suburb 2</string>
+ <string id="32113">Change Suburb 3</string>
+ <string id="32155">Change Radar ID for Suburb 1 (e.g. IDR022)</string>
+ <string id="32156">Change Radar ID for Suburb 2</string>
+ <string id="32157">Change Radar ID for Suburb 3</string>
+ <string id="32194">Use extended features (long forecast, radar
loop)</string>
+ <string id="32195">Enter suburb name, or your 4 digit postcode e.g.
3051</string>
+ <string id="32196">ABC Weather Video Quality Level</string>
</strings>
diff --git a/weather.ozweather/resources/lib/b808common/b808common.py
b/weather.ozweather/resources/lib/b808common/b808common.py
index 0a884c3..79b7a4e 100644
--- a/weather.ozweather/resources/lib/b808common/b808common.py
+++ b/weather.ozweather/resources/lib/b808common/b808common.py
@@ -2,7 +2,7 @@
### By bossanova808 2013
### Free in all senses....
-### VERSION 0.1.4 Dec 2013
+### VERSION 0.1.5
import xbmc
import xbmcaddon
@@ -15,7 +15,7 @@ import os
import platform
import socket
-from traceback import print_exc
+from traceback import format_exc
################################################################################
################################################################################
@@ -33,8 +33,7 @@ def log(message, inst=None, level=xbmc.LOGDEBUG):
xbmc.log("### " + ADDONNAME + "-" + VERSION + " ### " + str(message),
level )
else:
xbmc.log("### " + ADDONNAME + "-" + VERSION + " ### " + str(message),
level )
- xbmc.log("### " + ADDONNAME + "-" + VERSION + " ### Exception:", level )
- print_exc(inst)
+ xbmc.log("### " + ADDONNAME + "-" + VERSION + " ### Exception:" +
format_exc(inst), level )
#log something even if debug logging is off - for important stuff!
diff --git a/weather.ozweather/resources/settings.xml
b/weather.ozweather/resources/settings.xml
index ca9091c..065ae4d 100644
--- a/weather.ozweather/resources/settings.xml
+++ b/weather.ozweather/resources/settings.xml
@@ -2,14 +2,14 @@
<settings>
<category label="Enter Settings">
<!-- Best is mapped to trw in default.py -->
- <setting id="ABCQuality" label ="30196" type ="labelenum"
values="256k|512K|1000k|Best" default="1000k"/>
- <setting id="Location1" label="30111" type="action"
action="RunScript($ID,Location1)" default=""/>
- <setting id="Location2" label="30112" type="action"
action="RunScript($ID,Location2)" enable="!eq( -1,)" default=""/>
- <setting id="Location3" label="30113" type="action"
action="RunScript($ID,Location3)" enable="!eq( -1,)" default=""/>
- <setting id="ExtendedFeaturesToggle" label="30194" type="bool"
default="false"/>
- <setting id="Radar1" label="30155" type="text"
default="IDR00004"/>
- <setting id="Radar2" label="30156" type="text" enable="!eq(
-4,)" default=""/>
- <setting id="Radar3" label="30157" type="text" enable="!eq(
-4,)" default=""/>
+ <setting id="ABCQuality" label ="32196" type ="labelenum"
values="256k|512K|1000k|Best" default="1000k"/>
+ <setting id="Location1" label="32111" type="action"
action="RunScript($ID,Location1)" default=""/>
+ <setting id="Location2" label="32112" type="action"
action="RunScript($ID,Location2)" enable="!eq( -1,)" default=""/>
+ <setting id="Location3" label="32113" type="action"
action="RunScript($ID,Location3)" enable="!eq( -1,)" default=""/>
+ <setting id="ExtendedFeaturesToggle" label="32194" type="bool"
default="false"/>
+ <setting id="Radar1" label="32155" type="text"
default="IDR00004"/>
+ <setting id="Radar2" label="32156" type="text" enable="!eq(
-4,)" default=""/>
+ <setting id="Radar3" label="32157" type="text" enable="!eq(
-4,)" default=""/>
<setting id="Location1id" type="text" visible="false" default=""/>
<setting id="Location2id" type="text" visible="false"
default=""/>
<setting id="Location3id" type="text" visible="false"
default=""/>
-----------------------------------------------------------------------
Summary of changes:
weather.ozweather/README.md | 4 ++--
weather.ozweather/addon.xml | 8 +++++++-
weather.ozweather/default.py | 15 ++++++---------
.../resources/language/English/strings.xml | 20 ++++++++++----------
.../resources/lib/b808common/b808common.py | 7 +++----
weather.ozweather/resources/settings.xml | 16 ++++++++--------
6 files changed, 36 insertions(+), 34 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
