indymedia/epicyon
7
4 Fork 1
mirror of https://gitlab.com/bashrc2/epicyon synced 2026-11-05 04:02:21 +00:00
Code Issues 14 Releases Wiki Activity

Replace file operations with functions

Browse Source
This commit is contained in:
bashrc committed 2026-04-30 11:09:21 +01:00
1 parent 6a42cbca51
commit e06a331fe0
1 file changed
+42 -36
Download Patch File Download Diff File Expand all files Collapse all files
blocking.py
+42 -36
View File
@@ -486,20 +486,22 @@ def remove_global_block(base_dir: str,
unblock_handle = unblock_nickname + '@' + unblock_domain
if os.path.isfile(unblocking_filename):
if text_in_file(unblock_handle, unblocking_filename):
try:
with open(unblocking_filename, 'r',
encoding='utf-8') as fp_unblock:
with open(unblocking_filename + '.new', 'w+',
encoding='utf-8') as fpnew:
for line in fp_unblock:
handle = remove_eol(line)
if unblock_handle not in line:
fpnew.write(handle + '\n')
except OSError as ex:
print('EX: failed to remove global block ' +
unblocking_filename + ' ' + str(ex))
unblocking_list: list[str] = \
load_list(unblocking_filename,
'EX: failed to remove global block ' +
unblocking_filename + ' 1 [ex]')
if unblocking_list is None:
return False
text: str = ''
for line in unblocking_list:
handle = remove_eol(line)
if unblock_handle not in line:
text += handle + '\n'
save_string(text, unblocking_filename + '.new',
'EX: failed to remove global block ' +
unblocking_filename + ' 1 [ex]')
if os.path.isfile(unblocking_filename + '.new'):
try:
os.rename(unblocking_filename + '.new',
@@ -513,20 +515,22 @@ def remove_global_block(base_dir: str,
unblock_hashtag = unblock_nickname
if os.path.isfile(unblocking_filename):
if text_in_file(unblock_hashtag + '\n', unblocking_filename):
try:
with open(unblocking_filename, 'r',
encoding='utf-8') as fp_unblock:
with open(unblocking_filename + '.new', 'w+',
encoding='utf-8') as fpnew:
for line in fp_unblock:
block_line = remove_eol(line)
if unblock_hashtag not in line:
fpnew.write(block_line + '\n')
except OSError as ex:
print('EX: failed to remove global hashtag block ' +
unblocking_filename + ' ' + str(ex))
unblocking_list: list[str] = \
load_list(unblocking_filename,
'EX: failed to remove global hashtag block ' +
unblocking_filename + ' 1 [ex]')
if unblocking_list is None:
return False
text: str = ''
for line in unblocking_list:
block_line = remove_eol(line)
if unblock_hashtag not in line:
text += block_line + '\n'
save_string(text, unblocking_filename + '.new',
'EX: failed to remove global hashtag block ' +
unblocking_filename + ' 2 [ex]')
if os.path.isfile(unblocking_filename + '.new'):
try:
os.rename(unblocking_filename + '.new',
@@ -549,20 +553,22 @@ def remove_block(base_dir: str, nickname: str, domain: str,
unblock_handle = unblock_nickname + '@' + unblock_domain
if os.path.isfile(unblocking_filename):
if text_in_file(unblock_handle, unblocking_filename):
try:
with open(unblocking_filename, 'r',
encoding='utf-8') as fp_unblock:
with open(unblocking_filename + '.new', 'w+',
encoding='utf-8') as fpnew:
for line in fp_unblock:
handle = remove_eol(line)
if unblock_handle not in line:
fpnew.write(handle + '\n')
except OSError as ex:
print('EX: failed to remove block ' +
unblocking_filename + ' ' + str(ex))
unblocking_list: list[str] = \
load_list(unblocking_filename,
'EX: failed to remove block ' +
unblocking_filename + ' 1 [ex]')
if unblocking_list is None:
return False
text: str = ''
for line in unblocking_list:
handle = remove_eol(line)
if unblock_handle not in line:
text += handle + '\n'
save_string(text, unblocking_filename + '.new',
'EX: failed to remove block ' +
unblocking_filename + ' 2 [ex]')
if os.path.isfile(unblocking_filename + '.new'):
try:
os.rename(unblocking_filename + '.new',