From aecdb3b4f1d36fdf8a205ccf8973eb5a01071b13 Mon Sep 17 00:00:00 2001
From: rushilwiz <rushilwiz@gmail.com>
Date: Tue, 16 Jun 2020 23:47:03 -0400
Subject: [PATCH] finished bgservice
---
skoolos.py | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/skoolos.py b/skoolos.py
index ec35326..8c74516 100644
--- a/skoolos.py
+++ b/skoolos.py
@@ -88,11 +88,9 @@ def main():
USER = data['username']
print(data['username'])
if data['is_student']:
- empty_logs()
- bg.watch_dir()
+ # bg.watch_dir()
+ # atexit.register(stop_bg_service)
studentCLI(USER, PWD)
-
- atexit.register(stop_bg_service)
else:
teacherCLI(USER, PWD)
@@ -103,26 +101,14 @@ def stop_bg_service():
print("good")
bg.stop_watching()
print('also')
- cur_path = os.path.dirname(__file__)
+ cur_path = os.path.dirname('') # Change to definite SkoolOS dir
print('yes')
- newpath = os.path.relpath('bgservice/SkoolOS/logs')
+ newpath = os.path.relpath('bgservice/SkoolOS/logs/')
logText = ""
- with open(newpath, 'r') as logfile:
+ with open(newpath + '/skooloslog', 'r') as logfile:
logfile.read()
print (logText)
-def empty_logs():
- logs_folder = os.path.dirname(__file__) + 'bgservice/SkoolOS/logs/'
- for filename in os.listdir(logs_folder):
- file_path = os.path.join(logs_folder, filename)
- try:
- if os.path.isfile(file_path) or os.path.islink(file_path):
- os.unlink(file_path)
- elif os.path.isdir(file_path):
- shutil.rmtree(file_path)
- except Exception as e:
- print('Failed to delete %s. Reason: %s' % (file_path, e))
-