The branch, eden has been updated
via ed7b340160ab42cbd64e1f14f0000ce329061734 (commit)
via 5a0421751afed15ac8838059cd127aaf91dcff82 (commit)
from c3342c2b8a9fd80801e1a3d5f6b6b94a204f36ce (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=ed7b340160ab42cbd64e1f14f0000ce329061734
commit ed7b340160ab42cbd64e1f14f0000ce329061734
Author: amet <[email protected]>
Date: Mon Sep 10 10:11:44 2012 +0400
[weather.ozweather] -v0.4.0
diff --git a/weather.ozweather/addon.xml b/weather.ozweather/addon.xml
index 83f7d18..1006569 100644
--- a/weather.ozweather/addon.xml
+++ b/weather.ozweather/addon.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="weather.ozweather" name="Oz Weather" version="0.3.8"
provider-name="Bossanova808">
+<addon id="weather.ozweather" name="Oz Weather" version="0.4.0"
provider-name="Bossanova808">
<requires>
<import addon="xbmc.python" version="2.0"/>
- <import addon="script.module.parsedom" version="0.9.1"/>
+ <import addon="script.module.parsedom" version="1.0.0"/>
</requires>
<extension point="xbmc.python.weather" library="default.py"/>
<extension point="xbmc.addon.metadata">
diff --git a/weather.ozweather/default.py b/weather.ozweather/default.py
index fd19762..59249e8 100644
--- a/weather.ozweather/default.py
+++ b/weather.ozweather/default.py
@@ -21,7 +21,6 @@ import re
import ftplib
import shutil
import time
-#from PIL import Image
# plugin constants
#create an add on instation and store the reference
@@ -429,7 +428,7 @@ def propertiesPDOM(page, extendedFeatures):
shortDesc = shortDesc[0:7]
for count, desc in enumerate(shortDesc):
- shortDesc[count] = str.replace(shortDesc[count], '-<br />','')
+ shortDesc[count] = str.replace(shortDesc[count].title(), '-<br />','')
#log the collected data, helpful for finding errors
#log("Collected data: shortDesc [" + str(shortDesc) + "] maxList [" +
str(maxList) +"] minList [" + str(minList) + "]")
diff --git a/weather.ozweather/resources/lib/utilities.py
b/weather.ozweather/resources/lib/utilities.py
index 414bca0..e5fec19 100644
--- a/weather.ozweather/resources/lib/utilities.py
+++ b/weather.ozweather/resources/lib/utilities.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
import xbmc
DAYS = { "Mon": xbmc.getLocalizedString( 11 ),
@@ -9,51 +9,51 @@ DAYS = { "Mon": xbmc.getLocalizedString( 11 ),
"Sat": xbmc.getLocalizedString( 16 ),
"Sun": xbmc.getLocalizedString( 17 )}
-WEATHER_CODES = { 'Clearing shower' : '39',
+WEATHER_CODES = { 'Clearing Shower' : '39',
'Cloudy' : '26',
- 'Cloud and wind increasing' : '23',
- 'Cloud increasing' : '26',
+ 'Cloud And Wind Increasing' : '23',
+ 'Cloud Increasing' : '26',
'Drizzle' : '11',
- 'Drizzle clearing' : '39',
- 'Fog then sunny' : '34',
- 'Frost then sunny' : '34',
+ 'Drizzle Clearing' : '39',
+ 'Fog Then Sunny' : '34',
+ 'Frost Then Tunny' : '34',
'Hazy' : '21',
- 'Heavy rain' : '40',
- 'Heavy showers' : '12',
- 'Increasing sunshine' : '30',
- 'Late shower' : '45',
- 'Late thunder' : '47',
- 'Mostly cloudy' : '26',
- 'Mostly sunny' : '34',
+ 'Heavy Rain' : '40',
+ 'Heavy Showers' : '12',
+ 'Increasing Sunshine' : '30',
+ 'Late Shower' : '45',
+ 'Late Thunder' : '47',
+ 'Mostly Cloudy' : '26',
+ 'Mostly Sunny' : '34',
'Overcast' : '26',
- 'Possible shower' : '11',
- 'Possible thunderstorm' : '37',
+ 'Possible Shower' : '11',
+ 'Possible Thunderstorm' : '37',
'Rain' : '40',
- 'Rain and snow' : '5',
- 'Rain clearing' : '39',
- 'Rain developing' : '12',
- 'Rain tending to snow' : '5',
+ 'Rain and Snow' : '5',
+ 'Rain Clearing' : '39',
+ 'Rain Developing' : '12',
+ 'Rain Tending To Snow' : '5',
'Showers' : '11',
- 'Showers easing' : '11',
- 'Showers increasing' : '11',
+ 'Showers Easing' : '11',
+ 'Showers Increasing' : '11',
'Snow' : '41',
- 'Snowfalls clearing' : '5',
- 'Snow develping' : '13',
- 'Snow showers' : '41',
- 'Snow tending to rain' : '5',
+ 'Snowfalls Clearing' : '5',
+ 'Snow Developing' : '13',
+ 'Snow Showers' : '41',
+ 'Snow Tending To Rain' : '5',
'Sunny' : '32',
'Thunderstorms' : '38',
- 'Thunderstorms clearing' : '37',
+ 'Thunderstorms Clearing' : '37',
'Windy' : '23',
- 'Windy with rain' : '2',
- 'Windy with showers' : '2',
- 'Windy with snow' : '43',
- 'Wind and rain increasing' : '2',
- 'Wind and showers easing' : '11',
+ 'Windy Rith Rain' : '2',
+ 'Windy With Showers' : '2',
+ 'Windy With Snow' : '43',
+ 'Wind And Rain Increasing' : '2',
+ 'Wind And Showers Easing' : '11',
'Unknown' : 'na',
'nt_unknown' : 'na'}
-""" These are the weather codes fro XBMC is seems
+""" These are the weather codes fro XBMC is seems
N/A Not Available
0 Rain/Lightning
01 Windy/Rain
@@ -102,5 +102,5 @@ N/A Not Available
44 Same as 30
45 Rain/Night
46 Snow/Night
-47 Thunder Showers/Night
+47 Thunder Showers/Night
"""
\ No newline at end of file
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=5a0421751afed15ac8838059cd127aaf91dcff82
commit 5a0421751afed15ac8838059cd127aaf91dcff82
Author: amet <[email protected]>
Date: Mon Sep 10 10:08:09 2012 +0400
[service.watchdog] -v0.6.3
- added setting for delaying updates
- no longer scans/cleans during playback
diff --git a/service.watchdog/addon.xml b/service.watchdog/addon.xml
index d9100a6..a9573ff 100644
--- a/service.watchdog/addon.xml
+++ b/service.watchdog/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="service.watchdog"
name="Library watchdog"
- version="0.6.2"
+ version="0.6.3"
provider-name="takoi">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/service.watchdog/changelog.txt b/service.watchdog/changelog.txt
index 07a3edc..9e3ae91 100644
--- a/service.watchdog/changelog.txt
+++ b/service.watchdog/changelog.txt
@@ -1,3 +1,7 @@
+[B]0.6.3[/B]
+- added setting for delaying updates
+- no longer scans/cleans during playback
+
[B]0.6.2[/B]
- added multipath support
- added stricter triggering of library clean based on file type
diff --git a/service.watchdog/default.py b/service.watchdog/default.py
index d2a4535..275755d 100644
--- a/service.watchdog/default.py
+++ b/service.watchdog/default.py
@@ -29,7 +29,7 @@ POLLING = int(ADDON.getSetting('method'))
RECURSIVE = not (ADDON.getSetting('nonrecursive') in ['true']) or not POLLING
WATCH_VIDEO = ADDON.getSetting('watchvideo') in ['true']
WATCH_MUSIC = ADDON.getSetting('watchmusic') in ['true']
-DELAY = 1
+DELAY = int(ADDON.getSetting('delay')) or 1
EXTENSIONS =
"|.nsv|.m4a|.flac|.aac|.strm|.pls|.rm|.rma|.mpa|.wav|.wma|.ogg|.mp3|.mp2|.m3u|.mod|.amf|.669|.dmf|.dsm|.far|.gdm|.imf|.it|.m15|.med|.okt|.s3m|.stm|.sfx|.ult|.uni|.xm|.sid|.ac3|.dts|.cue|.aif|.aiff|.wpl|.ape|.mac|.mpc|.mp+|.mpp|.shn|.zip|.rar|.wv|.nsf|.spc|.gym|.adx|.dsp|.adp|.ymf|.ast|.afc|.hps|.xsp|.xwav|.waa|.wvs|.wam|.gcm|.idsp|.mpdsp|.mss|.spt|.rsd|.mid|.kar|.sap|.cmc|.cmr|.dmc|.mpt|.mpd|.rmt|.tmc|.tm8|.tm2|.oga|.url|.pxml|.tta|.rss|.cm3|.cms|.dlt|.brstm|.wtv|.mka|.m4v|.3g2|.3gp|.nsv|.tp|.ts|.ty|.strm|.pls|.rm|.rmvb|.m3u|.ifo|.mov|.qt|.divx|.xvid|.bivx|.vob|.nrg|.img|.iso|.pva|.wmv|.asf|.asx|.ogm|.m2v|.avi|.bin|.dat|.mpg|.mpeg|.mp4|.mkv|.avc|.vp3|.svq3|.nuv|.viv|.dv|.fli|.flv|.rar|.001|.wpl|.zip|.vdr|.dvr-ms|.xsp|.mts|.m2t|.m2ts|.evo|.ogv|.sdp|.avs|.rec|.url|.pxml|.vc1|.h264|.rcv|.rss|.mpls|.webm|.bdmv|.wtv|.m4v|.3g2|.3gp|.nsv|.tp|.ts|.ty|.strm|.pls|.rm|.rmvb|.m3u|.m3u8|.ifo|.mov|.qt|.divx|.xvid|.bivx|.vob|.nrg|.img|.iso|.pva|.wmv|.asf|.asx|.ogm|.m2v|.avi|.bin|.dat|.mpg|.mpeg|.mp4|.mkv|.avc|.vp3|.svq3|.nuv|.viv|.dv|.fli|.flv|.rar|.001|.wpl|.zip|.vdr|.dvr-ms|.xsp|.mts|.m2t|.m2ts|.evo|.ogv|.sdp|.avs|.rec|.url|.pxml|.vc1|.h264|.rcv|.rss|.mpls|.webm|.bdmv|.wtv|"
@@ -51,6 +51,8 @@ class Worker(Thread):
sleep(DELAY)
while True:
if self.clean:
+ while xbmc.Player().isPlaying():
+ sleep(1)
self.clean = False
log("cleaning %s library" % self.library)
xbmc.executebuiltin("CleanLibrary(%s)" % self.library)
@@ -59,6 +61,8 @@ class Worker(Thread):
sleep(1)
if self.scan:
+ while xbmc.Player().isPlaying():
+ sleep(1)
log("scanning %s library" % self.library)
self.scan = False
xbmc.executebuiltin("UpdateLibrary(%s)" % self.library)
diff --git a/service.watchdog/resources/language/English/strings.xml
b/service.watchdog/resources/language/English/strings.xml
index 4ffcb57..48453fd 100644
--- a/service.watchdog/resources/language/English/strings.xml
+++ b/service.watchdog/resources/language/English/strings.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
+ <string id="30001">General</string>
+ <string id="30002">Advanced</string>
<string id="30010">Clean library when files are moved or deleted</string>
<string id="30020">Method</string>
<string id="30021">Syscall</string>
@@ -7,5 +9,6 @@
<string id="30030">Only watch root directory</string>
<string id="30040">Watch video library</string>
<string id="30050">Watch music library</string>
+ <string id="30060">Delay</string>
</strings>
diff --git a/service.watchdog/resources/settings.xml
b/service.watchdog/resources/settings.xml
index bfcf1db..17a2ac6 100644
--- a/service.watchdog/resources/settings.xml
+++ b/service.watchdog/resources/settings.xml
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
- <setting label="30040" id="watchvideo" type="bool" default="true"/>
- <setting label="30050" id="watchmusic" type="bool" default="true"/>
- <setting label="30010" id="clean" type="bool" default="false"/>
- <setting label="30020" id="method" type="enum" lvalues="30021|30022"
default="0"/>
- <setting label="30030" id="nonrecursive" type="bool" enable="eq(-1,1)"
default="false"/>
+ <category label="30001">
+ <setting label="30040" id="watchvideo" type="bool" default="true"/>
+ <setting label="30050" id="watchmusic" type="bool" default="true"/>
+ <setting label="30010" id="clean" type="bool" default="false"/>
+ </category>
+ <category label="30002">
+ <setting label="30020" id="method" type="enum" lvalues="30021|30022"
default="0"/>
+ <setting label="30030" id="nonrecursive" type="bool" enable="eq(-1,1)"
default="false"/>
+ <setting label="30060" id="delay" type="number" default="1"/>
+ </category>
</settings>
-----------------------------------------------------------------------
Summary of changes:
service.watchdog/addon.xml | 2 +-
service.watchdog/changelog.txt | 4 +
service.watchdog/default.py | 6 ++-
.../resources/language/English/strings.xml | 3 +
service.watchdog/resources/settings.xml | 15 +++--
weather.ozweather/addon.xml | 4 +-
weather.ozweather/default.py | 3 +-
weather.ozweather/resources/lib/utilities.py | 68 ++++++++++----------
8 files changed, 60 insertions(+), 45 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
