sorting app usage on the basis of screen-time

1 files changed, 72 insertions, 19 deletions

diff --git a/src/Watcher/report_creation.py b/src/Watcher/report_creation.py
index c635f93..bde5d2d 100755
--- a/src/Watcher/report_creation.py
+++ b/src/Watcher/report_creation.py
@@ -1,22 +1,27 @@
 import csv
 import os
 import time_operations as to
-from log_files import get_date
+from watch_log import get_date
 from colored_text import Color
+import datetime
 
-def imp(date):
+def extract_data(date):
     user = os.getlogin()
     path = "/home/" + user +"/.cache/Watcher/raw_data/"
     filename = path + date + ".csv"
+
     l = list() # l = list of  (app_name, time spent on app on that session)
     d = dict()
 
-    with open(filename, 'r') as file:
-        reader = csv.reader(file)
-        for row in reader:
-            for column in row:
-                l.append([column[18::],column[9:18]])
-                d.update({column[18::]: "O"})
+    if os.path.isfile(filename):
+        with open(filename, 'r') as file:
+            reader = csv.reader(file)
+            for row in reader:
+                for column in row:
+                    l.append([column[18::],column[9:17]])
+                    d.update({column[18::]: "O"})
+    else:
+        None
 
     d = list(d) # list of app opened on that day
     return d, l
@@ -31,28 +36,76 @@ def final_report(window_opened, time_spent):
             if i == j[0]:
                 time = to.time_addition(j[1], time)
                 report.update({i:time})
-    report.pop("User-loged-in")
-    return report
+
+    #report.pop("User-logged-in")
+    # sort report dictonary in decreasing order of Usages
+    sorted_values = []
+    for x,y in report.items():
+        sorted_values.append(to.convert_into_sec(y))
+
+    sorted_values.sort(reverse=True)
+    sorted_report = dict()
+
+    for i in sorted_values:
+        for x, y in report.items():
+            if to.convert_into_sec(y) == i:
+                sorted_report.update({x:y})
+
+    return sorted_report
 
 # ░ ▒ █ ───
 #print("▒▒▒\t▒▒▒\n███")
 
-def prints_report(window_opened, time_spent):
+def prints_report(window_opened, time_spent, is_week):
     Total_screen_time = "00:00:00"
     for x,y in final_report(window_opened, time_spent).items():
         Total_screen_time = to.time_addition(y, Total_screen_time)
-    print(Color.YELLOW("\n  Today's Screen-Time \t\t  ") + Color.BLUE(to.convert_time(Total_screen_time)))
-    print("─────────────────────────────────────────────────")
-    print(Color.RED(f'{"App Usages":>28}'))
-    print("─────────────────────────────────────────────────")
+    if is_week:
+        print(Color.YELLOW("\n   Week's Screen-Time\t\t   ") + Color.BLUE(to.convert_time(Total_screen_time)))
+    else:
+        print(Color.YELLOW("\n   Today's Screen-Time\t\t   ") + Color.BLUE(to.convert_time(Total_screen_time)))
+    print(" ────────────────────────────────────────────────")
+    print(Color.RED(f'{" App Usages":>28}'))
+    print(" ────────────────────────────────────────────────")
 
     for x,y in final_report(window_opened, time_spent).items():
         if x == "":
             x = "Home-Screen"
-        print("  " + Color.GREEN(f'{x:<21}') + '\t\t ',to.convert_time(y))
+        print("   " + Color.GREEN(f'{x:<22}') + '\t ',f'{to.convert_time(y):>12}')
 
-if __name__ == "__main__":
+def daily_summary():
     date = get_date()
-    window_opened, time_spent = imp(date)
-    prints_report(window_opened, time_spent)
+    window_opened, time_spent = extract_data(date)
+    prints_report(window_opened, time_spent, False)
+
+def week_summary():
+    dates = []
+    theday = datetime.date.today()
+    weekday = theday.isoweekday() - 1 # week starts on Monday and ends on Sunday
+    start = theday - datetime.timedelta(days=weekday)
+    dates = [start + datetime.timedelta(days=d) for d in range(weekday+1)]
+    dates = [str(d) for d in dates]
+
+    window_opened = list()
+    time_spent = list()
+    for i in dates:
+        window_opened, time_spent = extract_data(i)
+        Total_screen_time = "00:00:00"
+        for x, y in final_report(window_opened, time_spent).items():
+            Total_screen_time = to.time_addition(y, Total_screen_time)
+        print("  "+Total_screen_time, end='   ')
+
+    print("\n    Mon          Tue          Wed          Thu            Fri         Sat          Sun" )
+
+    for i in dates:
+        x, y = extract_data(str(i))
+        window_opened += x # smth is wrong here
+        time_spent += y
+    prints_report(window_opened, time_spent, True)
+
+
+#d = os.popen('''date -d "2022-03-10" +%a''').read()
+if __name__ == "__main__":
+    daily_summary()
+    #week_summary()