From e95d8117d6c0a30542b79f4987c1790eb761d760 Mon Sep 17 00:00:00 2001 From: jeanGaston Date: Wed, 1 May 2024 23:21:49 +0200 Subject: [PATCH] updates --- Program/__pycache__/database.cpython-311.pyc | Bin 4239 -> 4552 bytes Program/__pycache__/mail.cpython-311.pyc | Bin 4142 -> 4278 bytes Program/database.py | 9 ++++++--- Program/datascraper.py | 4 +++- Program/mail.py | 5 ++++- Program/templates/index.html | 6 +++--- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Program/__pycache__/database.cpython-311.pyc b/Program/__pycache__/database.cpython-311.pyc index 58aa4c605b0a4420a753d48ccd3264be9caf560e..ea1a347cf50e0678e71ec7a6bfc08309d4829945 100644 GIT binary patch delta 1232 zcmah|O=uHA6rRccO}fn{RU50+np!GN)l^E=gJN5#o@`q57L}5ASFPr!%&x79kbnvb zK`m2JkY4>gmEuM4=E36zatI4Kdhj4ry!GUJyJ@2+IC=BEnU^>3d+*Kclin|Vk=Kz( z8-bBp8@}>=IkKlT3!CS}Bqq&~JjoD>>rjqnC}=4c%1arkX_GTD*yNm&S2Jo}%V=O% z?vo5NRlu;R0k)Y8P&dPX?PeQb#0*^^N&OqLCaK5FtYbOzc`FSYd138AS)z(i<$Fpe zIE2Mx+0`{zNictAsJNsJ#_Xb_z_vNAOX5ektJ?{083-i*mqWbgCDd`307|RMD@w?F zn8BdL(ZwfapSVQz*uTySUETX%g7$3!WmOR!YG+tYZ_pxQ4T0zIvclvFMQ zt*2VI=55F3SePdjic6ldz~>7N$GVdt9tFks0@xvdM1t=E8%Dg6dsL_t9!d=sagEZ{vw@Yv%c+%=YfOQ> zxf*D|Dx0pcX_rkm*zOlvl_hE{;j)B(Y_fG~(lt=3EL~%1cT2uv@X?mnDC{scYLF@$ ztFbYcjWL)YJib1z&C*^5d2_rvj_;7`2oVGWAjx=Cd}arSV`%9Bu+cx!96?K>S<{@c zt%6cWm)A!{!{|z3Og?}i{>U`e$~5Q@ z9|E6AaZDc)=c6Y|ao8md{|$2Nk{2r4!Sj^yoAe~Bu*mUS<9_GxY5Gsj?=i=^{dD}O zZwbe6e(Ia-RK955%vq=T2-xsTvp)iCNR-k#+2;mwcxzQBM%n+>$xioAsS~~I|AY}s T?$GEs-5|eVT%3)ak&*Zp5=0*! delta 967 zcmY*X&ui2`6rR~6o7vx6-L)+}G;OgG-PWRFwYF8Ey@(Vl78Z%3mNz#XBk=JIJn{wrT6tjg{Q7A>)f=RGS0=uzO8PRC@-gkuiC$pXy6A$X zr6Kw;SO>tyB8@_%f#Q|g{hj{AQQ%xu*Ro#NS|3%va~*@2Qyj(=`>M>hs*KzbCE#3A zlj-BCmLI-Zgq@uhXihV>D5JZiISWeyD-oepc$dPP5}GQo(XfUv)dmrmBdqr?8?7($ oJFYV>hTshEoqP?jtx-yq)z+mZ+U#7M4sMe@D5&MONgY%C1C}${>Hq)$ diff --git a/Program/__pycache__/mail.cpython-311.pyc b/Program/__pycache__/mail.cpython-311.pyc index d55802b08d0e27e0b0db4e4f4f0a20773fb90fa2..80282071346badfd7f340fe81573a004809ea9e4 100644 GIT binary patch delta 748 zcmZWm&ubGw6rRb>Y?9qnU%u3z1B<1 zG6-0D_0Y`blC`^9hu{hEh(`kw5{FRaiGYR)ClPTi&_d?0h_iq@9O^949X*M@Xd_C0N^uRh+#cQ8oy^qGbTUD?xJDc$Qg z1Xmw7fhZ`So68ZD|1#uyz^zl$LisIi~sHt?pXGN6rAhiplc;ZL(o(UmRU1Etc978!X*5?sP9*MvTTM)>>z+E^Dc`R*_cJ zrnO?>{#Qg)V1g5$XLoTt$W`yNV-GNC=VCiwU(=tGA?o-WJC3Io delta 710 zcmZXRL2DC16vt;WGuzF^NkS7f7LoSWD1=}TtVm3t5=)6f+tVHr(#&e2yRn(wc<^9~ zc=0H6=uuCKR0|@A7r#Ra5n-_)h=+oQfZ)NCZ&o7(2j(~b_vX#advD$??9KBRoLdOS z;Pv^NPoMBp!v+{TNFae- zgi5X&#$%QTnS1-)_(^bHeYHw>PMu7w&M$&H%(gpD`%bgf6HVU%I9{vk$}6x{RSy%N zGZYko`Qrg#2L%`*HB9C%Viaii-*G!ORe>>82+Ds&p2N=Wzujk4Rbv@-NM=n01<~vG z+iHPVRgp7nsSYm=nVf?Q!g$b;PD^xqw?bnhl2J|}^8={(C6X10l2HXG)&{+m-k+dm z9kQ>wjtqQx4I*rq{w2URI-v29wY5+CW7;3l{sHA}tjfs@ zuBf%-URs}*HI0hKqT;C>y8*JH&ZbIdv@@R!vr)qeUe|L9-t`X-pa%*)sx-Tn7{SkNjQ0gkX$SJiSD|pp>em VtA!Y@;R!lI6XT@``X5n2zX4&hqoDu* diff --git a/Program/database.py b/Program/database.py index 6950b1f..5b7067f 100644 --- a/Program/database.py +++ b/Program/database.py @@ -1,5 +1,7 @@ +from datetime import datetime import sqlite3 from os import path +import time from env import SENSORS, DBFILE @@ -34,11 +36,12 @@ def create_database(db_name): # Check if the database file exists def check_database(db_name): if not path.exists(db_name): - print(f"Database '{db_name}' not found. Creating...") + + print(f"[{datetime.now()}] Database '{db_name}' not found. Creating...") create_database(db_name) - print("Database and tables created successfully.") + print(f"[{datetime.now()}] Database and tables created successfully.") else: - print(f"Database '{db_name}' found.") + print(f"[{datetime.now()}] Database '{db_name}' found.") # Function to add data to SensorData table diff --git a/Program/datascraper.py b/Program/datascraper.py index 65a6614..48d5024 100644 --- a/Program/datascraper.py +++ b/Program/datascraper.py @@ -1,3 +1,4 @@ +from datetime import datetime from mail import * import schedule import threading @@ -35,7 +36,8 @@ def BltDataScrap(): return 0 def RunInThread_DataScrap(): - print("######################################################################\nOpen Thread datascrap") + now = datetime.now() + print(f"######################################################################\n[{now}] Open Thread datascrap") threading.Thread(target=BltDataScrap, daemon=True).start() def ScheduleDataScrap(): diff --git a/Program/mail.py b/Program/mail.py index 690db63..5bf1020 100644 --- a/Program/mail.py +++ b/Program/mail.py @@ -1,8 +1,10 @@ +from datetime import datetime from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText import sqlite3 import threading + import schedule from env import * @@ -88,7 +90,8 @@ def check_and_send_email(): conn.close() def RunInThread_MailAlerts(): - print("######################################################################\nOpen Thread mail check Alert") + now = datetime.now() + print(f"######################################################################\n[{now}] Open Thread mail check Alert") threading.Thread(target=check_and_send_email, daemon=True).start() def ScheduleMailAlerts(): diff --git a/Program/templates/index.html b/Program/templates/index.html index 60b7bbd..039be6d 100644 --- a/Program/templates/index.html +++ b/Program/templates/index.html @@ -71,9 +71,9 @@ {{ row[0] }} {{ row[1] }} {{ row[2] }} - {{ row[3] }} - {{ row[4] }} - {{ row[5] }} + {{ row[3] }}°C + {{ row[4] }}% + {{ row[5] }}% {% endfor %}