dymik739
/
modular-bot-framework-for-telegram
1
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: dymik739:28d88d0a6de8a7fec18439462a3ee2e07907141c
Branches Tags
dymik739:master
dymik739:dev
..
compare: dymik739:181e89b107b1f31e295d0683063f9636f4079231
Branches Tags
dymik739:master
dymik739:dev

6 Commits
28d88d0a6d ... 181e89b107

Author SHA1 Message Date
dymik739 181e89b107 merging pull request #4 2023-05-02 10:41:03 +03:00
Rhinemann 7bf5d957a1 Removed comment. 2023-04-30 00:23:48 +03:00
Rhinemann 520baa7dc1 Took out the spaces. 2023-04-30 00:14:08 +03:00
Rhinemann 68244a2e7c Made workable. 2023-04-30 00:13:44 +03:00
Rhinemann f1d04954f0 Merge branch 'master' of http://10.1.1.1:3000/dymik739/modular-bot-framework-for-telegram 2023-04-29 23:59:03 +03:00
Rhinemann 36793e9946 Cleaning up in auto-schedule 2023-04-27 11:22:25 +03:00
3 changed files with 54 additions and 97 deletions
Show Stats Expand all files Collapse all files

2
module-testing.py
View File

@ -222,4 +222,4 @@ while True:
if len(new_msg) == 0:
break
message_queue.append( Message(9, round(time.time()), Chat(575246355, 'supergroup'), text = new_msg) )
message_queue.append(Message(9, round(time.time()), Chat(575246355, 'supergroup'), text = new_msg))

139
modules/auto-schedule-pro/index.py
View File

@ -1,31 +1,14 @@
## env approximation ##
'''
import datetime, json, time
class Self:
def __init__(self):
self.path = ""
self.WEEKDAY_NAMES_ROD = ["понеділка", "вівторка", "середи", "четверга", "п'ятниці", "суботи", "неділі"]
self.WEEKDAY_NAMES_ROD_WITH_NEXT = ["наступного понеділка", "наступного вівторка", "наступної середи", "наступного четверга", "наступної п'ятниці", "наступної суботи", "наступної неділі"]
self.WEEKDAY_NAMES_ROD_WITH_THIS = ["цього понеділка", "цього вівторка", "цієї середи", "цього четверга", "цієї п'ятниці", "цієї суботи", "цієї неділі"]
def readfile(path):
return open(path).read()
self = Self()
'''
## code ##
if self.MESSAGE["text"].lower() == "!пара":
if (self.MESSAGE["text"].lower() == "!пара" or self.MESSAGE["text"].lower().split()[0] == "!пари"):
#getting current time
current_time = datetime.datetime.now()
current_week = current_time.isocalendar()[1] % 2
current_day = current_time.weekday()
current_seconds = current_week*604800 + current_day*86400 + current_time.hour*3600 + current_time.minute*60 + current_time.second
reference_time = int(current_time.strftime("%s")) - current_seconds
# baking defined schedule
raw_schedule = json.loads( readfile(self.path + "schedule.json") )
schedule = {}
@ -35,8 +18,8 @@ if self.MESSAGE["text"].lower() == "!пара":
new_item = dict(raw_schedule[day][i])
new_item["source"] = "schedule"
schedule[ts] = new_item
# baking additions (extra pairs)
# baking additions (extra lessons)
raw_additions = json.loads( readfile(self.path + "additions.json") )
additions = {}
for day in range(len(raw_additions)):
@ -47,40 +30,41 @@ if self.MESSAGE["text"].lower() == "!пара":
schedule[ts] = new_item
full_schedule = dict(list(schedule.items()) + list(additions.items()))
if self.MESSAGE["text"].lower() == "!пара":
print("test1")
print(f"Full schedule printout: {full_schedule}")
print(f"Current delta_time: {current_seconds}")
p = None
next_pair_time = None
next_lesson_time = None
key_list = list(full_schedule.keys())
key_list.sort()
for i in key_list:
if i > current_seconds - 5400:
p = full_schedule[i]
next_pair_time = i
next_lesson_time = i
break
print("test2")
if next_pair_time == None:
if next_lesson_time == None:
if len(full_schedule.keys()) > 0:
print("test3.1")
actual_pair_ts = reference_time + min(full_schedule.keys())
dt_pair = datetime.datetime.fromtimestamp(actual_pair_ts)
dt_pair_finish = datetime.datetime.fromtimestamp(actual_pair_ts + 5400)
actual_lesson_ts = reference_time + min(full_schedule.keys())
dt_lesson = datetime.datetime.fromtimestamp(actual_lesson_ts)
dt_lesson_finish = datetime.datetime.fromtimestamp(actual_lesson_ts + 5400)
p = full_schedule[min(full_schedule.keys())]
print("test3.1.1")
print("{} == 6 && {} == 1, {}".format(current_day, dt_pair.strftime('%u'), str( ((current_day + 2) == int(dt_pair.strftime("%u"))) or ((str(current_day) == "6") and (dt_pair.strftime("%u") == "1")) )))
print("{} == 6 && {} == 1, {}".format(current_day, dt_lesson.strftime('%u'), str( ((current_day + 2) == int(dt_lesson.strftime("%u"))) or ((str(current_day) == "6") and (dt_lesson.strftime("%u") == "1")) )))
human_readable_date = ""
if ((current_day + 2) == int(dt_pair.strftime("%u"))) or ((str(current_day) == "6") and (dt_pair.strftime("%u") == "1")):
if ((current_day + 2) == int(dt_lesson.strftime("%u"))) or ((str(current_day) == "6") and (dt_lesson.strftime("%u") == "1")):
human_readable_date += "завтра "
elif current_week != int(dt_pair.strftime("%W")) % 2:
human_readable_date += "{} ".format(self.WEEKDAY_NAMES_ROD_WITH_NEXT[int(dt_pair.strftime("%u")) - 1])
elif current_day != (int(dt_pair.strftime("%u")) - 1):
human_readable_date += "{} ".format(self.WEEKDAY_NAMES_ROD_WITH_THIS[int(dt_pair.strftime("%u")) - 1])
elif current_week != int(dt_lesson.strftime("%W")) % 2:
human_readable_date += "{} ".format(self.WEEKDAYS_GENITIVE_NEXT[int(dt_lesson.strftime("%u")) - 1])
elif current_day != (int(dt_lesson.strftime("%u")) - 1):
human_readable_date += "{} ".format(self.WEEKDAYS_GENITIVE_THIS[int(dt_lesson.strftime("%u")) - 1])
else:
human_readable_date += "сьогодні "
@ -89,11 +73,11 @@ if self.MESSAGE["text"].lower() == "!пара":
human_readable_date += "з "
print("test3.1.3")
human_readable_date += dt_pair.strftime("%H:%M")
human_readable_date += dt_lesson.strftime("%H:%M")
print("test3.1.4")
human_readable_date += " до "
human_readable_date += dt_pair_finish.strftime("%H:%M")
human_readable_date += dt_lesson_finish.strftime("%H:%M")
self.RESPONCE = "Актуальна пара: {}\nДата: {}\nВикладач: {}\nПосилання на пару: {}".format(p['name'], human_readable_date, p['teacher'], p['link'])
print("test3.1.5")
@ -102,60 +86,31 @@ if self.MESSAGE["text"].lower() == "!пара":
else:
print("test3.2")
actual_pair_ts = reference_time + next_pair_time
dt_pair = datetime.datetime.fromtimestamp(actual_pair_ts)
dt_pair_finish = datetime.datetime.fromtimestamp(actual_pair_ts + 5400)
actual_lesson_ts = reference_time + next_lesson_time
dt_lesson = datetime.datetime.fromtimestamp(actual_lesson_ts)
dt_lesson_finish = datetime.datetime.fromtimestamp(actual_lesson_ts + 5400)
human_readable_date = ""
if ((current_day + 2) == int(dt_pair.strftime("%u"))) or ((str(current_day) == "6") and (dt_pair.strftime("%u") == "1")):
if ((current_day + 2) == int(dt_lesson.strftime("%u"))) or ((str(current_day) == "6") and (dt_lesson.strftime("%u") == "1")):
human_readable_date += "завтра "
elif current_week != int(dt_pair.strftime("%W")) % 2:
human_readable_date += "{} ".format(self.WEEKDAY_NAMES_ROD_WITH_NEXT[int(dt_pair.strftime("%u")) - 1])
elif current_day != (int(dt_pair.strftime("%u")) - 1):
human_readable_date += "{} ".format(self.WEEKDAY_NAMES_ROD_WITH_THIS[int(dt_pair.strftime("%u")) - 1])
elif current_week != int(dt_lesson.strftime("%W")) % 2:
human_readable_date += "{} ".format(self.WEEKDAYS_GENITIVE_NEXT[int(dt_lesson.strftime("%u")) - 1])
elif current_day != (int(dt_lesson.strftime("%u")) - 1):
human_readable_date += "{} ".format(self.WEEKDAYS_GENITIVE_THIS[int(dt_lesson.strftime("%u")) - 1])
else:
human_readable_date += "сьогодні "
human_readable_date += "з "
human_readable_date += dt_pair.strftime("%H:%M")
human_readable_date += dt_lesson.strftime("%H:%M")
human_readable_date += " до "
human_readable_date += dt_pair_finish.strftime("%H:%M")
human_readable_date += dt_lesson_finish.strftime("%H:%M")
self.RESPONCE = "Актуальна пара: {}\nДата: {}\nВикладач: {}\nПосилання на пару: {}".format(p['name'], human_readable_date, p['teacher'], p['link'])
if self.MESSAGE["text"].lower().split()[0] == "!пари":
command = self.MESSAGE["text"].lower().split()
current_time = datetime.datetime.now()
current_week = current_time.isocalendar()[1] % 2
current_day = current_time.weekday()
current_seconds = current_week*604800 + current_day*86400 + current_time.hour*3600 + current_time.minute*60 + current_time.second
reference_time = int(current_time.strftime("%s")) - current_seconds
# baking defined schedule
raw_schedule = json.loads( readfile(self.path + "schedule.json") )
schedule = {}
for day in range(len(raw_schedule)):
for i in raw_schedule[day]:
ts = day*86400 + int(i.split(":")[0])*3600 + int(i.split(":")[1])*60
new_item = dict(raw_schedule[day][i])
new_item["source"] = "schedule"
schedule[ts] = new_item
# baking additions (extra pairs)
raw_additions = json.loads( readfile(self.path + "additions.json") )
additions = {}
for day in range(len(raw_additions)):
for i in raw_additions[day]:
ts = day*86400 + int(i.split(":")[0])*3600 + int(i.split(":")[1])*60
new_item = dict(raw_additions[day][i])
new_item["source"] = "additions"
schedule[ts] = new_item
full_schedule = dict(list(schedule.items()) + list(additions.items()))
preferences = {"name": True, "date": True, "teacher": True, "link": True}
selected_day = current_week*7 + current_day
@ -188,33 +143,33 @@ if self.MESSAGE["text"].lower().split()[0] == "!пари":
elif i[0] == "-":
preferences[i[1:]] = False
found_pairs = {}
found_lessons = {}
for i in full_schedule:
if selected_day*86400 <= i < (selected_day+1)*86400:
found_pairs[i] = dict(full_schedule[i])
found_lessons[i] = dict(full_schedule[i])
result_text = f"Пари у {self.WEEKDAY_NAMES_ZNAH[selected_day%7]}:\n\n"
for i in found_pairs:
actual_pair_ts = reference_time + i
dt_pair = datetime.datetime.fromtimestamp(actual_pair_ts)
dt_pair_finish = datetime.datetime.fromtimestamp(actual_pair_ts + 5400)
p = found_pairs[i]
result_text = f"Пари у {self.WEEKDAYS_ACCUSATIVE[selected_day%7]}:\n\n"
for i in found_lessons:
actual_lesson_ts = reference_time + i
dt_lesson = datetime.datetime.fromtimestamp(actual_lesson_ts)
dt_lesson_finish = datetime.datetime.fromtimestamp(actual_lesson_ts + 5400)
p = found_lessons[i]
human_readable_date = ""
if ((current_day + 2) == int(dt_pair.strftime("%u"))) or ((str(current_day) == "6") and (dt_pair.strftime("%u") == "1")):
if ((current_day + 2) == int(dt_lesson.strftime("%u"))) or ((str(current_day) == "6") and (dt_lesson.strftime("%u") == "1")):
human_readable_date += "завтра "
elif current_week != int(dt_pair.strftime("%W")) % 2:
human_readable_date += "{} ".format(self.WEEKDAY_NAMES_ROD_WITH_NEXT[int(dt_pair.strftime("%u")) - 1])
elif current_day != (int(dt_pair.strftime("%u")) - 1):
human_readable_date += "{} ".format(self.WEEKDAY_NAMES_ROD_WITH_THIS[int(dt_pair.strftime("%u")) - 1])
elif current_week != int(dt_lesson.strftime("%W")) % 2:
human_readable_date += "{} ".format(self.WEEKDAYS_GENITIVE_NEXT[int(dt_lesson.strftime("%u")) - 1])
elif current_day != (int(dt_lesson.strftime("%u")) - 1):
human_readable_date += "{} ".format(self.WEEKDAYS_GENITIVE_THIS[int(dt_lesson.strftime("%u")) - 1])
else:
human_readable_date += "сьогодні "
human_readable_date += "з "
human_readable_date += dt_pair.strftime("%H:%M")
human_readable_date += dt_lesson.strftime("%H:%M")
human_readable_date += " до "
human_readable_date += dt_pair_finish.strftime("%H:%M")
human_readable_date += dt_lesson_finish.strftime("%H:%M")
if preferences['name']:

10
modules/auto-schedule-pro/predefine.py
View File

@ -1,4 +1,6 @@
self.WEEKDAY_NAMES_ZNAH = ["понедулок", "вівторок", "середу", "четвер", "п'ятницю", "суботу", "неділю"]
self.WEEKDAY_NAMES_ROD_WITH_NEXT = ["наступного понеділка", "наступного вівторка", "наступної середи", "наступного четверга", "наступної п'ятниці", "наступної суботи", "наступної неділі"]
self.WEEKDAY_NAMES_ROD_WITH_THIS = ["цього понеділка", "цього вівторка", "цієї середи", "цього четверга", "цієї п'ятниці", "цієї суботи", "цієї неділі"]
self.current_seconds = 0
# Accusative - znahidnyj
self.WEEKDAYS_ACCUSATIVE = ["понеділок", "вівторок", "середу", "четвер", "п'ятницю", "суботу", "неділю"]
# Genitive - rodovyj
self.WEEKDAYS_GENITIVE_NEXT = ["наступного понеділка", "наступного вівторка", "наступної середи", "наступного четверга", "наступної п'ятниці", "наступної суботи", "наступної неділі"]
self.WEEKDAYS_GENITIVE_THIS = ["цього понеділка", "цього вівторка", "цієї середи", "цього четверга", "цієї п'ятниці", "цієї суботи", "цієї неділі"]
self.current_seconds = 0