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

Replace file operations with function

main
bashrc 2026-04-29 13:05:55 +01:00
parent f52a3e7ace
commit 6ad2e4c212
1 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
roles.py
View File

@ -69,18 +69,16 @@ def _add_role(base_dir: str, nickname: str, domain: str,
return return
lines.append(nickname) lines.append(nickname)
try: text = ''
with open(role_file, 'w+', encoding='utf-8') as fp_role: for role_nickname in lines:
for role_nickname in lines: role_nickname = role_nickname.strip('\n').strip('\r')
role_nickname = role_nickname.strip('\n').strip('\r') if len(role_nickname) < 2:
if len(role_nickname) < 2: continue
continue dir_str = data_dir(base_dir)
dir_str = data_dir(base_dir) if os.path.isdir(dir_str + '/' + role_nickname + '@' + domain):
if os.path.isdir(dir_str + '/' + text += role_nickname + '\n'
role_nickname + '@' + domain): save_string(text, role_file,
fp_role.write(role_nickname + '\n') 'EX: _add_role, failed to write roles file1 ' + role_file)
except OSError:
print('EX: _add_role, failed to write roles file1 ' + role_file)
else: else:
account_dir = acct_dir(base_dir, nickname, domain) account_dir = acct_dir(base_dir, nickname, domain)
if os.path.isdir(account_dir): if os.path.isdir(account_dir):
@ -103,14 +101,14 @@ def _remove_role(base_dir: str, nickname: str, role_filename: str) -> None:
if lines is None: if lines is None:
return return
try: text = ''
with open(role_file, 'w+', encoding='utf-8') as fp_role: for role_nickname in lines:
for role_nickname in lines: role_nickname = role_nickname.strip('\n').strip('\r')
role_nickname = role_nickname.strip('\n').strip('\r') if len(role_nickname) > 1 and role_nickname != nickname:
if len(role_nickname) > 1 and role_nickname != nickname: text += role_nickname + '\n'
fp_role.write(role_nickname + '\n') save_string(text, role_file,
except OSError: 'EX: _remove_role, failed to regenerate roles file ' +
print('EX: _remove_role, failed to regenerate roles file ' + role_file) role_file)
def _set_actor_role(actor_json: {}, role_name: str) -> bool: def _set_actor_role(actor_json: {}, role_name: str) -> bool:
@ -326,17 +324,16 @@ def set_roles_from_list(base_dir: str, domain: str, admin_nickname: str,
if ',' in fields[list_name]: if ',' in fields[list_name]:
# if the list was given as comma separated # if the list was given as comma separated
roles_list = fields[list_name].split(',') roles_list = fields[list_name].split(',')
try:
with open(roles_filename, 'w+', text = ''
encoding='utf-8') as fp_roles: for roles_nick in roles_list:
for roles_nick in roles_list: roles_nick = roles_nick.strip()
roles_nick = roles_nick.strip() roles_dir = acct_dir(base_dir, roles_nick, domain)
roles_dir = acct_dir(base_dir, roles_nick, domain) if os.path.isdir(roles_dir):
if os.path.isdir(roles_dir): text += roles_nick + '\n'
fp_roles.write(roles_nick + '\n') save_string(text, roles_filename,
except OSError as ex: 'EX: unable to write ' + list_name + ' ' +
print('EX: unable to write ' + list_name + ' ' + roles_filename + ' [ex]')
roles_filename + ' ' + str(ex))
for roles_nick in roles_list: for roles_nick in roles_list:
roles_nick = roles_nick.strip() roles_nick = roles_nick.strip()
@ -346,17 +343,16 @@ def set_roles_from_list(base_dir: str, domain: str, admin_nickname: str,
else: else:
# nicknames on separate lines # nicknames on separate lines
roles_list = fields[list_name].split('\n') roles_list = fields[list_name].split('\n')
try:
with open(roles_filename, 'w+', text = ''
encoding='utf-8') as fp_roles: for roles_nick in roles_list:
for roles_nick in roles_list: roles_nick = roles_nick.strip()
roles_nick = roles_nick.strip() roles_dir = acct_dir(base_dir, roles_nick, domain)
roles_dir = acct_dir(base_dir, roles_nick, domain) if os.path.isdir(roles_dir):
if os.path.isdir(roles_dir): text += roles_nick + '\n'
fp_roles.write(roles_nick + '\n') save_string(text, roles_filename,
except OSError as ex: 'EX: unable to write ' + list_name + ' ' +
print('EX: unable to write ' + list_name + ' ' + roles_filename + ' [ex]')
roles_filename + ' ' + str(ex))
for roles_nick in roles_list: for roles_nick in roles_list:
roles_nick = roles_nick.strip() roles_nick = roles_nick.strip()