mirror of https://gitlab.com/bashrc2/epicyon
Show event time span on posts
Bob Mottram
parent
c8b7e8aa87
commit
01c121d0a9
97
maps.py
97
maps.py
|
|
@ -108,6 +108,40 @@ def _get_category_from_tags(tags: []) -> str:
|
|||
return None
|
||||
|
||||
|
||||
def _get_event_time_span_from_tags(tags: []) -> (str, str, str, str):
|
||||
"""Returns the event time span from the tags list
|
||||
"""
|
||||
locn = get_location_dict_from_tags(tags)
|
||||
if locn:
|
||||
start_time = end_time = ''
|
||||
if locn.get('startTime'):
|
||||
if not isinstance(locn['startTime'], str):
|
||||
return None, None, None, None
|
||||
start_time = remove_html(locn['startTime'])
|
||||
if 'T' not in start_time:
|
||||
return None, None, None, None
|
||||
start_date_str = start_time.split('T')[0]
|
||||
start_time_str = start_time.split('T')[1]
|
||||
if '+' in start_time_str:
|
||||
start_time_str = start_time_str.split('+')[0]
|
||||
if '-' in start_time_str:
|
||||
start_time_str = start_time_str.split('-')[0]
|
||||
end_date_str = end_time_str = ''
|
||||
if locn.get('endTime'):
|
||||
if isinstance(locn['endTime'], str):
|
||||
end_time = remove_html(locn['endTime'])
|
||||
if 'T' in end_time:
|
||||
end_date_str = end_time.split('T')[0]
|
||||
end_time_str = end_time.split('T')[1]
|
||||
if '+' in end_time_str:
|
||||
end_time_str = end_time_str.split('+')[0]
|
||||
if '-' in end_time_str:
|
||||
end_time_str = end_time_str.split('-')[0]
|
||||
return start_date_str, start_time_str, \
|
||||
end_date_str, end_time_str
|
||||
return None, None, None, None
|
||||
|
||||
|
||||
def html_address_book_list(base_dir: str, nickname: str, domain: str) -> str:
|
||||
"""Creates a list of potential addresses when creating a new post
|
||||
with a location
|
||||
|
|
@ -246,6 +280,69 @@ def get_category_from_post(post_json_object: {}) -> str:
|
|||
return locn
|
||||
|
||||
|
||||
def get_event_time_span_from_post(post_json_object: {}) -> str:
|
||||
"""Returns the event start and end time for the given post
|
||||
"""
|
||||
start_time = end_time = ''
|
||||
start_date_str = start_time_str = end_date_str = end_time_str = ''
|
||||
|
||||
# location represented via a tag
|
||||
post_obj = post_json_object
|
||||
if has_object_dict(post_json_object):
|
||||
post_obj = post_json_object['object']
|
||||
if post_obj.get('tag'):
|
||||
if isinstance(post_obj['tag'], list):
|
||||
start_date_str, start_time_str, end_date_str, end_time_str = \
|
||||
_get_event_time_span_from_tags(post_obj['tag'])
|
||||
|
||||
# location representation used by pixelfed
|
||||
locn2 = None
|
||||
if post_obj.get('location'):
|
||||
locn2 = post_obj['location']
|
||||
if isinstance(locn2, dict):
|
||||
if locn2.get('startTime'):
|
||||
if not isinstance(locn2['startTime'], str):
|
||||
return start_date_str, start_time_str, \
|
||||
end_date_str, end_time_str
|
||||
start_time = remove_html(locn2['startTime'])
|
||||
if not start_time:
|
||||
return start_date_str, start_time_str, \
|
||||
end_date_str, end_time_str
|
||||
if 'T' not in start_time:
|
||||
return start_date_str, start_time_str, \
|
||||
end_date_str, end_time_str
|
||||
start_date_str = start_time.split('T')[0]
|
||||
start_time_str = start_time.split('T')[1]
|
||||
if '+' in start_time_str:
|
||||
start_time_str = start_time_str.split('+')[0]
|
||||
if '-' in start_time_str:
|
||||
start_time_str = start_time_str.split('-')[0]
|
||||
if locn2.get('endTime'):
|
||||
if isinstance(locn2['endTime'], str):
|
||||
end_time = remove_html(locn2['endTime'])
|
||||
if 'T' not in end_time:
|
||||
end_date_str = end_time.split('T')[0]
|
||||
end_time_str = end_time.split('T')[1]
|
||||
if '+' in end_time_str:
|
||||
end_time_str = end_time_str.split('+')[0]
|
||||
if '-' in end_time_str:
|
||||
end_time_str = end_time_str.split('-')[0]
|
||||
if start_date_str:
|
||||
if not end_date_str:
|
||||
return '<time datetime="' + start_time + '">' + \
|
||||
start_date_str + ' ' + start_time_str + '</time>'
|
||||
if start_date_str == end_date_str:
|
||||
return '<time datetime="' + start_time + '">' + \
|
||||
start_date_str + ' ' + start_time_str + '</time> - ' + \
|
||||
'<time datetime="' + end_time + '">' + end_time_str + '</time>'
|
||||
return '<time datetime="' + start_time + '">' + \
|
||||
start_date_str + ' ' + start_time_str + '</time> - ' + \
|
||||
'<time datetime="' + end_time + '">' + \
|
||||
end_date_str + ' ' + end_time_str + '</time>'
|
||||
|
||||
return ''
|
||||
|
||||
|
||||
def _geocoords_from_osm_link(url: str, osm_domain: str) -> (int, float, float):
|
||||
"""Returns geocoordinates from an OSM map link
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -132,6 +132,7 @@ from maps import set_map_preferences_url
|
|||
from maps import geocoords_from_map_link
|
||||
from maps import get_location_from_post
|
||||
from maps import get_category_from_post
|
||||
from maps import get_event_time_span_from_post
|
||||
from session import get_json_valid
|
||||
from session import get_json
|
||||
|
||||
|
|
@ -3189,8 +3190,10 @@ def individual_post_as_html(signing_priv_key_pem: str,
|
|||
# show embedded map if the location contains a map url
|
||||
location_str = get_location_from_post(post_json_object)
|
||||
category_str = ''
|
||||
time_span_str = ''
|
||||
if location_str:
|
||||
category_str = get_category_from_post(post_json_object)
|
||||
time_span_str = get_event_time_span_from_post(post_json_object)
|
||||
|
||||
loc_str = location_str
|
||||
if location_str:
|
||||
|
|
@ -3218,6 +3221,8 @@ def individual_post_as_html(signing_priv_key_pem: str,
|
|||
category_text = translate['Category']
|
||||
event_category = '<br>' + category_text + ': ' + \
|
||||
category_str + '\n'
|
||||
if time_span_str:
|
||||
time_span_str = '<br>' + time_span_str
|
||||
map_addr_str = ''
|
||||
if '<br><address>' in location_str:
|
||||
# append the address after the map
|
||||
|
|
@ -3225,7 +3230,8 @@ def individual_post_as_html(signing_priv_key_pem: str,
|
|||
map_addr_str = \
|
||||
'<br><br><address>' + addrstr + '\n'
|
||||
map_str = '<center>\n' + map_str + \
|
||||
map_addr_str + event_category + '</center>\n'
|
||||
map_addr_str + time_span_str + event_category + \
|
||||
'</center>\n'
|
||||
attrib = None
|
||||
if post_json_object['object'].get('attributedTo'):
|
||||
attrib = \
|
||||
|
|
@ -3273,6 +3279,8 @@ def individual_post_as_html(signing_priv_key_pem: str,
|
|||
locn_text = translate['Location']
|
||||
map_str += '<p>' + locn_text + ': ' + \
|
||||
location_str + '</p>\n'
|
||||
if time_span_str:
|
||||
map_str += '<p>' + time_span_str + '</p>\n'
|
||||
|
||||
if is_muted:
|
||||
content_str = ''
|
||||
|
|
|
|||
Loading…
Reference in New Issue