iicd/Inkycal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Temporary disabled recurring events

Browse Source 
Trying to find the cause for some errors related to recurring events.
This commit is contained in:
Ace 2019-03-07 15:31:45 +01:00 committed by GitHub
parent 4e6acc0913
commit bbe7f836d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Calendar/E-Paper.py
View File

@ -200,27 +200,32 @@ def main():
# print(fix_e_2) # print(fix_e_2)
ical = Calendar(fix_e_2) ical = Calendar(fix_e_2)
for events in ical.events: for events in ical.events:
if re.search('RRULE',str(events)) is not None: if events.begin.date().month == today.month:
r = re.search('RRULE:(.+?)\n',str(events)) if int((events.begin).format('D')) not in events_this_month:
r_start = re.search('DTSTART:(.+?)\n',str(events)) events_this_month.append(int((events.begin).format('D')))
if time.now().month == 12: if today <= events.begin.date() <= time_span:
r_string=(r.group(1).rstrip()+';UNTIL='+'%04d%02d%02d'+'T000000Z') % (time.now().year+1, 1, 1) upcoming.append({'date':events.begin.format('YYYY MM DD'), 'event':events.name})
else: ## if re.search('RRULE',str(events)) is not None:
r_string=(r.group(1).rstrip()+';UNTIL='+'%04d%02d%02d'+'T000000Z') % (time.now().year, time.now().month+1, 1) ## r = re.search('RRULE:(.+?)\n',str(events))
rule=rrulestr(r_string,dtstart=parse(r_start.group(1))) ## r_start = re.search('DTSTART:(.+?)\n',str(events))
for i in rule: ## if time.now().month == 12:
if i.year == time.now().year and i.month == time.now().month and i.day >= time.now().day: ## r_string=(r.group(1).rstrip()+';UNTIL='+'%04d%02d%02d'+'T000000Z') % (time.now().year+1, 1, 1)
upcoming.append({'date':str(time.now().year) + " " + time.now().strftime('%m')+ " " + str(i.day).zfill(2), 'event':events.name}) ## else:
if i.day not in events_this_month: ## r_string=(r.group(1).rstrip()+';UNTIL='+'%04d%02d%02d'+'T000000Z') % (time.now().year, time.now().month+1, 1)
events_this_month.append(i.day) ## rule=rrulestr(r_string,dtstart=parse(r_start.group(1)))
# uncomment this line to see fetched recurring events ## for i in rule:
#print ("Appended recurring event: " + events.name + " on " + str(time.now().year) + " " + time.now().strftime('%m')+ " " + str(i.day).zfill(2)) ## if i.year == time.now().year and i.month == time.now().month and i.day >= time.now().day:
else: ## upcoming.append({'date':str(time.now().year) + " " + time.now().strftime('%m')+ " " + str(i.day).zfill(2), 'event':events.name})
if events.begin.date().month == today.month: ## if i.day not in events_this_month:
if int((events.begin).format('D')) not in events_this_month: ## events_this_month.append(i.day)
events_this_month.append(int((events.begin).format('D'))) ## # uncomment this line to see fetched recurring events
if today <= events.begin.date() <= time_span: ## print ("Appended recurring event: " + events.name + " on " + str(time.now().year) + " " + time.now().strftime('%m')+ " " + str(i.day).zfill(2))
upcoming.append({'date':events.begin.format('YYYY MM DD'), 'event':events.name}) ## else:
## if events.begin.date().month == today.month:
## if int((events.begin).format('D')) not in events_this_month:
## events_this_month.append(int((events.begin).format('D')))
## if today <= events.begin.date() <= time_span:
## upcoming.append({'date':events.begin.format('YYYY MM DD'), 'event':events.name})
def takeDate(elem): def takeDate(elem):
return elem['date'] return elem['date']