Changeset 1768

Timestamp:

11/13/08 22:29:28 (1 year ago)

Author:

shypike

Message:

Implement full on-the-fly adding, deleting and modifying of servers, without requiring a warm restart.
Add enable bit to all servers.
Implement schedules enabling and disabling of servers.

Closes #11 for trunk.

Files:

• trunk/main/interfaces/Default/templates/config_scheduling.tmpl (modified) (1 diff)
• trunk/main/interfaces/Default/templates/config_server.tmpl (modified) (2 diffs)
• trunk/main/interfaces/Plush/templates/config_scheduling.tmpl (modified) (1 diff)
• trunk/main/interfaces/Plush/templates/config_server.tmpl (modified) (2 diffs)
• trunk/main/interfaces/iphone/templates/config_scheduling.tmpl (modified) (1 diff)
• trunk/main/interfaces/iphone/templates/config_server.tmpl (modified) (1 diff)
• trunk/main/interfaces/prototype/templates/config_scheduling.tmpl (modified) (1 diff)
• trunk/main/interfaces/prototype/templates/config_server.tmpl (modified) (2 diffs)
• trunk/main/interfaces/smpl/templates/config_scheduling.tmpl (modified) (1 diff)
• trunk/main/interfaces/smpl/templates/config_server.tmpl (modified) (2 diffs)
• trunk/main/sabnzbd/__init__.py (modified) (5 diffs)
• trunk/main/sabnzbd/downloader.py (modified) (10 diffs)
• trunk/main/sabnzbd/interface.py (modified) (9 diffs)
• trunk/main/sabnzbd/newswrapper.py (modified) (1 diff)
• trunk/main/sabnzbd/scheduler.py (modified) (5 diffs)

trunk/main/interfaces/Default/templates/config_scheduling.tmpl

@@ -44 +44 @@
-<br>Action:<br> 
-<select name="action">
-
-
-
-
+
+
+
-</select>
-<br>Arguments:<br> 

trunk/main/interfaces/Default/templates/config_server.tmpl

@@ -18 +18 @@
-      Timeout:<br><input type="text" size="25" name="timeout" value="120"><br>
-      Connections:<br><input type="text" size="25" name="connections"><br>
-
-
-
-
-
-
+
+
+
+
+
+
+
-      <p><input type="submit" value="Add Server"></p>
-    </fieldset>
@@ -39 +40 @@
-      Timeout:<br><input type="text" size="25" name="timeout" value="$servers[$server]['timeout']"><br>
-      Connections:<br><input type="text" size="25" name="connections" value="$servers[$server]['connections']"><br>
-
-
-
-
-
-
+
+
+
+
+
+
+
-      <input type="hidden" name="server" value="$server">
-      <p><input type="submit" value="Save Changes"></p>

trunk/main/interfaces/Plush/templates/config_scheduling.tmpl

@@ -50 +50 @@
-                                        </td><td>
-                                                <select name="action">
-
-
-
-
+
+
+
-                                                </select>
-                                        </td></tr>

trunk/main/interfaces/Plush/templates/config_server.tmpl

@@ -28 +28 @@
-                                <tr><td align=right><div class="sucker">Backup&nbsp;Server?</div></td><td>
-                                        <input type="checkbox" name="fillserver" value="1"/>
+                                </td></tr>
+                                <tr><td align=right><div class="sucker">Enable?</div></td><td>
+                                        <input type="checkbox" name="enable" value="1"/>
-                                </td></tr>
-                                
@@ -79 +82 @@
-                                        </td>
-                                </tr>
+                                <tr>
+                                        <td align=right><div class="sucker">Enable?</div></td>
+                                        <td>
+                                                <input type="checkbox" name="enable" value="1" <!--#if int($servers[$server]['enable']) != 0 then "checked=1" else ""#--> />
+                                        </td>
+                                </tr>
-                                </table>
-                                

trunk/main/interfaces/iphone/templates/config_scheduling.tmpl

@@ -50 +50 @@
-    <label>Action:</label><br/><br/>
-    <select name="action">
-
-
-
-
+
+
+
-    </select>
-</div>

trunk/main/interfaces/iphone/templates/config_server.tmpl

@@ -54 +54 @@
-            <input type="hidden" id="$server" name="fillserver" value="<!--#if int($servers[$server]['fillserver']) != 0 then '1' else '0'#-->">
-            <div class="toggle" onclick="toggleValue('$server')" <!--#if int($servers[$server]['fillserver']) != 0 then 'toggled="true"' else ''#-->><span class="thumb"></span><span class="toggleOn">Yes</span><span class="toggleOff">No</span></div>
+        </div>
+
+        <div class="row">
+
+                        <label>Enable:</label><br/><br/>
+            <input type="hidden" id="$server" name="enable" value="<!--#if int($servers[$server]['enable']) != 0 then '1' else '0'#-->">
+            <div class="toggle" onclick="toggleValue('$server')" <!--#if int($servers[$server]['enable']) != 0 then 'toggled="true"' else ''#-->><span class="thumb"></span><span class="toggleOn">Yes</span><span class="toggleOff">No</span></div>
-                <input type="hidden" name="server" value="$server">
-        </div>

trunk/main/interfaces/prototype/templates/config_scheduling.tmpl

@@ -41 +41 @@
-<label class="label">Action:</label>
-<select name="action">
-
-
-
-
+
+
+
-</select>
-<br class="clear" />

trunk/main/interfaces/prototype/templates/config_server.tmpl

@@ -31 +31 @@
-            <label><span class="label">Backup Server:</span>
-                        <input class="radio" type="checkbox" name="fillserver" value="1" <!--#if int($servers[$server]['fillserver']) != 0 then "checked=1" else ""#--> /></label>
+            </label><br class="clear" />
+
+            <label><span class="label">Enable:</span>
+                        <input class="radio" type="checkbox" name="enable" value="1" <!--#if int($servers[$server]['enable']) != 0 then "checked=1" else ""#--> /></label>
-                <input type="hidden" name="server" value="$server"><br class="clear" />
-
@@ -74 +78 @@
-                                <input class="radio" type="checkbox" name="fillserver" value="1"></label>
-                <br class="clear" />
+        
+                        <label><span class="label">Enable:</span>
+                                <input class="radio" type="checkbox" name="enable" value="1"></label>
+                <br class="clear" />
-
-      <p><input type="button" class="submitindent" size="40" value="Add Server" onclick="javascript:submitconfig('config/server/addServer', 'submitstatus3','addserver','config/server','0')">

trunk/main/interfaces/smpl/templates/config_scheduling.tmpl

@@ -41 +41 @@
-<label class="label">Action:</label>
-<select name="action">
-
-
-
-
+
+
+
-</select>
-<br class="clear" />

trunk/main/interfaces/smpl/templates/config_server.tmpl

@@ -32 +32 @@
-            <label><span class="label">Backup Server:</span>
-                        <input class="radio" type="checkbox" name="fillserver" value="1" <!--#if int($servers[$server]['fillserver']) != 0 then "checked=1" else ""#--> /></label>
+            </label><br class="clear" />
+
+            <label><span class="label">Enable:</span>
+                        <input class="radio" type="checkbox" name="enable" value="1" <!--#if int($servers[$server]['enable']) != 0 then "checked=1" else ""#--> /></label>
-                <input type="hidden" name="server" value="$server"><br class="clear" />
-
@@ -77 +81 @@
-                <br class="clear" />
-
+                        <label><span class="label">Enable:</span>
+                                <input class="radio" type="checkbox" name="enable" value="1"></label>
+                <br class="clear" />
+
-      <p><input type="button" class="submitindent" size="40" value="Add Server" onclick="javascript:submitconfig('config/server/addServer', 'submitstatus3','addserver','config/server','0')">
-<span class="submitstatus" id="submitstatus3"></span></p>

trunk/main/sabnzbd/__init__.py

@@ -50 +50 @@
-from sabnzbd.misc import DirScanner, real_path, \
-                         create_real_path, check_latest_version, from_units, SameFile, decodePassword, \
-
+, save_configfile
-from sabnzbd.urlgrabber import URLGrabber
-from sabnzbd.nzbstuff import NzbObject
@@ -576 +576 @@
-
-    if DOWNLOADER:
-CFG['servers'], 
+
-    else:
-CFG['servers']
+
-        if pause_downloader:
-            DOWNLOADER.paused = True
@@ -595 +595 @@
-
-    if evalSched:
-
-
-
-
-
-
+
-
-    logging.info('All processes started')
@@ -1129 +1124 @@
-## Unsynchronized methods                                                     ##
-################################################################################
+def enable_server(server):
+    """ Enable server """
+    try:
+        CFG['servers'][server]['enable'] = 1
+    except:
+        logging.warning('[%s] Trying to set status of non-existing server %s', __NAME__, server)
+        return
+    save_configfile(CFG)
+    update_server(server, server)
+
+def disable_server(server):
+    """ Disable server """
+    try:
+        CFG['servers'][server]['enable'] = 0
+    except:
+        logging.warning('[%s] Trying to set status of non-existing server %s', __NAME__, server)
+        return
+    save_configfile(CFG)
+    update_server(server, server)
+
-def change_web_dir(web_dir):
-    LOGIN_PAGE.change_web_dir(web_dir)
@@ -1182 +1197 @@
-    try:
-        DOWNLOADER.disconnect()
+    except:
+        logging.exception("[%s] Error accessing DOWNLOADER?", __NAME__)
+
+def update_server(oldserver, newserver):
+    global DOWNLOADER, CV
+    try:
+        CV.acquire()
+        try:
+            DOWNLOADER.init_server(oldserver, newserver)
+        finally:
+            CV.notifyAll()
+            CV.release()
-    except:
-        logging.exception("[%s] Error accessing DOWNLOADER?", __NAME__)

trunk/main/sabnzbd/downloader.py

@@ -58 +58 @@
-
-class Server:
-
+id, 
-                 password = None):
+        self.id = id
+        self.newid = None
+        self.restart = False
-        self.host = host
-        self.port = port
@@ -69 +72 @@
-        self.username = username
-        self.password = password
-
+
-        self.busy_threads = []
-        self.idle_threads = []
@@ -75 +78 @@
-        for i in range(threads):
-            self.idle_threads.append(NewsWrapper(self, i+1))
+
+    def stop(self, readers, writers):
+        for nw in self.idle_threads:
+            try:
+                fno = nw.nntp.sock.fileno()
+            except:
+                fno = None
+            if fno and fno in readers:
+                readers.pop(fno)
+            if fno and fno in writers:
+                writers.pop(fno)
+            nw.terminate()
+        self.idle_threads = []
-
-    def __repr__(self):
@@ -129 +145 @@
-
-class Downloader(Thread):
-servers, 
+
-        Thread.__init__(self)
+
+        logging.debug("[%s] Initializing downloader/decoder", __NAME__)
-
-        # Used for scheduled pausing
@@ -144 +162 @@
-
-        self.shutdown = False
+        self.__restart = 0
-
-        self.force_disconnect = False
@@ -152 +171 @@
-        self.servers = []
-
+        servers = sabnzbd.CFG['servers']
+
-        primary = False
-        for server in servers:
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            host = GetParm(srv, 'host')
-            port = GetParmInt(srv, 'port', 119)
@@ -165 +206 @@
-            fillserver = bool(GetParmInt(srv, 'fillserver', 0))
-            primary = primary or (enabled and (not fillserver) and (threads > 0))
-
+ and sabnzbd.newswrapper.HAVE_SSL
-            username = GetParm(srv, 'username')
-            password = decodePassword(GetParm(srv, 'password'), 'server')
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def stop(self):
@@ -225 +273 @@
-                        self.__reset_nw(nw, "timed out")
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    continue
-
@@ -282 +344 @@
-
-                    for server in self.servers:
-
-
+
-
-                    logging.info("[%s] Shutting down", __NAME__)
@@ -313 +374 @@
-                sabnzbd.CV.acquire()
-                while (not sabnzbd.has_articles() or self.paused or self.delayed or self.postproc) and not \
-
+ and not self.__restart
-                    sabnzbd.CV.wait()
-                sabnzbd.CV.release()

trunk/main/sabnzbd/interface.py

@@ -1412 +1412 @@
-            new[svr]['fillserver'] = org[svr]['fillserver']
-            new[svr]['ssl'] = org[svr]['ssl']
+            new[svr]['enable'] = org[svr]['enable']
-        config['servers'] = new
-
@@ -1427 +1428 @@
-    @cherrypy.expose
-    def addServer(self, server = None, host = None, port = None, timeout = None, username = None,
-
+enable=None, 
-
-        timeout = check_timeout(timeout)
@@ -1441 +1442 @@
-        if not ssl:
-            ssl = '0'
+        if enable == None:
+            enable = '1'
-        if host and port and port.isdigit() \
-           and connections.isdigit() and fillserver.isdigit() \
@@ -1465 +1468 @@
-                sabnzbd.CFG['servers'][server]['fillserver'] = fillserver
-                sabnzbd.CFG['servers'][server]['ssl'] = ssl
-
+
+
+
+
+
+
-
-    @cherrypy.expose
-    def saveServer(self, server = None, host = None, port = None, username = None, timeout = None,
-
+enable=None, 
-
-        timeout = check_timeout(timeout)
-
-
+old
-        port = Strip(port)
-
@@ -1484 +1492 @@
-        if not fillserver:
-            fillserver = '0'
+        if not enable:
+            enable = '0'
-        if host and port and port.isdigit() \
-           and connections.isdigit() and fillserver and fillserver.isdigit() \
@@ -1492 +1502 @@
-
-            if password and not password.strip('*'):
-
-
-
+old
+
+old
-
-            # Allow IPV6 numerical addresses, '[]' is not compatible with
@@ -1512 +1522 @@
-            sabnzbd.CFG['servers'][server]['fillserver'] = fillserver
-            sabnzbd.CFG['servers'][server]['ssl'] = ssl
-
+
+
+
+
+
-
-    @cherrypy.expose
-    def delServer(self, *args, **kwargs):
-        if 'server' in kwargs and kwargs['server'] in sabnzbd.CFG['servers']:
-
-
+
+
+
+
+
-        if '_dc' in kwargs:
-eturn saveAndRestart(self.__root, 
+aise Raiser(self.__root, _dc=
-        else:
-eturn saveAndRestart(self.__root, 
+aise Raiser(self.__root, _dc=
-
-#------------------------------------------------------------------------------
@@ -1767 +1784 @@
-            config['schedlines'].append(ev[3])
-
+        actions = ['resume', 'pause', 'shutdown', 'speedlimit']
+        servers = sabnzbd.CFG['servers']
+        for server in servers:
+            actions.append(server)
+        config['actions'] = actions
-
-        template = Template(file=os.path.join(self.__web_dir, 'config_scheduling.tmpl'),
@@ -1778 +1800 @@
-                    action = None, arguments = None, _dc = None):
-        schedules = sabnzbd.CFG['misc']['schedlines']
+
+        arguments = arguments.strip().lower()
+        if arguments in ('on', 'enable'):
+            arguments = '1'
+        elif arguments in ('off','disable'):
+            arguments = '0'
+
-        if minute and hour  and dayofweek and action:
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                schedules.append('%s %s %s %s %s' %
-                                 (minute, hour, dayofweek, action, arguments))
-            except:
-                pass
-        save_configfile(sabnzbd.CFG)
-        scheduler.restart()

trunk/main/sabnzbd/newswrapper.py

@@ -245 +245 @@
-            # Reset for internal reasons, just wait 5 sec
-            self.timeout = time() + 5
-
+
+
+
+
+
+
+
+
+
-
-

trunk/main/sabnzbd/scheduler.py

@@ -41 +41 @@
-    """ Create the scheduler and set all required events
-    """
-
+, CFG
-
-    need_rsstask = True
@@ -79 +79 @@
-        elif action_name == 'speedlimit' and arguments != []:
-            action = sabnzbd.limit_speed
+        elif action_name == 'enable_server' and arguments != []:
+            action = sabnzbd.enable_server
+        elif action_name == 'disable_server' and arguments != []:
+            action = sabnzbd.disable_server
-        else:
-            logging.warning("[%s] Unknown action: %s", __NAME__, action_name)
@@ -140 +144 @@
-    stop()
-
-
-
-
-
-
-
+
+
-    init()
-    start()
@@ -204 +204 @@
-
-
-
+was_paused=False
-    """ Determine what pause/resume state we would have now.
-        Return True if paused mode would be active.
@@ -213 +213 @@
-    paused = None
-    speedlimit = None
+    servers = {}
-
-    for ev in sort_schedules(schedlines, forward=False):
-        logging.debug('[%s] Schedule check result = %s', __NAME__, ev)
-        action = ev[1]
+        try:
+            value = ev[2]
+        except:
+            value = None
-        if action == 'pause':
-            paused = True
-        elif action == 'resume':
-            paused = False
-ev[2]
+value
-            speedlimit = int(ev[2])
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+