Handle dead sockets and already-running servers

[bg-scripts] / randombg.py

diff --git a/randombg.py b/randombg.py
index 9a587bb2e5b2270d36e72d965380f504160e14f5..51f6f726a0e037e55aeb5e66e8bb93afddfa8e4b 100755 (executable)
--- a/randombg.py
+++ b/randombg.py
@@ -1,10 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
-VERSION = "2.0"
+VERSION = "2.1"
 
 
-import asyncore, asynchat, socket
-import os, os.path, random, sys, time
+import asyncore
+import asynchat
+import socket
+import os
+import random
+import sys
+import time
 from optparse import OptionParser
 import logging
 try:
@@ -231,10 +236,10 @@ class FolderRandomFileList(BaseFileList):
 class Cycler(object):
        def init(self, options, paths, oneshot=False):
                self.cycle_time = options.cycle_time
-               self.history_filename = options.history_filename
+               self.cache_filename = options.cache_filename
 
                logging.debug("Initialising wallchanger")
-               wallchanger.init(options.background_colour, options.permanent, options.convert)
+               wallchanger.init(options.background_colour, options.convert)
 
                logging.debug("Initialising file list")
                if options.all_random:
@@ -247,7 +252,7 @@ class Cycler(object):
                for path in paths:
                        self.filelist.add_path(path)
 
-               if self.filelist.load_cache(self.history_filename):
+               if self.filelist.load_cache(self.cache_filename):
                        logging.debug("Loaded cache successfully")
                else:
                        logging.debug("Could not load cache")
@@ -264,7 +269,7 @@ class Cycler(object):
                        self.cmd_reload()
        
        def finish(self):
-               self.filelist.store_cache(self.history_filename)
+               self.filelist.store_cache(self.cache_filename)
 
        def find_files(self, options, paths):
                return filelist
@@ -280,7 +285,7 @@ class Cycler(object):
                        self.task.cancel()
                self.task = asyncsched.schedule(self.cycle_time, next)
                logging.debug("Reset timer for %s seconds" % self.cycle_time)
-               self.filelist.store_cache(self.history_filename)
+               self.filelist.store_cache(self.cache_filename)
        
        def cmd_reload(self):
                image = self.filelist.get_current_image()
@@ -362,21 +367,29 @@ class Listener(asyncore.dispatcher):
 
 def do_server(options, paths):
        try:
-               cycler = Cycler()
-               listener = Listener(options.socket_filename, cycler)
-               # Initialisation of Cycler delayed so we grab the socket quickly
-               cycler.init(options, paths)
-               try:
-                       asyncsched.loop()
-               except KeyboardInterrupt:
-                       print
-               cycler.finish()
-       finally:
-               # Make sure that the socket is cleaned up
-               try:
-                       os.unlink(options.socket_filename)
-               except:
-                       pass
+               sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+               sock.connect(options.socket_filename)
+               print >>sys.stderr, "Server is already running! Sending exit command."
+               sock = sock.makefile()
+               sock.write("cmd exit\n")
+               sock.close()
+       except Exception, e:
+               pass
+
+       try:
+               os.unlink(options.socket_filename)
+       except OSError:
+               pass
+
+       cycler = Cycler()
+       listener = Listener(options.socket_filename, cycler)
+       # Initialisation of Cycler delayed so we grab the socket quickly
+       cycler.init(options, paths)
+       try:
+               asyncsched.loop()
+       except KeyboardInterrupt:
+               print
+       cycler.finish()
 
 def do_client(options, args):
        if len(args) == 0:
@@ -402,9 +415,6 @@ def build_parser():
                        "\n(client) %prog [options] [next|prev|rescan|reload|pause] [...]"
                        "\nThe first instance to be run will be the server.\n"
                )
-       parser.add_option("-p", "--permanent",
-               action="store_true", dest="permanent", default=False,
-               help="Make the background permanent. Note: This will cause all machines logged in with this account to simultaneously change background [Default: %default]")
        parser.add_option("-v", '-d', "--verbose", "--debug",
                action="count", dest="verbose", default=0,
                help="Make the louder (good for debugging, or those who are curious)")
@@ -429,9 +439,12 @@ def build_parser():
        parser.add_option("--socket",
                action="store", type="string", dest="socket_filename", default=os.path.expanduser('~/.randombg_socket'),
                help="Location of the command/control socket.")
-       parser.add_option("--history-file",
-               action="store", type="string", dest="history_filename", default=os.path.expanduser('~/.randombg_historyfile'),
+       parser.add_option("--cache-file",
+               action="store", type="string", dest="cache_filename", default=os.path.expanduser('~/.randombg_cache'),
                help="Stores the location of the last image to be loaded.")
+       parser.add_option("--server",
+               action="store_true", dest="server", default=False,
+               help="Run in server mode to listen for clients.")
        return parser
 
 def main():
@@ -443,13 +456,19 @@ def main():
        elif options.verbose >= 2:
                logging.getLogger().setLevel(logging.DEBUG)
        
+       if options.server:
+               do_server(options, args)
+               return
+
        if options.oneshot:
                do_oneshot(options, args)
-       else:
-               if os.path.exists(options.socket_filename):
-                       do_client(options, args)
-               else:
-                       do_server(options, args)
+               return
+
+       try:
+               do_client(options, args)
+               return
+       except Exception, e:
+               print >>sys.stderr, "Failed to connect to server:", e
 
 
 if __name__ == "__main__":