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

Less indentation

merge-requests/30/head
Bob Mottram 2024-07-02 20:59:47 +01:00
parent 76d0bcf3fd
commit 86e963abc0
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
petnames.py
View File

@ -86,20 +86,24 @@ def get_pet_name(base_dir: str, nickname: str, domain: str,
if not os.path.isfile(petnames_filename):
return ''
with open(petnames_filename, 'r', encoding='utf-8') as petnames_file:
petnames_str = petnames_file.read()
if ' ' + handle + '\n' in petnames_str:
petnames_list = petnames_str.split('\n')
for pet in petnames_list:
if pet.endswith(' ' + handle):
return pet.replace(' ' + handle, '').strip()
elif ' ' + handle.lower() + '\n' in petnames_str.lower():
petnames_list = petnames_str.split('\n')
handle = handle.lower()
for pet in petnames_list:
if pet.lower().endswith(' ' + handle):
handle2 = pet.split(' ')[-1]
return pet.replace(' ' + handle2, '').strip()
petnames_str = ''
try:
with open(petnames_filename, 'r', encoding='utf-8') as petnames_file:
petnames_str = petnames_file.read()
except OSError:
print('EX: get_pet_name unable to read ' + petnames_filename)
if ' ' + handle + '\n' in petnames_str:
petnames_list = petnames_str.split('\n')
for pet in petnames_list:
if pet.endswith(' ' + handle):
return pet.replace(' ' + handle, '').strip()
elif ' ' + handle.lower() + '\n' in petnames_str.lower():
petnames_list = petnames_str.split('\n')
handle = handle.lower()
for pet in petnames_list:
if pet.lower().endswith(' ' + handle):
handle2 = pet.split(' ')[-1]
return pet.replace(' ' + handle2, '').strip()
return ''