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-19 12:56:05 +01:00
parent 7c52e3a7ca
commit 7c70fe6f57
1 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
shares.py
View File

@ -105,12 +105,13 @@ def _load_dfc_ids(base_dir: str, system_language: str,
continue continue
if not label.get('@value'): if not label.get('@value'):
continue continue
if label['@language'] == system_language: if label['@language'] != system_language:
item_id = \ continue
item['@id'].replace('http://static.datafoodconsortium.org', item_id = \
http_prefix + '://' + domain_full) item['@id'].replace('http://static.datafoodconsortium.org',
dfc_ids[label['@value'].lower()] = item_id http_prefix + '://' + domain_full)
break dfc_ids[label['@value'].lower()] = item_id
break
return dfc_ids return dfc_ids
@ -155,13 +156,15 @@ def remove_shared_item2(base_dir: str, nickname: str, domain: str,
if shares_json[item_id]['imageUrl']: if shares_json[item_id]['imageUrl']:
formats = get_image_extensions() formats = get_image_extensions()
for ext in formats: for ext in formats:
if shares_json[item_id]['imageUrl'].endswith('.' + ext): if not shares_json[item_id]['imageUrl'].endswith('.' + ext):
if os.path.isfile(item_idfile + '.' + ext): continue
try: if not os.path.isfile(item_idfile + '.' + ext):
os.remove(item_idfile + '.' + ext) continue
except OSError: try:
print('EX: remove_shared_item unable to delete ' + os.remove(item_idfile + '.' + ext)
item_idfile + '.' + ext) except OSError:
print('EX: remove_shared_item unable to delete ' +
item_idfile + '.' + ext)
# remove the item itself # remove the item itself
del shares_json[item_id] del shares_json[item_id]
save_json(shares_json, shares_filename) save_json(shares_json, shares_filename)
@ -358,9 +361,10 @@ def add_share(base_dir: str,
acct_dir(base_dir, nickname, domain) + '/upload' acct_dir(base_dir, nickname, domain) + '/upload'
formats = get_image_extensions() formats = get_image_extensions()
for ext in formats: for ext in formats:
if os.path.isfile(shares_image_filename + '.' + ext): if not os.path.isfile(shares_image_filename + '.' + ext):
image_filename = shares_image_filename + '.' + ext continue
move_image = True image_filename = shares_image_filename + '.' + ext
move_image = True
domain_full = get_full_domain(domain, port) domain_full = get_full_domain(domain, port)
@ -486,12 +490,13 @@ def _expire_shares_for_account(base_dir: str, nickname: str, domain: str,
item_idfile = base_dir + '/sharefiles/' + nickname + '/' + item_id item_idfile = base_dir + '/sharefiles/' + nickname + '/' + item_id
formats = get_image_extensions() formats = get_image_extensions()
for ext in formats: for ext in formats:
if os.path.isfile(item_idfile + '.' + ext): if not os.path.isfile(item_idfile + '.' + ext):
try: continue
os.remove(item_idfile + '.' + ext) try:
except OSError: os.remove(item_idfile + '.' + ext)
print('EX: _expire_shares_for_account unable to delete ' + except OSError:
item_idfile + '.' + ext) print('EX: _expire_shares_for_account unable to delete ' +
item_idfile + '.' + ext)
save_json(shares_json, shares_filename) save_json(shares_json, shares_filename)
return removed_ctr return removed_ctr
@ -2297,15 +2302,16 @@ def actor_attached_shares_as_html(actor_json: {},
html_str = '' html_str = ''
ctr = 0 ctr = 0
for attach_item in actor_json['attachment']: for attach_item in actor_json['attachment']:
if _is_valueflows_attachment(attach_item): if not _is_valueflows_attachment(attach_item):
if not html_str: continue
html_str = '<ul>\n' if not html_str:
html_str += \ html_str = '<ul>\n'
' <li><a href="' + attach_item['href'] + '" tabindex="1">' + \ html_str += \
remove_html(attach_item['name']) + '</a></li>\n' ' <li><a href="' + attach_item['href'] + '" tabindex="1">' + \
ctr += 1 remove_html(attach_item['name']) + '</a></li>\n'
if ctr >= max_shares_on_profile: ctr += 1
break if ctr >= max_shares_on_profile:
break
if html_str: if html_str:
html_str = html_str.strip() + '</ul>\n' html_str = html_str.strip() + '</ul>\n'
return html_str return html_str