The branch, eden has been updated
       via  4c653c2f19d722381797a25f25b6ff9678c2c5ad (commit)
       via  d416f28507c543a070180a1cf1034ec9966d3052 (commit)
      from  4b1e987f0c5d0abb937f75674852a7b6a12de04b (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=4c653c2f19d722381797a25f25b6ff9678c2c5ad

commit 4c653c2f19d722381797a25f25b6ff9678c2c5ad
Author: M. Kaijser <[email protected]>
Date:   Wed Oct 24 10:32:42 2012 +0200

    [script.advanced.wol] -v1.2.2

diff --git a/script.advanced.wol/addon.xml b/script.advanced.wol/addon.xml
index c6aa24b..6d63f47 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.1.3"
+       version="1.2.2"
        provider-name="mandark">
   <requires>
         <import addon="xbmc.python" version="2.0"/>
@@ -15,6 +15,9 @@
     <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.
 ------------------------
 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.
+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.
 ------------------------
 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:
   - False: launch immediately (default)
@@ -31,7 +34,14 @@ You can also pass the Host/IP and MAC-Address of the Remote 
Computer to the scri
 
 This is useful, if you have more then one remote computer you want to wake 
independently.
 ------------------------
-In the advanced settings you can 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.</description>
+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.
+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:
+  - XBMC must be run as Administrator on Windows / with root rights on Linux 
for ping-based host-up checks to work.
+  - If this is not possible or it still fails, you can disable ping-based 
host-up checks in the advanced addon-settings.
+    This allows you to set a fixed timespan, after which the addon just 
assumes, that the remote host is awake (to display success-notifies, launch 
other commands, etc.).</description>
     <disclaimer lang="en">Uses XBMC-builtin-command &quot;WakeOnLan&quot; to 
send the wakeup-packet, and the GNU-licensed &quot;python-ping&quot;-script to 
determine the status of the server. Please see the file &quot;ping.py&quot; for 
infos on the latter one.</disclaimer>
     <platform>all</platform>
   </extension>
diff --git a/script.advanced.wol/autostart.py b/script.advanced.wol/autostart.py
index a57ddad..f6ff7b8 100644
--- a/script.advanced.wol/autostart.py
+++ b/script.advanced.wol/autostart.py
@@ -1,13 +1,30 @@
 # Wake-On-LAN
 
-import xbmcaddon, sys
-
-settings = xbmcaddon.Addon( id="script.advanced.wol" )
+import xbmcaddon, sys, time
 
 # Read Settings
 settings = xbmcaddon.Addon( id="script.advanced.wol" )
 autostart = settings.getSetting("autostart")
+wolAfterStandby = settings.getSetting("wolAfterStandby")
+wolDelayOnLaunch = int(settings.getSetting("wolDelayOnLaunch"))
+wolDelayAfterStandby = int(settings.getSetting("wolDelayAfterStandby"))
 
 if (autostart == "true"):
   import default
-  default.main()
\ No newline at end of file
+  if (wolDelayOnLaunch > 0):
+       xbmc.sleep(wolDelayOnLaunch*1000)
+  default.main(True)
+  if (wolAfterStandby == "true"):
+       print "script.advanced.wol: Waiting for resume from standby"
+       previousTime = time.time()
+       while (not xbmc.abortRequested):
+               if ( time.time()-previousTime > 5):
+                       if (wolDelayAfterStandby > 0):
+                               xbmc.sleep(wolDelayAfterStandby*1000)
+                       print "script.advanced.wol: Start WOL script after 
return from standby"
+                       default.main(True)
+                       previousTime = time.time()
+                       xbmc.sleep(1000)
+               else:
+                       previousTime = time.time()
+                       xbmc.sleep(1000)
\ No newline at end of file
diff --git a/script.advanced.wol/changelog.txt 
b/script.advanced.wol/changelog.txt
index 6a475ef..169c235 100644
--- a/script.advanced.wol/changelog.txt
+++ b/script.advanced.wol/changelog.txt
@@ -1,3 +1,18 @@
+[B]1.2.2[/B]
+- Added help-text in autostart-settings stating that changes require a restart 
of XBMC to take effect
+
+[B]1.2.1[/B]
+- Added options to set delay of WOL-signals on wake-on-launch and 
wake-after-standby (thanks to user "Skyler"!)
+
+[B]1.2.0[/B]
+- Added futher customizability of notification-settings
+- Added options to perform updates of music- and/or video-libraries after a 
successful wakeup in autostart mode (thanks to user "sw4y"!)
+- Added option to perform wakeup after XBMC itself has returned from 
sleep/standby/suspend (thanks to users "Marvel" and "yunti"!)
+- Added option to disable the sending of continuous WOL-packets, when XBMC 
returns from sleep/standby/suspend (thanks to user "jandias"!)
+- Added option to disable the hostup-check via ping, and instead set a fixed 
timespan, after that the addon should assume, that the remote host is awake 
(useful, if hostup-check via ping is not possible)
+- Fixed an error with hostup-check on recent OpenELEC-version (thanks to user 
"tenzion"!)
+- Restructured settings a bit (you might have to customize your settings again)
+
 [B]1.1.3[/B]
 - Fixed script-error on ATV2
 
@@ -6,15 +21,15 @@
 - Fixed problems with XBMC accessing internet-resources when using continuous 
WOL-packets- and autostart-feature
 
 [B]1.1.1[/B]
-- Fixed error and improved error-message on missing root-rights with 
hostup-checks on linux machines.
+- Fixed error and improved error-message on missing root-rights with 
hostup-checks on linux machines
 
 [B]1.1.0[/B]
-- Added option to send continuous WOL-packets (thanks to user "TheLexus"!).
-- Added option to enable/disable notifications.
-- Added option to enable/disable hostup-check and -notifications.
-- Reorganisation of settings.
-- Improved error-message on missing administrator-rights with hostup-checks.
-- Fixed error with non-ASCII-charakters in error messages of hostup-check.
+- Added option to send continuous WOL-packets (thanks to user "TheLexus"!)
+- Added option to enable/disable notifications
+- Added option to enable/disable hostup-check and -notifications
+- Reorganisation of settings
+- Improved error-message on missing administrator-rights with hostup-checks
+- Fixed error with non-ASCII-charakters in error messages of hostup-check
 
 [B]1.0.0[/B]
 - Initial Release
\ No newline at end of file
diff --git a/script.advanced.wol/default.py b/script.advanced.wol/default.py
index 03ba367..17448cf 100644
--- a/script.advanced.wol/default.py
+++ b/script.advanced.wol/default.py
@@ -1,19 +1,32 @@
 # Wake-On-LAN
 
-import socket, ping, os, sys
+import socket, ping, os, sys, time
 import xbmc, xbmcgui, xbmcaddon
 
-def main():
-       # Read Settings
+def main(isAutostart=False):
+       
+       print 'script.advanced.wol: Starting WOL script'
+       
+       ####### Read Settings
        settings = xbmcaddon.Addon( id="script.advanced.wol" )
        language  = settings.getLocalizedString
+       # basic settings
        macAddress = settings.getSetting("macAddress")
-       hostOrIp = settings.getSetting("hostOrIp")
+       hostOrIp = settings.getSetting("hostOrIp")      
+       #notification settings
+       enableLaunchNotifies = settings.getSetting("enableLaunchNotifies")
+       enablePingCounterNotifies = 
settings.getSetting("enablePingCounterNotifies")
+       enableHostupNotifies = settings.getSetting("enableHostupNotifies")
+       enableErrorNotifies = settings.getSetting("enableErrorNotifies")
+       #advanced settings
        pingTimeout = int(settings.getSetting("pingTimeout"))
-       enableNotifies = settings.getSetting("enableNotifies")
-       enableVerificationNotifies = 
settings.getSetting("enableVerificationNotifies")
+       hostupWaitTime = int(settings.getSetting("hostupWaitTime"))
+       disablePingHostupCheck = settings.getSetting("disablePingHostupCheck")  
        continuousWol = settings.getSetting("continuousWol")
        continuousWolDelay = int(settings.getSetting("continuousWolDelay"))
+       continuousWolAfterStandby = 
settings.getSetting("continuousWolAfterStandby")
+       updateVideoLibraryAfterWol = 
settings.getSetting("updateVideoLibraryAfterWol")
+       updateMusicLibraryAfterWol = 
settings.getSetting("updateMusicLibraryAfterWol")
 
        #if the scrpit was called with a 3rd parameter,
        #use the mac-address and host/ip from there
@@ -44,42 +57,57 @@ def main():
        except:
                pass
 
+       # Launch additional command passed with parameters, if it should not be 
delayed to after successful wakeup
        if ((launchcommand == True) & (delaycommand == False)):
                xbmc.executebuiltin(sys.argv[1])
 
        # Send WOL-Packet
        xbmc.executebuiltin('XBMC.WakeOnLan("'+macAddress+'")')
-       print 'WakeOnLan signal sent to MAC-Address '+macAddress
-
-       if (enableNotifies == "true"):
-
-               # Send Connection Notification
+       print 'script.advanced.wol: WakeOnLan signal sent to MAC-Address 
'+macAddress
+       
+       # Send Connection Notification
+       if (enableLaunchNotifies == "true"):            
                
xbmc.executebuiltin('XBMC.Notification("'+language(60000).replace("%hostOrIp%",hostOrIp)+'","",5000,"'+iconConnect+'")')
-               
-               if (enableVerificationNotifies == "true"):
-
-                       # Check for Ping-Answer
-                       try:
-                               timecount = 1
-                               while timecount <= pingTimeout:
-                                       delay = ping.do_one(hostOrIp, 1)
-                                       if delay == None:
-                                               
xbmc.executebuiltin('XBMC.Notification("'+language(60001).replace("%hostOrIp%",hostOrIp)+'","'+language(60002).replace("%timecount%",str(timecount)).replace("%timeout%",str(pingTimeout))+'",5000,"'+iconConnect+'")')
-                                               timecount = timecount+1
-                                       else:
-                                               break
+       
+       # Determine wakeup-success
+       hostupConfirmed = False
+       if (disablePingHostupCheck == "true"):
+               #with this setting, we just wait for "hostupWaitTime" seconds 
and assume a successful wakeup then.
+               timecount = 1
+               while timecount <= hostupWaitTime:
+                       xbmc.sleep(1000)
+                       if (enablePingCounterNotifies == "true"):
+                               
xbmc.executebuiltin('XBMC.Notification("'+language(60001).replace("%hostOrIp%",hostOrIp)+'","'+language(60002).replace("%timecount%",str(timecount)).replace("%timeout%",str(hostupWaitTime))+'",5000,"'+iconConnect+'")')
+                       timecount = timecount+1
+               if (enableHostupNotifies == "true"):
+                       
xbmc.executebuiltin('XBMC.Notification("'+language(60011).replace("%hostOrIp%",hostOrIp)+'","",5000,"'+iconSuccess+'")')
+               hostupConfirmed = True
+       else:
+               #otherwise we determine the success by pinging (default 
behaviour)
+               try:
+                       timecount = 1
+                       while timecount <= pingTimeout:
+                               delay = ping.do_one(hostOrIp, 1)
                                if delay == None:
-                                       xbmc.sleep(1000)
-                                       
xbmc.executebuiltin('XBMC.Notification("'+language(60003).replace("%hostOrIp%",hostOrIp)+'","",5000,"'+iconError+'")')
+                                       if (enablePingCounterNotifies == 
"true"):
+                                               
xbmc.executebuiltin('XBMC.Notification("'+language(60001).replace("%hostOrIp%",hostOrIp)+'","'+language(60002).replace("%timecount%",str(timecount)).replace("%timeout%",str(pingTimeout))+'",5000,"'+iconConnect+'")')
+                                       timecount = timecount+1
                                else:
-                                       xbmc.sleep(1000)
-                                       if ((launchcommand == True) & 
(delaycommand == True)):
-                                               
xbmc.executebuiltin('XBMC.Notification("'+language(60004).replace("%hostOrIp%",hostOrIp)+'","'+language(60007)+'",5000,"'+iconSuccess+'")')
-                                               xbmc.sleep(1000)
-                                               xbmc.executebuiltin(sys.argv[1])
-                                       
xbmc.executebuiltin('XBMC.Notification("'+language(60004).replace("%hostOrIp%",hostOrIp)+'","",5000,"'+iconSuccess+'")')
-                       except socket.error, (errno, msg):
+                                       break
+                       if delay == None:
                                xbmc.sleep(1000)
+                               if (enableHostupNotifies == "true"):
+                                       
xbmc.executebuiltin('XBMC.Notification("'+language(60003).replace("%hostOrIp%",hostOrIp)+'","",5000,"'+iconError+'")')
+                       else:
+                               xbmc.sleep(1000)
+                               if (enableHostupNotifies == "true"):
+                                       
xbmc.executebuiltin('XBMC.Notification("'+language(60004).replace("%hostOrIp%",hostOrIp)+'","",5000,"'+iconSuccess+'")')
+                               hostupConfirmed = True
+                               
+               except socket.error, (errno, msg):
+                       xbmc.sleep(1000)
+                       print 'script.advanced.wol: Error No.: '+str(errno)+' / 
Error Msg.: '+msg.decode("utf-8","ignore")
+                       if (enablePingCounterNotifies == "true"):
                                if errno == 11004:
                                        
xbmc.executebuiltin('XBMC.Notification("'+language(60005)+'","'+language(60006).replace("%hostOrIp%",hostOrIp)+'",10000,"'+iconError+'")')
                                elif errno == 10013:
@@ -90,24 +118,52 @@ def main():
                                                
xbmc.executebuiltin('XBMC.Notification("'+language(60005)+'","'+language(60010)+'",20000,"'+iconError+'")')
             
                                else:
                                        
xbmc.executebuiltin('XBMC.Notification("'+language(60005)+'","'+msg.decode("utf-8","ignore")+'",20000,"'+iconError+'")')
+       
+       # Things to perform after successful wake-up
+       if (hostupConfirmed == True):
+       
+               # Launch additional command passed with parameters, if it 
should be delayed to after successful wakeup
+               if ((launchcommand == True) & (delaycommand == True)):
+                       if (enableHostupNotifies == "true"):
+                               
xbmc.executebuiltin('XBMC.Notification("'+language(60004).replace("%hostOrIp%",hostOrIp)+'","'+language(60007)+'",5000,"'+iconSuccess+'")')
+                       xbmc.sleep(1000)
+                       xbmc.executebuiltin(sys.argv[1])
+                       
+               # Initiate XBMC-library-updates, if we are in autostart and it 
is set in the settings.
+               if (isAutostart == True):
+               
+                       if (updateVideoLibraryAfterWol == "true"):
+                               xbmc.executebuiltin('UpdateLibrary("video")')
+                               
+                       if (updateMusicLibraryAfterWol == "true"):
+                               xbmc.executebuiltin('UpdateLibrary("music")')
+               
 
        # Continue sending WOL-packets, if configured in the settings
        if (continuousWol == "true"):
                xbmc.sleep(5000)
                
-               if (enableNotifies == "true"):
-                       # Send Connection Notification
-                       
xbmc.executebuiltin('XBMC.Notification("'+language(60008).replace("%continuousWolDelay%",str(continuousWolDelay))+'","",5000,"'+iconSuccess+'")')
-               count = 0
+               if (enableLaunchNotifies == "true"):
+                       # Send Notification regarding continuous WOL-packets
+                       
xbmc.executebuiltin('XBMC.Notification("'+language(53020)+'","'+language(60008).replace("%continuousWolDelay%",str(continuousWolDelay))+'",5000,"'+iconSuccess+'")')
+               
+               # the previousTime-functionality to stop continuous WOL-packets 
after XBMC returns from standby was suggested by XBMC-forum-user "jandias" 
(THANKS!)
+               previousTime = time.time()
+               countingSeconds = 0
                while (not xbmc.abortRequested):
-                       xbmc.sleep(1000)
-                       if (count == continuousWolDelay):
-                               
xbmc.executebuiltin('XBMC.WakeOnLan("'+macAddress+'")')
-                               print 'WakeOnLan signal sent to MAC-Address 
'+macAddress
-                               count = 0
+                       if ((continuousWolAfterStandby == "false") and ( 
time.time()-previousTime > 5)):
+                               break
                        else:
-                               count+=1
-       
+                               previousTime = time.time()
+                               xbmc.sleep(1000)
+                               if (countingSeconds == continuousWolDelay):
+                                       
xbmc.executebuiltin('XBMC.WakeOnLan("'+macAddress+'")')
+                                       print 'script.advanced.wol: WakeOnLan 
signal sent to MAC-Address '+macAddress
+                                       countingSeconds = 0
+                               else:
+                                       countingSeconds+=1      
+
+       print 'script.advanced.wol: Closing WOL script'
        return
        
 if __name__ == '__main__':
diff --git a/script.advanced.wol/ping.py b/script.advanced.wol/ping.py
index 04711f9..33ca767 100644
--- a/script.advanced.wol/ping.py
+++ b/script.advanced.wol/ping.py
@@ -177,7 +177,10 @@ def do_one(dest_addr, timeout):
     """
     Returns either the delay (in seconds) or none on timeout.
     """
-    icmp = socket.getprotobyname("icmp")
+    try:
+        icmp = socket.getprotobyname("icmp")
+    except socket.error, (errmsg):
+        icmp = 1
     try:
         my_socket = socket.socket(socket.AF_INET, socket.SOCK_RAW, icmp)
     except socket.error, (errno, msg):
diff --git a/script.advanced.wol/resources/language/English/strings.xml 
b/script.advanced.wol/resources/language/English/strings.xml
index 9d5aaf8..d2ad19c 100644
--- a/script.advanced.wol/resources/language/English/strings.xml
+++ b/script.advanced.wol/resources/language/English/strings.xml
@@ -2,15 +2,36 @@
 <strings>
        <string id="51000">Basic settings</string>
     <string id="51001">Ethernet MAC-address</string>
-    <string id="51002">Wake on XBMC-launch</string>
-       <string id="52000">Notification settings</string>
-    <string id="52001">Enable notifications</string>
-    <string id="52002">Enable hostup-check and -notifications</string>
-    <string id="52003">IP-address or hostname</string>
-    <string id="52004">Timeout for hostup-check (in seconds)</string>
+       <string id="51002">IP-address or hostname</string>
+       
+       <string id="54000">Autostart</string>
+       <string id="54001">NOTE: Changing these settings requires a 
XBMC-restart to take effect!</string>
+       <string id="54010">Wake on XBMC-launch</string>
+    <string id="54011">Activate wake-on-launch</string>
+       <string id="54012">Delay WOL-signal on wake-on-launch (in 
seconds)</string>
+       <string id="54020">Also wake after XBMC returns from standby</string>
+       <string id="54021">Activate wake-after-standby</string>
+       <string id="54022">Delay WOL-signal on wake-after-standby (in 
seconds)</string>
+       <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="52000">Notifications</string>
+    <string id="52001">Enable launch notification</string>
+    <string id="52002">Enable ping- or waiting-counter -notifications</string>
+       <string id="52003">Enable host-up success/failure notification</string>
+       <string id="52004">Enable error notifications</string>
+    
        <string id="53000">Advanced settings</string>
-       <string id="53001">Send continuous WOL-packets</string>
-       <string id="53002">Delay between packets (in seconds)</string>
+       <string id="53010">Host-up check</string>
+       <string id="53011">Ping-timeout for host-up check (in seconds)</string>
+       <string id="53012">Disable host-up check via ping...</string>
+       <string id="53013">...and simply assume wake-up after this timespan (in 
seconds)</string>
+       <string id="53020">Continuous WOL-signals</string>
+       <string id="53021">Send continuous WOL-packets</string>
+       <string id="53022">Delay between packets (in seconds)</string>
+       <string id="53023">Continue sending after XBMC returns from 
standby</string>
+
     <string id="60000">Waking up %hostOrIp%...</string>
     <string id="60001">Waiting for %hostOrIp% to wake up...</string>
     <string id="60002">%timecount% of %timeout% seconds</string>
@@ -19,7 +40,8 @@
     <string id="60005">ERROR on hostup-check</string>
     <string id="60006">Host %hostOrIp% could not be resolved.</string>
     <string id="60007">Launching command...</string>
-       <string id="60008">Submission of WOL-packets will continue with a delay 
of %continuousWolDelay% seconds.</string>
-       <string id="60009">XBMC must be run as Administrator for this feature 
to work. You can disable &quot;hostup-notifications&quot; in the addon-settings 
to prevent this error.</string>
-       <string id="60010">XBMC must be run as root for this feature to work. 
You can disable &quot;hostup-notifications&quot; in the addon-settings to 
prevent this error.</string>
+       <string id="60008">WOL-packets will continue with a delay of 
%continuousWolDelay% seconds.</string>
+       <string id="60009">XBMC must be run as Administrator for ping-based 
host-up checks to work. You can disable the &quot;host-up check via ping&quot; 
in the addon-settings to prevent this error.</string>
+       <string id="60010">XBMC must be run as root for ping-based host-up 
checks to work. You can disable the &quot;host-up check via ping&quot; in the 
addon-settings to prevent this error.</string>
+       <string id="60011">%hostOrIp% should be awake now!</string>
 </strings>
diff --git a/script.advanced.wol/resources/settings.xml 
b/script.advanced.wol/resources/settings.xml
index 54c885f..4dd4756 100644
--- a/script.advanced.wol/resources/settings.xml
+++ b/script.advanced.wol/resources/settings.xml
@@ -1,20 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
        <category label="51000">
-               <setting id="separator" type="lsep" label="51000"/>
                <setting id="macAddress" type="text" label="51001" 
default="00:25:11:c4:fb:8a" />
-               <setting id="hostOrIp" type="text" label="52003" 
default="my-server" />
-               <setting id="autostart" type="bool" label="51002"  
default="false" />
+               <setting id="hostOrIp" type="text" label="51002" 
default="my-server" />
+       </category>
+       <category label="54000">
+               <setting id="separator" type="lsep" label="54001"/>
+               <setting type="sep"/>
+               <setting id="separator" type="lsep" label="54010"/>
+               <setting id="autostart" type="bool" label="54011"  
default="false" />
+               <setting id="wolDelayOnLaunch" type="labelenum" label="54012" 
values="0|5|10|15|20" default="0" visible="eq(-1,true)" />
+               <setting type="sep"/>
+               <setting id="separator" type="lsep" label="54020" 
visible="eq(-3,true)"/>
+               <setting id="wolAfterStandby" type="bool" label="54021" 
default="false" visible="eq(-4,true)" />
+               <setting id="wolDelayAfterStandby" type="labelenum" 
label="54022" values="0|5|10|15|20" default="0" enable="eq(-1,true)" 
visible="eq(-5,true)" />
+               <setting type="sep"/>
+               <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)" />
        </category>
        <category label="52000">
-               <setting id="separator" type="lsep" label="52000"/>
-               <setting id="enableNotifies" type="bool" label="52001" 
default="true" />
-               <setting id="enableVerificationNotifies" type="bool" 
label="52002" default="true" enable="eq(-1,true)" />
-               <setting id="pingTimeout" type="labelenum" label="52004" 
values="10|20|30|40|50|60|120" default="30" enable="eq(-1,true)+eq(-2,true)" />
+               <setting id="enableLaunchNotifies" type="bool" label="52001" 
default="true" />
+               <setting id="enablePingCounterNotifies" type="bool" 
label="52002" default="true" />
+               <setting id="enableHostupNotifies" type="bool" label="52003" 
default="true" />
+               <setting id="enableErrorNotifies" type="bool" label="52004" 
default="true" />
        </category>
        <category label="53000">
-               <setting id="separator" type="lsep" label="53000"/>
-               <setting id="continuousWol" type="bool" label="53001" 
default="false" />
-               <setting id="continuousWolDelay" type="labelenum" label="53002" 
values="10|20|30|40|50|60|120" default="30" visible="eq(-1,true)" />
+               <setting id="separator" type="lsep" label="53010"/>
+               <setting id="pingTimeout" type="labelenum" label="53011" 
values="10|20|30|40|50|60|120" default="30" enable="eq(1,false)" />
+               <setting id="disablePingHostupCheck" type="bool" label="53012" 
default="false" />
+               <setting id="hostupWaitTime" type="labelenum" label="53013" 
values="10|20|30|40|50|60|120" default="30" visible="eq(-1,true)" />
+               <setting type="sep"/>
+               <setting id="separator" type="lsep" label="53020"/>
+               <setting id="continuousWol" type="bool" label="53021" 
default="false" />
+               <setting id="continuousWolDelay" type="labelenum" label="53022" 
values="10|20|30|40|50|60|120" default="30" visible="eq(-1,true)" />
+               <setting id="continuousWolAfterStandby" type="bool" 
label="53023" default="true" visible="eq(-2,true)" />
        </category>
 </settings>

http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=d416f28507c543a070180a1cf1034ec9966d3052


-----------------------------------------------------------------------

Summary of changes:
 script.advanced.wol/addon.xml                      |   14 +-
 script.advanced.wol/autostart.py                   |   25 +-
 script.advanced.wol/changelog.txt                  |   29 +-
 script.advanced.wol/default.py                     |  144 +-
 script.advanced.wol/ping.py                        |    5 +-
 .../resources/language/English/strings.xml         |   44 +-
 script.advanced.wol/resources/settings.xml         |   39 +-
 .../LICENSE.txt                                    |  131 +-
 .../addon.xml                                      |   36 +-
 script.module.feedparser/changelog.txt             |    2 +
 script.module.feedparser/lib/feedparser.py         | 4017 ++++++++++++++++++++
 .../lib/sgmllib3.py                                |   50 +-
 script.module.feedparser/readme.txt                |    2 +
 13 files changed, 4345 insertions(+), 193 deletions(-)
 copy script.mythbox/resources/lib/feedparser/LICENSE => 
script.module.feedparser/LICENSE.txt (77%)
 copy {script.module.xmltodict => script.module.feedparser}/addon.xml (57%)
 create mode 100644 script.module.feedparser/changelog.txt
 create mode 100644 script.module.feedparser/lib/feedparser.py
 copy script.web.viewer/lib/webviewer/mechanize/_sgmllib_copy.py => 
script.module.feedparser/lib/sgmllib3.py (93%)
 create mode 100644 script.module.feedparser/readme.txt


hooks/post-receive
-- 
Scripts

------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to