Merge pull request #656 from sirenum/fix-655

Fixes Issue #655
This commit is contained in:
Stephan Raue 2012-05-14 11:50:27 -07:00
commit bd7abb5082
3 changed files with 10 additions and 6 deletions

View File

@ -1,3 +1,6 @@
2.1.4
- fixes bug in sleep control
2.1.3
- fix so python dont steal xbmc's webserver port (again)
- add option to wake up periodically

View File

@ -3,6 +3,6 @@
<setting id="SABNZBD_PWD" value="" />
<setting id="SABNZBD_USER" value="" />
<setting id="SABNZBD_KEEP_AWAKE" value="false" />
<setting id="SABNZBD_PERIODIC_WAKE" value="true" />
<setting id="SABNZBD_PERIODIC_WAKE" value="false" />
<setting id="SABNZBD_WAKE_AT" value="1" />
</settings>

View File

@ -58,8 +58,8 @@ sabNzbdQueue = 'http://' + sabNzbdAddress + '/sabnzbd/api?mode=queue&output
socket.setdefaulttimeout(timeout)
# perform some initial checks and log essential settings
shouldKeepAwake = __settings__.getSetting('SABNZBD_KEEP_AWAKE')
wakePeriodically = __settings__.getSetting('SABNZBD_PERIODIC_WAKE')
shouldKeepAwake = (__settings__.getSetting('SABNZBD_KEEP_AWAKE').lower() == 'true')
wakePeriodically = (__settings__.getSetting('SABNZBD_PERIODIC_WAKE').lower() == 'true')
wakeHourIdx = int(__settings__.getSetting('SABNZBD_WAKE_AT'))
if shouldKeepAwake:
xbmc.log('SABnzbd-Suite: will prevent idle sleep/shutdown while downloading')
@ -70,8 +70,8 @@ if wakePeriodically:
while (not xbmc.abortRequested):
# reread setting in case it has changed
shouldKeepAwake = __settings__.getSetting('SABNZBD_KEEP_AWAKE')
wakePeriodically = __settings__.getSetting('SABNZBD_PERIODIC_WAKE')
shouldKeepAwake = (__settings__.getSetting('SABNZBD_KEEP_AWAKE').lower() == 'true')
wakePeriodically = (__settings__.getSetting('SABNZBD_PERIODIC_WAKE').lower() == 'true')
wakeHourIdx = int(__settings__.getSetting('SABNZBD_WAKE_AT'))
# check if SABnzbd is downloading
@ -109,3 +109,4 @@ while (not xbmc.abortRequested):
open("/sys/class/rtc/rtc0/wakealarm", "w").write(str(secondsSinceEpoch))
xbmc.sleep(checkInterval * 1000)