updated custom_timer; added kv for timer_screen.py, play sound for timer, json reading
This commit is contained in:
0
kawai_focus/utils/__init__.py
Normal file
0
kawai_focus/utils/__init__.py
Normal file
36
kawai_focus/utils/data_json.py
Normal file
36
kawai_focus/utils/data_json.py
Normal file
@@ -0,0 +1,36 @@
|
||||
import json
|
||||
|
||||
from kawai_focus.main import Logger
|
||||
|
||||
|
||||
class ReadJson:
|
||||
"""Класс для чтения json файла"""
|
||||
|
||||
def __init__(self, file_name: str):
|
||||
self.file_name = file_name
|
||||
self.json_data = self.read_json_as_dict()
|
||||
|
||||
def read_json_as_dict(self) -> dict:
|
||||
"""Метод для чтения json файла как dict"""
|
||||
|
||||
try:
|
||||
file_path = f'json/{self.file_name}'
|
||||
with open(file=file_path, mode='r') as file:
|
||||
return json.load(file)
|
||||
except (FileNotFoundError, json.decoder.JSONDecodeError) as err:
|
||||
Logger.error(f'Logger: {err.__class__.__name__}: {err}')
|
||||
|
||||
def get_text(self, name: str) -> str:
|
||||
"""Метод для возврата текста из файла json по ключу name"""
|
||||
|
||||
text = self.json_data.get(name)
|
||||
|
||||
if text:
|
||||
if isinstance(text, list):
|
||||
text = ''.join(text)
|
||||
return text
|
||||
return text
|
||||
|
||||
|
||||
read_json_err = ReadJson(file_name='errors.json')
|
||||
read_json_timer = ReadJson(file_name='timer.json')
|
||||
30
kawai_focus/utils/utils.py
Normal file
30
kawai_focus/utils/utils.py
Normal file
@@ -0,0 +1,30 @@
|
||||
from typing import Generator
|
||||
|
||||
from kawai_focus.main import Logger
|
||||
from kawai_focus.utils.data_json import read_json_err
|
||||
|
||||
|
||||
def custom_timer(hh: int=0, mm: int=0, ss: int=0) -> Generator[str, None, None]:
|
||||
"""Функция отсчитывает время, установленное для таймера в формате
|
||||
'hh:mm:ss'. Возвращает генератор, который возвращает текущее время
|
||||
в формате 'hh:mm:ss'."""
|
||||
|
||||
try:
|
||||
if ss == 0 and mm == 0 and hh == 0:
|
||||
raise ValueError(read_json_err.get_text('no_time'))
|
||||
|
||||
if ss < 0 or mm < 0 or hh < 0:
|
||||
raise ValueError(read_json_err.get_text('negative_time'))
|
||||
|
||||
if ss > 59 or mm > 59:
|
||||
raise ValueError(read_json_err.get_text('ss_mm_big'))
|
||||
|
||||
if hh > 23:
|
||||
raise ValueError(read_json_err.get_text('hh_big'))
|
||||
|
||||
total_seconds = (int(hh or 0) * 3600) + (int(mm or 0) * 60) + (int(ss or 0))
|
||||
|
||||
for remaining in range(total_seconds, -1, -1):
|
||||
yield f"{remaining // 3600:02d}:{(remaining % 3600) // 60:02d}:{remaining % 60:02d}"
|
||||
except (TypeError, ValueError) as err:
|
||||
Logger.error(f'Logger: {err.__class__.__name__}: {err}')
|
||||
Reference in New Issue
Block a user