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

Replace file operations with functions

main
bashrc 2026-04-30 11:09:21 +01:00
parent 6a42cbca51
commit e06a331fe0
1 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
blocking.py
View File

@ -486,19 +486,21 @@ def remove_global_block(base_dir: str,
unblock_handle = unblock_nickname + '@' + unblock_domain unblock_handle = unblock_nickname + '@' + unblock_domain
if os.path.isfile(unblocking_filename): if os.path.isfile(unblocking_filename):
if text_in_file(unblock_handle, unblocking_filename): if text_in_file(unblock_handle, unblocking_filename):
try: unblocking_list: list[str] = \
with open(unblocking_filename, 'r', load_list(unblocking_filename,
encoding='utf-8') as fp_unblock: 'EX: failed to remove global block ' +
with open(unblocking_filename + '.new', 'w+', unblocking_filename + ' 1 [ex]')
encoding='utf-8') as fpnew: if unblocking_list is None:
for line in fp_unblock: return False
text: str = ''
for line in unblocking_list:
handle = remove_eol(line) handle = remove_eol(line)
if unblock_handle not in line: if unblock_handle not in line:
fpnew.write(handle + '\n') text += handle + '\n'
except OSError as ex: save_string(text, unblocking_filename + '.new',
print('EX: failed to remove global block ' + 'EX: failed to remove global block ' +
unblocking_filename + ' ' + str(ex)) unblocking_filename + ' 1 [ex]')
return False
if os.path.isfile(unblocking_filename + '.new'): if os.path.isfile(unblocking_filename + '.new'):
try: try:
@ -513,19 +515,21 @@ def remove_global_block(base_dir: str,
unblock_hashtag = unblock_nickname unblock_hashtag = unblock_nickname
if os.path.isfile(unblocking_filename): if os.path.isfile(unblocking_filename):
if text_in_file(unblock_hashtag + '\n', unblocking_filename): if text_in_file(unblock_hashtag + '\n', unblocking_filename):
try: unblocking_list: list[str] = \
with open(unblocking_filename, 'r', load_list(unblocking_filename,
encoding='utf-8') as fp_unblock: 'EX: failed to remove global hashtag block ' +
with open(unblocking_filename + '.new', 'w+', unblocking_filename + ' 1 [ex]')
encoding='utf-8') as fpnew: if unblocking_list is None:
for line in fp_unblock: return False
text: str = ''
for line in unblocking_list:
block_line = remove_eol(line) block_line = remove_eol(line)
if unblock_hashtag not in line: if unblock_hashtag not in line:
fpnew.write(block_line + '\n') text += block_line + '\n'
except OSError as ex: save_string(text, unblocking_filename + '.new',
print('EX: failed to remove global hashtag block ' + 'EX: failed to remove global hashtag block ' +
unblocking_filename + ' ' + str(ex)) unblocking_filename + ' 2 [ex]')
return False
if os.path.isfile(unblocking_filename + '.new'): if os.path.isfile(unblocking_filename + '.new'):
try: try:
@ -549,19 +553,21 @@ def remove_block(base_dir: str, nickname: str, domain: str,
unblock_handle = unblock_nickname + '@' + unblock_domain unblock_handle = unblock_nickname + '@' + unblock_domain
if os.path.isfile(unblocking_filename): if os.path.isfile(unblocking_filename):
if text_in_file(unblock_handle, unblocking_filename): if text_in_file(unblock_handle, unblocking_filename):
try: unblocking_list: list[str] = \
with open(unblocking_filename, 'r', load_list(unblocking_filename,
encoding='utf-8') as fp_unblock: 'EX: failed to remove block ' +
with open(unblocking_filename + '.new', 'w+', unblocking_filename + ' 1 [ex]')
encoding='utf-8') as fpnew: if unblocking_list is None:
for line in fp_unblock: return False
text: str = ''
for line in unblocking_list:
handle = remove_eol(line) handle = remove_eol(line)
if unblock_handle not in line: if unblock_handle not in line:
fpnew.write(handle + '\n') text += handle + '\n'
except OSError as ex: save_string(text, unblocking_filename + '.new',
print('EX: failed to remove block ' + 'EX: failed to remove block ' +
unblocking_filename + ' ' + str(ex)) unblocking_filename + ' 2 [ex]')
return False
if os.path.isfile(unblocking_filename + '.new'): if os.path.isfile(unblocking_filename + '.new'):
try: try: