X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=xsetbg.py;h=10f76db5378f847ee5a56b0a450a743975916076;hb=9f11c26113add5270ade4da28c7a2adb84194b1b;hp=4092415d239d1ca1060875b3647bcaad2b172c04;hpb=8b74c08eda8ee4d62db000571a6df4ec4d59186a;p=xsetbg.git

diff --git a/xsetbg.py b/xsetbg.py
index 4092415..10f76db 100755
--- a/xsetbg.py
+++ b/xsetbg.py
@@ -3,18 +3,16 @@
 
 Select a random image from a (list of) directory(s)
 and set it as the desktop wallpaper (display it in the root window)
-using xli or xsetbg programs.
+using xli program.
 
 """
 
-__version__ = "$Revision$"[11:-2]
-__revision__ = "$Id$"[5:-2]
-__date__ = "$Date$"[7:-2]
-
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2000-2010 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2000-2012 PhiloSoft Design"
 __license__ = "GNU GPL"
 
+__all__ = ['host', 'port', 'change']
+
 
 import sys, os
 from ConfigParser import SafeConfigParser
@@ -26,11 +24,6 @@ import subprocess
 from time import time
 from fcntl import flock, LOCK_EX, LOCK_UN, LOCK_NB
 
-from wsgiref import simple_server
-from wsgiref.handlers import SimpleHandler
-from wsgiref.simple_server import WSGIServer, make_server
-simple_server.ServerHandler = SimpleHandler # Stop logging to stdout
-
 
 def error(error_str, error_code=1):
    sys.stderr.write("%s: Error: %s\n" % (sys.argv[0], error_str))
@@ -149,12 +142,7 @@ if not images:
    error("No images found. Abort.")
 
 
-def published(func):
-    func._wsgi_published = True
-    return func
-
-@published
-def ping(force=False):
+def change(force=False):
    # Use the program's file as the lock file:
    # lock it to prevent two processes run in parallel.
    lock_file = open("xsetbg.py", 'r')
@@ -211,49 +199,3 @@ def ping(force=False):
       lock_file.close()
       # Flush and close the global persistent dictionary
       if global_db: global_db.close()
-
-@published
-def force():
-    ping(force=True)
-
-@published
-def stop():
-    QuitWSGIServer._quit_flag = True
-
-
-g = globals().copy()
-commands = dict([(name, g[name]) for name in g
-    if getattr(g[name], '_wsgi_published', False)])
-del g
-
-class QuitWSGIServer(WSGIServer):
-    _quit_flag = False
-
-    def serve_forever(self):
-        while not self._quit_flag:
-            self.handle_request()
-
-def app(env, start_response):
-    command = env['PATH_INFO'][1:] # Remove the leading slash
-    if command not in commands:
-        status = '404 Not found'
-        response_headers = [('Content-type', 'text/plain')]
-        start_response(status, response_headers)
-        return ['The command was not found.\n']
-
-    try:
-        commands[command]()
-    except:
-        status = '500 Error'
-        response_headers = [('Content-type', 'text/plain')]
-        start_response(status, response_headers)
-        return ['Error occured!\n']
-
-    status = '200 OK'
-    response_headers = [('Content-type', 'text/plain')]
-    start_response(status, response_headers)
-    return ['Ok\n']
-
-force()
-httpd = make_server(host, port, app, server_class=QuitWSGIServer)
-httpd.serve_forever()