__copyright__ = "Copyright (C) 2000-2014 PhiloSoft Design"
__license__ = "GNU GPL"
-__all__ = ['host', 'port', 'change']
+__all__ = ['change']
import anydbm
from time import time
from xsetbg_conf import xsetbg_dir, xsetbg_conf
-from xsetbg_db import xsetbg_db
+from xsetbg_db import xsetbg_db_path
def error(error_str, error_code=1):
else:
min_delay = 3600*24 # 24 hours
-# httpd settings
-if xsetbg_conf.has_option("httpd", "host"):
- host = xsetbg_conf.get("httpd", "host")
-else:
- host = 'localhost'
-
-if xsetbg_conf.has_option("httpd", "port"):
- port = xsetbg_conf.getint("httpd", "port")
-else:
- error("Config must specify a port to listen. Abort.")
-
# DB keys
timestamp_key = "timestamp"
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')
+ lock_file = open(os.path.join(xsetbg_dir, 'xsetbg.py'), 'r')
+
try:
flock(lock_file, LOCK_EX|LOCK_NB)
except IOError: # already locked
xsetbg_db[old_filename_key] = xsetbg_db[filename_key]
xsetbg_db[filename_key] = image_name
- program_options = ["xli", "-onroot", "-quiet"] + \
- ["-center", "-border", random.choice(borders), "-zoom", "auto",
- image_name]
+ program_options = ["xli", "-border", random.choice(borders),
+ "-center", "-onroot", "-quiet", "-zoom", "auto",
+ image_name]
rc = subprocess.call(program_options)
if rc: