фиксы
This commit is contained in:
parent
7f9723d9f4
commit
fc21b8328a
|
|
@ -14,7 +14,7 @@ class MAIN_SETTINGS:
|
||||||
res = sql_select(t)
|
res = sql_select(t)
|
||||||
self.list = {}
|
self.list = {}
|
||||||
for i in res:
|
for i in res:
|
||||||
self.list[i[0]] = i
|
self.list[i[0]] = list(i)
|
||||||
print(i)
|
print(i)
|
||||||
return 'ok'
|
return 'ok'
|
||||||
except SystemError as e:
|
except SystemError as e:
|
||||||
|
|
@ -38,11 +38,9 @@ class MAIN_SETTINGS:
|
||||||
print(e)
|
print(e)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@log_function_call
|
|
||||||
def get(self, id):
|
def get(self, id):
|
||||||
return self.list[id]
|
return self.list[id]
|
||||||
|
|
||||||
@log_function_call
|
|
||||||
def get_by_name(self, name):
|
def get_by_name(self, name):
|
||||||
for obj in self.list:
|
for obj in self.list:
|
||||||
if self.list[obj][1] == name:
|
if self.list[obj][1] == name:
|
||||||
|
|
|
||||||
5
start.py
5
start.py
|
|
@ -3,10 +3,13 @@ from main_func import main_func
|
||||||
from main_settings import main_settings
|
from main_settings import main_settings
|
||||||
from timers import timers
|
from timers import timers
|
||||||
import time
|
import time
|
||||||
|
main_settings.load_settings()
|
||||||
|
main_settings.edit_setting(2, 1)
|
||||||
|
|
||||||
timers.load_timers()
|
timers.load_timers()
|
||||||
timers.activate_check()
|
timers.activate_check()
|
||||||
|
# main_settings.load_settings()
|
||||||
|
# main_settings.edit_setting(1, 1)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
12
timers.py
12
timers.py
|
|
@ -1,6 +1,8 @@
|
||||||
from settings.logger import log_function_call, logger
|
from settings.logger import log_function_call, logger
|
||||||
from utils import sql_insert, sql_select, sql_update
|
from utils import sql_insert, sql_select, sql_update
|
||||||
import time
|
import time
|
||||||
|
from datetime import datetime
|
||||||
|
from main_settings import main_settings
|
||||||
|
|
||||||
|
|
||||||
class TIMERS:
|
class TIMERS:
|
||||||
|
|
@ -15,7 +17,7 @@ class TIMERS:
|
||||||
res = sql_select(t)
|
res = sql_select(t)
|
||||||
self.list = {}
|
self.list = {}
|
||||||
for i in res:
|
for i in res:
|
||||||
self.list[i[0]] = i
|
self.list[i[0]] = list(i)
|
||||||
print(i)
|
print(i)
|
||||||
return 'ok'
|
return 'ok'
|
||||||
except SystemError as e:
|
except SystemError as e:
|
||||||
|
|
@ -52,10 +54,14 @@ class TIMERS:
|
||||||
|
|
||||||
def activate_check(self):
|
def activate_check(self):
|
||||||
while True:
|
while True:
|
||||||
|
if main_settings.get(2)[2] == 1:
|
||||||
for obj in self.list:
|
for obj in self.list:
|
||||||
if self.list[obj][7] == 0:
|
if self.list[obj][7] == 0:
|
||||||
# if self.list[obj][2] <= time.time()
|
if self.list[obj][2] <= datetime.now():
|
||||||
print(self.list[obj][2])
|
print(f"Будильник {self.list[obj][1]}")
|
||||||
|
#TODO Сделать отправку уведомленния
|
||||||
|
self.switch_timer(obj, 1)
|
||||||
|
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
|
||||||
timers = TIMERS()
|
timers = TIMERS()
|
||||||
Loading…
Reference in New Issue