changing approach to problem occured at 24:00 clock | added prompt in install script

1 files changed, 14 insertions, 8 deletions

diff --git a/src/Watcher/watch_log.py b/src/Watcher/watch_log.py
index 46abc15..704ee3f 100755
--- a/src/Watcher/watch_log.py
+++ b/src/Watcher/watch_log.py
@@ -41,21 +41,27 @@ def log_creation():
         with open(filename, 'a') as csvfile:
             csvwriter = csv.writer(csvfile, delimiter='\t')
             csvwriter.writerow([get_time(), "00:00:00", ""])
-
     append_line_in_csv(get_date(), get_time(), "User-logged-in")
-    while True:
-        filename = "/home/"+os.getlogin()+"/.cache/Watcher/raw_data/"+get_date()+".csv"
-        if not(os.path.isfile(filename)):
-            with open(filename, 'a') as csvfile:
-                csvwriter = csv.writer(csvfile, delimiter='\t')
-                csvwriter.writerow([get_time(), "00:00:00", ""])
 
+    while True:
         previous_window = x.active_window()
         if x.is_window_changed(previous_window) and not(afk):
             next_window = x.active_window()
             closed_at = get_time() # for next_window its the opening time
             date = get_date()
-            append_line_in_csv(date, closed_at, previous_window)
+            filename = "/home/"+os.getlogin()+"/.cache/Watcher/raw_data/"+date+".csv"
+            if not(os.path.isfile(filename)):
+                with open(filename, 'a') as csvfile:
+                    csvwriter = csv.writer(csvfile, delimiter='\t')
+                    prev_date = os.popen("""date -d "yesterday" '+%Y-%m-%d'""")
+                    prev_file = "/home/"+os.getlogin()+"/.cache/Watcher/raw_data/"+prev_date+".csv"
+                    with open(prev_file, 'r') as file:
+                        last_app_time = file.readlines()[-1][0:8]
+                    csvwriter.writerow([get_time(), time_difference(last_app_time, closed_at), previous_window])
+
+            else:
+                # appends line when app gets closed
+                append_line_in_csv(date, closed_at, previous_window)
 
         if afk:
             afk_closed_time = get_time()