indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Tidying

merge-requests/30/head
Bob Mottram 2022-06-14 12:52:43 +01:00
parent 5ece8e80b5
commit 2371e20541
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
happening.py
View File

@ -353,8 +353,7 @@ def _dav_encode_token(year: int, month_number: int,
def _icalendar_day(base_dir: str, nickname: str, domain: str, def _icalendar_day(base_dir: str, nickname: str, domain: str,
day_events: [], person_cache: {}, day_events: [], person_cache: {}) -> str:
http_prefix: str) -> str:
"""Returns a day's events in icalendar format """Returns a day's events in icalendar format
""" """
ical_str = '' ical_str = ''
@ -478,7 +477,6 @@ def _icalendar_day(base_dir: str, nickname: str, domain: str,
def get_todays_events_icalendar(base_dir: str, nickname: str, domain: str, def get_todays_events_icalendar(base_dir: str, nickname: str, domain: str,
year: int, month_number: int, year: int, month_number: int,
day_number: int, person_cache: {}, day_number: int, person_cache: {},
http_prefix: str,
text_match: str, system_language: str) -> str: text_match: str, system_language: str) -> str:
"""Returns today's events in icalendar format """Returns today's events in icalendar format
""" """
@ -503,8 +501,7 @@ def get_todays_events_icalendar(base_dir: str, nickname: str, domain: str,
return ical_str return ical_str
ical_str += \ ical_str += \
_icalendar_day(base_dir, nickname, domain, day_events, person_cache, _icalendar_day(base_dir, nickname, domain, day_events, person_cache)
http_prefix)
ical_str += 'END:VCALENDAR\n' ical_str += 'END:VCALENDAR\n'
return ical_str return ical_str
@ -514,7 +511,6 @@ def get_month_events_icalendar(base_dir: str, nickname: str, domain: str,
year: int, year: int,
month_number: int, month_number: int,
person_cache: {}, person_cache: {},
http_prefix: str,
text_match: str) -> str: text_match: str) -> str:
"""Returns today's events in icalendar format """Returns today's events in icalendar format
""" """
@ -537,8 +533,7 @@ def get_month_events_icalendar(base_dir: str, nickname: str, domain: str,
day_events = month_events[str(day_of_month)] day_events = month_events[str(day_of_month)]
ical_str += \ ical_str += \
_icalendar_day(base_dir, nickname, domain, _icalendar_day(base_dir, nickname, domain,
day_events, person_cache, day_events, person_cache)
http_prefix)
ical_str += 'END:VCALENDAR\n' ical_str += 'END:VCALENDAR\n'
return ical_str return ical_str
@ -1098,7 +1093,7 @@ def dav_report_response(base_dir: str, nickname: str, domain: str,
search_date.year, search_date.year,
search_date.month, search_date.month,
search_date.day, person_cache, search_date.day, person_cache,
http_prefix, text_match, text_match,
system_language) system_language)
events_href = \ events_href = \
http_prefix + '://' + domain_full + '/users/' + \ http_prefix + '://' + domain_full + '/users/' + \
@ -1132,7 +1127,6 @@ def dav_report_response(base_dir: str, nickname: str, domain: str,
query_start_year, query_start_year,
query_start_month, query_start_month,
person_cache, person_cache,
http_prefix,
text_match) text_match)
events_href = \ events_href = \
http_prefix + '://' + domain_full + '/users/' + \ http_prefix + '://' + domain_full + '/users/' + \
@ -1180,7 +1174,6 @@ def dav_report_response(base_dir: str, nickname: str, domain: str,
nickname, domain, nickname, domain,
year, month, year, month,
person_cache, person_cache,
http_prefix,
text_match) text_match)
events_href = \ events_href = \
http_prefix + '://' + domain_full + '/users/' + \ http_prefix + '://' + domain_full + '/users/' + \
@ -1217,7 +1210,7 @@ def dav_report_response(base_dir: str, nickname: str, domain: str,
get_todays_events_icalendar(base_dir, nickname, domain, get_todays_events_icalendar(base_dir, nickname, domain,
search_date.year, search_date.month, search_date.year, search_date.month,
search_date.day, person_cache, search_date.day, person_cache,
http_prefix, text_match, text_match,
system_language) system_language)
events_href = \ events_href = \
http_prefix + '://' + domain_full + '/users/' + \ http_prefix + '://' + domain_full + '/users/' + \

3
webapp_calendar.py
View File

@ -383,7 +383,6 @@ def html_calendar(person_cache: {}, css_cache: {}, translate: {},
year, month_number, year, month_number,
day_number, day_number,
person_cache, person_cache,
http_prefix,
text_match, text_match,
system_language) system_language)
day_events = None day_events = None
@ -404,7 +403,7 @@ def html_calendar(person_cache: {}, css_cache: {}, translate: {},
if icalendar: if icalendar:
return get_month_events_icalendar(base_dir, nickname, domain, return get_month_events_icalendar(base_dir, nickname, domain,
year, month_number, person_cache, year, month_number, person_cache,
http_prefix, text_match) text_match)
events = \ events = \
get_calendar_events(base_dir, nickname, domain, year, month_number, get_calendar_events(base_dir, nickname, domain, year, month_number,