From f02d3ecc36a8eb9b6f32c57252bbb4d9ef8fb432 Mon Sep 17 00:00:00 2001
From: Raspiduino <raspiduinogit@gmail.com>
Date: Thu, 26 Nov 2020 11:14:54 +0700
Subject: [PATCH] New Commit

---
 admin.pyo | Bin 1078 -> 0 bytes
 comadd.py | 104 +++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 92 insertions(+), 12 deletions(-)
 delete mode 100644 admin.pyo

diff --git a/admin.pyo b/admin.pyo
deleted file mode 100644
index 623e4b08e648100fd7362f8ae184794517f85b51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1078
zcmY*YOK%e~5VoD{qiI@|ho~wcv<E<1gequn6+#UqRV&)0%Bmnmk)rL|X*b!mSGJ=*
zR4%j}`48!lBY($NPW=l#G2R6PUU@t-w#VPhH~Vg3p@CrRzy2}YbP@V#jX$FX$|g+p
z76e5UXQ*GTxR1dm8Odw?8n(V#R?nTj1A3i0*QoDOpSsk$#(j_C2!(UE5Ce5WY<zXX
zvMdoC^u@^P?K754HEW+G_KY1ECZIuEFx3czMq^Czgvd9PP?V9+=)8G}#<g*M=G>qN
zF4#}IGw;T(KCNA0izPz*d3o1?yFHC&b2or{LL#Ia)U`V!{0Lp)FOUzQ^g4!cE$#Cc
zFIqHDd61m2WD<<xG-LE-5GyqW?{UC|4q_g}_RQ+GaSEZ*vx`@UTuqBYNX=*<3MON1
z536&fSssjp4D?B=f?UvP#x{ayDx5b&C{yQg&WxMr^MWbko~E2;neoa>t*@DdU3I9K
zZ1ED3nbR^(*ioEJ%v>Q;u7~U_0SHz#?lIHTl$vI5%5|Evwv<AKSo)CDcO>t@a<{s*
zF|YyE;NAOZN5uSiCr$_N#VOB3Ow}L}c}(e`O0GCJ^J(?IO?C+as7D|WZeX7f+{7;S
z;d60=G>LowJBclz9R#NBuad_eD1Uj})I<Y&+8Mi)T%wsrYd4tISD=$-{$Jan=qp)4
zu;YGnK4ZRU8KmANS_Yr(JK)Uk$T~zej-2vX-Ql35@76*H9pmumM4TFDv>&U9akJth
zlSg*l20~3UD-L1_wbxLL3r9_<2*QT6ttUMz>@Q$^;A4FaI@T;ipN7#+_fx0a+i&ej
zo1R&Y+U?<fEBY|(bhq}pQTw3R-D*dXaa56|+SJD)<;JagASA|1a=MptX8b~mWS2u%
zSW+r+-$raeCM{L9AJ}RU1R@RM;ySkVeo~W9!4u+6=vP=DgJ~9j!^~I9zNyeX{NMR|
i%cfN_RR;R!{SrwD!hchB>DzfYt1O9@<R)$sf9V%LQ51pz

diff --git a/comadd.py b/comadd.py
index b35a44b..94de9da 100644
--- a/comadd.py
+++ b/comadd.py
@@ -22,7 +22,7 @@
 import subprocess
 import stat
 import json
-from datetime import date
+from datetime import date, timedelta
 import matplotlib.pyplot as plt
 
 if not admin.isUserAdmin():
@@ -82,6 +82,19 @@ def advsetexec():
             if appblock in apps:
                 apps.remove(appblock) 
 
+    if settings[10] == "1":
+        if os.name == "nt":
+            os.system("start /min python apptrack.py")
+        else:
+            os.system("nohup python3 track.py &")
+
+    if settings[11] == "1":
+        if os.name == "nt":
+            os.system("start /min python track.py")
+        else:
+            os.system("nohup python3 apptrack.py &")
+
+
 # Function to rewrite the setting file
 def wsetting():
     os.remove("setting.txt")
@@ -366,6 +379,8 @@ def advanced():
     btn5 = AskButtons(wadvanced, "Disable setting in session time?", 7)
     btn6 = AskButtons(wadvanced, "Disable system setting in session time?\n(Windows Only)", 8)
     btn7 = AskButtons(wadvanced, "Protect program from being edited or \ndeleted?", 9)
+    btn8 = AskButtons(wadvanced, "Enable app time tracker?", 10)
+    btn9 = AskButtons(wadvanced, "Enable web time tracker?", 11)
 
 def onlinehelp():
     webbrowser.open_new_tab("https://github.com/raspiduino/comadd/wiki/help")
@@ -379,15 +394,16 @@ def sapp():
     else:
         jsonfile = open("logs/applog"+date.today().strftime("%d%m%y")+".txt", "r")
     glist = list(dict(json.loads(jsonfile.read().split("\n")[-2].replace("'", '"'))).items())
+    jsonfile.close()
 
     # Draw graph
-    gsites = []
+    gapps = []
     gtimes = []
     for i in glist:
         x,y = i
-        gsites.append(x)
+        gapps.append(x + " (" + str(y//60) + " min " + str(y%60) + " sec)")
         gtimes.append(y)
-    plt.pie(gtimes, explode=tuple(0 for i in range(len(gsites))), labels=gsites, autopct='%1.1f%%', shadow=True, startangle=0)
+    plt.pie(gtimes, explode=tuple(0 for i in range(len(gapps))), labels=gapps, autopct='%1.1f%%', shadow=True, startangle=0)
     plt.show()
 
 def sweb():
@@ -397,19 +413,88 @@ def sweb():
     else:
         jsonfile = open("logs/weblog"+date.today().strftime("%d%m%y")+".txt", "r")
     glist = list(dict(json.loads(jsonfile.read().split("\n")[-1].replace("'", '"'))).items())[1:]
+    jsonfile.close()
 
     # Draw graph
     gsites = []
     gtimes = []
     for i in glist:
         x,y = i
-        gsites.append(x)
+        gsites.append(x + " (" + str(y//60) + " min " + str(y%60) + " sec)")
         gtimes.append(y)
     plt.pie(gtimes, explode=tuple(0 for i in range(len(gsites))), labels=gsites, autopct='%1.1f%%', shadow=True, startangle=0)
     plt.show()
 
 def timespend():
-    pass
+    wtimespend = tk.Toplevel(gui)
+
+    if os.name == "nt":
+        appfile = open("logs\\applog"+date.today().strftime("%d%m%y")+".txt", "r")
+        webfile = open("logs\\weblog"+date.today().strftime("%d%m%y")+".txt", "r")
+        pappfile = open("logs\\applog"+(date.today() - timedelta(days=1)).strftime("%d%m%y")+".txt", "r")
+        pwebfile = open("logs\\weblog"+(date.today() - timedelta(days=1)).strftime("%d%m%y")+".txt", "r")
+    else:
+        appfile = open("logs/applog"+date.today().strftime("%d%m%y")+".txt", "r")
+        webfile = open("logs/weblog"+date.today().strftime("%d%m%y")+".txt", "r")
+        pappfile = open("logs/applog"+(date.today() - timedelta(days=1)).strftime("%d%m%y")+".txt", "r")
+        pwebfile = open("logs/weblog"+(date.today() - timedelta(days=1)).strftime("%d%m%y")+".txt", "r")
+
+    glist1 = list(dict(json.loads(appfile.read().split("\n")[-2].replace("'", '"'))).items())[1:]
+    pglist1 = list(dict(json.loads(pappfile.read().split("\n")[-2].replace("'", '"'))).items())[1:]
+    appfile.close()
+    pappfile.close()
+    gapps = []
+    gappst = []
+    totalapptime = 0
+    ptotalapptime = 0
+    for i in glist1:
+        x,y = i
+        gapps.append(x)
+        gappst.append(y)
+        totalapptime += y
+
+    for i in pglist1:
+        x,y = i
+        ptotalapptime += y
+
+    tk.Label(wtimespend, text="Total time spend on the apps: " + str(totalapptime)).pack()
+    tk.Label(wtimespend, text="Most used app: " + gapps[gappst.index(max(gappst))] + " (" + str(max(gappst)//60) + "min" + str(max(gappst)%60) + "sec)").pack()
+    atimer = ptotalapptime - totalapptime
+    if atimer < 0:
+        tk.Label(wtimespend, text=("You spend more time than yesterday! (+" + str(atimer) + ")"), fg="red").pack()
+    else:
+        tk.Label(wtimespend, text=("You spend less time than yesterday! (-" + str(atimer) + ")"), fg="green").pack()
+
+    glist2 = list(dict(json.loads(webfile.read().split("\n")[-1].replace("'", '"'))).items())[1:]
+    pglist2 = list(dict(json.loads(pwebfile.read().split("\n")[-1].replace("'", '"'))).items())[1:]
+    webfile.close()
+    pwebfile.close()
+    gwebs = []
+    gwebst = []
+    totalwebtime = 0
+    ptotalwebtime = 0
+    for i in glist2:
+        x,y = i
+        gwebs.append(x)
+        gwebst.append(y)
+        totalwebtime += y
+
+    for i in pglist2:
+        x,y = i
+        ptotalwebtime += y
+
+    tk.Label(wtimespend, text="Total time spend on the webs: " + str(totalwebtime)).pack()
+    tk.Label(wtimespend, text="Most used web: " + gwebs[gwebst.index(max(gwebst))] + " (" + str(max(gwebst)//60) + "min" + str(max(gwebst)%60) + "sec)").pack()
+    wtimer = ptotalwebtime - totalwebtime
+    if wtimer < 0:
+        tk.Label(wtimespend, text=("You spend more time than yesterday! (+" + str(wtimer) + ")"), fg="red").pack()
+    else:
+        tk.Label(wtimespend, text=("You spend less time than yesterday! (-" + str(wtimer) + ")"), fg="green").pack()
+
+    if (wtimer + atimer) < 0:
+        tk.Label(wtimespend, text=("Overall: You spend more time than yesterday! (+" + str(wtimer + atimer) + ")"), fg="red").pack()
+    else:
+        tk.Label(wtimespend, text=("Overall: You spend less time than yesterday! (-" + str(wtimer + atimer) + ")"), fg="green").pack()
 
 # Create GUI
 gui = tk.Tk()
@@ -473,11 +558,6 @@ def timespend():
 
 gui.configure(menu=menubar)
 
-if os.name == "nt":
-    os.system("start python track.py")
-    os.system("start python apptrack.py")
-else:
-    os.system("nohup python3 track.py &")
-    os.system("nohup python3 apptrack.py &")
+advsetexec()
 
 gui.mainloop()