Обновление 1.7

Фиксы багов связанных с RPC и файлами.
This commit is contained in:
Profitroll 2021-04-06 01:32:55 +03:00
parent c8e3f64762
commit 747e666cf1
3 changed files with 45 additions and 7 deletions

View File

@ -90,10 +90,12 @@ def getLessons():
if not os.path.exists(files_folder+'lessons.json'): if not os.path.exists(files_folder+'lessons.json'):
with open(files_folder+'lessons.json', 'w', encoding="utf-8") as f: with open(files_folder+'lessons.json', 'w', encoding="utf-8") as f:
f.write("[]") f.write("[]")
f.close()
lessons_list = [] lessons_list = []
else: else:
with open(files_folder+'lessons.json', encoding="utf-8") as json_file: with open(files_folder+'lessons.json', encoding="utf-8") as json_file:
lessons_list = json.load(json_file) lessons_list = json.load(json_file)
json_file.close()
return lessons_list return lessons_list
@ -528,6 +530,7 @@ def removeAllLessons():
if removeall.lower() in ['y', 'yes', 'д', 'да']: if removeall.lower() in ['y', 'yes', 'д', 'да']:
with open(files_folder+'lessons.json', 'w', encoding="utf-8") as f: with open(files_folder+'lessons.json', 'w', encoding="utf-8") as f:
f.write("[]") f.write("[]")
f.close()
clear() clear()
none = input('Все уроки были удалены.\n\n > ') none = input('Все уроки были удалены.\n\n > ')
clear() clear()
@ -726,6 +729,7 @@ def settings():
if settings_choose == '1': if settings_choose == '1':
with open(f"{files_folder}config.json", encoding="utf-8") as json_file: with open(f"{files_folder}config.json", encoding="utf-8") as json_file:
config_list = json.load(json_file) config_list = json.load(json_file)
json_file.close()
config_list["debug"] = not getConfig("debug") config_list["debug"] = not getConfig("debug")
saveJson(files_folder+'config.json', config_list) saveJson(files_folder+'config.json', config_list)
@ -735,6 +739,7 @@ def settings():
elif settings_choose == '2': elif settings_choose == '2':
with open(f"{files_folder}config.json", encoding="utf-8") as json_file: with open(f"{files_folder}config.json", encoding="utf-8") as json_file:
config_list = json.load(json_file) config_list = json.load(json_file)
json_file.close()
config_list["use_colors"] = not getConfig("use_colors") config_list["use_colors"] = not getConfig("use_colors")
saveJson(files_folder+'config.json', config_list) saveJson(files_folder+'config.json', config_list)
@ -744,6 +749,7 @@ def settings():
elif settings_choose == '3': elif settings_choose == '3':
with open(f"{files_folder}config.json", encoding="utf-8") as json_file: with open(f"{files_folder}config.json", encoding="utf-8") as json_file:
config_list = json.load(json_file) config_list = json.load(json_file)
json_file.close()
config_list["run_fullscreen"] = not getConfig("run_fullscreen") config_list["run_fullscreen"] = not getConfig("run_fullscreen")
saveJson(files_folder+'config.json', config_list) saveJson(files_folder+'config.json', config_list)
@ -754,6 +760,7 @@ def settings():
elif settings_choose == '4': elif settings_choose == '4':
with open(f"{files_folder}config.json", encoding="utf-8") as json_file: with open(f"{files_folder}config.json", encoding="utf-8") as json_file:
config_list = json.load(json_file) config_list = json.load(json_file)
json_file.close()
config_list["sounds"] = not getConfig("sounds") config_list["sounds"] = not getConfig("sounds")
saveJson(files_folder+'config.json', config_list) saveJson(files_folder+'config.json', config_list)
@ -764,6 +771,7 @@ def settings():
elif settings_choose == '5': elif settings_choose == '5':
with open(f"{files_folder}config.json", encoding="utf-8") as json_file: with open(f"{files_folder}config.json", encoding="utf-8") as json_file:
config_list = json.load(json_file) config_list = json.load(json_file)
json_file.close()
if getConfig("obs_core") and getConfig("obs_exe") not in [None, 'Disabled']: if getConfig("obs_core") and getConfig("obs_exe") not in [None, 'Disabled']:
config_list["obs_core"] = 'Disabled' config_list["obs_core"] = 'Disabled'
@ -819,6 +827,7 @@ def settings():
elif settings_choose == '6': elif settings_choose == '6':
with open(f"{files_folder}config.json", encoding="utf-8") as json_file: with open(f"{files_folder}config.json", encoding="utf-8") as json_file:
config_list = json.load(json_file) config_list = json.load(json_file)
json_file.close()
config_list["shutdown_enabled"] = not getConfig("shutdown_enabled") config_list["shutdown_enabled"] = not getConfig("shutdown_enabled")
saveJson(files_folder+'config.json', config_list) saveJson(files_folder+'config.json', config_list)
@ -828,6 +837,7 @@ def settings():
elif settings_choose == '7': elif settings_choose == '7':
with open(f"{files_folder}config.json", encoding="utf-8") as json_file: with open(f"{files_folder}config.json", encoding="utf-8") as json_file:
config_list = json.load(json_file) config_list = json.load(json_file)
json_file.close()
try: try:
clear() clear()
@ -844,6 +854,7 @@ def settings():
elif settings_choose == '8': elif settings_choose == '8':
with open(f"{files_folder}config.json", encoding="utf-8") as json_file: with open(f"{files_folder}config.json", encoding="utf-8") as json_file:
config_list = json.load(json_file) config_list = json.load(json_file)
json_file.close()
try: try:
clear() clear()
@ -860,6 +871,7 @@ def settings():
elif settings_choose == '9': elif settings_choose == '9':
with open(f"{files_folder}config.json", encoding="utf-8") as json_file: with open(f"{files_folder}config.json", encoding="utf-8") as json_file:
config_list = json.load(json_file) config_list = json.load(json_file)
json_file.close()
try: try:
clear() clear()
@ -876,6 +888,7 @@ def settings():
elif settings_choose == '10': elif settings_choose == '10':
with open(f"{files_folder}config.json", encoding="utf-8") as json_file: with open(f"{files_folder}config.json", encoding="utf-8") as json_file:
config_list = json.load(json_file) config_list = json.load(json_file)
json_file.close()
config_list["telegram_enabled"] = not getConfig("telegram_enabled") config_list["telegram_enabled"] = not getConfig("telegram_enabled")
saveJson(files_folder+'config.json', config_list) saveJson(files_folder+'config.json', config_list)
@ -946,6 +959,21 @@ def settings():
return return
def main(source='deamon'): def main(source='deamon'):
##########################################
# Возможность профилей сделана для себя
# и не планируется как фича, однако
# вы можете присобачить сюда что хотите.
try:
from profile import profilename
except:
profilename = ''
pass
##########################################
try: try:
import time import time
from main import mainMenu from main import mainMenu
@ -962,6 +990,7 @@ def main(source='deamon'):
if obs_choice.lower() in ['y', 'yes', 'д', 'да']: if obs_choice.lower() in ['y', 'yes', 'д', 'да']:
with open(f"{files_folder}config.json", encoding="utf-8") as json_file: with open(f"{files_folder}config.json", encoding="utf-8") as json_file:
config_list = json.load(json_file) config_list = json.load(json_file)
json_file.close()
while True: while True:
try: try:
filename = easygui.fileopenbox('Выберите путь до obs32.exe или obs64.exe') filename = easygui.fileopenbox('Выберите путь до obs32.exe или obs64.exe')
@ -999,9 +1028,13 @@ def main(source='deamon'):
break break
break break
elif obs_choice.lower() in ['n', 'no', 'н', 'нет']: elif obs_choice.lower() in ['n', 'no', 'н', 'нет']:
with open(f"{files_folder}config.json", encoding="utf-8") as json_file:
config_list = json.load(json_file)
config_list["obs_exe"] = 'Disabled' config_list["obs_exe"] = 'Disabled'
config_list["obs_core"] = 'Disabled' config_list["obs_core"] = 'Disabled'
saveJson(files_folder+'config.json', config_list) saveJson(files_folder+'config.json', config_list)
json_file.close()
clear() clear()
break break
else: else:
@ -1032,6 +1065,7 @@ def main(source='deamon'):
elif tg_choice.lower() in ['n', 'no', 'н', 'нет']: elif tg_choice.lower() in ['n', 'no', 'н', 'нет']:
with open(files_folder+'telegram.conf', 'w', encoding="utf-8") as f: with open(files_folder+'telegram.conf', 'w', encoding="utf-8") as f:
f.write('Not Configured') f.write('Not Configured')
f.close()
lessons_count = 0 lessons_count = 0
try: try:
@ -1108,7 +1142,7 @@ def main(source='deamon'):
print(f'{nowtime()} Захвачен текущий урок в Zoom.') print(f'{nowtime()} Захвачен текущий урок в Zoom.')
playSound("started") playSound("started")
tgsend(getConfig("telegram_enabled"), f"▶ Зашёл на урок *{lesson_name}* в *{nowtime(False, False, False)}*") tgsend(getConfig("telegram_enabled"), f"▶ Зашёл на урок *{lesson_name}* в *{nowtime(False, False, False)}* {profilename}")
rpc.onLesson(lesson_name, start_time_unix) rpc.onLesson(lesson_name, start_time_unix)
@ -1203,7 +1237,7 @@ def main(source='deamon'):
if getConfig("shutdown_enabled"): if getConfig("shutdown_enabled"):
if getConfig("end_mode") == 'shutdown': if getConfig("end_mode") == 'shutdown':
try: try:
tgsend(getConfig("telegram_enabled"), f"⚠ Уроки кончились, автовыключение через {nowtime(False, False, False)} мин...") tgsend(getConfig("telegram_enabled"), f"⚠ Уроки кончились, автовыключение {profilename}через {nowtime(False, False, False)} мин...")
print(f'{nowtime()} Ваш ПК автоматически выключится через {BRED}{str(getConfig("shutdown_timeout"))} мин{RESET}.') print(f'{nowtime()} Ваш ПК автоматически выключится через {BRED}{str(getConfig("shutdown_timeout"))} мин{RESET}.')
playSound("shutdown") playSound("shutdown")
end_unix = int(time.time())+getConfig("shutdown_timeout")*60 end_unix = int(time.time())+getConfig("shutdown_timeout")*60

View File

@ -34,6 +34,7 @@ def getConfig(some_var):
try: try:
with open(f"{files_folder}config.json", encoding="utf-8") as json_file: with open(f"{files_folder}config.json", encoding="utf-8") as json_file:
config_list = json.load(json_file) config_list = json.load(json_file)
json_file.close()
return config_list[some_var] return config_list[some_var]
except: except:
return "Error" return "Error"
@ -60,6 +61,7 @@ def getConfig(some_var):
try: try:
with open(f"{files_folder}config.json", encoding="utf-8") as json_file: with open(f"{files_folder}config.json", encoding="utf-8") as json_file:
config_list = json.load(json_file) config_list = json.load(json_file)
json_file.close()
return config_list[some_var] return config_list[some_var]
except: except:
return "Error" return "Error"
@ -69,3 +71,4 @@ def getConfig(some_var):
def saveJson(filename, value): def saveJson(filename, value):
with open(filename, 'w', encoding="utf-8") as f: with open(filename, 'w', encoding="utf-8") as f:
json.dump(value, f, indent=4, ensure_ascii=False) json.dump(value, f, indent=4, ensure_ascii=False)
f.close()

1
rpc.py
View File

@ -3,6 +3,7 @@
import time import time
import os import os
import sys import sys
from colors import *
from functions import * from functions import *
version = '1.6' version = '1.6'