From 0a411d21a4fe70a6db8496114a6dd49dd4cf345a Mon Sep 17 00:00:00 2001 From: Waishnav Date: Fri, 11 Mar 2022 23:40:58 +0530 Subject: updating executable file and added function in time_operation module --- src/Watcher/colored_text.py | 2 +- src/Watcher/log_files.py | 54 -------------------------------------- src/Watcher/time_operations.py | 5 ++++ src/Watcher/watch_log.py | 59 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+), 55 deletions(-) delete mode 100755 src/Watcher/log_files.py create mode 100755 src/Watcher/watch_log.py (limited to 'src/Watcher') diff --git a/src/Watcher/colored_text.py b/src/Watcher/colored_text.py index b143829..162510d 100755 --- a/src/Watcher/colored_text.py +++ b/src/Watcher/colored_text.py @@ -1,7 +1,7 @@ class Color: def GREY(text): - return '\033[30m' + text + '\033[0m' + return '\033[90m' + text + '\033[0m' def BLUE(text): return '\033[34m' + text + '\033[0m' diff --git a/src/Watcher/log_files.py b/src/Watcher/log_files.py deleted file mode 100755 index 9dfc713..0000000 --- a/src/Watcher/log_files.py +++ /dev/null @@ -1,54 +0,0 @@ -import os -import csv -import time -import get_windows as x -from time_operations import time_difference - -# get current time whenever the function is called -def get_time(): - t = os.popen('''date +"%T"''').read() - return t[0:-1] - -# get date of today -def get_date(): - d = os.popen('''date +"%Y-%m-%d"''').read() - return d[0:-1] - -def append_line_in_csv(date, closed_time, window_name): - user = os.getlogin() - filename = "/home/"+user+"/.cache/Watcher/raw_data/"+date+".csv" - with open(filename, 'r') as file: - last_app_time = file.readlines()[-1][0:8] - - time_spent = time_difference(last_app_time, closed_time) - - Data = [closed_time, time_spent, window_name] - with open(filename, 'a') as csvfile: - csvwriter = csv.writer(csvfile, delimiter='\t') - csvwriter.writerow(Data) - - -# Expected Behaviour == if date got changed then append line in new csv file after initializing the csv file -# also if usr is AFK then append line - -# TODO: AFK feature devlopement (it will be developed after completing alpha product (after whole project up end running) - -afk = False -def log_creation(): - global afk - append_line_in_csv(get_date(), get_time(), "User-loged-in") - 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) - - if afk: - afk_closed_time = get_time() - append_line_in_csv(date, afk_closed_time, "AFK") - - -if __name__ == "__main__": - log_creation() diff --git a/src/Watcher/time_operations.py b/src/Watcher/time_operations.py index 985a5e8..4145e8d 100755 --- a/src/Watcher/time_operations.py +++ b/src/Watcher/time_operations.py @@ -53,3 +53,8 @@ def convert_time(t): else: result = t[0:2] + 'h ' + t[3:5] + 'm ' + t[6::] + 's' return result + +def convert_into_sec(t): + sec = int(t[0:2])*3600 + int(t[3:5])*60 + int(t[6::]) + return sec + diff --git a/src/Watcher/watch_log.py b/src/Watcher/watch_log.py new file mode 100755 index 0000000..3ac7aa4 --- /dev/null +++ b/src/Watcher/watch_log.py @@ -0,0 +1,59 @@ +import os +import csv +import time +import get_windows as x +from time_operations import time_difference + +# get current time whenever the function is called +def get_time(): + t = os.popen('''date +"%T"''').read() + return t[0:-1] + +# get date of today +def get_date(): + d = os.popen('''date +"%Y-%m-%d"''').read() + return d[0:-1] + +def append_line_in_csv(date, closed_time, window_name): + user = os.getlogin() + filename = "/home/"+user+"/.cache/Watcher/raw_data/"+date+".csv" + with open(filename, 'r') as file: + last_app_time = file.readlines()[-1][0:8] + + time_spent = time_difference(last_app_time, closed_time) + + Data = [closed_time, time_spent, window_name] + with open(filename, 'a') as csvfile: + csvwriter = csv.writer(csvfile, delimiter='\t') + csvwriter.writerow(Data) + +# Expected Behaviour == if date got changed then append line in new csv file after initializing the csv file +# also if usr is AFK then append line + +# TODO: AFK feature devlopement (it will be developed after completing alpha product (after whole project up end running) + +afk = False +def log_creation(): + global afk + append_line_in_csv(get_date(), get_time(), "User-loged-in") + 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) + + if afk: + afk_closed_time = get_time() + append_line_in_csv(date, afk_closed_time, "AFK") + + +if __name__ == "__main__": + 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", ""]) + + log_creation() -- cgit v1.2.3