BDE_IUT_Info/TelegramEDT
Archived
1
0
Fork 0
Code Activity

Fix setedt verification

Browse source
This commit is contained in:
Ethanell 2019-12-26 14:58:55 +01:00
parent e58b04f7d8
commit eac1820d3a
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
TelegramEDT/EDTcalendar.py
View file

@ -13,7 +13,8 @@ EMPTY_CALENDAR = "BEGIN:VCALENDAR\r\nPRODID:ics.py - http://git.io/lLljaA\r\nVER
class Calendar(ics.Calendar): class Calendar(ics.Calendar):
def __init__(self, time: str, resources: int, url: str = URL, projectid: int = 4, pass_week: bool = True): def __init__(self, time: str, resources: int, url: str = URL, projectid: int = 4, pass_week: bool = True):
super().__init__(self._get_calendar(url, resources, projectid)) self.url = self._url(url, resources, projectid)
super().__init__(self._get_calendar(resources, projectid))
self.events = self._events(time, pass_week) self.events = self._events(time, pass_week)
self.timeline = Timeline(self) self.timeline = Timeline(self)
@ -37,12 +38,12 @@ class Calendar(ics.Calendar):
lastdate = now.date() + datetime.timedelta(days=7+(7-now.isoweekday())) lastdate = now.date() + datetime.timedelta(days=7+(7-now.isoweekday()))
return f"{url}?resources={resources}&projectId={projectid}&calType=ical&firstDate={firstdate}&lastDate={lastdate}" return f"{url}?resources={resources}&projectId={projectid}&calType=ical&firstDate={firstdate}&lastDate={lastdate}"
def _get_calendar(self, url: str, resources: int, projectid: int): def _get_calendar(self, resources: int, projectid: int):
name = f"calendars/{resources}-{projectid}.ical" name = f"calendars/{resources}-{projectid}.ical"
now = self._now().timestamp() now = self._now().timestamp()
if not isfile(name) or now-getmtime(name) < now-360: if not isfile(name) or now-getmtime(name) < now-360:
try: try:
calendar = requests.get(self._url(url, resources, projectid)).text calendar = requests.get(self.url).text
string_to_container(calendar) string_to_container(calendar)
except (ParseError, requests.exceptions.ConnectionError, requests.exceptions.ConnectTimeout): except (ParseError, requests.exceptions.ConnectionError, requests.exceptions.ConnectTimeout):
if not isfile(name): if not isfile(name):

5
TelegramEDT/edt.py
View file

@ -7,7 +7,7 @@ from aiogram import types
from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton, InputTextMessageContent, \ from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton, InputTextMessageContent, \
InlineQueryResultArticle, InlineQuery, ContentType InlineQueryResultArticle, InlineQuery, ContentType
from aiogram.types import ParseMode from aiogram.types import ParseMode
from ics.parse import ParseError from ics.parse import ParseError, string_to_container
from pyzbar.pyzbar import decode from pyzbar.pyzbar import decode
from requests.exceptions import ConnectionError, InvalidSchema, MissingSchema from requests.exceptions import ConnectionError, InvalidSchema, MissingSchema
@ -108,7 +108,8 @@ async def await_cmd(message: types.message):
resources = message.text resources = message.text
try: try:
Calendar("", int(resources)) string_to_container(requests.get(Calendar("", int(resources)).url).text)
except (ParseError, ConnectionError, InvalidSchema, MissingSchema, ValueError, UnboundLocalError): except (ParseError, ConnectionError, InvalidSchema, MissingSchema, ValueError, UnboundLocalError):
msg = lang(user, "setedt_err_res") msg = lang(user, "setedt_err_res")
else: else: