kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-07 09:50:07 +02:00
Code Activity

update: only show missing ipfs_cid warning once.

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2022-09-23 10:58:05 +02:00
parent 29838a8bae
commit 02a91cba66
No known key found for this signature in database
GPG Key ID: 3E177817BA1B9BFA
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fdroidserver/common.py
View File

@ -287,6 +287,9 @@ def fill_config_defaults(thisconfig):
if not thisconfig.get('apksigner'):
logging.warning(_('apksigner not found! Cannot sign or verify modern APKs'))
if 'ipfs_cid' not in thisconfig and shutil.which('ipfs_cid'):
logging.warning(_("ipfs_cid not found, skipping CIDv1 generation"))
for k in ['ndk_paths', 'java_paths']:
d = thisconfig[k]
for k2 in d.copy():
@ -4144,17 +4147,15 @@ def run_yamllint(path, indent=0):
def calculate_IPFS_cid(filename):
"""
Calculate the IPFS CID of a file and add it to the index.
"""Calculate the IPFS CID of a file and add it to the index.
uses ipfs_cid package at https://packages.debian.org/sid/ipfs-cid
Returns CIDv1 of a file as per IPFS recommendation
"""
exe_name = 'ipfs_cid'
if not set_command_in_config(exe_name) or not config.get(exe_name):
logging.info(_("%s not found, skipping CIDv1 generation") % exe_name)
cmd = config and config.get('ipfs_cid')
if not cmd:
return
file_cid = subprocess.run([config[exe_name], filename], capture_output=True)
file_cid = subprocess.run([cmd, filename], capture_output=True)
if file_cid.returncode == 0:
cid_output = file_cid.stdout.decode()