xsetbg (DBus version).

[xsetbg.git] / xsetbg.py

diff --git a/xsetbg.py b/xsetbg.py
index c57e56af2447a554a9936e6d5fd119f2d1eb3da4..c0fd295f2440b179510b923e8c229631e312361f 100755 (executable)
--- a/xsetbg.py
+++ b/xsetbg.py
@@ -3,7 +3,7 @@
 
 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.
 
 """
 
@@ -11,13 +11,22 @@ __version__ = "$Revision$"[11:-2]
 __revision__ = "$Id$"[5:-2]
 __date__ = "$Date$"[7:-2]
 
-__author__ = "Oleg Broytman <phd@phd.pp.ru>"
+__author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2000-2010 PhiloSoft Design"
 __license__ = "GNU GPL"
 
+__all__ = ['host', 'port', 'change']
+
 
 import sys, os
+from ConfigParser import SafeConfigParser
+
+import anydbm
+import random
+import shelve
 import subprocess
+from time import time
+from fcntl import flock, LOCK_EX, LOCK_UN, LOCK_NB
 
 
 def error(error_str, error_code=1):
@@ -25,8 +34,6 @@ def error(error_str, error_code=1):
    sys.exit(error_code)
 
 
-from ConfigParser import SafeConfigParser
-
 xsetbg_dir = os.path.dirname(os.path.abspath(__file__))
 os.chdir(xsetbg_dir)
 
@@ -102,14 +109,7 @@ filename_key = "filename"
 old_filename_key = "old_filename"
 
 
-import random
-import anydbm, shelve
-from time import time
-from fcntl import flock, LOCK_EX, LOCK_UN, LOCK_NB
-
-# Import pickle and all anydbm/shelve internal machinery, so that
-# when ReadyExec forks they will be ready.
-# Also create the database if it is not exists yet.
+# Create the database if it is not exists yet.
 
 try:
    global_db = shelve.open(global_db_name, flag='c')
@@ -146,12 +146,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')
@@ -194,67 +189,17 @@ def ping(force=False):
          global_db[old_filename_key] = global_db[filename_key]
       global_db[filename_key] = image_name
 
+      program_options = ["xli", "-onroot", "-quiet"] + \
+         ["-center", "-border", random.choice(borders), "-zoom", "auto",
+            image_name]
+
+      rc = subprocess.call(program_options)
+      if rc:
+         error("cannot execute xli!")
+
    finally:
       # Unlock and close the lock file
       flock(lock_file, LOCK_UN)
       lock_file.close()
       # Flush and close the global persistent dictionary
       if global_db: global_db.close()
-
-   program_options = ["xli", "-onroot", "-quiet"] + \
-      ["-center", "-border", random.choice(borders), "-zoom", "auto",
-         image_name]
-
-   rc = subprocess.call(program_options)
-   if rc:
-      error("cannot execute xli!")
-
-@published
-def force():
-    ping(force=True)
-
-@published
-def stop():
-    QuitWSGIServer._quit_flag = True
-
-
-from wsgiref.handlers import SimpleHandler
-from wsgiref import simple_server
-simple_server.ServerHandler = SimpleHandler # Stop logging to stdout
-from wsgiref.simple_server import WSGIServer, make_server
-
-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']
-
-httpd = make_server(host, port, app, server_class=QuitWSGIServer)
-httpd.serve_forever()