Exception handling when reading from file

merge-requests/30/head
Bob Mottram 2024-07-13 15:38:11 +01:00
parent 97a4beee60
commit 21e2095696
22 changed files with 1082 additions and 836 deletions

View File

@ -286,7 +286,7 @@ def show_individual_post(self, ssml_getreq: bool, authorized: bool,
with open(ssml_filename, 'r', encoding='utf-8') as fp_ssml: with open(ssml_filename, 'r', encoding='utf-8') as fp_ssml:
ssml_str = fp_ssml.read() ssml_str = fp_ssml.read()
except OSError: except OSError:
pass print('EX: unable to read ssml file ' + ssml_filename)
if ssml_str: if ssml_str:
msg = ssml_str.encode('utf-8') msg = ssml_str.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -615,7 +615,7 @@ def show_individual_at_post(self, ssml_getreq: bool, authorized: bool,
with open(ssml_filename, 'r', encoding='utf-8') as fp_ssml: with open(ssml_filename, 'r', encoding='utf-8') as fp_ssml:
ssml_str = fp_ssml.read() ssml_str = fp_ssml.read()
except OSError: except OSError:
pass print('EX: unable to read ssml file 2 ' + ssml_filename)
if ssml_str: if ssml_str:
msg = ssml_str.encode('utf-8') msg = ssml_str.encode('utf-8')
msglen = len(msg) msglen = len(msg)

View File

@ -330,10 +330,13 @@ def _desktop_show_banner() -> None:
banner_filename = 'theme/' + banner_theme + '/banner.txt' banner_filename = 'theme/' + banner_theme + '/banner.txt'
if not os.path.isfile(banner_filename): if not os.path.isfile(banner_filename):
return return
with open(banner_filename, 'r', encoding='utf-8') as banner_file: try:
banner = banner_file.read() with open(banner_filename, 'r', encoding='utf-8') as fp_banner:
banner = fp_banner.read()
if banner: if banner:
print(banner + '\n') print(banner + '\n')
except OSError:
print('EX: unable to read banner file ' + banner_filename)
def _desktop_wait_for_cmd(timeout: int, debug: bool) -> str: def _desktop_wait_for_cmd(timeout: int, debug: bool) -> str:

View File

@ -1715,12 +1715,16 @@ def _command_options() -> None:
approve_follows_filename = accounts_dir + '/followrequests.txt' approve_follows_filename = accounts_dir + '/followrequests.txt'
approve_ctr = 0 approve_ctr = 0
if os.path.isfile(approve_follows_filename): if os.path.isfile(approve_follows_filename):
try:
with open(approve_follows_filename, 'r', with open(approve_follows_filename, 'r',
encoding='utf-8') as approvefile: encoding='utf-8') as approvefile:
for approve in approvefile: for approve in approvefile:
approve1 = remove_eol(approve) approve1 = remove_eol(approve)
print(approve1) print(approve1)
approve_ctr += 1 approve_ctr += 1
except OSError:
print('EX: unable to read follow approvals file ' +
approve_follows_filename)
if approve_ctr == 0: if approve_ctr == 0:
print('There are no follow requests pending approval.') print('There are no follow requests pending approval.')
sys.exit() sys.exit()

View File

@ -1598,9 +1598,10 @@ def pending_followers_timeline_json(actor: str, base_dir: str,
follow_requests_filename = \ follow_requests_filename = \
acct_dir(base_dir, nickname, domain) + '/followrequests.txt' acct_dir(base_dir, nickname, domain) + '/followrequests.txt'
if os.path.isfile(follow_requests_filename): if os.path.isfile(follow_requests_filename):
try:
with open(follow_requests_filename, 'r', with open(follow_requests_filename, 'r',
encoding='utf-8') as req_file: encoding='utf-8') as fp_req:
for follower_handle in req_file: for follower_handle in fp_req:
if len(follower_handle) == 0: if len(follower_handle) == 0:
continue continue
follower_handle = remove_eol(follower_handle) follower_handle = remove_eol(follower_handle)
@ -1620,4 +1621,7 @@ def pending_followers_timeline_json(actor: str, base_dir: str,
if not follow_json: if not follow_json:
continue continue
result_json['orderedItems'].append(follow_json) result_json['orderedItems'].append(follow_json)
except OSError as exc:
print('EX: unable to read follow requests ' +
follow_requests_filename + ' ' + str(exc))
return result_json return result_json

View File

@ -77,15 +77,23 @@ def _remove_event_from_timeline(event_id: str,
""" """
if not text_in_file(event_id + '\n', tl_events_filename): if not text_in_file(event_id + '\n', tl_events_filename):
return return
events_timeline = ''
with open(tl_events_filename, 'r', with open(tl_events_filename, 'r',
encoding='utf-8') as fp_tl: encoding='utf-8') as fp_tl:
events_timeline = fp_tl.read().replace(event_id + '\n', '') events_timeline = fp_tl.read().replace(event_id + '\n', '')
if events_timeline:
try: try:
with open(tl_events_filename, 'w+', with open(tl_events_filename, 'w+',
encoding='utf-8') as fp2: encoding='utf-8') as fp2:
fp2.write(events_timeline) fp2.write(events_timeline)
except OSError: except OSError:
print('EX: ERROR: unable to save events timeline') print('EX: ERROR: unable to save events timeline')
elif os.path.isfile(tl_events_filename):
try:
os.remove(tl_events_filename)
except OSError:
print('EX: ERROR: unable to remove events timeline')
def save_event_post(base_dir: str, handle: str, post_id: str, def save_event_post(base_dir: str, handle: str, post_id: str,
@ -289,10 +297,12 @@ def get_todays_events(base_dir: str, nickname: str, domain: str,
calendar_post_ids = [] calendar_post_ids = []
recreate_events_file = False recreate_events_file = False
try:
with open(calendar_filename, 'r', encoding='utf-8') as events_file: with open(calendar_filename, 'r', encoding='utf-8') as events_file:
for post_id in events_file: for post_id in events_file:
post_id = remove_eol(post_id) post_id = remove_eol(post_id)
post_filename = locate_post(base_dir, nickname, domain, post_id) post_filename = \
locate_post(base_dir, nickname, domain, post_id)
if not post_filename: if not post_filename:
recreate_events_file = True recreate_events_file = True
continue continue
@ -306,9 +316,9 @@ def get_todays_events(base_dir: str, nickname: str, domain: str,
content = None content = None
if post_json_object['object'].get('contentMap'): if post_json_object['object'].get('contentMap'):
sys_lang = system_language sys_lang = system_language
if post_json_object['object']['contentMap'].get(sys_lang): content_map = post_json_object['object']['contentMap']
content = \ if content_map.get(sys_lang):
post_json_object['object']['contentMap'][sys_lang] content = content_map[sys_lang]
content_language = sys_lang content_language = sys_lang
if not content: if not content:
if post_json_object['object'].get('content'): if post_json_object['object'].get('content'):
@ -357,6 +367,8 @@ def get_todays_events(base_dir: str, nickname: str, domain: str,
events[day_of_month].append(post_event) events[day_of_month].append(post_event)
events[day_of_month] = \ events[day_of_month] = \
_sort_todays_events(events[day_of_month]) _sort_todays_events(events[day_of_month])
except OSError:
print('EX: get_todays_events failed to read ' + calendar_filename)
# if some posts have been deleted then regenerate the calendar file # if some posts have been deleted then regenerate the calendar file
if recreate_events_file: if recreate_events_file:
@ -592,10 +604,12 @@ def day_events_check(base_dir: str, nickname: str, domain: str,
return False return False
events_exist = False events_exist = False
try:
with open(calendar_filename, 'r', encoding='utf-8') as events_file: with open(calendar_filename, 'r', encoding='utf-8') as events_file:
for post_id in events_file: for post_id in events_file:
post_id = remove_eol(post_id) post_id = remove_eol(post_id)
post_filename = locate_post(base_dir, nickname, domain, post_id) post_filename = \
locate_post(base_dir, nickname, domain, post_id)
if not post_filename: if not post_filename:
continue continue
@ -623,6 +637,8 @@ def day_events_check(base_dir: str, nickname: str, domain: str,
continue continue
events_exist = True events_exist = True
break break
except OSError:
print('EX: day_events_check failed to read ' + calendar_filename)
return events_exist return events_exist
@ -648,10 +664,12 @@ def get_this_weeks_events(base_dir: str, nickname: str, domain: str) -> {}:
calendar_post_ids = [] calendar_post_ids = []
recreate_events_file = False recreate_events_file = False
try:
with open(calendar_filename, 'r', encoding='utf-8') as events_file: with open(calendar_filename, 'r', encoding='utf-8') as events_file:
for post_id in events_file: for post_id in events_file:
post_id = remove_eol(post_id) post_id = remove_eol(post_id)
post_filename = locate_post(base_dir, nickname, domain, post_id) post_filename = \
locate_post(base_dir, nickname, domain, post_id)
if not post_filename: if not post_filename:
recreate_events_file = True recreate_events_file = True
continue continue
@ -684,6 +702,8 @@ def get_this_weeks_events(base_dir: str, nickname: str, domain: str) -> {}:
if not events.get(week_day_index): if not events.get(week_day_index):
events[week_day_index] = [] events[week_day_index] = []
events[week_day_index].append(post_event) events[week_day_index].append(post_event)
except OSError:
print('EX: get_this_weeks_events failed to read ' + calendar_filename)
# if some posts have been deleted then regenerate the calendar file # if some posts have been deleted then regenerate the calendar file
if recreate_events_file: if recreate_events_file:
@ -717,10 +737,12 @@ def get_calendar_events(base_dir: str, nickname: str, domain: str,
calendar_post_ids = [] calendar_post_ids = []
recreate_events_file = False recreate_events_file = False
try:
with open(calendar_filename, 'r', encoding='utf-8') as events_file: with open(calendar_filename, 'r', encoding='utf-8') as events_file:
for post_id in events_file: for post_id in events_file:
post_id = remove_eol(post_id) post_id = remove_eol(post_id)
post_filename = locate_post(base_dir, nickname, domain, post_id) post_filename = \
locate_post(base_dir, nickname, domain, post_id)
if not post_filename: if not post_filename:
recreate_events_file = True recreate_events_file = True
continue continue
@ -771,6 +793,8 @@ def get_calendar_events(base_dir: str, nickname: str, domain: str,
if not events.get(day_of_month): if not events.get(day_of_month):
events[day_of_month] = [] events[day_of_month] = []
events[day_of_month].append(post_event) events[day_of_month].append(post_event)
except OSError:
print('EX: get_calendar_events failed to read ' + calendar_filename)
# if some posts have been deleted then regenerate the calendar file # if some posts have been deleted then regenerate the calendar file
if recreate_events_file: if recreate_events_file:
@ -807,7 +831,7 @@ def remove_calendar_event(base_dir: str, nickname: str, domain: str,
with open(calendar_filename, 'r', encoding='utf-8') as fp_cal: with open(calendar_filename, 'r', encoding='utf-8') as fp_cal:
lines_str = fp_cal.read() lines_str = fp_cal.read()
except OSError: except OSError:
print('EX: unable to read calendar file ' + print('EX: remove_calendar_event unable to read calendar file ' +
calendar_filename) calendar_filename)
if not lines_str: if not lines_str:
return return

View File

@ -433,7 +433,7 @@ def store_hash_tags(base_dir: str, nickname: str, domain: str,
with open(tags_filename, 'r', encoding='utf-8') as tags_file: with open(tags_filename, 'r', encoding='utf-8') as tags_file:
content = tags_file.read() content = tags_file.read()
except OSError: except OSError:
pass print('EX: store_hash_tags failed to read ' + tags_filename)
if post_url not in content: if post_url not in content:
content = tag_line + content content = tag_line + content
try: try:
@ -1226,11 +1226,14 @@ def _notify_moved(base_dir: str, domain_full: str,
prev_actor_handle + ' ' + new_actor_handle + ' ' + url prev_actor_handle + ' ' + new_actor_handle + ' ' + url
if os.path.isfile(moved_file): if os.path.isfile(moved_file):
try:
with open(moved_file, 'r', with open(moved_file, 'r',
encoding='utf-8') as fp_move: encoding='utf-8') as fp_move:
prev_moved_str = fp_move.read() prev_moved_str = fp_move.read()
if prev_moved_str == moved_str: if prev_moved_str == moved_str:
continue continue
except OSError:
print('EX: _notify_moved unable to read ' + moved_file)
try: try:
with open(moved_file, 'w+', encoding='utf-8') as fp_move: with open(moved_file, 'w+', encoding='utf-8') as fp_move:
fp_move.write(moved_str) fp_move.write(moved_str)
@ -3920,10 +3923,13 @@ def _like_notify(base_dir: str, domain: str,
# was there a previous like notification? # was there a previous like notification?
if os.path.isfile(prev_like_file): if os.path.isfile(prev_like_file):
# is it the same as the current notification ? # is it the same as the current notification ?
try:
with open(prev_like_file, 'r', encoding='utf-8') as fp_like: with open(prev_like_file, 'r', encoding='utf-8') as fp_like:
prev_like_str = fp_like.read() prev_like_str = fp_like.read()
if prev_like_str == like_str: if prev_like_str == like_str:
return return
except OSError:
print('EX: _like_notify unable to read ' + prev_like_file)
try: try:
with open(prev_like_file, 'w+', encoding='utf-8') as fp_like: with open(prev_like_file, 'w+', encoding='utf-8') as fp_like:
fp_like.write(like_str) fp_like.write(like_str)
@ -3985,10 +3991,13 @@ def _reaction_notify(base_dir: str, domain: str, onion_domain: str,
# was there a previous reaction notification? # was there a previous reaction notification?
if os.path.isfile(prev_reaction_file): if os.path.isfile(prev_reaction_file):
# is it the same as the current notification ? # is it the same as the current notification ?
try:
with open(prev_reaction_file, 'r', encoding='utf-8') as fp_react: with open(prev_reaction_file, 'r', encoding='utf-8') as fp_react:
prev_reaction_str = fp_react.read() prev_reaction_str = fp_react.read()
if prev_reaction_str == reaction_str: if prev_reaction_str == reaction_str:
return return
except OSError:
print('EX: _reaction_notify unable to read ' + prev_reaction_file)
try: try:
with open(prev_reaction_file, 'w+', encoding='utf-8') as fp_react: with open(prev_reaction_file, 'w+', encoding='utf-8') as fp_react:
fp_react.write(reaction_str) fp_react.write(reaction_str)
@ -4015,10 +4024,13 @@ def _notify_post_arrival(base_dir: str, handle: str, url: str) -> None:
notify_file = account_dir + '/.newNotifiedPost' notify_file = account_dir + '/.newNotifiedPost'
if os.path.isfile(notify_file): if os.path.isfile(notify_file):
# check that the same notification is not repeatedly sent # check that the same notification is not repeatedly sent
try:
with open(notify_file, 'r', encoding='utf-8') as fp_notify: with open(notify_file, 'r', encoding='utf-8') as fp_notify:
existing_notification_message = fp_notify.read() existing_notification_message = fp_notify.read()
if url in existing_notification_message: if url in existing_notification_message:
return return
except OSError:
print('EX: _notify_post_arrival unable to read ' + notify_file)
try: try:
with open(notify_file, 'w+', encoding='utf-8') as fp_notify: with open(notify_file, 'w+', encoding='utf-8') as fp_notify:
fp_notify.write(url) fp_notify.write(url)
@ -4297,12 +4309,16 @@ def _update_last_seen(base_dir: str, handle: str, actor: str) -> None:
days_since_epoch = (curr_time - date_epoch()).days days_since_epoch = (curr_time - date_epoch()).days
# has the value changed? # has the value changed?
if os.path.isfile(last_seen_filename): if os.path.isfile(last_seen_filename):
try:
with open(last_seen_filename, 'r', with open(last_seen_filename, 'r',
encoding='utf-8') as last_seen_file: encoding='utf-8') as last_seen_file:
days_since_epoch_file = last_seen_file.read() days_since_epoch_file = last_seen_file.read()
if int(days_since_epoch_file) == days_since_epoch: if int(days_since_epoch_file) == days_since_epoch:
# value hasn't changed, so we can save writing anything to file # value hasn't changed, so we can save writing
# anything to file
return return
except OSError:
print('EX: _update_last_seen unable to read ' + last_seen_filename)
try: try:
with open(last_seen_filename, 'w+', with open(last_seen_filename, 'w+',
encoding='utf-8') as last_seen_file: encoding='utf-8') as last_seen_file:

14
keys.py
View File

@ -19,8 +19,11 @@ def _get_local_private_key(base_dir: str, nickname: str, domain: str) -> str:
key_filename = base_dir + '/keys/private/' + handle.lower() + '.key' key_filename = base_dir + '/keys/private/' + handle.lower() + '.key'
if not os.path.isfile(key_filename): if not os.path.isfile(key_filename):
return None return None
with open(key_filename, 'r', encoding='utf-8') as pem_file: try:
return pem_file.read() with open(key_filename, 'r', encoding='utf-8') as fp_pem:
return fp_pem.read()
except OSError:
print('EX: _get_local_private_key unable to read ' + key_filename)
return None return None
@ -33,8 +36,11 @@ def _get_local_public_key(base_dir: str, nickname: str, domain: str) -> str:
key_filename = base_dir + '/keys/public/' + handle.lower() + '.key' key_filename = base_dir + '/keys/public/' + handle.lower() + '.key'
if not os.path.isfile(key_filename): if not os.path.isfile(key_filename):
return None return None
with open(key_filename, 'r', encoding='utf-8') as pem_file: try:
return pem_file.read() with open(key_filename, 'r', encoding='utf-8') as fp_pem:
return fp_pem.read()
except OSError:
print('EX: _get_local_public_key unable to read ' + key_filename)
return None return None

View File

@ -178,8 +178,12 @@ def manual_approve_follow_request(session, session_onion, session_i2p,
# is the handle in the requests file? # is the handle in the requests file?
approve_follows_str = '' approve_follows_str = ''
try:
with open(approve_follows_filename, 'r', encoding='utf-8') as fp_foll: with open(approve_follows_filename, 'r', encoding='utf-8') as fp_foll:
approve_follows_str = fp_foll.read() approve_follows_str = fp_foll.read()
except OSError:
print('EX: manual_approve_follow_request unable to read ' +
approve_follows_filename)
exists = False exists = False
approve_handle_full = approve_handle approve_handle_full = approve_handle
if approve_handle in approve_follows_str: if approve_handle in approve_follows_str:
@ -213,6 +217,7 @@ def manual_approve_follow_request(session, session_onion, session_i2p,
'" ' + approve_follows_filename) '" ' + approve_follows_filename)
return return
try:
with open(approve_follows_filename + '.new', 'w+', with open(approve_follows_filename + '.new', 'w+',
encoding='utf-8') as approvefilenew: encoding='utf-8') as approvefilenew:
update_approved_followers = False update_approved_followers = False
@ -221,8 +226,8 @@ def manual_approve_follow_request(session, session_onion, session_i2p,
encoding='utf-8') as approvefile: encoding='utf-8') as approvefile:
for handle_of_follow_requester in approvefile: for handle_of_follow_requester in approvefile:
# is this the approved follow? # is this the approved follow?
approve_handl = approve_handle_full appr_handl = approve_handle_full
if not handle_of_follow_requester.startswith(approve_handl): if not handle_of_follow_requester.startswith(appr_handl):
# this isn't the approved follow so it will remain # this isn't the approved follow so it will remain
# in the requests file # in the requests file
approvefilenew.write(handle_of_follow_requester) approvefilenew.write(handle_of_follow_requester)
@ -234,10 +239,12 @@ def manual_approve_follow_request(session, session_onion, session_i2p,
handle_of_follow_requester.replace('\r', '') handle_of_follow_requester.replace('\r', '')
port2 = port port2 = port
if ':' in handle_of_follow_requester: if ':' in handle_of_follow_requester:
port2 = get_port_from_domain(handle_of_follow_requester) port2 = \
get_port_from_domain(handle_of_follow_requester)
requests_dir = account_dir + '/requests' requests_dir = account_dir + '/requests'
follow_activity_filename = \ follow_activity_filename = \
requests_dir + '/' + handle_of_follow_requester + '.follow' requests_dir + '/' + \
handle_of_follow_requester + '.follow'
if not os.path.isfile(follow_activity_filename): if not os.path.isfile(follow_activity_filename):
update_approved_followers = True update_approved_followers = True
continue continue
@ -308,6 +315,9 @@ def manual_approve_follow_request(session, session_onion, session_i2p,
sites_unavailable, sites_unavailable,
system_language) system_language)
update_approved_followers = True update_approved_followers = True
except OSError as exc:
print('EX: manual_approve_follow_request unable to write ' +
approve_follows_filename + '.new ' + str(exc))
followers_filename = account_dir + '/followers.txt' followers_filename = account_dir + '/followers.txt'
if update_approved_followers: if update_approved_followers:

View File

@ -44,6 +44,7 @@ def _meta_data_instance_v1(show_accounts: bool,
rules_list = [] rules_list = []
rules_filename = data_dir(base_dir) + '/tos.md' rules_filename = data_dir(base_dir) + '/tos.md'
if os.path.isfile(rules_filename): if os.path.isfile(rules_filename):
try:
with open(rules_filename, 'r', encoding='utf-8') as fp_rules: with open(rules_filename, 'r', encoding='utf-8') as fp_rules:
rules_lines = fp_rules.readlines() rules_lines = fp_rules.readlines()
rule_ctr = 1 rule_ctr = 1
@ -58,6 +59,9 @@ def _meta_data_instance_v1(show_accounts: bool,
'text': line 'text': line
}) })
rule_ctr += 1 rule_ctr += 1
except OSError:
print('EX: _meta_data_instance_v1 unable to read ' +
rules_filename)
is_bot = False is_bot = False
is_group = False is_group = False

View File

@ -328,8 +328,11 @@ def _spoof_meta_data(base_dir: str, nickname: str, domain: str,
decoy_seed_filename = acct_dir(base_dir, nickname, domain) + '/decoyseed' decoy_seed_filename = acct_dir(base_dir, nickname, domain) + '/decoyseed'
decoy_seed = 63725 decoy_seed = 63725
if os.path.isfile(decoy_seed_filename): if os.path.isfile(decoy_seed_filename):
try:
with open(decoy_seed_filename, 'r', encoding='utf-8') as fp_seed: with open(decoy_seed_filename, 'r', encoding='utf-8') as fp_seed:
decoy_seed = int(fp_seed.read()) decoy_seed = int(fp_seed.read())
except OSError:
print('EX: _spoof_meta_data unable to read ' + decoy_seed_filename)
else: else:
decoy_seed = randint(10000, 10000000000000000) decoy_seed = randint(10000, 10000000000000000)
try: try:
@ -337,7 +340,8 @@ def _spoof_meta_data(base_dir: str, nickname: str, domain: str,
encoding='utf-8') as fp_seed: encoding='utf-8') as fp_seed:
fp_seed.write(str(decoy_seed)) fp_seed.write(str(decoy_seed))
except OSError: except OSError:
print('EX: unable to write ' + decoy_seed_filename) print('EX: _spoof_meta_data unable to write ' +
decoy_seed_filename)
if os.path.isfile('/usr/bin/exiftool'): if os.path.isfile('/usr/bin/exiftool'):
print('Spoofing metadata in ' + output_filename + ' using exiftool') print('Spoofing metadata in ' + output_filename + ' using exiftool')

View File

@ -36,6 +36,7 @@ def _move_following_handles_for_account(base_dir: str,
acct_dir(base_dir, nickname, domain) + '/following.txt' acct_dir(base_dir, nickname, domain) + '/following.txt'
if not os.path.isfile(following_filename): if not os.path.isfile(following_filename):
return ctr return ctr
try:
with open(following_filename, 'r', encoding='utf-8') as fp_foll: with open(following_filename, 'r', encoding='utf-8') as fp_foll:
following_handles = fp_foll.readlines() following_handles = fp_foll.readlines()
for follow_handle in following_handles: for follow_handle in following_handles:
@ -46,6 +47,9 @@ def _move_following_handles_for_account(base_dir: str,
http_prefix, cached_webfingers, http_prefix, cached_webfingers,
debug, signing_priv_key_pem, debug, signing_priv_key_pem,
block_federated) block_federated)
except OSError:
print('EX: _move_following_handles_for_account unable to read ' +
following_filename)
return ctr return ctr
@ -135,8 +139,12 @@ def _update_moved_handle(base_dir: str, nickname: str, domain: str,
acct_dir(base_dir, nickname, domain) + '/following.txt' acct_dir(base_dir, nickname, domain) + '/following.txt'
if os.path.isfile(following_filename): if os.path.isfile(following_filename):
following_handles = [] following_handles = []
try:
with open(following_filename, 'r', encoding='utf-8') as foll1: with open(following_filename, 'r', encoding='utf-8') as foll1:
following_handles = foll1.readlines() following_handles = foll1.readlines()
except OSError:
print('EX: _update_moved_handle unable to read ' +
following_filename)
moved_to_handle = moved_to_nickname + '@' + moved_to_domain_full moved_to_handle = moved_to_nickname + '@' + moved_to_domain_full
handle_lower = handle.lower() handle_lower = handle.lower()

View File

@ -394,8 +394,12 @@ def _newswire_hashtag_processing(base_dir: str, post_json_object: {},
if not os.path.isfile(rules_filename): if not os.path.isfile(rules_filename):
return True return True
rules = [] rules = []
try:
with open(rules_filename, 'r', encoding='utf-8') as fp_rules: with open(rules_filename, 'r', encoding='utf-8') as fp_rules:
rules = fp_rules.readlines() rules = fp_rules.readlines()
except OSError:
print('EX: _newswire_hashtag_processing unable to read ' +
rules_filename)
domain_full = get_full_domain(domain, port) domain_full = get_full_domain(domain, port)
@ -467,7 +471,9 @@ def _create_news_mirror(base_dir: str, domain: str,
# no index for mirrors found # no index for mirrors found
return True return True
removals = [] removals = []
with open(mirror_index_filename, 'r', encoding='utf-8') as index_file: try:
with open(mirror_index_filename, 'r',
encoding='utf-8') as fp_index:
# remove the oldest directories # remove the oldest directories
ctr = 0 ctr = 0
while no_of_dirs > max_mirrored_articles: while no_of_dirs > max_mirrored_articles:
@ -476,7 +482,7 @@ def _create_news_mirror(base_dir: str, domain: str,
# escape valve # escape valve
break break
post_id = index_file.readline() post_id = fp_index.readline()
if not post_id: if not post_id:
continue continue
post_id = post_id.strip() post_id = post_id.strip()
@ -486,16 +492,23 @@ def _create_news_mirror(base_dir: str, domain: str,
ignore_errors=False, onexc=None) ignore_errors=False, onexc=None)
removals.append(post_id) removals.append(post_id)
no_of_dirs -= 1 no_of_dirs -= 1
except OSError as exc:
print('EX: _create_news_mirror unable to read ' +
mirror_index_filename + ' ' + str(exc))
# remove the corresponding index entries # remove the corresponding index entries
if removals: if removals:
index_content = '' index_content = ''
try:
with open(mirror_index_filename, 'r', with open(mirror_index_filename, 'r',
encoding='utf-8') as index_file: encoding='utf-8') as index_file:
index_content = index_file.read() index_content = index_file.read()
for remove_post_id in removals: for remove_post_id in removals:
index_content = \ index_content = \
index_content.replace(remove_post_id + '\n', '') index_content.replace(remove_post_id + '\n', '')
except OSError:
print('EX: _create_news_mirror unable to read ' +
mirror_index_filename)
try: try:
with open(mirror_index_filename, 'w+', with open(mirror_index_filename, 'w+',
encoding='utf-8') as index_file: encoding='utf-8') as index_file:

View File

@ -385,9 +385,14 @@ def load_hashtag_categories(base_dir: str, language: str) -> None:
if not os.path.isfile(hashtag_categories_filename): if not os.path.isfile(hashtag_categories_filename):
return return
with open(hashtag_categories_filename, 'r', encoding='utf-8') as fp_cat: try:
with open(hashtag_categories_filename, 'r',
encoding='utf-8') as fp_cat:
xml_str = fp_cat.read() xml_str = fp_cat.read()
_xml2str_to_hashtag_categories(base_dir, xml_str, 1024, True) _xml2str_to_hashtag_categories(base_dir, xml_str, 1024, True)
except OSError:
print('EX: load_hashtag_categories unable to read ' +
hashtag_categories_filename)
def _xml2str_to_hashtag_categories(base_dir: str, xml_str: str, def _xml2str_to_hashtag_categories(base_dir: str, xml_str: str,
@ -1618,6 +1623,7 @@ def _add_account_blogs_to_newswire(base_dir: str, nickname: str, domain: str,
if os.path.isfile(moderated_filename): if os.path.isfile(moderated_filename):
moderated = True moderated = True
try:
with open(index_filename, 'r', encoding='utf-8') as index_file: with open(index_filename, 'r', encoding='utf-8') as index_file:
post_filename = 'start' post_filename = 'start'
ctr = 0 ctr = 0
@ -1660,16 +1666,17 @@ def _add_account_blogs_to_newswire(base_dir: str, nickname: str, domain: str,
system_language) system_language)
description = first_paragraph_from_string(content) description = first_paragraph_from_string(content)
description = remove_html(description) description = remove_html(description)
tags_from_post = _get_hashtags_from_post(post_json_object) tags_from_post = \
_get_hashtags_from_post(post_json_object)
summary = post_json_object['object']['summary'] summary = post_json_object['object']['summary']
url_str = \ url2 = post_json_object['object']['url']
get_url_from_post(post_json_object['object']['url']) url_str = get_url_from_post(url2)
url2 = remove_html(url_str) url3 = remove_html(url_str)
fediverse_handle = '' fediverse_handle = ''
extra_links = [] extra_links = []
_add_newswire_dict_entry(base_dir, _add_newswire_dict_entry(base_dir,
newswire, published, newswire, published,
summary, url2, summary, url3,
votes, full_post_filename, votes, full_post_filename,
description, moderated, False, description, moderated, False,
tags_from_post, tags_from_post,
@ -1680,6 +1687,9 @@ def _add_account_blogs_to_newswire(base_dir: str, nickname: str, domain: str,
ctr += 1 ctr += 1
if ctr >= max_blogs_per_account: if ctr >= max_blogs_per_account:
break break
except OSError as exc:
print('EX: _add_account_blogs_to_newswire unable to read ' +
index_filename + ' ' + str(exc))
def _add_blogs_to_newswire(base_dir: str, domain: str, newswire: {}, def _add_blogs_to_newswire(base_dir: str, domain: str, newswire: {},
@ -1755,8 +1765,12 @@ def get_dict_from_newswire(session, base_dir: str, domain: str,
# add rss feeds # add rss feeds
rss_feed = [] rss_feed = []
try:
with open(subscriptions_filename, 'r', encoding='utf-8') as fp_sub: with open(subscriptions_filename, 'r', encoding='utf-8') as fp_sub:
rss_feed = fp_sub.readlines() rss_feed = fp_sub.readlines()
except OSError:
print('EX: get_dict_from_newswire unable to read ' +
subscriptions_filename)
result = {} result = {}
for url in rss_feed: for url in rss_feed:
url = url.strip() url = url.strip()

View File

@ -1273,8 +1273,11 @@ def reenable_account(base_dir: str, nickname: str) -> None:
suspended_filename = data_dir(base_dir) + '/suspended.txt' suspended_filename = data_dir(base_dir) + '/suspended.txt'
if os.path.isfile(suspended_filename): if os.path.isfile(suspended_filename):
lines = [] lines = []
try:
with open(suspended_filename, 'r', encoding='utf-8') as fp_sus: with open(suspended_filename, 'r', encoding='utf-8') as fp_sus:
lines = fp_sus.readlines() lines = fp_sus.readlines()
except OSError:
print('EX: reenable_account unable to read ' + suspended_filename)
try: try:
with open(suspended_filename, 'w+', encoding='utf-8') as fp_sus: with open(suspended_filename, 'w+', encoding='utf-8') as fp_sus:
for suspended in lines: for suspended in lines:
@ -1298,8 +1301,11 @@ def suspend_account(base_dir: str, nickname: str, domain: str) -> None:
# Don't suspend moderators # Don't suspend moderators
moderators_file = data_dir(base_dir) + '/moderators.txt' moderators_file = data_dir(base_dir) + '/moderators.txt'
if os.path.isfile(moderators_file): if os.path.isfile(moderators_file):
try:
with open(moderators_file, 'r', encoding='utf-8') as fp_mod: with open(moderators_file, 'r', encoding='utf-8') as fp_mod:
lines = fp_mod.readlines() lines = fp_mod.readlines()
except OSError:
print('EX: suspend_account unable too read ' + moderators_file)
for moderator in lines: for moderator in lines:
if moderator.strip('\n').strip('\r') == nickname: if moderator.strip('\n').strip('\r') == nickname:
return return
@ -1319,8 +1325,11 @@ def suspend_account(base_dir: str, nickname: str, domain: str) -> None:
suspended_filename = data_dir(base_dir) + '/suspended.txt' suspended_filename = data_dir(base_dir) + '/suspended.txt'
if os.path.isfile(suspended_filename): if os.path.isfile(suspended_filename):
try:
with open(suspended_filename, 'r', encoding='utf-8') as fp_sus: with open(suspended_filename, 'r', encoding='utf-8') as fp_sus:
lines = fp_sus.readlines() lines = fp_sus.readlines()
except OSError:
print('EX: suspend_account unable to read 2 ' + suspended_filename)
for suspended in lines: for suspended in lines:
if suspended.strip('\n').strip('\r') == nickname: if suspended.strip('\n').strip('\r') == nickname:
return return
@ -1356,8 +1365,12 @@ def can_remove_post(base_dir: str,
# is the post by a moderator? # is the post by a moderator?
moderators_file = data_dir(base_dir) + '/moderators.txt' moderators_file = data_dir(base_dir) + '/moderators.txt'
if os.path.isfile(moderators_file): if os.path.isfile(moderators_file):
lines = []
try:
with open(moderators_file, 'r', encoding='utf-8') as fp_mod: with open(moderators_file, 'r', encoding='utf-8') as fp_mod:
lines = fp_mod.readlines() lines = fp_mod.readlines()
except OSError:
print('EX: can_remove_post unable to read ' + moderators_file)
for moderator in lines: for moderator in lines:
if domain_full + '/users/' + \ if domain_full + '/users/' + \
moderator.strip('\n') + '/' in post_id: moderator.strip('\n') + '/' in post_id:
@ -1389,8 +1402,12 @@ def _remove_tags_for_nickname(base_dir: str, nickname: str,
if not text_in_file(match_str, tag_filename): if not text_in_file(match_str, tag_filename):
continue continue
lines = [] lines = []
try:
with open(tag_filename, 'r', encoding='utf-8') as fp_tag: with open(tag_filename, 'r', encoding='utf-8') as fp_tag:
lines = fp_tag.readlines() lines = fp_tag.readlines()
except OSError:
print('EX: _remove_tags_for_nickname unable to read ' +
tag_filename)
try: try:
with open(tag_filename, 'w+', encoding='utf-8') as tag_file: with open(tag_filename, 'w+', encoding='utf-8') as tag_file:
for tagline in lines: for tagline in lines:
@ -1415,8 +1432,12 @@ def remove_account(base_dir: str, nickname: str,
# Don't remove moderators # Don't remove moderators
moderators_file = data_dir(base_dir) + '/moderators.txt' moderators_file = data_dir(base_dir) + '/moderators.txt'
if os.path.isfile(moderators_file): if os.path.isfile(moderators_file):
lines = []
try:
with open(moderators_file, 'r', encoding='utf-8') as fp_mod: with open(moderators_file, 'r', encoding='utf-8') as fp_mod:
lines = fp_mod.readlines() lines = fp_mod.readlines()
except OSError:
print('EX: remove_account unable to read ' + moderators_file)
for moderator in lines: for moderator in lines:
if moderator.strip('\n') == nickname: if moderator.strip('\n') == nickname:
return False return False
@ -1542,8 +1563,9 @@ def is_person_snoozed(base_dir: str, nickname: str, domain: str,
return False return False
# remove the snooze entry if it has timed out # remove the snooze entry if it has timed out
replace_str = None replace_str = None
with open(snoozed_filename, 'r', encoding='utf-8') as snoozed_file: try:
for line in snoozed_file: with open(snoozed_filename, 'r', encoding='utf-8') as fp_snoozed:
for line in fp_snoozed:
# is this the entry for the actor? # is this the entry for the actor?
if line.startswith(snooze_actor + ' '): if line.startswith(snooze_actor + ' '):
snoozed_time_str1 = line.split(' ')[1] snoozed_time_str1 = line.split(' ')[1]
@ -1558,10 +1580,15 @@ def is_person_snoozed(base_dir: str, nickname: str, domain: str,
else: else:
replace_str = line replace_str = line
break break
except OSError:
print('EX: is_person_snoozed unable to read ' + snoozed_filename)
if replace_str: if replace_str:
content = None content = None
with open(snoozed_filename, 'r', encoding='utf-8') as snoozed_file: try:
content = snoozed_file.read().replace(replace_str, '') with open(snoozed_filename, 'r', encoding='utf-8') as fp_snoozed:
content = fp_snoozed.read().replace(replace_str, '')
except OSError:
print('EX: is_person_snoozed unable to read 2 ' + snoozed_filename)
if content: if content:
try: try:
with open(snoozed_filename, 'w+', with open(snoozed_filename, 'w+',
@ -1610,15 +1637,21 @@ def person_unsnooze(base_dir: str, nickname: str, domain: str,
if not text_in_file(snooze_actor + ' ', snoozed_filename): if not text_in_file(snooze_actor + ' ', snoozed_filename):
return return
replace_str = None replace_str = None
with open(snoozed_filename, 'r', encoding='utf-8') as snoozed_file: try:
for line in snoozed_file: with open(snoozed_filename, 'r', encoding='utf-8') as fp_snoozed:
for line in fp_snoozed:
if line.startswith(snooze_actor + ' '): if line.startswith(snooze_actor + ' '):
replace_str = line replace_str = line
break break
except OSError:
print('EX: person_unsnooze unable to read ' + snoozed_filename)
if replace_str: if replace_str:
content = None content = None
with open(snoozed_filename, 'r', encoding='utf-8') as snoozed_file: try:
content = snoozed_file.read().replace(replace_str, '') with open(snoozed_filename, 'r', encoding='utf-8') as fp_snoozed:
content = fp_snoozed.read().replace(replace_str, '')
except OSError:
print('EX: person_unsnooze unable to read 2 ' + snoozed_filename)
if content is not None: if content is not None:
try: try:
with open(snoozed_filename, 'w+', with open(snoozed_filename, 'w+',
@ -1658,9 +1691,13 @@ def get_person_notes(base_dir: str, nickname: str, domain: str,
acct_dir(base_dir, nickname, domain) + \ acct_dir(base_dir, nickname, domain) + \
'/notes/' + handle + '.txt' '/notes/' + handle + '.txt'
if os.path.isfile(person_notes_filename): if os.path.isfile(person_notes_filename):
try:
with open(person_notes_filename, 'r', with open(person_notes_filename, 'r',
encoding='utf-8') as fp_notes: encoding='utf-8') as fp_notes:
person_notes = fp_notes.read() person_notes = fp_notes.read()
except OSError:
print('EX: get_person_notes unable to read ' +
person_notes_filename)
return person_notes return person_notes
@ -1907,8 +1944,11 @@ def get_person_avatar_url(base_dir: str, person_url: str,
if ext != 'svg': if ext != 'svg':
return im_path return im_path
content = '' content = ''
try:
with open(im_filename, 'r', encoding='utf-8') as fp_im: with open(im_filename, 'r', encoding='utf-8') as fp_im:
content = fp_im.read() content = fp_im.read()
except OSError:
print('EX: get_person_avatar_url unable to read ' + im_filename)
if not dangerous_svg(content, False): if not dangerous_svg(content, False):
return im_path return im_path

View File

@ -168,8 +168,13 @@ def is_moderator(base_dir: str, nickname: str) -> bool:
return True return True
return False return False
lines = []
try:
with open(moderators_file, 'r', encoding='utf-8') as fp_mod: with open(moderators_file, 'r', encoding='utf-8') as fp_mod:
lines = fp_mod.readlines() lines = fp_mod.readlines()
except OSError:
print('EX: is_moderator unable to read ' + moderators_file)
if len(lines) == 0: if len(lines) == 0:
admin_name = get_config_param(base_dir, 'admin') admin_name = get_config_param(base_dir, 'admin')
if not admin_name: if not admin_name:
@ -193,6 +198,7 @@ def no_of_followers_on_domain(base_dir: str, handle: str,
return 0 return 0
ctr = 0 ctr = 0
try:
with open(filename, 'r', encoding='utf-8') as followers_file: with open(filename, 'r', encoding='utf-8') as followers_file:
for follower_handle in followers_file: for follower_handle in followers_file:
if '@' in follower_handle: if '@' in follower_handle:
@ -200,6 +206,8 @@ def no_of_followers_on_domain(base_dir: str, handle: str,
follower_domain = remove_eol(follower_domain) follower_domain = remove_eol(follower_domain)
if domain == follower_domain: if domain == follower_domain:
ctr += 1 ctr += 1
except OSError:
print('EX: no_of_followers_on_domain unable to read ' + filename)
return ctr return ctr
@ -1991,8 +1999,12 @@ def get_pinned_post_as_json(base_dir: str, http_prefix: str,
actor = local_actor_url(http_prefix, nickname, domain_full) actor = local_actor_url(http_prefix, nickname, domain_full)
if os.path.isfile(pinned_filename): if os.path.isfile(pinned_filename):
pinned_content = None pinned_content = None
with open(pinned_filename, 'r', encoding='utf-8') as pin_file: try:
pinned_content = pin_file.read() with open(pinned_filename, 'r', encoding='utf-8') as fp_pin:
pinned_content = fp_pin.read()
except OSError:
print('EX: get_pinned_post_as_json unable to read ' +
pinned_filename)
if pinned_content: if pinned_content:
pinned_post_json = { pinned_post_json = {
'atomUri': actor + '/pinned', 'atomUri': actor + '/pinned',
@ -2214,8 +2226,13 @@ def _append_citations_to_blog_post(base_dir: str,
if not os.path.isfile(citations_filename): if not os.path.isfile(citations_filename):
return return
citations_separator = '#####' citations_separator = '#####'
citations = []
try:
with open(citations_filename, 'r', encoding='utf-8') as fp_cit: with open(citations_filename, 'r', encoding='utf-8') as fp_cit:
citations = fp_cit.readlines() citations = fp_cit.readlines()
except OSError:
print('EX: _append_citations_to_blog_post unable to read ' +
citations_filename)
for line in citations: for line in citations:
if citations_separator not in line: if citations_separator not in line:
continue continue
@ -2634,6 +2651,7 @@ def create_report_post(base_dir: str,
moderators_list = [] moderators_list = []
moderators_file = data_dir(base_dir) + '/moderators.txt' moderators_file = data_dir(base_dir) + '/moderators.txt'
if os.path.isfile(moderators_file): if os.path.isfile(moderators_file):
try:
with open(moderators_file, 'r', encoding='utf-8') as fp_mod: with open(moderators_file, 'r', encoding='utf-8') as fp_mod:
for line in fp_mod: for line in fp_mod:
line = line.strip('\n').strip('\r') line = line.strip('\n').strip('\r')
@ -2664,6 +2682,8 @@ def create_report_post(base_dir: str,
local_actor_url(http_prefix, line, domain_full) local_actor_url(http_prefix, line, domain_full)
if moderator_actor not in moderators_list: if moderator_actor not in moderators_list:
moderators_list.append(moderator_actor) moderators_list.append(moderator_actor)
except OSError:
print('EX: create_report_post unable to read ' + moderators_file)
if len(moderators_list) == 0: if len(moderators_list) == 0:
# if there are no moderators then the admin becomes the moderator # if there are no moderators then the admin becomes the moderator
admin_nickname = get_config_param(base_dir, 'admin') admin_nickname = get_config_param(base_dir, 'admin')
@ -3305,8 +3325,9 @@ def group_followers_by_domain(base_dir: str, nickname: str, domain: str) -> {}:
if not os.path.isfile(followers_filename): if not os.path.isfile(followers_filename):
return None return None
grouped = {} grouped = {}
with open(followers_filename, 'r', encoding='utf-8') as foll_file: try:
for follower_handle in foll_file: with open(followers_filename, 'r', encoding='utf-8') as fp_foll:
for follower_handle in fp_foll:
if '@' not in follower_handle: if '@' not in follower_handle:
continue continue
fhandle1 = follower_handle.strip() fhandle1 = follower_handle.strip()
@ -3316,6 +3337,9 @@ def group_followers_by_domain(base_dir: str, nickname: str, domain: str) -> {}:
grouped[follower_domain] = [fhandle] grouped[follower_domain] = [fhandle]
else: else:
grouped[follower_domain].append(fhandle) grouped[follower_domain].append(fhandle)
except OSError:
print('EX: group_followers_by_domain unable to read ' +
followers_filename)
return grouped return grouped
@ -4339,6 +4363,8 @@ def create_outbox(base_dir: str, nickname: str, domain: str,
def create_moderation(base_dir: str, nickname: str, domain: str, port: int, def create_moderation(base_dir: str, nickname: str, domain: str, port: int,
http_prefix: str, items_per_page: int, header_only: bool, http_prefix: str, items_per_page: int, header_only: bool,
page_number: int) -> {}: page_number: int) -> {}:
"""
"""
box_dir = create_person_dir(nickname, domain, base_dir, 'inbox') box_dir = create_person_dir(nickname, domain, base_dir, 'inbox')
boxname = 'moderation' boxname = 'moderation'
@ -4369,9 +4395,14 @@ def create_moderation(base_dir: str, nickname: str, domain: str, port: int,
if is_moderator(base_dir, nickname): if is_moderator(base_dir, nickname):
moderation_index_file = data_dir(base_dir) + '/moderation.txt' moderation_index_file = data_dir(base_dir) + '/moderation.txt'
if os.path.isfile(moderation_index_file): if os.path.isfile(moderation_index_file):
lines = []
try:
with open(moderation_index_file, 'r', with open(moderation_index_file, 'r',
encoding='utf-8') as index_file: encoding='utf-8') as index_file:
lines = index_file.readlines() lines = index_file.readlines()
except OSError:
print('EX: create_moderation unable to read ' +
moderation_index_file)
box_header['totalItems'] = len(lines) box_header['totalItems'] = len(lines)
if header_only: if header_only:
return box_header return box_header
@ -4499,8 +4530,15 @@ def _add_post_to_timeline(file_path: str, boxname: str,
posts_in_box: [], box_actor: str) -> bool: posts_in_box: [], box_actor: str) -> bool:
""" Reads a post from file and decides whether it is valid """ Reads a post from file and decides whether it is valid
""" """
with open(file_path, 'r', encoding='utf-8') as post_file: post_str = ''
post_str = post_file.read() try:
with open(file_path, 'r', encoding='utf-8') as fp_post:
post_str = fp_post.read()
except OSError:
print('EX: _add_post_to_timeline unable to read ' + file_path)
if not post_str:
return False
if file_path.endswith('.json'): if file_path.endswith('.json'):
replies_filename = file_path.replace('.json', '.replies') replies_filename = file_path.replace('.json', '.replies')
@ -4513,9 +4551,8 @@ def _add_post_to_timeline(file_path: str, boxname: str,
# append a mitm identifier, which will later be removed # append a mitm identifier, which will later be removed
post_str += '<postmitm>' post_str += '<postmitm>'
return _add_post_string_to_timeline(post_str, boxname, posts_in_box, return _add_post_string_to_timeline(post_str, boxname,
box_actor) posts_in_box, box_actor)
return False
def remove_post_interactions(post_json_object: {}, force: bool) -> bool: def remove_post_interactions(post_json_object: {}, force: bool) -> bool:
@ -4641,6 +4678,7 @@ def _create_box_items(base_dir: str,
first_post_id = first_post_id.replace('--', '#') first_post_id = first_post_id.replace('--', '#')
first_post_id = first_post_id.replace('/', '#') first_post_id = first_post_id.replace('/', '#')
try:
with open(index_filename, 'r', encoding='utf-8') as index_file: with open(index_filename, 'r', encoding='utf-8') as index_file:
posts_added_to_timeline = 0 posts_added_to_timeline = 0
while posts_added_to_timeline < items_per_page: while posts_added_to_timeline < items_per_page:
@ -4746,6 +4784,9 @@ def _create_box_items(base_dir: str,
else: else:
print('WARN: Unable to locate post ' + post_url + print('WARN: Unable to locate post ' + post_url +
' nickname ' + nickname) ' nickname ' + nickname)
except OSError as exc:
print('EX: _create_box_items unable to read ' + index_filename +
' ' + str(exc))
return total_posts_count, posts_added_to_timeline return total_posts_count, posts_added_to_timeline
@ -5732,8 +5773,12 @@ def get_public_post_domains_blocked(session, base_dir: str,
# read the blocked domains as a single string # read the blocked domains as a single string
blocked_str = '' blocked_str = ''
try:
with open(blocking_filename, 'r', encoding='utf-8') as fp_block: with open(blocking_filename, 'r', encoding='utf-8') as fp_block:
blocked_str = fp_block.read() blocked_str = fp_block.read()
except OSError:
print('EX: get_public_post_domains_blocked unable to read ' +
blocking_filename)
blocked_domains = [] blocked_domains = []
for domain_name in post_domains: for domain_name in post_domains:
@ -5784,9 +5829,13 @@ def check_domains(session, base_dir: str,
update_follower_warnings = False update_follower_warnings = False
follower_warning_str = '' follower_warning_str = ''
if os.path.isfile(follower_warning_filename): if os.path.isfile(follower_warning_filename):
try:
with open(follower_warning_filename, 'r', with open(follower_warning_filename, 'r',
encoding='utf-8') as fp_warn: encoding='utf-8') as fp_warn:
follower_warning_str = fp_warn.read() follower_warning_str = fp_warn.read()
except OSError:
print('EX: check_domains unable to read ' +
follower_warning_filename)
if single_check: if single_check:
# checks a single random non-mutual # checks a single random non-mutual
@ -5852,7 +5901,9 @@ def populate_replies_json(base_dir: str, nickname: str, domain: str,
pub_str = 'https://www.w3.org/ns/activitystreams#Public' pub_str = 'https://www.w3.org/ns/activitystreams#Public'
# populate the items list with replies # populate the items list with replies
replies_boxes = ('outbox', 'inbox') replies_boxes = ('outbox', 'inbox')
with open(post_replies_filename, 'r', encoding='utf-8') as replies_file: try:
with open(post_replies_filename, 'r',
encoding='utf-8') as replies_file:
for message_id in replies_file: for message_id in replies_file:
reply_found = False reply_found = False
# examine inbox and outbox # examine inbox and outbox
@ -5867,21 +5918,22 @@ def populate_replies_json(base_dir: str, nickname: str, domain: str,
text_in_file(pub_str, search_filename): text_in_file(pub_str, search_filename):
post_json_object = load_json(search_filename) post_json_object = load_json(search_filename)
if post_json_object: if post_json_object:
if post_json_object['object'].get('cc'):
pjo = post_json_object pjo = post_json_object
ordered_items = replies_json['orderedItems']
if pjo['object'].get('cc'):
if (authorized or if (authorized or
(pub_str in pjo['object']['to'] or (pub_str in pjo['object']['to'] or
pub_str in pjo['object']['cc'])): pub_str in pjo['object']['cc'])):
replies_json['orderedItems'].append(pjo) ordered_items.append(pjo)
reply_found = True reply_found = True
else: else:
if authorized or \ if authorized or \
pub_str in post_json_object['object']['to']: pub_str in pjo['object']['to']:
pjo = post_json_object ordered_items.append(pjo)
replies_json['orderedItems'].append(pjo)
reply_found = True reply_found = True
break break
# if not in either inbox or outbox then examine the shared inbox # if not in either inbox or outbox then examine the
# shared inbox
if not reply_found: if not reply_found:
message_id2 = remove_eol(message_id) message_id2 = remove_eol(message_id)
search_filename = \ search_filename = \
@ -5895,18 +5947,20 @@ def populate_replies_json(base_dir: str, nickname: str, domain: str,
# the collection # the collection
post_json_object = load_json(search_filename) post_json_object = load_json(search_filename)
if post_json_object: if post_json_object:
if post_json_object['object'].get('cc'):
pjo = post_json_object pjo = post_json_object
ordered_items = replies_json['orderedItems']
if pjo['object'].get('cc'):
if (authorized or if (authorized or
(pub_str in pjo['object']['to'] or (pub_str in pjo['object']['to'] or
pub_str in pjo['object']['cc'])): pub_str in pjo['object']['cc'])):
pjo = post_json_object ordered_items.append(pjo)
replies_json['orderedItems'].append(pjo)
else: else:
if authorized or \ if authorized or \
pub_str in post_json_object['object']['to']: pub_str in pjo['object']['to']:
pjo = post_json_object ordered_items.append(pjo)
replies_json['orderedItems'].append(pjo) except OSError:
print('EX: populate_replies_json unable to read ' +
post_replies_filename)
def _reject_announce(announce_filename: str, def _reject_announce(announce_filename: str,

View File

@ -145,9 +145,15 @@ def question_update_votes(base_dir: str, nickname: str, domain: str,
print('EX: unable to append to voters file ' + voters_filename) print('EX: unable to append to voters file ' + voters_filename)
else: else:
# change an entry in the voters file # change an entry in the voters file
lines = []
try:
with open(voters_filename, 'r', with open(voters_filename, 'r',
encoding='utf-8') as voters_file: encoding='utf-8') as voters_file:
lines = voters_file.readlines() lines = voters_file.readlines()
except OSError:
print('EX: question_update_votes unable to read ' +
voters_filename)
newlines = [] newlines = []
save_voters_file = False save_voters_file = False
for vote_line in lines: for vote_line in lines:
@ -179,8 +185,13 @@ def question_update_votes(base_dir: str, nickname: str, domain: str,
if not possible_answer.get('name'): if not possible_answer.get('name'):
continue continue
total_items = 0 total_items = 0
with open(voters_filename, 'r', encoding='utf-8') as voters_file: lines = []
lines = voters_file.readlines() try:
with open(voters_filename, 'r', encoding='utf-8') as fp_voters:
lines = fp_voters.readlines()
except OSError:
print('EX: question_update_votes unable to read ' +
voters_filename)
for vote_line in lines: for vote_line in lines:
if vote_line.endswith(voters_file_separator + if vote_line.endswith(voters_file_separator +
possible_answer['name'] + '\n'): possible_answer['name'] + '\n'):

View File

@ -472,7 +472,8 @@ def _update_common_reactions(base_dir: str, emoji_content: str) -> None:
encoding='utf-8') as fp_react: encoding='utf-8') as fp_react:
common_reactions = fp_react.readlines() common_reactions = fp_react.readlines()
except OSError: except OSError:
print('EX: unable to load common reactions file') print('EX: unable to load common reactions file' +
common_reactions_filename)
if common_reactions: if common_reactions:
new_common_reactions = [] new_common_reactions = []
reaction_found = False reaction_found = False

View File

@ -283,8 +283,12 @@ def is_devops(base_dir: str, nickname: str) -> bool:
return True return True
return False return False
lines = []
try:
with open(devops_file, 'r', encoding='utf-8') as fp_mod: with open(devops_file, 'r', encoding='utf-8') as fp_mod:
lines = fp_mod.readlines() lines = fp_mod.readlines()
except OSError:
print('EX: is_devops unable to read ' + devops_file)
if len(lines) == 0: if len(lines) == 0:
# if there is nothing in the file # if there is nothing in the file
admin_name = get_config_param(base_dir, 'admin') admin_name = get_config_param(base_dir, 'admin')

View File

@ -1770,11 +1770,15 @@ def _generate_next_shares_token_update(base_dir: str,
token_update_filename = token_update_dir + '/.tokenUpdate' token_update_filename = token_update_dir + '/.tokenUpdate'
next_update_sec = None next_update_sec = None
if os.path.isfile(token_update_filename): if os.path.isfile(token_update_filename):
try:
with open(token_update_filename, 'r', encoding='utf-8') as fp_tok: with open(token_update_filename, 'r', encoding='utf-8') as fp_tok:
next_update_str = fp_tok.read() next_update_str = fp_tok.read()
if next_update_str: if next_update_str:
if next_update_str.isdigit(): if next_update_str.isdigit():
next_update_sec = int(next_update_str) next_update_sec = int(next_update_str)
except OSError:
print('EX: _generate_next_shares_token_update unable to read ' +
token_update_filename)
curr_time = int(time.time()) curr_time = int(time.time())
updated = False updated = False
if next_update_sec: if next_update_sec:
@ -1818,11 +1822,15 @@ def _regenerate_shares_token(base_dir: str, domain_full: str,
if not os.path.isfile(token_update_filename): if not os.path.isfile(token_update_filename):
return return
next_update_sec = None next_update_sec = None
try:
with open(token_update_filename, 'r', encoding='utf-8') as fp_tok: with open(token_update_filename, 'r', encoding='utf-8') as fp_tok:
next_update_str = fp_tok.read() next_update_str = fp_tok.read()
if next_update_str: if next_update_str:
if next_update_str.isdigit(): if next_update_str.isdigit():
next_update_sec = int(next_update_str) next_update_sec = int(next_update_str)
except OSError:
print('EX: _regenerate_shares_token unable to read ' +
token_update_filename)
if not next_update_sec: if not next_update_sec:
return return
curr_time = int(time.time()) curr_time = int(time.time())

View File

@ -180,5 +180,6 @@ def load_unavailable_sites(base_dir: str) -> []:
encoding='utf-8') as fp_sites: encoding='utf-8') as fp_sites:
sites_unavailable = fp_sites.read().split('\n') sites_unavailable = fp_sites.read().split('\n')
except OSError: except OSError:
print('EX: unable to save unavailable sites') print('EX: unable to read unavailable sites ' +
unavailable_sites_filename)
return sites_unavailable return sites_unavailable

View File

@ -150,6 +150,7 @@ def _speaker_pronounce(base_dir: str, say_text: str, translate: {}) -> str:
")": "," ")": ","
} }
if os.path.isfile(pronounce_filename): if os.path.isfile(pronounce_filename):
try:
with open(pronounce_filename, 'r', encoding='utf-8') as fp_pro: with open(pronounce_filename, 'r', encoding='utf-8') as fp_pro:
pronounce_list = fp_pro.readlines() pronounce_list = fp_pro.readlines()
for conversion in pronounce_list: for conversion in pronounce_list:
@ -168,6 +169,9 @@ def _speaker_pronounce(base_dir: str, say_text: str, translate: {}) -> str:
text = conversion.split(separator)[0].strip() text = conversion.split(separator)[0].strip()
converted = conversion.split(separator)[1].strip() converted = conversion.split(separator)[1].strip()
convert_dict[text] = converted convert_dict[text] = converted
except OSError:
print('EX: _speaker_pronounce unable to read ' +
pronounce_filename)
for text, converted in convert_dict.items(): for text, converted in convert_dict.items():
if text in say_text: if text in say_text:
say_text = say_text.replace(text, converted) say_text = say_text.replace(text, converted)
@ -528,13 +532,18 @@ def _post_to_speaker_json(base_dir: str, http_prefix: str,
accounts_dir = acct_dir(base_dir, nickname, domain_full) accounts_dir = acct_dir(base_dir, nickname, domain_full)
approve_follows_filename = accounts_dir + '/followrequests.txt' approve_follows_filename = accounts_dir + '/followrequests.txt'
if os.path.isfile(approve_follows_filename): if os.path.isfile(approve_follows_filename):
with open(approve_follows_filename, 'r', encoding='utf-8') as fp_foll: try:
with open(approve_follows_filename, 'r',
encoding='utf-8') as fp_foll:
follows = fp_foll.readlines() follows = fp_foll.readlines()
if len(follows) > 0: if len(follows) > 0:
follow_requests_exist = True follow_requests_exist = True
for i, _ in enumerate(follows): for i, _ in enumerate(follows):
follows[i] = follows[i].strip() follows[i] = follows[i].strip()
follow_requests_list = follows follow_requests_list = follows
except OSError:
print('EX: _post_to_speaker_json unable to read ' +
approve_follows_filename)
post_dm = False post_dm = False
dm_filename = accounts_dir + '/.newDM' dm_filename = accounts_dir + '/.newDM'
if os.path.isfile(dm_filename): if os.path.isfile(dm_filename):
@ -546,8 +555,12 @@ def _post_to_speaker_json(base_dir: str, http_prefix: str,
liked_by = '' liked_by = ''
like_filename = accounts_dir + '/.newLike' like_filename = accounts_dir + '/.newLike'
if os.path.isfile(like_filename): if os.path.isfile(like_filename):
try:
with open(like_filename, 'r', encoding='utf-8') as fp_like: with open(like_filename, 'r', encoding='utf-8') as fp_like:
liked_by = fp_like.read() liked_by = fp_like.read()
except OSError:
print('EX: _post_to_speaker_json unable to read 2 ' +
like_filename)
calendar_filename = accounts_dir + '/.newCalendar' calendar_filename = accounts_dir + '/.newCalendar'
post_cal = os.path.isfile(calendar_filename) post_cal = os.path.isfile(calendar_filename)
share_filename = accounts_dir + '/.newShare' share_filename = accounts_dir + '/.newShare'

View File

@ -46,6 +46,7 @@ def import_theme(base_dir: str, filename: str) -> bool:
' missing from imported theme') ' missing from imported theme')
return False return False
new_theme_name = None new_theme_name = None
try:
with open(temp_theme_dir + '/name.txt', 'r', with open(temp_theme_dir + '/name.txt', 'r',
encoding='utf-8') as fp_theme: encoding='utf-8') as fp_theme:
new_theme_name1 = fp_theme.read() new_theme_name1 = fp_theme.read()
@ -65,6 +66,9 @@ def import_theme(base_dir: str, filename: str) -> bool:
if char in new_theme_name: if char in new_theme_name:
print('WARN: theme name contains forbidden character') print('WARN: theme name contains forbidden character')
return False return False
except OSError:
print('EX: import_theme unable to read ' +
temp_theme_dir + '/name.txt')
if not new_theme_name: if not new_theme_name:
return False return False