m.giller/E-Paper-Calendar
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

Redefined special day recognition

Browse source
This commit is contained in:
Maximilian Giller 2019-04-05 22:07:33 +02:00
parent 22242d894f
commit 4b656ee819
1 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Calendar/TextFormatter.py
View file

@ -1,8 +1,10 @@
from settings import hours, language from settings import hours, language
from datetime import timedelta, datetime, timezone
first_occurrence_char = '[' first_occurrence_char = '['
middle_occurrence_char = '|' middle_occurrence_char = '|'
last_occurrence_char = ']' last_occurrence_char = ']'
until_character = '-'
allday_lang = { allday_lang = {
"en" : "All day", "en" : "All day",
@ -22,30 +24,23 @@ def event_prefix_str (event, relative_date=None):
if relative_date is None: if relative_date is None:
relative_date = event.begin_datetime.date() relative_date = event.begin_datetime.date()
#Is multiday event if __is_multiday__(event) is False:
if event.begin_datetime.day is not event.end_datetime.day or \
event.begin_datetime.month is not event.end_datetime.month or \
event.begin_datetime.year is not event.end_datetime.year:
return event_time_summary(event) return event_time_summary(event)
#Relative to #Relative to
#First day #First day
if event.begin_datetime.day is relative_date.day and \ elif __equal__(event.begin_datetime, relative_date):
event.begin_datetime.month is relative_date.month and \ return event_time_summary(event) + until_character
event.begin_datetime.year is relative_date.year:
return event_time_summary(event) + first_occurrence_char
#Last day #Last day
elif event.end_datetime.day is relative_date.day and \ elif __equal__(event.end_datetime, relative_date) or \
event.end_datetime.month is relative_date.month and \ (__day_duration__(event.end_datetime) == timedelta(0) and __equal__(relative_date + timedelta(1), event.end_datetime)):
event.end_datetime.year is relative_date.year: return until_character + event_time_summary(event)
event.begin_datetime = event.end_datetime
return event_time_summary(event) + last_occurrence_char
#Some day #Some day
else: else:
event.allday = True event.allday = True
return event_time_summary(event) return until_character + event_time_summary(event) + until_character
def event_time_summary (event): def event_time_summary (event):
if event.allday: if event.allday:
@ -57,7 +52,7 @@ def event_time_detailed (event):
if event.allday: if event.allday:
return allday_detailed return allday_detailed
else: else:
return time_str(event.begin_datetime) + " - " + time_str(event.end_datetime) return time_str(event.begin_datetime) + until_character + time_str(event.end_datetime)
def date_str(dt): def date_str(dt):
return remove_leading_zero(dt.strftime('%d. %b')) return remove_leading_zero(dt.strftime('%d. %b'))
@ -69,3 +64,20 @@ def remove_leading_zero (text):
def date_summary_str(dt): def date_summary_str(dt):
return dt.strftime('%a %d. %b') return dt.strftime('%a %d. %b')
def __is_multiday__ (event):
if event.allday and event.duration == timedelta(1):
return False
return event.begin_datetime.day != event.end_datetime.day or \
event.begin_datetime.month != event.end_datetime.month or \
event.begin_datetime.year != event.end_datetime.year
def __equal__(dt1, dt2):
return dt1.day == dt2.day and \
dt1.month == dt2.month and \
dt1.year == dt2.year
def __day_duration__(dt):
day_begin = datetime(dt.year, dt.month, dt.day, 0, 0, 0, 0, timezone.utc)
return dt - day_begin