From 9e053c715d15d20d131aaaba4ac1cb7ed402b036 Mon Sep 17 00:00:00 2001 From: George Lacey Date: Mon, 3 May 2021 17:56:01 +0100 Subject: [PATCH] Add end time --- src/database.py | 2 +- src/logentry.py | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/database.py b/src/database.py index b0092ae..f5d9952 100644 --- a/src/database.py +++ b/src/database.py @@ -27,6 +27,6 @@ class Database(object): def insert(self, log_entry: LogEntry): query = f"INSERT INTO {self.table_name} (name, fingerprint, start, end, duration, filecount) VALUES(?,?,?,?,?)" - self.conn.execute(query, (log_entry.name, log_entry.fingerprint, log_entry.start_time, "", + self.conn.execute(query, (log_entry.name, log_entry.fingerprint, log_entry.start_time, log_entry.end_time, log_entry.duration, log_entry.file_count)) self.commit() diff --git a/src/logentry.py b/src/logentry.py index 7a55a23..31f1b2d 100644 --- a/src/logentry.py +++ b/src/logentry.py @@ -4,11 +4,12 @@ import re class LogEntry(object): - def __init__(self, name, fingerprint, start_time, duration_string, + def __init__(self, name, fingerprint, start_time, end_time, duration_string, file_count): self.name = name self.fingerprint = fingerprint self.start_time = self.get_datetime(start_time) + self.end_time = self.get_datetime(end_time) self.duration = self.get_duration(duration_string) self.file_count = file_count @@ -17,13 +18,14 @@ class LogEntry(object): file.writelines([f"name: {self.name}", f"fingerprint: {self.fingerprint}", f"start: {self.start_time.date()} time: {self.start_time.time()}", + f"end: {self.end_time.date()} time: {self.end_time.time()}", f"duration: {self.duration}", f"file_count: {self.file_count}"]) - def datetime_string(self): - s = self.start_time - return "%04d-%02d-%02d %02d:%02d:%02d" % (s.year, s.month, s.day, - s.hour, s.minute, s.second) + # def datetime_string(self): + # s = self.start_time + # return "%04d-%02d-%02d %02d:%02d:%02d" % (s.year, s.month, s.day, + # s.hour, s.minute, s.second) @staticmethod def get_duration(duration_string):