anima/timetrack
1
1
Fork 0
Code Issues 18 Projects 2 Releases 4 Wiki Activity

db handling optimized

Browse Source
This commit is contained in:
Schreiner Pascal
2021-06-05 11:39:28 +02:00
parent a5cde65967
commit 3d9d1a1d5f
1 changed files with 89 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
timeTrack.py
View File

@@ -3,7 +3,7 @@
# #
# timeTrack.py # timeTrack.py
# by 4nima # by 4nima
# v.2.0.2 # v.2.0.3
# #
######################### #########################
# simple time tracking with database # simple time tracking with database
@@ -24,6 +24,7 @@ class TimeTrack:
self.USERNAME = '' self.USERNAME = ''
self.OLDEVENT = 2 self.OLDEVENT = 2
self.LOGFILE = 'timetrack.log' self.LOGFILE = 'timetrack.log'
self.DBCON = sqlite3.connect(self.DATABASE, detect_types=sqlite3.PARSE_DECLTYPES | sqlite3.PARSE_COLNAMES)
logging.basicConfig( logging.basicConfig(
filename=self.LOGFILE, filename=self.LOGFILE,
level=logging.DEBUG, level=logging.DEBUG,
@@ -33,6 +34,9 @@ class TimeTrack:
self.db_setup() self.db_setup()
self.load_config() self.load_config()
def __del__(self):
self.DBCON.close()
## Prepartation ## Prepartation
### Check OS and clear screen ### Check OS and clear screen
def clear_screen(self): def clear_screen(self):
@@ -95,22 +99,19 @@ class TimeTrack:
) )
""") """)
connect = sqlite3.connect(self.DATABASE)
cursor = connect.cursor()
logging.debug('Create initial database tables') logging.debug('Create initial database tables')
for SQL in sql: try:
try: with self.DBCON as con:
cursor.execute(SQL) for SQL in sql:
except: con.execute(SQL)
logging.error('Table could not be created') except sqlite3.Error as err:
logging.debug(SQL) logging.error('Table could not be created')
print('TimeTrack wird beendet: Fehler bei Datanbank Setup') logging.debug(sql)
quit() logging.error('SQLError: {}'.format(err))
else: print('TimeTrack wird beendet: Fehler bei Datanbank Setup')
logging.debug('Table was created successfully or already exists') quit()
else:
connect.commit() logging.debug('Table was created successfully or already exists')
connect.close()
### Loads or creates a config file ### Loads or creates a config file
def load_config(self): def load_config(self):
@@ -160,21 +161,16 @@ class TimeTrack:
logging.debug('Accepted username: {}'.format(username)) logging.debug('Accepted username: {}'.format(username))
connect = sqlite3.connect(self.DATABASE)
cursor = connect.cursor()
sql = "INSERT INTO users ( name ) values ( ? )" sql = "INSERT INTO users ( name ) values ( ? )"
try: try:
cursor.execute(sql, [username]) with self.DBCON as con:
except: con.execute(sql, [username])
except sqlite3.Error as err:
logging.error('User could not be saved in database') logging.error('User could not be saved in database')
logging.debug(sql) logging.debug(sql)
logging.error('SQLError: {}'.format(err))
else: else:
logging.info('User was saved successfully') logging.info('User was saved successfully')
connect.commit()
connect.close()
### Outputs existing users from the DB ### Outputs existing users from the DB
def get_users(self, UID=0, NAME=''): def get_users(self, UID=0, NAME=''):
@@ -191,25 +187,23 @@ class TimeTrack:
data = '' data = ''
sql = "SELECT * FROM users" sql = "SELECT * FROM users"
connect = sqlite3.connect(self.DATABASE)
cursor = connect.cursor()
try: try:
if data: with self.DBCON as con:
cursor.execute(sql, [data]) cur = con.cursor()
else: if data:
cursor.execute(sql) cur.execute(sql, [data])
except: else:
cur.execute(sql)
data = cur.fetchall()
except sqlite3.Error as err:
logging.error('Could not get user') logging.error('Could not get user')
logging.debug(sql) logging.debug(sql)
logging.error('SQLError: {}'.format(err))
print('Fehler beim Zugriff auf die Benutzer Datenbank') print('Fehler beim Zugriff auf die Benutzer Datenbank')
return 1 return 1
else: else:
logging.debug('User database read out successfully') logging.debug('User database read out successfully')
connect.commit()
data = cursor.fetchall()
connect.close()
return data return data
### Defines a user for the session ### Defines a user for the session
@@ -231,23 +225,22 @@ class TimeTrack:
def save_event(self, TIME=datetime.datetime.now()): def save_event(self, TIME=datetime.datetime.now()):
if not self.get_event(USERID=self.USERID): if not self.get_event(USERID=self.USERID):
logging.debug('No active events found for the user: {}'.format(self.USERID)) logging.debug('No active events found for the user: {}'.format(self.USERID))
connect = sqlite3.connect(self.DATABASE)
cursor = connect.cursor()
sql = "INSERT INTO active_events ( starttime, user_id ) VALUES ( ?, ? )"
sql = "INSERT INTO active_events ( starttime, user_id ) VALUES ( ?, ? )"
try: try:
cursor.execute(sql, [TIME, self.USERID]) with self.DBCON as con:
except: con.execute(sql, [TIME, self.USERID])
except sqlite3.Error as err:
logging.error('Event could not be created') logging.error('Event could not be created')
logging.debug(sql) logging.debug(sql)
logging.error('SQLError: {}'.format(err))
print('Event konnte nicht gespeichert werden.') print('Event konnte nicht gespeichert werden.')
return False return False
else: else:
logging.info('Event was created successfully') logging.info('Event was created successfully')
connect.commit()
connect.close()
return True return True
else: else:
logging.warning('Active events found for the user, new event could not be created') logging.warning('Active events found for the user, new event could not be created')
return False return False
@@ -267,20 +260,16 @@ class TimeTrack:
print('Keine angabe was gelöscht werden soll') print('Keine angabe was gelöscht werden soll')
return 0 return 0
connect = sqlite3.connect(self.DATABASE, detect_types=sqlite3.PARSE_DECLTYPES | sqlite3.PARSE_COLNAMES)
cursor = connect.cursor()
try: try:
cursor.execute(sql, [data]) with self.DBCON as con:
except: con.execute(sql, [data])
except sqlite3.Error as err:
logging.error('Event could not be deleted') logging.error('Event could not be deleted')
logging.debug(sql) logging.debug(sql)
logging.error('SQLError: {}'.format(err))
print('Fehler beim löschen des Events.') print('Fehler beim löschen des Events.')
else: else:
logging.debug('Event was successfully deleted') logging.debug('Event was successfully deleted')
connect.commit()
connect.close()
### Get an active event based on a user or event ID ### Get an active event based on a user or event ID
def get_event(self, ENTRYID='', USERID=''): def get_event(self, ENTRYID='', USERID=''):
@@ -296,29 +285,30 @@ class TimeTrack:
sql = "SELECT * FROM active_events" sql = "SELECT * FROM active_events"
data = '' data = ''
connect = sqlite3.connect(self.DATABASE, detect_types=sqlite3.PARSE_DECLTYPES | sqlite3.PARSE_COLNAMES)
cursor = connect.cursor()
try: try:
if data: with self.DBCON as con:
logging.debug('Search event') cur = con.cursor()
cursor.execute(sql, [data]) if data:
else: logging.debug('Search event')
logging.debug('Get all Events') cur.execute(sql, [data])
cursor.execute(sql) else:
except: logging.debug('Get all Events')
cur.execute(sql)
data = cur.fetchall()
except sqlite3.Error as err:
logging.error('Events could not be read') logging.error('Events could not be read')
logging.debug(sql) logging.debug(sql)
logging.error('SQLError: {}'.format(err))
print('Fehler beim auslesen der aktiven Events') print('Fehler beim auslesen der aktiven Events')
else: else:
logging.debug('Events could be read out successfully') logging.debug('Events could be read out successfully')
data = cursor.fetchall()
connect.close() if data == []:
if data == []: logging.debug('No active events found')
logging.debug('No active events found') return 0
return 0 else:
else: logging.debug('{} events found'.format(len(data)))
logging.debug('{} events found'.format(len(data))) return data[0]
return data[0]
def time_start(self, AUTOFORWARD=True): def time_start(self, AUTOFORWARD=True):
self.clear_screen() self.clear_screen()
@@ -421,44 +411,41 @@ class TimeTrack:
endtime = datetime.datetime.now() endtime = datetime.datetime.now()
logging.debug('Event end process start at {}'.format(endtime)) logging.debug('Event end process start at {}'.format(endtime))
connect = sqlite3.connect(self.DATABASE)
cursor = connect.cursor()
sql = "INSERT INTO time_entries ( starttime, endtime, user_id, activity ) VALUES ( ?, ?, ?, ? )"
sql = "INSERT INTO time_entries ( starttime, endtime, user_id, activity ) VALUES ( ?, ?, ?, ? )"
try: try:
cursor.execute(sql, [data[1], endtime, self.USERID, action]) with self.DBCON as con:
except: con.execute(sql, [data[1], endtime, self.USERID, action])
except sqlite3.Error as err:
logging.error('Time entry could not be created') logging.error('Time entry could not be created')
logging.debug(sql) logging.debug(sql)
logging.error('SQLError: {}'.format(err))
print('Zeiteintrag konnte nicht gespeichert werden.') print('Zeiteintrag konnte nicht gespeichert werden.')
return False return False
else: else:
logging.info('Time entry was created successfully') logging.info('Time entry was created successfully')
connect.commit()
self.delete_event(data[0])
self.print_time_entry(STARTTIME=data[1], ENDTIME=endtime, ACTIVITY=action)
print('Zeiteintrag wurde gespeichert.')
userinput = 0
while not 0 < int(userinput) < 3:
print('Nächsten Zeiteintrag beginnen ?')
print('[1] Ja')
print('[2] Nein')
userinput = input('Aktion: ')
logging.debug('User input: {}'.format(userinput))
try:
int(userinput)
except ValueError:
userinput = 0
self.clear_screen()
if userinput == "1":
self.time_start()
else:
logging.debug('Terminated by the user')
exit()
connect.close() self.delete_event(data[0])
self.print_time_entry(STARTTIME=data[1], ENDTIME=endtime, ACTIVITY=action)
print('Zeiteintrag wurde gespeichert.')
userinput = 0
while not 0 < int(userinput) < 3:
print('Nächsten Zeiteintrag beginnen ?')
print('[1] Ja')
print('[2] Nein')
userinput = input('Aktion: ')
logging.debug('User input: {}'.format(userinput))
try:
int(userinput)
except ValueError:
userinput = 0
self.clear_screen()
if userinput == "1":
self.time_start()
else:
logging.debug('Terminated by the user')
exit()
elif userinput == "2": elif userinput == "2":
logging.info('Event should be deleted (eventid: {})'.format(data[0])) logging.info('Event should be deleted (eventid: {})'.format(data[0]))
@@ -484,5 +471,7 @@ class TimeTrack:
print(ACTIVITY) print(ACTIVITY)
print(50*"-") print(50*"-")
test = TimeTrack() if __name__ == "__main__":
test.time_start() test = TimeTrack()
test.time_start()
test.DBCON.close()