#12 lps_gen.py: Update the timeslot regex to make the name optional

Закрыто
mmu_man хочет смерджить 1 коммит(ов) из mmu_man/timeslot_re в rsd/master
mmu_man прокомментировал 6 лет назад

This seems to fix the ical generation.

This seems to fix the ical generation.
siddharth ravikumar прокомментировал 6 лет назад
Владелец

@mmu_man, Thanks for the patch!

Looking at the current year's program, the time slots that have a description are separated from the time interval by a -. Would it be possible to modify the time slot regex to accommodate this too?

Something like this:

self.timeslot_re = re.compile(r'(\d+:\d+).+?(\d+:\d+)'
                              r'\s*[:-]?\s*(.+\b)?')

will work.

@mmu_man, Thanks for the patch! Looking at the [current year's program](https://www.libreplanet.org/2018/program/), the time slots that have a description are separated from the time interval by a `-`. Would it be possible to modify the time slot regex to accommodate this too? Something like this: ```python self.timeslot_re = re.compile(r'(\d+:\d+).+?(\d+:\d+)' r'\s*[:-]?\s*(.+\b)?') ``` will work.
mmu_man прокомментировал 6 лет назад
Автор

The current regex will match anyway, but will eat the - as part of the name field, which is not used. Yeah the one you propose should work.

The current regex will match anyway, but will eat the - as part of the name field, which is not used. Yeah the one you propose should work.
siddharth ravikumar прокомментировал 6 лет назад
Владелец

@mmu_man, Merged your patch and made some minor tweaks. Thanks again!

@mmu_man, Merged [your patch](commit/8f83f1b38c108615e39c697c08f2172b8cafd8f8) and made some minor tweaks. Thanks again!
Пожалуйста снова откройте этот запрос для слияния.
Войдите, чтобы присоединиться к обсуждению.
Нет меток
bug
Нет этапа
Нет ответственного
2 участников
Загрузка...
Отмена
Сохранить
Пока нет содержимого.