From 3a189ad8ed0bdcfe3d6a51e8d2cd378faaa1a154 Mon Sep 17 00:00:00 2001
From: anima
Date: Mon, 31 May 2021 00:12:31 +0200
Subject: [PATCH] add set_user function an fix some bugs
---
timeTrack.py | 38 ++++++++++++++++++++------------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/timeTrack.py b/timeTrack.py
index 80bfb38..c74ee6e 100644
--- a/timeTrack.py
+++ b/timeTrack.py
@@ -19,7 +19,8 @@ class TimeTrack:
def __init__(self, DATABASE='timetrack.db', CONFIG='timetrack.conf'):
self.DATABASE = DATABASE
self.CONFIG = CONFIG
- self.USER = 0
+ self.USERID = 0
+ self.USERNAME = ''
self.LOGFILE = 'timetrack.log'
logging.basicConfig(filename=self.LOGFILE,
level=logging.DEBUG,
@@ -28,6 +29,7 @@ class TimeTrack:
)
self.load_config()
self.db_setup()
+ self.set_user()
## Läd oder erstellt das config file
def load_config(self):
@@ -42,7 +44,7 @@ class TimeTrack:
quit()
else:
logging.info('Config file loaded successfully')
- self.USER = data['user']
+ self.USERID = data['user']
else:
logging.info('Config file not found')
@@ -119,13 +121,9 @@ class TimeTrack:
logging.debug(SQL)
else:
logging.info('Success execute SQL command')
- connect.commit
- connect.close()
-
-
- ##> Kürzer möglich ?
- def db_connect(self, SQL, DATA=''):
- pass
+
+ connect.commit
+ connect.close()
def create_user(self, USER=''):
if USER == '':
@@ -150,18 +148,18 @@ class TimeTrack:
else:
logging.info('Success execute SQL command')
connect.commit()
- connect.close()
+
+ connect.close()
- ##> verbugt noch nicht funktional
def get_users(self, UID=0, NAME=''):
if not UID == 0:
logging.info('UID Used')
data = UID
- sql = "SELECT name FROM users WHERE id = ?"
+ sql = "SELECT * FROM users WHERE id = ?"
elif not NAME == '':
logging.info('NAME used')
data = NAME
- sql = "SELECT name FROM users WHERE name = ?"
+ sql = "SELECT * FROM users WHERE name = ?"
else:
logging.info('nothing used')
data = ''
@@ -186,15 +184,19 @@ class TimeTrack:
row = cursor.fetchall()
output = []
for data in row:
- print(data)
output.append(data)
connect.close()
return output
def set_user(self):
- pass
+ data = self.get_users()
+ if not data:
+ logging.info("No user found. Create new.")
+ print("Es wurde kein User gefunden, bitte legen sie einen neuen an.")
+ self.create_user()
+
+ data = self.get_users(UID=self.USERID)
+ self.USERNAME = data[0][1]
-test = TimeTrack()
-test.create_user()
-#test.get_users(NAME=input('Test:'))
\ No newline at end of file
+test = TimeTrack()
\ No newline at end of file