refactoring of db-related stuff

modules/cronograph/cron.py

@@ -1,4 +1,5 @@
-from db import *
+import db
+import sys
 
 def handle():
   from subprocess import Popen, PIPE
@@ -8,9 +9,8 @@ def handle():
   out = None
   err = None
   exit_code = None
-
 
-  db = ensure_db_structure(spawn_db(get_database_name()))
+  database = db.ensure_structure(db.spawn()) 
 
   args = sys.argv
   args.pop(0)
@@ -38,8 +38,8 @@ def handle():
 
   data = [' '.join(args), start_time, end_time, out, err, exit_code]
 
-  db.execute('insert into cronjobs (command_line, start_time, end_time, stdout, stderr, exit_code) values(?, ?, ?, ?, ?, ?)', data)
-  db.commit()
+  database.execute('insert into cronjobs (command_line, start_time, end_time, stdout, stderr, exit_code) values(?, ?, ?, ?, ?, ?)', data)
+  database.commit()
 
   if should_notify_by_email(*data):
     print_email_notification(*data)

modules/cronograph/db.py

@@ -2,10 +2,14 @@
 import sys
 import sqlite3
 
-def get_database_name():
-  return sys.argv.pop(1) if len(sys.argv)>1 and sys.argv[1].endswith('.sqlite3') else os.path.expanduser('~/.cronograph.sqlite3')
+_database_name = None
 
-def ensure_db_structure(db):
+def database_name():
+  global _database_name
+  _database_name = _database_name or (sys.argv.pop(1) if len(sys.argv)>1 and sys.argv[1].endswith('.sqlite3') else os.path.expanduser('~/.cronograph.sqlite3'))
+  return _database_name
+
+def ensure_structure(db):
   db.execute('''
     CREATE TABLE IF NOT EXISTS cronjobs (
       start_time INTEGER NOT NULL,
@@ -18,7 +22,7 @@ def ensure_db_structure(db):
   ''')
   return db
 
-def spawn_db(database_name):
-  db = sqlite3.connect(database_name)
+def spawn():
+  db = sqlite3.connect(database_name())
   db.row_factory = sqlite3.Row
   return db

modules/cronograph/server.py

@@ -1,23 +1,30 @@
-from db import *
+import db
+import sys
 
 def serve():
   import web
-
   sys.argv.pop(1)
 
   urls = (
       '/', 'index'
   )
 
-  database_name = get_database_name()
-  ensure_db_structure(spawn_db(database_name))
-
-  class index:
-    def GET(self):
-      result = ""
-      for row in spawn_db(database_name).execute('SELECT * FROM cronjobs'):
-        result += row['stdout']
-      return result
+  db.ensure_structure(db.spawn())
 
-  app = web.application(urls, {'index': index})
+  app = web.application(urls, globals())
   app.run()
+
+class Request:
+  def __init__(self):
+    self._db = None
+
+  def db(self):
+    self._db = self._db or db.spawn()
+    return self._db
+
+class index(Request):
+  def GET(self):
+    result = ""
+    for row in self.db().execute('SELECT * FROM cronjobs'):
+      result += row['stdout']
+    return result