diff --git a/.gitignore b/.gitignore index 7910e55..07a1f5c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ config.cfg *.pyc ghostdriver.log node_modules -photos +files/ diff --git a/dbtools/__init__.py b/dbtools/__init__.py deleted file mode 100644 index a0a49ec..0000000 --- a/dbtools/__init__.py +++ /dev/null @@ -1,90 +0,0 @@ -import setuptools -import sqlite3, pymysql, pymysql.cursors - -SQLITE = 0 -MYSQL = 1 -MARIADB = MYSQL - -MIN = 0 -MAX = 1 - -class dbObject: - -# --------------------------------------------- Initialization ------------------------------------------------- - - def initMySQL(self, host, port, user, pwd, db): - self.conn = pymysql.connect(host = host, port = port, user = user, password = pwd, db = db, charset = "utf8mb4", cursorclass = pymysql.cursors.DictCursor) - self.cur = self.conn.cursor() - self.dbtype = MYSQL - self.host = host - self.port = port - self.user = user - self.pwd = pwd - self.db = db - - def initSQLite(self, path): - self.conn = sqlite3.connect(path) - self.cur = self.conn.cursor() - self.dbtype = SQLITE - self.path = path - - def __init__(self, dbtype = SQLITE, path = None, host = None, port = None, user = None, pwd = None, db = None): - - if dbtype == SQLITE: - self.initSQLite(path or 'Database.db') - - elif dbtype == MYSQL: - self.initMySQL(host or 'localhost', port or 3306, user, pwd, db) - - else: - raise ValueError("Unknown database type %s." % str(dbtype)) - -# ---------------------------------------------- No more initialization ---------------------------------------- - - def closeConnection(self): - return self.conn.close() - - def commit(self): - return self.conn.commit() - - def executeQuery(self, query): - return self.cur.execute(query) - - def getAll(self): - return self.cur.fetchall() - - def getNext(self): - return self.cur.fetchone() - - def isInitialized(self): - try: - self.executeQuery("SELECT * FROM messages") - return True - except: - return False - - def getLatestMessage(db, mode = 0, user = setuptools.user()): - if mode == 0: - db.executeQuery("SELECT max(id) FROM messages WHERE recipient_id='%s'" % user) - else: - db.executeQuery("SELECT max(id) FROM messages WHERE sender_id='%s'" % user) - try: - return int(db.getNext()[0]) - except: - return 0 - - def checkID(db, mid): - db.executeQuery("SELECT * FROM messages WHERE id=%s" % mid) - try: - db.getNext()[0] - return True - except: - return False - -def dbHelper(): - if setuptools.dbtype() == SQLITE: - return dbObject(dbtype=SQLITE, path=setuptools.dbpath()) - elif setuptools.dbtype() == MYSQL: - return dbObject(dbtype=MYSQL, host=setuptools.dbhost(), user=setuptools.dbuser(), pwd=setuptools.dbpass(), db=setuptools.dbname()) - else: - raise setuptools.SetupException()