diff --git a/main_settings.py b/main_settings.py index 531754c..821f56d 100644 --- a/main_settings.py +++ b/main_settings.py @@ -14,7 +14,7 @@ class MAIN_SETTINGS: res = sql_select(t) self.list = {} for i in res: - self.list[i[0]] = i + self.list[i[0]] = list(i) print(i) return 'ok' except SystemError as e: @@ -38,11 +38,9 @@ class MAIN_SETTINGS: print(e) return False - @log_function_call def get(self, id): return self.list[id] - @log_function_call def get_by_name(self, name): for obj in self.list: if self.list[obj][1] == name: diff --git a/start.py b/start.py index e5821d5..e5360a9 100644 --- a/start.py +++ b/start.py @@ -3,10 +3,13 @@ from main_func import main_func from main_settings import main_settings from timers import timers import time - +main_settings.load_settings() +main_settings.edit_setting(2, 1) timers.load_timers() timers.activate_check() +# main_settings.load_settings() +# main_settings.edit_setting(1, 1) diff --git a/timers.py b/timers.py index 0cf3a1e..3875c23 100644 --- a/timers.py +++ b/timers.py @@ -1,6 +1,8 @@ from settings.logger import log_function_call, logger from utils import sql_insert, sql_select, sql_update import time +from datetime import datetime +from main_settings import main_settings class TIMERS: @@ -15,7 +17,7 @@ class TIMERS: res = sql_select(t) self.list = {} for i in res: - self.list[i[0]] = i + self.list[i[0]] = list(i) print(i) return 'ok' except SystemError as e: @@ -52,10 +54,14 @@ class TIMERS: def activate_check(self): while True: - for obj in self.list: - if self.list[obj][7] == 0: - # if self.list[obj][2] <= time.time() - print(self.list[obj][2]) + if main_settings.get(2)[2] == 1: + for obj in self.list: + if self.list[obj][7] == 0: + if self.list[obj][2] <= datetime.now(): + print(f"Будильник {self.list[obj][1]}") + #TODO Сделать отправку уведомленния + self.switch_timer(obj, 1) + time.sleep(1) timers = TIMERS() \ No newline at end of file