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

Replace readlines with functions

main
bashrc 2026-04-26 17:49:49 +01:00
parent 3beb8c97f8
commit 4a1ee28e8d
23 changed files with 392 additions and 488 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
blocking.py
View File

@ -54,6 +54,7 @@ from conversation import unmute_conversation
from auth import create_basic_auth_header from auth import create_basic_auth_header
from session import get_json from session import get_json
from data import load_string from data import load_string
from data import load_list
from data import save_string from data import save_string
from data import append_string from data import append_string
@ -605,19 +606,15 @@ def update_blocked_cache(base_dir: str,
global_blocking_filename = data_dir(base_dir) + '/blocking.txt' global_blocking_filename = data_dir(base_dir) + '/blocking.txt'
if not os.path.isfile(global_blocking_filename): if not os.path.isfile(global_blocking_filename):
return blocked_cache_last_updated return blocked_cache_last_updated
try: blocked_lines = load_list(global_blocking_filename,
with open(global_blocking_filename, 'r', 'EX: update_blocked_cache unable to read ' +
encoding='utf-8') as fp_blocked: global_blocking_filename + ' [ex]')
blocked_lines = fp_blocked.readlines() # remove newlines
# remove newlines for index, _ in enumerate(blocked_lines):
for index, _ in enumerate(blocked_lines): blocked_lines[index] = remove_eol(blocked_lines[index])
blocked_lines[index] = remove_eol(blocked_lines[index]) # update the cache
# update the cache blocked_cache.clear()
blocked_cache.clear() blocked_cache += evil_incarnate() + blocked_lines
blocked_cache += evil_incarnate() + blocked_lines
except OSError as ex:
print('EX: update_blocked_cache unable to read ' +
global_blocking_filename + ' ' + str(ex))
return curr_time return curr_time
@ -1599,20 +1596,17 @@ def set_broch_mode(base_dir: str, domain_full: str, enabled: bool) -> None:
following_filename = account_dir + '/' + follow_file_type following_filename = account_dir + '/' + follow_file_type
if not os.path.isfile(following_filename): if not os.path.isfile(following_filename):
continue continue
try: follow_list = \
with open(following_filename, 'r', load_list(following_filename,
encoding='utf-8') as fp_foll: 'EX: set_broch_mode failed to read ' +
follow_list = fp_foll.readlines() following_filename + ' [ex]')
for handle in follow_list: for handle in follow_list:
if '@' not in handle: if '@' not in handle:
continue continue
handle = remove_eol(handle) handle = remove_eol(handle)
handle_domain = handle.split('@')[1] handle_domain = handle.split('@')[1]
if handle_domain not in allowed_domains: if handle_domain not in allowed_domains:
allowed_domains.append(handle_domain) allowed_domains.append(handle_domain)
except OSError as ex:
print('EX: set_broch_mode failed to read ' +
following_filename + ' ' + str(ex))
break break
# write the allow file # write the allow file

19
blog.py
View File

@ -48,6 +48,7 @@ from newswire import rss2footer
from cache import get_person_from_cache from cache import get_person_from_cache
from flags import is_image_file from flags import is_image_file
from data import load_string from data import load_string
from data import load_list
def _no_of_blog_replies(base_dir: str, http_prefix: str, translate: {}, def _no_of_blog_replies(base_dir: str, http_prefix: str, translate: {},
@ -82,12 +83,9 @@ def _no_of_blog_replies(base_dir: str, http_prefix: str, translate: {},
removals: list[str] = [] removals: list[str] = []
replies = 0 replies = 0
lines: list[str] = [] lines: list[str] = \
try: load_list(post_filename,
with open(post_filename, 'r', encoding='utf-8') as fp_post: 'EX: failed to read blog ' + post_filename)
lines = fp_post.readlines()
except OSError:
print('EX: failed to read blog ' + post_filename)
for reply_post_id in lines: for reply_post_id in lines:
reply_post_id = remove_eol(reply_post_id) reply_post_id = remove_eol(reply_post_id)
@ -156,12 +154,9 @@ def _get_blog_replies(base_dir: str, http_prefix: str, translate: {},
return blog_text + '\n' return blog_text + '\n'
return '' return ''
lines: list[str] = [] lines: list[str] = \
try: load_list(post_filename,
with open(post_filename, 'r', encoding='utf-8') as fp_post: 'EX: unable to read blog 4 ' + post_filename)
lines = fp_post.readlines()
except OSError:
print('EX: unable to read blog 4 ' + post_filename)
if lines: if lines:
replies_str: str = '' replies_str: str = ''

34
mastoapiv1.py
View File

@ -21,6 +21,7 @@ from utils import lines_in_file
from utils import data_dir from utils import data_dir
from utils import account_is_indexable from utils import account_is_indexable
from utils import is_yggdrasil_address from utils import is_yggdrasil_address
from data import load_list
def _meta_data_instance_v1(show_accounts: bool, def _meta_data_instance_v1(show_accounts: bool,
@ -46,24 +47,21 @@ def _meta_data_instance_v1(show_accounts: bool,
rules_list: list[str] = [] rules_list: list[str] = []
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: rules_lines = load_list(rules_filename,
with open(rules_filename, 'r', encoding='utf-8') as fp_rules: 'EX: _meta_data_instance_v1 unable to read ' +
rules_lines = fp_rules.readlines() rules_filename)
rule_ctr = 1 rule_ctr = 1
for line in rules_lines: for line in rules_lines:
line = line.strip() line = line.strip()
if not line: if not line:
continue continue
if line.startswith('#'): if line.startswith('#'):
continue continue
rules_list.append({ rules_list.append({
'id': str(rule_ctr), 'id': str(rule_ctr),
'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

10
mastoapiv2.py
View File

@ -23,6 +23,7 @@ from formats import get_image_mime_type
from formats import get_image_extensions from formats import get_image_extensions
from formats import get_audio_extensions from formats import get_audio_extensions
from formats import get_video_extensions from formats import get_video_extensions
from data import load_list
def _get_masto_api_v2id_from_nickname(nickname: str) -> int: def _get_masto_api_v2id_from_nickname(nickname: str) -> int:
@ -53,12 +54,9 @@ def _meta_data_instance_v2(show_accounts: bool,
rules_list: list[str] = [] rules_list: list[str] = []
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):
rules_lines: list[str] = [] rules_lines: list[str] = \
try: load_list(rules_filename,
with open(rules_filename, 'r', encoding='utf-8') as fp_rules: 'EX: _meta_data_instance_v2 unable to read rules')
rules_lines = fp_rules.readlines()
except OSError:
print('EX: _meta_data_instance_v2 unable to read rules')
rule_ctr = 1 rule_ctr = 1
for line in rules_lines: for line in rules_lines:
line = line.strip() line = line.strip()

49
migrate.py
View File

@ -20,6 +20,7 @@ from blocking import is_blocked
from posts import get_user_url from posts import get_user_url
from follow import unfollow_account from follow import unfollow_account
from person import get_actor_json from person import get_actor_json
from data import load_list
def _move_following_handles_for_account(base_dir: str, def _move_following_handles_for_account(base_dir: str,
@ -38,20 +39,18 @@ 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: following_handles = \
with open(following_filename, 'r', encoding='utf-8') as fp_foll: load_list(following_filename,
following_handles = fp_foll.readlines() 'EX: _move_following_handles_for_account unable to read ' +
for follow_handle in following_handles: following_filename)
follow_handle = follow_handle.strip("\n").strip("\r") for follow_handle in following_handles:
ctr += \ follow_handle = follow_handle.strip("\n").strip("\r")
_update_moved_handle(base_dir, nickname, domain, ctr += \
follow_handle, session, _update_moved_handle(base_dir, nickname, domain,
http_prefix, cached_webfingers, follow_handle, session,
debug, signing_priv_key_pem, http_prefix, cached_webfingers,
block_federated, mitm_servers) debug, signing_priv_key_pem,
except OSError: block_federated, mitm_servers)
print('EX: _move_following_handles_for_account unable to read ' +
following_filename)
return ctr return ctr
@ -152,13 +151,10 @@ def _update_moved_handle(base_dir: str, nickname: str, domain: str,
following_filename = \ following_filename = \
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: list[str] = [] following_handles: list[str] = \
try: load_list(following_filename,
with open(following_filename, 'r', encoding='utf-8') as fp_foll1: 'EX: _update_moved_handle unable to read ' +
following_handles = fp_foll1.readlines() following_filename)
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()
@ -205,13 +201,10 @@ def _update_moved_handle(base_dir: str, nickname: str, domain: str,
followers_filename = \ followers_filename = \
acct_dir(base_dir, nickname, domain) + '/followers.txt' acct_dir(base_dir, nickname, domain) + '/followers.txt'
if os.path.isfile(followers_filename): if os.path.isfile(followers_filename):
follower_handles: list[str] = [] follower_handles: list[str] = \
try: load_list(followers_filename,
with open(followers_filename, 'r', encoding='utf-8') as fp_foll3: 'EX: _update_moved_handle unable to read ' +
follower_handles = fp_foll3.readlines() followers_filename)
except OSError:
print('EX: _update_moved_handle unable to read ' +
followers_filename)
handle_lower = handle.lower() handle_lower = handle.lower()

12
newsdaemon.py
View File

@ -42,6 +42,7 @@ from threads import begin_thread
from threads import thread_with_trace from threads import thread_with_trace
from webapp_hashtagswarm import store_hash_tags from webapp_hashtagswarm import store_hash_tags
from cache import clear_from_post_caches from cache import clear_from_post_caches
from data import load_list
def _update_feeds_outbox_index(base_dir: str, domain: str, def _update_feeds_outbox_index(base_dir: str, domain: str,
@ -396,13 +397,10 @@ def _newswire_hashtag_processing(base_dir: str, post_json_object: {},
rules_filename = data_dir(base_dir) + '/hashtagrules.txt' rules_filename = data_dir(base_dir) + '/hashtagrules.txt'
if not os.path.isfile(rules_filename): if not os.path.isfile(rules_filename):
return True return True
rules: list[str] = [] rules: list[str] = \
try: load_list(rules_filename,
with open(rules_filename, 'r', encoding='utf-8') as fp_rules: 'EX: _newswire_hashtag_processing unable to read ' +
rules = fp_rules.readlines() rules_filename)
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)

12
newswire.py
View File

@ -54,6 +54,7 @@ from blocking import is_blocked_hashtag
from filters import is_filtered from filters import is_filtered
from session import download_image_any_mime_type from session import download_image_any_mime_type
from content import remove_script from content import remove_script
from data import load_list
def _remove_cdata(text: str) -> str: def _remove_cdata(text: str) -> str:
@ -1826,13 +1827,10 @@ def get_dict_from_newswire(session, base_dir: str, domain: str,
max_posts_per_source = 5 max_posts_per_source = 5
# add rss feeds # add rss feeds
rss_feed: list[str] = [] rss_feed: list[str] = \
try: load_list(subscriptions_filename,
with open(subscriptions_filename, 'r', encoding='utf-8') as fp_sub: 'EX: get_dict_from_newswire unable to read ' +
rss_feed = fp_sub.readlines() subscriptions_filename)
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()

59
person.py
View File

@ -91,6 +91,7 @@ from cache import store_person_in_cache
from cache import remove_person_from_cache from cache import remove_person_from_cache
from filters import is_filtered_bio from filters import is_filtered_bio
from follow import is_following_actor from follow import is_following_actor
from data import load_list
def generate_rsa_key() -> (str, str): def generate_rsa_key() -> (str, str):
@ -1332,12 +1333,10 @@ def reenable_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):
lines: list[str] = [] lines: list[str] = \
try: load_list(suspended_filename,
with open(suspended_filename, 'r', encoding='utf-8') as fp_sus: 'EX: reenable_account unable to read ' +
lines = fp_sus.readlines() suspended_filename)
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:
@ -1388,11 +1387,10 @@ 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: lines: list[str] = \
with open(moderators_file, 'r', encoding='utf-8') as fp_mod: load_list(moderators_file,
lines = fp_mod.readlines() 'EX: suspend_account unable too read ' +
except OSError: moderators_file)
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
@ -1413,11 +1411,10 @@ 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: lines: list[str] = \
with open(suspended_filename, 'r', encoding='utf-8') as fp_sus: load_list(suspended_filename,
lines = fp_sus.readlines() 'EX: suspend_account unable to read 2 ' +
except OSError: suspended_filename)
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
@ -1454,12 +1451,10 @@ 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: list[str] = [] lines: list[str] = \
try: load_list(moderators_file,
with open(moderators_file, 'r', encoding='utf-8') as fp_mod: 'EX: can_remove_post unable to read ' +
lines = fp_mod.readlines() moderators_file)
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:
@ -1490,13 +1485,10 @@ def _remove_tags_for_nickname(base_dir: str, nickname: str,
continue continue
if not text_in_file(match_str, tag_filename): if not text_in_file(match_str, tag_filename):
continue continue
lines: list[str] = [] lines: list[str] = \
try: load_list(tag_filename,
with open(tag_filename, 'r', encoding='utf-8') as fp_tag: 'EX: _remove_tags_for_nickname unable to read ' +
lines = fp_tag.readlines() tag_filename)
except OSError:
print('EX: _remove_tags_for_nickname unable to read ' +
tag_filename)
try: try:
with open(tag_filename, 'w+', encoding='utf-8') as fp_tag: with open(tag_filename, 'w+', encoding='utf-8') as fp_tag:
for tagline in lines: for tagline in lines:
@ -1546,12 +1538,9 @@ 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: list[str] = [] lines: list[str] = \
try: load_list(moderators_file,
with open(moderators_file, 'r', encoding='utf-8') as fp_mod: 'EX: remove_account unable to read ' + moderators_file)
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

24
posts.py
View File

@ -144,6 +144,7 @@ from pyjsonld import JsonLdError
from conversation import conversation_tag_to_convthread_id from conversation import conversation_tag_to_convthread_id
from conversation import post_id_to_convthread_id from conversation import post_id_to_convthread_id
from quote import quote_toots_allowed from quote import quote_toots_allowed
from data import load_list
def convert_post_content_to_html(message_json: {}) -> None: def convert_post_content_to_html(message_json: {}) -> None:
@ -2443,13 +2444,10 @@ 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: list[str] = [] citations: list[str] = \
try: load_list(citations_filename,
with open(citations_filename, 'r', encoding='utf-8') as fp_cit: 'EX: _append_citations_to_blog_post unable to read ' +
citations = fp_cit.readlines() citations_filename)
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
@ -4565,14 +4563,10 @@ 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: list[str] = [] lines: list[str] = \
try: load_list(moderation_index_file,
with open(moderation_index_file, 'r', 'EX: create_moderation unable to read ' +
encoding='utf-8') as fp_index: moderation_index_file)
lines = fp_index.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

24
question.py
View File

@ -16,6 +16,7 @@ from utils import text_in_file
from utils import dangerous_markup from utils import dangerous_markup
from utils import get_reply_to from utils import get_reply_to
from utils import get_actor_from_post from utils import get_actor_from_post
from data import load_list
def is_vote(base_dir: str, nickname: str, domain: str, def is_vote(base_dir: str, nickname: str, domain: str,
@ -145,14 +146,10 @@ 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: list[str] = [] lines: list[str] = \
try: load_list(voters_filename,
with open(voters_filename, 'r', 'EX: question_update_votes unable to read ' +
encoding='utf-8') as fp_voters: voters_filename)
lines = fp_voters.readlines()
except OSError:
print('EX: question_update_votes unable to read ' +
voters_filename)
newlines: list[str] = [] newlines: list[str] = []
save_voters_file = False save_voters_file = False
@ -185,13 +182,10 @@ 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
lines: list[str] = [] lines: list[str] = \
try: load_list(voters_filename,
with open(voters_filename, 'r', encoding='utf-8') as fp_voters: 'EX: question_update_votes unable to read ' +
lines = fp_voters.readlines() voters_filename)
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'):

12
reaction.py
View File

@ -38,6 +38,7 @@ from session import post_json
from webfinger import webfinger_handle from webfinger import webfinger_handle
from auth import create_basic_auth_header from auth import create_basic_auth_header
from posts import get_person_box from posts import get_person_box
from data import load_list
# the maximum number of reactions from individual actors which can be # the maximum number of reactions from individual actors which can be
# added to a post. Hence an adversary can't bombard you with sockpuppet # added to a post. Hence an adversary can't bombard you with sockpuppet
@ -484,13 +485,10 @@ def _update_common_reactions(base_dir: str, emoji_content: str) -> None:
common_reactions_filename = data_dir(base_dir) + '/common_reactions.txt' common_reactions_filename = data_dir(base_dir) + '/common_reactions.txt'
common_reactions = None common_reactions = None
if os.path.isfile(common_reactions_filename): if os.path.isfile(common_reactions_filename):
try: common_reactions: list[str] = \
with open(common_reactions_filename, 'r', load_list(common_reactions_filename,
encoding='utf-8') as fp_react: 'EX: unable to load common reactions file' +
common_reactions = fp_react.readlines() common_reactions_filename)
except OSError:
print('EX: unable to load common reactions file' +
common_reactions_filename)
if common_reactions: if common_reactions:
new_common_reactions: list[str] = [] new_common_reactions: list[str] = []
reaction_found = False reaction_found = False

27
roles.py
View File

@ -16,6 +16,7 @@ from utils import acct_dir
from utils import text_in_file from utils import text_in_file
from utils import get_config_param from utils import get_config_param
from status import get_status_number from status import get_status_number
from data import load_list
def _clear_role_status(base_dir: str, role: str) -> None: def _clear_role_status(base_dir: str, role: str) -> None:
@ -54,12 +55,9 @@ def _add_role(base_dir: str, nickname: str, domain: str,
if os.path.isfile(role_file): if os.path.isfile(role_file):
# is this nickname already in the file? # is this nickname already in the file?
lines: list[str] = [] lines: list[str] = \
try: load_list(role_file,
with open(role_file, 'r', encoding='utf-8') as fp_role: 'EX: _add_role, failed to read roles file ' + role_file)
lines = fp_role.readlines()
except OSError:
print('EX: _add_role, failed to read roles file ' + role_file)
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')
@ -97,11 +95,9 @@ def _remove_role(base_dir: str, nickname: str, role_filename: str) -> None:
if not os.path.isfile(role_file): if not os.path.isfile(role_file):
return return
try: lines: list[str] = \
with open(role_file, 'r', encoding='utf-8') as fp_role: load_list(role_file,
lines = fp_role.readlines() 'EX: _remove_role, failed to read roles file ' + role_file)
except OSError:
print('EX: _remove_role, failed to read roles file ' + role_file)
try: try:
with open(role_file, 'w+', encoding='utf-8') as fp_role: with open(role_file, 'w+', encoding='utf-8') as fp_role:
@ -283,12 +279,9 @@ def is_devops(base_dir: str, nickname: str) -> bool:
return True return True
return False return False
lines: list[str] = [] lines: list[str] = \
try: load_list(devops_file,
with open(devops_file, 'r', encoding='utf-8') as fp_mod: 'EX: is_devops unable to read ' + devops_file)
lines = fp_mod.readlines()
except OSError:
print('EX: is_devops unable to read ' + devops_file)
if not lines: if not lines:
# 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')

24
speaker.py
View File

@ -32,6 +32,7 @@ from utils import local_actor_url
from utils import get_actor_from_post from utils import get_actor_from_post
from content import html_replace_quote_marks from content import html_replace_quote_marks
from content import html_replace_inline_quotes from content import html_replace_inline_quotes
from data import load_list
SPEAKER_REMOVE_CHARS = ('.\n', '. ', ',', ';', '?', '!') SPEAKER_REMOVE_CHARS = ('.\n', '. ', ',', ';', '?', '!')
@ -151,13 +152,10 @@ def _speaker_pronounce(base_dir: str, say_text: str, translate: {}) -> str:
")": "," ")": ","
} }
if os.path.isfile(pronounce_filename): if os.path.isfile(pronounce_filename):
pronounce_list: list[str] = [] pronounce_list: list[str] = \
try: load_list(pronounce_filename,
with open(pronounce_filename, 'r', encoding='utf-8') as fp_pro: 'EX: _speaker_pronounce unable to read ' +
pronounce_list = fp_pro.readlines() pronounce_filename)
except OSError:
print('EX: _speaker_pronounce unable to read ' +
pronounce_filename)
if pronounce_list: if pronounce_list:
for conversion in pronounce_list: for conversion in pronounce_list:
separator = None separator = None
@ -542,14 +540,10 @@ 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):
follows: list[str] = [] follows: list[str] = \
try: load_list(approve_follows_filename,
with open(approve_follows_filename, 'r', 'EX: _post_to_speaker_json unable to read ' +
encoding='utf-8') as fp_foll: approve_follows_filename)
follows = fp_foll.readlines()
except OSError:
print('EX: _post_to_speaker_json unable to read ' +
approve_follows_filename)
if follows: if follows:
follow_requests_exist = True follow_requests_exist = True
for i, _ in enumerate(follows): for i, _ in enumerate(follows):

294
tests.py
View File

@ -244,6 +244,8 @@ from blocking import is_blocked_domain
from filters import filtered_match from filters import filtered_match
from gemini import blog_to_gemini from gemini import blog_to_gemini
from blog import html_blog_post_gemini_links from blog import html_blog_post_gemini_links
from data import load_list
from data import load_string
TEST_SERVER_GROUP_RUNNING = False TEST_SERVER_GROUP_RUNNING = False
@ -2123,9 +2125,11 @@ def test_shared_items_federation(base_dir: str) -> None:
assert valid_inbox(bob_dir, 'bob', bob_domain) assert valid_inbox(bob_dir, 'bob', bob_domain)
assert valid_inbox_filenames(bob_dir, 'bob', bob_domain, assert valid_inbox_filenames(bob_dir, 'bob', bob_domain,
alice_domain, alice_port) alice_domain, alice_port)
assert text_in_file('alice@' + alice_domain, filename = bob_dir_str + '/bob@' + bob_domain + '/followers.txt'
bob_dir_str + '/bob@' + if not text_in_file('alice@' + alice_domain, filename):
bob_domain + '/followers.txt') text = load_string(filename, '')
print('alice@' + alice_domain + ' not in\n' + str(text))
assert text_in_file('alice@' + alice_domain, filename)
assert text_in_file('bob@' + bob_domain, assert text_in_file('bob@' + bob_domain,
alice_dir_str + '/alice@' + alice_dir_str + '/alice@' +
alice_domain + '/following.txt') alice_domain + '/following.txt')
@ -5762,9 +5766,8 @@ def _test_thread_functions():
modules[mod_name]['source'] = source_str modules[mod_name]['source'] = source_str
if 'thread_with_trace(' in source_str: if 'thread_with_trace(' in source_str:
threads_called_in_modules.append(mod_name) threads_called_in_modules.append(mod_name)
with open(source_file, 'r', encoding='utf-8') as fp_src: lines: list[str] = load_list(source_file, '')
lines = fp_src.readlines() modules[mod_name]['lines'] = lines
modules[mod_name]['lines'] = lines
for mod_name in threads_called_in_modules: for mod_name in threads_called_in_modules:
thread_sections = \ thread_sections = \
@ -5919,152 +5922,149 @@ def _test_functions():
'functions': [] 'functions': []
} }
# load the module source # load the module source
source_str = '' source_str: str = load_string(source_file, '')
with open(source_file, 'r', encoding='utf-8') as fp_src: modules[mod_name]['source'] = source_str
source_str = fp_src.read()
modules[mod_name]['source'] = source_str
# go through the source line by line # go through the source line by line
with open(source_file, 'r', encoding='utf-8') as fp_src: lines: list[str] = load_list(source_file, '')
lines = fp_src.readlines() modules[mod_name]['lines'] = lines
modules[mod_name]['lines'] = lines line_count = 0
line_count = 0 prev_line = 'start'
prev_line = 'start' method_name = ''
method_name = '' method_args: list[str] = []
method_args: list[str] = [] module_line = 0
module_line = 0 curr_return_types = ''
curr_return_types = '' is_comment = False
is_comment = False for line in lines:
for line in lines: if '"""' in line:
if '"""' in line: is_comment = not is_comment
is_comment = not is_comment module_line += 1
module_line += 1 # what group is this module in?
# what group is this module in? if '__module_group__' in line:
if '__module_group__' in line: if '=' in line:
if '=' in line: group_name = line.split('=')[1].strip()
group_name = line.split('=')[1].strip() group_name = group_name.replace('"', '')
group_name = group_name.replace('"', '') group_name = group_name.replace("'", '')
group_name = group_name.replace("'", '') modules[mod_name]['group'] = group_name
modules[mod_name]['group'] = group_name if not mod_groups.get(group_name):
if not mod_groups.get(group_name): mod_groups[group_name] = [mod_name]
mod_groups[group_name] = [mod_name] else:
else: if mod_name not in mod_groups[group_name]:
if mod_name not in mod_groups[group_name]: mod_groups[group_name].append(mod_name)
mod_groups[group_name].append(mod_name) # reading function lines
# reading function lines if not line.strip().startswith('def '):
if not line.strip().startswith('def '): if 'self.server.' in line:
if 'self.server.' in line: assert _check_self_variables(mod_name,
assert _check_self_variables(mod_name, method_name,
method_name, method_args, line,
method_args, line, module_line)
module_line) if line_count > 0:
if line_count > 0: line_count += 1
line_count += 1 # add LOC count for this function
# add LOC count for this function if len(prev_line.strip()) == 0 and \
if len(prev_line.strip()) == 0 and \ len(line.strip()) == 0 and \
len(line.strip()) == 0 and \ line_count > 2:
line_count > 2: line_count -= 2
line_count -= 2 if line_count > 80:
if line_count > 80: loc_str = str(line_count) + ';' + method_name
loc_str = str(line_count) + ';' + method_name if line_count < 1000:
if line_count < 1000: loc_str = '0' + loc_str
loc_str = '0' + loc_str if line_count < 100:
if line_count < 100: loc_str = '0' + loc_str
loc_str = '0' + loc_str if line_count < 10:
if line_count < 10: loc_str = '0' + loc_str
loc_str = '0' + loc_str if loc_str not in method_loc:
if loc_str not in method_loc: method_loc.append(loc_str)
method_loc.append(loc_str) line_count = 0
line_count = 0
is_return_statement = False is_return_statement = False
if ' return' in line: if ' return' in line:
before_return = line.split(' return')[0].strip() before_return = line.split(' return')[0].strip()
if not before_return: if not before_return:
is_return_statement = True is_return_statement = True
if curr_return_types and is_return_statement and \ if curr_return_types and is_return_statement and \
not is_comment and '#' not in line and \ not is_comment and '#' not in line and \
'"""' not in line: '"""' not in line:
# check return statements are of the expected type # check return statements are of the expected type
if line.endswith(' return\n'): if line.endswith(' return\n'):
if curr_return_types != 'None': if curr_return_types != 'None':
print(method_name + ' in module ' + print(method_name + ' in module ' +
mod_name + ' has unexpected return') mod_name + ' has unexpected return')
print('Expected: return ' + print('Expected: return ' +
str(curr_return_types)) str(curr_return_types))
print('Actual: ' + line.strip()) print('Actual: ' + line.strip())
assert False assert False
elif (' return' in line and elif (' return' in line and
not line.endswith(',\n') and not line.endswith(',\n') and
not line.endswith('\\\n') and not line.endswith('\\\n') and
',' in curr_return_types): ',' in curr_return_types):
# check the number of return values # check the number of return values
ret_types = line.split(' return', 1)[1] ret_types = line.split(' return', 1)[1]
no_of_args1 = \ no_of_args1 = \
len(curr_return_types.split(',')) len(curr_return_types.split(','))
no_of_args2 = \ no_of_args2 = \
len(ret_types.split(',')) len(ret_types.split(','))
if no_of_args1 != no_of_args2: if no_of_args1 != no_of_args2:
print(method_name + ' in module ' + print(method_name + ' in module ' +
mod_name + mod_name +
' has unexpected ' + ' has unexpected ' +
'number of arguments') 'number of arguments')
print('Expected: return ' + print('Expected: return ' +
str(curr_return_types)) str(curr_return_types))
print('Actual: ' + line.strip()) print('Actual: ' + line.strip())
assert False assert False
prev_line = line
continue
# reading function def
prev_line = line prev_line = line
line_count = 1 continue
method_name = line.split('def ', 1)[1].split('(')[0] # reading function def
# get list of arguments with spaces removed prev_line = line
method_args = \ line_count = 1
source_str.split('def ' + method_name + '(')[1] method_name = line.split('def ', 1)[1].split('(')[0]
return_types = method_args.split(')', 1)[1] # get list of arguments with spaces removed
if ':' in return_types: method_args = \
return_types = return_types.split(':')[0] source_str.split('def ' + method_name + '(')[1]
if '->' in return_types: return_types = method_args.split(')', 1)[1]
return_types = return_types.split('->')[1].strip() if ':' in return_types:
if return_types.startswith('(') and \ return_types = return_types.split(':')[0]
not return_types.endswith(')'): if '->' in return_types:
return_types += ')' return_types = return_types.split('->')[1].strip()
else: if return_types.startswith('(') and \
return_types: list[str] = [] not return_types.endswith(')'):
curr_return_types = return_types return_types += ')'
method_args = method_args.split(')', 1)[0] else:
method_args = method_args.replace(' ', '').split(',') return_types: list[str] = []
if function.get(mod_name): curr_return_types = return_types
function[mod_name].append(method_name) method_args = method_args.split(')', 1)[0]
else: method_args = method_args.replace(' ', '').split(',')
function[mod_name] = [method_name] if function.get(mod_name):
if method_name not in modules[mod_name]['functions']: function[mod_name].append(method_name)
modules[mod_name]['functions'].append(method_name) else:
if not _check_method_args(mod_name, method_name, function[mod_name] = [method_name]
method_args): if method_name not in modules[mod_name]['functions']:
assert False modules[mod_name]['functions'].append(method_name)
# create an entry for this function if not _check_method_args(mod_name, method_name,
function_properties[method_name] = { method_args):
"args": method_args, assert False
"module": mod_name, # create an entry for this function
"calledInModule": [], function_properties[method_name] = {
"returns": return_types "args": method_args,
} "module": mod_name,
# LOC count for the last function "calledInModule": [],
if line_count > 2: "returns": return_types
line_count -= 2 }
if line_count > 80: # LOC count for the last function
loc_str = str(line_count) + ';' + method_name if line_count > 2:
if line_count < 1000: line_count -= 2
loc_str = '0' + loc_str if line_count > 80:
if line_count < 100: loc_str = str(line_count) + ';' + method_name
loc_str = '0' + loc_str if line_count < 1000:
if line_count < 10: loc_str = '0' + loc_str
loc_str = '0' + loc_str if line_count < 100:
if loc_str not in method_loc: loc_str = '0' + loc_str
method_loc.append(loc_str) if line_count < 10:
loc_str = '0' + loc_str
if loc_str not in method_loc:
method_loc.append(loc_str)
break break
print('LOC counts:') print('LOC counts:')

49
utils.py
View File

@ -22,6 +22,7 @@ from cryptography.hazmat.primitives import hashes
from followingCalendar import add_person_to_calendar from followingCalendar import add_person_to_calendar
from unicodetext import standardize_text from unicodetext import standardize_text
from formats import get_image_extensions from formats import get_image_extensions
from data import load_list
VALID_HASHTAG_CHARS = \ VALID_HASHTAG_CHARS = \
set('_0123456789' + set('_0123456789' +
@ -797,12 +798,9 @@ def get_followers_list(base_dir: str,
if not os.path.isfile(filename): if not os.path.isfile(filename):
return [] return []
lines: list[str] = [] lines: list[str] = \
try: load_list(filename,
with open(filename, 'r', encoding='utf-8') as fp_foll: 'EX: get_followers_list unable to read ' + filename)
lines = fp_foll.readlines()
except OSError:
print('EX: get_followers_list unable to read ' + filename)
if lines: if lines:
for i, _ in enumerate(lines): for i, _ in enumerate(lines):
@ -1640,16 +1638,13 @@ def follow_person(base_dir: str, nickname: str, domain: str,
if text_in_file(handle_to_follow, unfollowed_filename): if text_in_file(handle_to_follow, unfollowed_filename):
# remove them from the unfollowed file # remove them from the unfollowed file
new_lines = '' new_lines = ''
try: lines: list[str] = \
with open(unfollowed_filename, 'r', load_list(unfollowed_filename,
encoding='utf-8') as fp_unfoll: 'EX: follow_person unable to read ' +
lines = fp_unfoll.readlines() unfollowed_filename)
for line in lines: for line in lines:
if handle_to_follow not in line: if handle_to_follow not in line:
new_lines += line new_lines += line
except OSError:
print('EX: follow_person unable to read ' +
unfollowed_filename)
try: try:
with open(unfollowed_filename, 'w+', with open(unfollowed_filename, 'w+',
encoding='utf-8') as fp_unfoll: encoding='utf-8') as fp_unfoll:
@ -1897,13 +1892,10 @@ def remove_post_from_index(post_url: str, debug: bool,
post_id = remove_id_ending(post_url) post_id = remove_id_ending(post_url)
if not text_in_file(post_id, index_file): if not text_in_file(post_id, index_file):
return return
lines: list[str] = [] lines: list[str] = \
try: load_list(index_file,
with open(index_file, 'r', encoding='utf-8') as fp_mod1: 'EX: remove_post_from_index unable to read ' +
lines = fp_mod1.readlines() index_file + ' [ex]')
except OSError as exc:
print('EX: remove_post_from_index unable to read ' +
index_file + ' ' + str(exc))
if not lines: if not lines:
return return
@ -2072,13 +2064,10 @@ def _remove_post_id_from_tag_index(tag_index_filename: str,
post_id: str) -> None: post_id: str) -> None:
"""Remove post_id from the tag index file """Remove post_id from the tag index file
""" """
lines = None lines: list[str] = \
try: load_list(tag_index_filename,
with open(tag_index_filename, 'r', encoding='utf-8') as fp_index: 'EX: _remove_post_id_from_tag_index unable to read ' +
lines = fp_index.readlines() tag_index_filename)
except OSError:
print('EX: _remove_post_id_from_tag_index unable to read ' +
tag_index_filename)
if not lines: if not lines:
return return
newlines = '' newlines = ''

13
webapp_column_left.py
View File

@ -25,6 +25,7 @@ from webapp_utils import html_footer
from webapp_utils import get_banner_file from webapp_utils import get_banner_file
from webapp_utils import edit_text_field from webapp_utils import edit_text_field
from shares import share_category_icon from shares import share_category_icon
from data import load_list
def _links_exist(base_dir: str) -> bool: def _links_exist(base_dir: str) -> bool:
@ -222,14 +223,12 @@ def get_left_column_content(base_dir: str, nickname: str, domain_full: str,
links_filename = data_dir(base_dir) + '/links.txt' links_filename = data_dir(base_dir) + '/links.txt'
links_file_contains_entries = False links_file_contains_entries = False
links_list = None links_list: list[str] = None
if os.path.isfile(links_filename): if os.path.isfile(links_filename):
try: links_list = \
with open(links_filename, 'r', encoding='utf-8') as fp_links: load_list(links_filename,
links_list = fp_links.readlines() 'EX: get_left_column_content unable to read ' +
except OSError: links_filename)
print('EX: get_left_column_content unable to read ' +
links_filename)
if not front_page: if not front_page:
# show a number of shares # show a number of shares

12
webapp_column_right.py
View File

@ -35,6 +35,7 @@ from webapp_utils import html_post_separator
from webapp_utils import header_buttons_front_screen from webapp_utils import header_buttons_front_screen
from webapp_utils import edit_text_field from webapp_utils import edit_text_field
from textmode import text_mode_browser from textmode import text_mode_browser
from data import load_list
def _votes_indicator(total_votes: int, positive_voting: bool) -> str: def _votes_indicator(total_votes: int, positive_voting: bool) -> str:
@ -383,13 +384,10 @@ def html_citations(base_dir: str, nickname: str, domain: str,
citations_selected: list[str] = [] citations_selected: list[str] = []
if os.path.isfile(citations_filename): if os.path.isfile(citations_filename):
citations_separator = '#####' citations_separator = '#####'
citations: list[str] = [] citations: list[str] = \
try: load_list(citations_filename,
with open(citations_filename, 'r', encoding='utf-8') as fp_cit: 'EX: html_citations unable to read ' +
citations = fp_cit.readlines() citations_filename + ' [ex]')
except OSError as exc:
print('EX: html_citations unable to read ' +
citations_filename + ' ' + str(exc))
for line in citations: for line in citations:
if citations_separator not in line: if citations_separator not in line:
continue continue

13
webapp_create_post.py
View File

@ -53,6 +53,7 @@ from maps import get_location_from_post
from cache import get_person_from_cache from cache import get_person_from_cache
from person import get_person_notes from person import get_person_notes
from textmode import text_mode_browser from textmode import text_mode_browser
from data import load_list
def _html_new_post_drop_down(scope_icon: str, scope_description: str, def _html_new_post_drop_down(scope_icon: str, scope_description: str,
@ -937,14 +938,10 @@ def html_new_post(edit_post_params: {},
translate['Citations'] + ':</label></p>\n' translate['Citations'] + ':</label></p>\n'
citations_str += ' <ul>\n' citations_str += ' <ul>\n'
citations_separator = '#####' citations_separator = '#####'
citations: list[str] = [] citations: list[str] = \
try: load_list(citations_filename,
with open(citations_filename, 'r', 'EX: html_new_post unable to read ' +
encoding='utf-8') as fp_cit: citations_filename + ' [ex]')
citations = fp_cit.readlines()
except OSError as exc:
print('EX: html_new_post unable to read ' +
citations_filename + ' ' + str(exc))
for line in citations: for line in citations:
if citations_separator not in line: if citations_separator not in line:
continue continue

71
webapp_moderation.py
View File

@ -35,6 +35,7 @@ from blocking import get_global_block_reason
from blocking import is_blocked_domain from blocking import is_blocked_domain
from blocking import is_blocked from blocking import is_blocked
from session import create_session from session import create_session
from data import load_list
def html_moderation(default_timeline: str, def html_moderation(default_timeline: str,
@ -473,42 +474,40 @@ def html_moderation_info(translate: {}, base_dir: str,
blocking_reasons_exist = False blocking_reasons_exist = False
if os.path.isfile(blocking_reasons_filename): if os.path.isfile(blocking_reasons_filename):
blocking_reasons_exist = True blocking_reasons_exist = True
try: blocked_lines: list[str] = \
with open(blocking_filename, 'r', encoding='utf-8') as fp_block: load_list(blocking_filename,
blocked_lines = fp_block.readlines() 'EX: html_moderation_info unable to read 2 ' +
blocked_str = '' blocking_filename + ' [ex]')
if blocked_lines: blocked_str = ''
blocked_lines.sort() if blocked_lines:
for line in blocked_lines: blocked_lines.sort()
if not line: for line in blocked_lines:
continue if not line:
line = remove_eol(line).strip() continue
if blocking_reasons_exist: line = remove_eol(line).strip()
blocking_reasons_file = blocking_reasons_filename if blocking_reasons_exist:
reason = \ blocking_reasons_file = blocking_reasons_filename
get_global_block_reason(line, reason = \
blocking_reasons_file) get_global_block_reason(line,
if reason: blocking_reasons_file)
blocked_str += \ if reason:
line + ' - ' + reason + '\n' blocked_str += \
continue line + ' - ' + reason + '\n'
blocked_str += line + '\n' continue
info_form += '<div class="container">\n' blocked_str += line + '\n'
info_form += \ info_form += '<div class="container">\n'
' <br><b>' + \ info_form += \
translate['Blocked accounts and hashtags'] + '</b>' ' <br><b>' + \
info_form += \ translate['Blocked accounts and hashtags'] + '</b>'
' <br>' + \ info_form += \
translate[msg_str1] ' <br>' + \
info_form += \ translate[msg_str1]
' <textarea id="message" ' + \ info_form += \
'name="blocked" style="height:2000px" ' + \ ' <textarea id="message" ' + \
'spellcheck="false">' + blocked_str + '</textarea>\n' 'name="blocked" style="height:2000px" ' + \
info_form += '</div>\n' 'spellcheck="false">' + blocked_str + '</textarea>\n'
info_shown = True info_form += '</div>\n'
except OSError as exc: info_shown = True
print('EX: html_moderation_info unable to read 2 ' +
blocking_filename + ' ' + str(exc))
filters_filename = dir_str + '/filters.txt' filters_filename = dir_str + '/filters.txt'
if os.path.isfile(filters_filename): if os.path.isfile(filters_filename):

13
webapp_post.py
View File

@ -145,6 +145,7 @@ from session import get_json_valid
from session import get_json from session import get_json
from blog import html_blog_post_markdown from blog import html_blog_post_markdown
from blog import html_blog_post_gemini_links from blog import html_blog_post_gemini_links
from data import load_list
# maximum length for display name within html posts # maximum length for display name within html posts
MAX_DISPLAY_NAME_LENGTH = 42 MAX_DISPLAY_NAME_LENGTH = 42
@ -2111,14 +2112,10 @@ def _substitute_onion_domains(base_dir: str, content: str) -> str:
onion_domains_filename = data_dir(base_dir) + '/onion_domains.txt' onion_domains_filename = data_dir(base_dir) + '/onion_domains.txt'
if os.path.isfile(onion_domains_filename): if os.path.isfile(onion_domains_filename):
onion_domains_list: list[str] = [] onion_domains_list: list[str] = \
try: load_list(onion_domains_filename,
with open(onion_domains_filename, 'r', 'EX: unable to load onion domains file ' +
encoding='utf-8') as fp_onions: onion_domains_filename)
onion_domains_list = fp_onions.readlines()
except OSError:
print('EX: unable to load onion domains file ' +
onion_domains_filename)
if onion_domains_list: if onion_domains_list:
onion_domains = {} onion_domains = {}
separators = (' ', ',', '->') separators = (' ', ',', '->')

14
webapp_profile.py
View File

@ -136,6 +136,7 @@ from shares import actor_attached_shares_as_html
from git import get_repo_url from git import get_repo_url
from reading import html_profile_book_list from reading import html_profile_book_list
from availability import get_availability from availability import get_availability
from data import load_list
THEME_FORMATS = '.zip, .gz' THEME_FORMATS = '.zip, .gz'
BLOCKFILE_FORMATS = '.csv' BLOCKFILE_FORMATS = '.csv'
@ -2762,14 +2763,11 @@ def _html_edit_profile_filtering(base_dir: str, nickname: str, domain: str,
locations_filename = base_dir + '/custom_locations.txt' locations_filename = base_dir + '/custom_locations.txt'
if not os.path.isfile(locations_filename): if not os.path.isfile(locations_filename):
locations_filename = base_dir + '/locations.txt' locations_filename = base_dir + '/locations.txt'
cities: list[str] = [] cities: list[str] = \
try: load_list(locations_filename,
with open(locations_filename, 'r', encoding='utf-8') as fp_loc: 'EX: _html_edit_profile_filtering unable to read ' +
cities = fp_loc.readlines() locations_filename)
cities.sort() cities.sort()
except OSError:
print('EX: _html_edit_profile_filtering unable to read ' +
locations_filename)
edit_profile_form += ' <select id="cityDropdown" ' + \ edit_profile_form += ' <select id="cityDropdown" ' + \
'name="cityDropdown" class="theme">\n' 'name="cityDropdown" class="theme">\n'
city = city.lower() city = city.lower()

36
webapp_search.py
View File

@ -57,6 +57,7 @@ from webapp_hashtagswarm import html_hash_tag_swarm
from maps import html_hashtag_maps from maps import html_hashtag_maps
from session import get_json_valid from session import get_json_valid
from session import get_json from session import get_json
from data import load_list
def html_search_emoji(translate: {}, base_dir: str, search_str: str, def html_search_emoji(translate: {}, base_dir: str, search_str: str,
@ -928,12 +929,10 @@ def html_hashtag_search(nickname: str, domain: str, port: int,
nickname = None nickname = None
# read the index # read the index
lines: list[str] = [] lines: list[str] = \
try: load_list(hashtag_index_file,
with open(hashtag_index_file, 'r', encoding='utf-8') as fp_hash: 'EX: html_hashtag_search unable to read ' +
lines = fp_hash.readlines() hashtag_index_file)
except OSError:
print('EX: html_hashtag_search unable to read ' + hashtag_index_file)
# read the css # read the css
css_filename = base_dir + '/epicyon-profile.css' css_filename = base_dir + '/epicyon-profile.css'
@ -1383,12 +1382,10 @@ def hashtag_search_rss(nickname: str, domain: str, port: int,
nickname = None nickname = None
# read the index # read the index
lines: list[str] = [] lines: list[str] = \
try: load_list(hashtag_index_file,
with open(hashtag_index_file, 'r', encoding='utf-8') as fp_hash: 'EX: hashtag_search_rss unable to read ' +
lines = fp_hash.readlines() hashtag_index_file)
except OSError:
print('EX: hashtag_search_rss unable to read ' + hashtag_index_file)
if not lines: if not lines:
return None return None
@ -1396,8 +1393,8 @@ def hashtag_search_rss(nickname: str, domain: str, port: int,
max_feed_length = 10 max_feed_length = 10
hashtag_feed = rss2tag_header(hashtag, http_prefix, domain_full) hashtag_feed = rss2tag_header(hashtag, http_prefix, domain_full)
for index, _ in enumerate(lines): for index, item in enumerate(lines):
post_id = lines[index].strip('\n').strip('\r') post_id = item.strip('\n').strip('\r')
if ' ' not in post_id: if ' ' not in post_id:
nickname = get_nickname_from_actor(post_id) nickname = get_nickname_from_actor(post_id)
if not nickname: if not nickname:
@ -1497,13 +1494,10 @@ def hashtag_search_json(nickname: str, domain: str, port: int,
nickname = None nickname = None
# read the index # read the index
lines: list[str] = [] lines: list[str] = \
try: load_list(hashtag_index_file,
with open(hashtag_index_file, 'r', encoding='utf-8') as fp_hash: 'EX: hashtag_search_json unable to read ' +
lines = fp_hash.readlines() hashtag_index_file)
except OSError:
print('EX: hashtag_search_json unable to read ' +
hashtag_index_file)
if not lines: if not lines:
return None return None

11
webapp_utils.py
View File

@ -59,6 +59,7 @@ from blocking import is_blocked
from blocking import allowed_announce from blocking import allowed_announce
from shares import vf_proposal_from_share from shares import vf_proposal_from_share
from webapp_pwa import get_pwa_theme_colors from webapp_pwa import get_pwa_theme_colors
from data import load_list
def minimizing_attached_images(base_dir: str, nickname: str, domain: str, def minimizing_attached_images(base_dir: str, nickname: str, domain: str,
@ -2215,13 +2216,9 @@ def html_common_emoji(base_dir: str, no_of_emoji: int) -> str:
common_emoji_filename = data_dir(base_dir) + '/common_emoji.txt' common_emoji_filename = data_dir(base_dir) + '/common_emoji.txt'
if not os.path.isfile(common_emoji_filename): if not os.path.isfile(common_emoji_filename):
return '' return ''
common_emoji = None common_emoji: list[str] = \
try: load_list(common_emoji_filename,
with open(common_emoji_filename, 'r', encoding='utf-8') as fp_emoji: 'EX: html_common_emoji unable to load file')
common_emoji = fp_emoji.readlines()
except OSError:
print('EX: html_common_emoji unable to load file')
return ''
if not common_emoji: if not common_emoji:
return '' return ''
line_ctr = 0 line_ctr = 0