diff --git a/main.py b/main.py index cada9c5..5e6fbc0 100644 --- a/main.py +++ b/main.py @@ -72,8 +72,12 @@ async def echo(message: types.Message) -> None: async def send_message(chat_ids: list[int]) -> None: - text = parse_site(driver=driver) - + text = parse_site( + driver=driver, + url='https://yandex.ru/maps/213/moscow/stops/stop__9640740/' + '?l=masstransit&ll=37.527754%2C55.823507&tab=overview&z=21', + message='Остановка Б. Академическая ул, д. 15' + ) await asyncio.gather( *[bot.send_message(chat_id=chat_id, text=text, parse_mode=types.ParseMode.HTML) for chat_id in chat_ids] ) diff --git a/mos_gor.py b/mos_gor.py index fac15e1..8c6eab5 100644 --- a/mos_gor.py +++ b/mos_gor.py @@ -66,6 +66,11 @@ def parse_site(driver: WebDriver, url: str, message: str) -> str: bus_t19_arrival = element.find_element(by='class name', value='masstransit-prognoses-view__title-text') except NoSuchElementException: pass - return (f'{message}\n\n' - f'Автобус {bus_300.text} - {bus_300_arrival.text}\nАвтобус {bus_t19.text} - {bus_t19_arrival.text}' - ) + answer = f'{message}\n\n' + if not all([bus_300, bus_t19]): + return 'Автобусов 300 или Т19 не найдено. \n\nСмотри на карте :)' + if bus_300: + answer += f'Автобус {bus_300.text} - {bus_300_arrival.text}\n' + if bus_t19: + answer += f'Автобус {bus_300.text} - {bus_300_arrival.text}\nАвтобус {bus_t19.text} - {bus_t19_arrival.text}' + return answer