done linting...just need to wrap up and publish

1 files changed, 34 insertions, 34 deletions

diff --git a/lib/db.py b/lib/db.py
index c6286ad..a236344 100644
--- a/lib/db.py
+++ b/lib/db.py
@@ -1,11 +1,9 @@
 # coding: utf-8
+"""all database connections and logic goes here"""
+from config import DB_HOST, DB_USER, DB_PASSWORD, DB_NAME
 import time, sys
-HOST = "lalalizard.com"
-USER = "asdfus"
-PASSWORD = "gTYgT&M6q"
-DATABASE = "asdfus"
 
-from sqlalchemy import Column, Integer, LargeBinary, String, create_engine, sql 
+from sqlalchemy import Column, Integer, LargeBinary, String, create_engine, sql
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 _NULL = sql.null()
@@ -14,6 +12,7 @@ Base = declarative_base()
 metadata = Base.metadata
 
 class ImCmd(Base):
+    """defines the table class"""
     __tablename__ = 'im_cmd'
     id = Column(Integer, primary_key=True)
     date = Column(Integer)
@@ -28,33 +27,34 @@ class ImCmd(Base):
     tag = Column(String(50))
 
 class Db(object):
-  def __init__(self):
-    engine = create_engine('mysql://{}:{}@{}/{}'.format(
-      USER, 
-      PASSWORD, 
-      HOST,
-      DATABASE
-    ))
-    self.Session = sessionmaker(bind=engine)
+    """wrapper for all db methods"""
+    def __init__(self):
+        engine = create_engine('mysql://{}:{}@{}/{}'.format(
+            DB_USER,
+            DB_PASSWORD,
+            DB_HOST,
+            DB_NAME
+        ))
+        self.Session = sessionmaker(bind=engine)
 
-  def insert_cmd ( self, **kwargs):
-    try:
-      session = self.Session()
-      _entry_data = {
-        'date' : kwargs.get("date", int(time.time())),
-        'remote_addr' : kwargs['remote_addr'] or _NULL,
-        'name' : kwargs['username'] or _NULL,
-        'url' : kwargs['username'] or _NULL,
-        'dir' : kwargs['directory'] or _NULL,
-        'oldfile' : kwargs['oldfile'] or _NULL,
-        'newfile' : kwargs['newfile'] or _NULL,
-        'cmd' : kwargs['cmd'] or _NULL,
-        'dataobj' : kwargs['dataobj'] or _NULL,
-        'tag' : kwargs['tag'] or _NULL
-      }
-      session.add(ImCmd(**_entry_data))
-      session.commit()
-      #FIXME session.close()....
-    except Exception as e:
-      sys.stderr.write("Unable to commit database entry\n");
-      sys.stderr.write(str(e))
+    def insert_cmd(self, **kwargs):
+        try:
+            session = self.Session()
+            _entry_data = {
+                'date' : kwargs.get("date", int(time.time())),
+                'remote_addr' : kwargs['remote_addr'] or _NULL,
+                'name' : kwargs['username'] or _NULL,
+                'url' : kwargs['username'] or _NULL,
+                'dir' : kwargs['directory'] or _NULL,
+                'oldfile' : kwargs['oldfile'] or _NULL,
+                'newfile' : kwargs['newfile'] or _NULL,
+                'cmd' : kwargs['cmd'] or _NULL,
+                'dataobj' : kwargs['dataobj'] or _NULL,
+                'tag' : kwargs['tag'] or _NULL
+            }
+            session.add(ImCmd(**_entry_data))
+            session.commit()
+            #FIXME session.close()....
+        except Exception as e:
+            sys.stderr.write("Unable to commit database entry\n")
+            sys.stderr.write(str(e))