The branch, frodo has been updated
via 673b72f395cb62e631056d9c3672dd94ecebdc68 (commit)
via 9664b2c285bf2777ed01136c61a44a821018d8b7 (commit)
from 0b7131741e3526fdb513da15441af5c5bc4166d2 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=673b72f395cb62e631056d9c3672dd94ecebdc68
commit 673b72f395cb62e631056d9c3672dd94ecebdc68
Author: Martijn Kaijser <[email protected]>
Date: Sun Sep 15 15:31:17 2013 +0200
[script.advanced.wol] 1.2.4
diff --git a/script.advanced.wol/addon.xml b/script.advanced.wol/addon.xml
index 6d63f47..ca259b9 100644
--- a/script.advanced.wol/addon.xml
+++ b/script.advanced.wol/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.advanced.wol"
name="Advanced Wake On Lan"
- version="1.2.2"
+ version="1.2.4"
provider-name="mandark">
<requires>
<import addon="xbmc.python" version="2.0"/>
@@ -11,31 +11,32 @@
<extension point="xbmc.service"
library="autostart.py" />
<extension point="xbmc.addon.metadata">
- <summary lang="en">Wake up a sleeping computer using Wake-On-Lan</summary>
- <description lang="en">Sends a WOL magic packet to a remote computer using
its ethernet MAC address and displays a notification if and when the computer
is available.
+ <summary lang="en">Wake up a sleeping device (e.g. NAS, Server, etc.)
using Wake-On-Lan</summary>
+ <description lang="en">Sends a WOL magic packet to a remote device using
its ethernet MAC address and displays a notification if and when the device is
available.
------------------------
-The Addon can be launched manually from the Programs-section of XBMC (and thus
added to your favourites, etc.), and can also be configured in the
addon-settings to autostart with XBMC, thus waking up your remote computer when
XBMC starts.
+The Addon can be launched manually from the Programs-section of XBMC (and thus
added to your favourites, etc.), and can also be configured in the
addon-settings to autostart with XBMC, thus waking up your remote device when
XBMC starts.
There is also a setting that will also send a wake-up signal, if XBMC comes
out from standby/sleep/suspend.
------------------------
When autostarted with XBMC you can also set the addon to update the video-
and/or music-libraries automatically after a successful wake-up.
+You can also set up a delay for the library scans. This is needed, if the
filesystem needs some further time to get ready after a successful wake-up.
------------------------
-Additionally another command (e.g. activate a specific window) can be handed
to the script as a parameter. It then launches that command either immediately
or not until the remote computer is available. Behaviour can be set by a second
parameter:
+Additionally another command (e.g. activate a specific window) can be handed
to the script as a parameter. It then launches that command either immediately
or not until the remote device is available. Behaviour can be set by a second
parameter:
- False: launch immediately (default)
- - True: wait for remote computer
+ - True: wait for remote device
As an example, you could add the following entry to your favourites.xml:
"RunScript(&quot;script.advanced.wol&quot;,ActivateWindow(MyVideoLibrary),True)"
-This would attempt to wake the remote computer configured in the
"Advanced Wake On Lan"-Settings, wait until it is awake, and only
then launch the XBMC-Video-Library.
+This would attempt to wake the remote device configured in the "Advanced
Wake On Lan"-Settings, wait until it is awake, and only then launch the
XBMC-Video-Library.
-This feature is especially useful, if you want to launch your remote computer,
when entering a specific menu-item in XBMC.
+This feature is especially useful, if you want to launch your remote device,
when entering a specific menu-item in XBMC.
------------------------
-You can also pass the Host/IP and MAC-Address of the Remote Computer to the
script as the third parameter, bypassing the config in the addon-settings. E.g.:
+You can also pass the Host/IP and MAC-Address of the rmote device to the
script as the third parameter, bypassing the config in the addon-settings. E.g.:
"RunScript(&quot;script.advanced.wol&quot;,,,my-server@50:E5:49:B5:61:34)"
-This is useful, if you have more then one remote computer you want to wake
independently.
+This is useful, if you have more then one remote device you want to wake
independently.
------------------------
In the advanced settings you can also set the addon to continue sending WOL
packets with a configurable delay.
-This is useful, when the remote computer or NAS is kept awake, as long as
WOL-packets are received.
+This is useful, when the remote device or NAS is kept awake, as long as
WOL-packets are received.
Normally the continuous WOL-packets will also continue after XBMC has returned
from standby/sleep/suspend, but there is an option to turn this behaviour off.
------------------------
If for any reason the check of a successful wake-up via ping is not possible
or fails on your system, please note the following:
diff --git a/script.advanced.wol/autostart.py b/script.advanced.wol/autostart.py
index f6ff7b8..6505c66 100644
--- a/script.advanced.wol/autostart.py
+++ b/script.advanced.wol/autostart.py
@@ -18,11 +18,13 @@ if (autostart == "true"):
print "script.advanced.wol: Waiting for resume from standby"
previousTime = time.time()
while (not xbmc.abortRequested):
- if ( time.time()-previousTime > 5):
+ elapsedTime = time.time()-previousTime
+ if ( elapsedTime > 5):
if (wolDelayAfterStandby > 0):
xbmc.sleep(wolDelayAfterStandby*1000)
- print "script.advanced.wol: Start WOL script after
return from standby"
+ print "script.advanced.wol: Start WOL script after
return from standby (Standby took "+str(time.time()-previousTime)+" sec.)"
default.main(True)
+ print "script.advanced.wol: Waiting for resume from
standby"
previousTime = time.time()
xbmc.sleep(1000)
else:
diff --git a/script.advanced.wol/changelog.txt
b/script.advanced.wol/changelog.txt
index 169c235..4773e59 100644
--- a/script.advanced.wol/changelog.txt
+++ b/script.advanced.wol/changelog.txt
@@ -1,3 +1,10 @@
+[B]1.2.4[/B]
+- Fix bug regarding log-messages after wakeup, that led to an exception.
(thanks to user "Ghostdivision"!)
+
+[B]1.2.3[/B]
+- Add some further log-messages regarding wakeup and library-updates
+- Add option to set delay of library-updates (should fix problems when
filesystem on server/nas is not ready yet after successful wake-up)
+
[B]1.2.2[/B]
- Added help-text in autostart-settings stating that changes require a restart
of XBMC to take effect
diff --git a/script.advanced.wol/default.py b/script.advanced.wol/default.py
index 17448cf..1c20fe5 100644
--- a/script.advanced.wol/default.py
+++ b/script.advanced.wol/default.py
@@ -27,6 +27,7 @@ def main(isAutostart=False):
continuousWolAfterStandby =
settings.getSetting("continuousWolAfterStandby")
updateVideoLibraryAfterWol =
settings.getSetting("updateVideoLibraryAfterWol")
updateMusicLibraryAfterWol =
settings.getSetting("updateMusicLibraryAfterWol")
+ libraryUpdatesDelay = int(settings.getSetting("libraryUpdatesDelay"))
#if the scrpit was called with a 3rd parameter,
#use the mac-address and host/ip from there
@@ -132,10 +133,15 @@ def main(isAutostart=False):
# Initiate XBMC-library-updates, if we are in autostart and it
is set in the settings.
if (isAutostart == True):
+ if (((updateVideoLibraryAfterWol == "true") or
(updateMusicLibraryAfterWol == "true")) and (libraryUpdatesDelay > 0)):
+ xbmc.sleep(libraryUpdatesDelay*1000)
+
if (updateVideoLibraryAfterWol == "true"):
+ print 'script.advanced.wol: Initiating Video
Library Update'
xbmc.executebuiltin('UpdateLibrary("video")')
if (updateMusicLibraryAfterWol == "true"):
+ print 'script.advanced.wol: Initiating Music
Library Update'
xbmc.executebuiltin('UpdateLibrary("music")')
diff --git a/script.advanced.wol/resources/language/English/strings.xml
b/script.advanced.wol/resources/language/English/strings.xml
index d2ad19c..ed267a8 100644
--- a/script.advanced.wol/resources/language/English/strings.xml
+++ b/script.advanced.wol/resources/language/English/strings.xml
@@ -15,6 +15,7 @@
<string id="54030">Update libraries after succesful wake-on-launch and
wake-after-standby</string>
<string id="54031">Update video library</string>
<string id="54032">Update music library</string>
+ <string id="54033">Delay library updates (in seconds)</string>
<string id="52000">Notifications</string>
<string id="52001">Enable launch notification</string>
diff --git a/script.advanced.wol/resources/settings.xml
b/script.advanced.wol/resources/settings.xml
index 4dd4756..eea5a36 100644
--- a/script.advanced.wol/resources/settings.xml
+++ b/script.advanced.wol/resources/settings.xml
@@ -18,6 +18,7 @@
<setting id="separator" type="lsep" label="54030"
visible="eq(-7,true)"/>
<setting id="updateVideoLibraryAfterWol" type="bool"
label="54031" default="false" visible="eq(-8,true)" />
<setting id="updateMusicLibraryAfterWol" type="bool"
label="54032" default="false" visible="eq(-9,true)" />
+ <setting id="libraryUpdatesDelay" type="labelenum"
label="54033" values="0|10|20|30|60|120" default="10" visible="eq(-10,true)" />
</category>
<category label="52000">
<setting id="enableLaunchNotifies" type="bool" label="52001"
default="true" />
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=9664b2c285bf2777ed01136c61a44a821018d8b7
commit 9664b2c285bf2777ed01136c61a44a821018d8b7
Author: Martijn Kaijser <[email protected]>
Date: Sun Sep 15 15:24:51 2013 +0200
[script.xbmc.lcdproc] 2.3.1
diff --git a/script.xbmc.lcdproc/addon.xml b/script.xbmc.lcdproc/addon.xml
index 97e588e..4dee8a7 100644
--- a/script.xbmc.lcdproc/addon.xml
+++ b/script.xbmc.lcdproc/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.xbmc.lcdproc" name="XBMC LCDproc" version="2.3.0"
provider-name="Team XBMC: Memphiz, Daniel 'herrnst' Scheller">
+<addon id="script.xbmc.lcdproc" name="XBMC LCDproc" version="2.3.1"
provider-name="Team XBMC: Memphiz, Daniel 'herrnst' Scheller">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="xbmc.gui" version="4.0.0"/>
diff --git a/script.xbmc.lcdproc/changelog.txt
b/script.xbmc.lcdproc/changelog.txt
index 172a1e2..f30cb6d 100644
--- a/script.xbmc.lcdproc/changelog.txt
+++ b/script.xbmc.lcdproc/changelog.txt
@@ -1,3 +1,6 @@
+1.3.1 / 2.3.1
+- Recognize E-AC3 (Dolby Digital plus) as AC3 in extra stuff support (affect
imonlcd support)
+- Fix BigDigits overdrawing text on addon start when things change too fast
1.3.0 / 2.3.0
- Alternate charmap selection, support for HD44780/iMON ROM (A00 and A02
variants) charsets
- New "tvshow" mode, active when playing media from the TV-shows database
diff --git a/script.xbmc.lcdproc/resources/LCD.xml.defaults
b/script.xbmc.lcdproc/resources/LCD.xml.defaults
index b565702..361407d 100644
--- a/script.xbmc.lcdproc/resources/LCD.xml.defaults
+++ b/script.xbmc.lcdproc/resources/LCD.xml.defaults
@@ -1,6 +1,24 @@
<lcd>
- <!-- set this to video,music to disable the LCD on playback of music and
video-->
- <disableonplay>video</disableonplay>
+ <!-- advanced configurables, XML-uncomment and set options as desired -->
+
+ <!-- scrollseparator: string to use as separator if text gets scrolled -->
+ <!--scrollseparator> </scrollseparator-->
+
+ <!-- progressbarsurroundings: put progress bars in square brackets (on/off)
-->
+ <!--progressbarsurroundings>off</progressbarsurroundings-->
+
+ <!-- icontextoffset: offset for text displayed after any play/pause icons
-->
+ <!--icontextoffset>2</icontextoffset-->
+
+ <!-- allowemptylines: show text lines without contents or filter them
(on/off) -->
+ <!--allowemptylines>off</allowemptylines-->
+
+ <!-- centerbigdigits: (try to) align big numbers centered on the display
(on/off) -->
+ <!--centerbigdigits>off</centerbigdigits-->
+
+ <!-- disableplayindicatoronpause: turn off any playing indicator (extra
stuff) when pausing playback (on/off) -->
+ <!--disableplayindicatoronpause>off</disableplayindicatoronpause-->
+
<navigation>
<line>$INFO[System.CurrentWindow]</line>
<line>$INFO[System.CurrentControl]</line>
diff --git a/script.xbmc.lcdproc/resources/lib/lcdbase.py
b/script.xbmc.lcdproc/resources/lib/lcdbase.py
index db60af9..d6c0a53 100644
--- a/script.xbmc.lcdproc/resources/lib/lcdbase.py
+++ b/script.xbmc.lcdproc/resources/lib/lcdbase.py
@@ -653,8 +653,8 @@ class LcdBase():
if strAudioCodec in ["mpga", "mp2"]:
self.m_cExtraIcons.SetIconState(LCD_EXTRAICONS.LCD_EXTRAICON_ACODEC_MPEG, True)
- # any ac3/dolby digital
- elif strAudioCodec in ["ac3", "truehd"]:
+ # any ac3/dolby digital/dd+/truehd
+ elif strAudioCodec in ["ac3", "eac3", "truehd"]:
self.m_cExtraIcons.SetIconState(LCD_EXTRAICONS.LCD_EXTRAICON_ACODEC_AC3, True)
# any dts including hires variants
diff --git a/script.xbmc.lcdproc/resources/lib/lcdproc.py
b/script.xbmc.lcdproc/resources/lib/lcdproc.py
index e18d364..50db90b 100644
--- a/script.xbmc.lcdproc/resources/lib/lcdproc.py
+++ b/script.xbmc.lcdproc/resources/lib/lcdproc.py
@@ -466,7 +466,8 @@ class LCDProc(LcdBase):
iOffset = 1;
if self.m_iOffset != iOffset:
- self.ClearBigDigits()
+ # on offset change, reset numbers (only) to force redraw
+ self.ClearBigDigits(False)
self.m_iOffset = iOffset
for i in range(int(iStringOffset), int(iStringLength)):
@@ -518,17 +519,19 @@ class LCDProc(LcdBase):
def GetRows(self):
return int(self.m_iRows)
- def ClearBigDigits(self):
+ def ClearBigDigits(self, fullredraw = True):
for i in range(1,int(self.m_iBigDigits + 1)):
# Clear Digit
- self.m_strSetLineCmds += "widget_set xbmc lineBigDigit" + str(i) + " 0
0\n"
+ if fullredraw:
+ self.m_strSetLineCmds += "widget_set xbmc lineBigDigit" + str(i) + " 0
0\n"
self.m_strDigits[i] = ""
- # make sure all widget get redrawn by resetting their type
- for i in range(0, int(self.GetRows())):
- self.m_strLineType[i] = ""
- self.m_strLineText[i] = ""
- self.m_strLineIcon[i] = ""
+ # on full redraw, make sure all widget get redrawn by resetting their type
+ if fullredraw:
+ for i in range(0, int(self.GetRows())):
+ self.m_strLineType[i] = ""
+ self.m_strLineText[i] = ""
+ self.m_strLineIcon[i] = ""
def ClearLine(self, iLine):
self.m_strSetLineCmds += "widget_set xbmc lineIcon%i 0 0 BLOCK_FILLED\n" %
(iLine)
-----------------------------------------------------------------------
Summary of changes:
script.advanced.wol/addon.xml | 23 ++++++++++---------
script.advanced.wol/autostart.py | 6 +++-
script.advanced.wol/changelog.txt | 7 ++++++
script.advanced.wol/default.py | 6 +++++
.../resources/language/English/strings.xml | 1 +
script.advanced.wol/resources/settings.xml | 1 +
script.xbmc.lcdproc/addon.xml | 2 +-
script.xbmc.lcdproc/changelog.txt | 3 ++
script.xbmc.lcdproc/resources/LCD.xml.defaults | 22 +++++++++++++++++-
script.xbmc.lcdproc/resources/lib/lcdbase.py | 4 +-
script.xbmc.lcdproc/resources/lib/lcdproc.py | 19 +++++++++-------
11 files changed, 68 insertions(+), 26 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/22/13.
http://pubads.g.doubleclick.net/gampad/clk?id=64545871&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
