diff -r d1c9dec8b059 -r 59413cc48bd3 cronrec.py --- a/cronrec.py Thu Sep 30 16:19:14 2010 +0200 +++ b/cronrec.py Fri Oct 01 00:45:07 2010 +0200 @@ -10,7 +10,8 @@ import sys import argparse from datetime import datetime -import sqlite3 + +import db WD = "working_path" CONFIG = {WD: str} @@ -31,14 +32,6 @@ DEF_PROJECT = "default" DEF_ACTIVITY = "default" -def db_session(): - global config - if WD not in config: - print "Error: working directory is not configured. Use init command." - sys.exit() - con = sqlite3.connect(config[WD] + "/" + DB_FILE) - return con, con.cursor() - def read_config(): config = {} with open(CONFIG_FILE, "r") as config_stream: @@ -56,10 +49,14 @@ config_input.write("\n".join([CONFIG_SEP.join((k, v)) for k, v in config.iteritems() if k in CONFIG])) -def db_init(db_file): - con, cur = db_session() - sql = "create table projects()" - +def db_file(): + global config + if WD not in config: + print "Working directory path is not configured. \ +Please use the init command." + return None + return config[WD] + "/" + DB_FILE + def init(args): global config last_wd = None @@ -68,9 +65,8 @@ config[WD] = args.working_path write_config(config) path_exists = os.path.exists(config[WD]) and os.path.isdir(config[WD]) - db_file = config[WD] + "/" + DB_FILE - db_exists = path_exists and os.path.exists(db_file) - and os.path.isfile(db_file) + db_exists = path_exists and os.path.exists(db_file())\ + and os.path.isfile(db_file()) if last_wd != config[WD]: print "Changed working directory from %s to %s." % (last_wd, config[WD]) else: @@ -80,16 +76,10 @@ os.makedirs(config[WD]) print "Working directory %s created." % config[WD] elif db_exists: - print "Database file %s already exists, please delete it before\ - initiating a new database at this location." % db_file + print "Database file %s already exists, please delete it before \ +initiating a new database at this location." % db_file() if not db_exists: - db_init(db_file) - -def db_begin(project, activity, time): - con, cur = db_session() - cur.execute("") - con.commit() - cur.close() + db.init(db_file()) def begin(args): project = None @@ -103,7 +93,7 @@ project = DEF_PROJECT if not activity: activity = DEF_ACTIVITY - db_begin(project, activity, datetime.now()) + db.begin(db_file(), project, activity, datetime.now()) print "begins %s:%s" % (project, activity) def end(args):