mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

install: convert to common.get_config()

Browse source
This commit is contained in:
Hans-Christoph Steiner 2024-10-28 22:56:35 +01:00
parent 3a3417f6f8
commit b77eba824b
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
fdroidserver/install.py
View file

@ -31,8 +31,6 @@ from . import _
from . import common, index, net from . import common, index, net
from .exception import FDroidException from .exception import FDroidException
config = None
DEFAULT_IPFS_GATEWAYS = ("https://gateway.ipfs.io/ipfs/",) DEFAULT_IPFS_GATEWAYS = ("https://gateway.ipfs.io/ipfs/",)
@ -107,7 +105,7 @@ def install_fdroid_apk(privacy_mode=False):
logging.warning(_('Privacy mode was enabled based on your locale.')) logging.warning(_('Privacy mode was enabled based on your locale.'))
privacy_mode = True privacy_mode = True
if privacy_mode or not (config and config.get('jarsigner')): if privacy_mode or not (common.config and common.config.get('jarsigner')):
download_methods = [download_fdroid_apk] download_methods = [download_fdroid_apk]
else: else:
download_methods = [download_apk, download_fdroid_apk] download_methods = [download_apk, download_fdroid_apk]
@ -120,7 +118,7 @@ def install_fdroid_apk(privacy_mode=False):
else: else:
return _('F-Droid.apk could not be downloaded from any known source!') return _('F-Droid.apk could not be downloaded from any known source!')
if config and config['apksigner']: if common.config and common.config.get('apksigner'):
# TODO this should always verify, but that requires APK sig verification in Python #94 # TODO this should always verify, but that requires APK sig verification in Python #94
logging.info(_('Verifying package {path} with apksigner.').format(path=f)) logging.info(_('Verifying package {path} with apksigner.').format(path=f))
common.verify_apk_signature(f) common.verify_apk_signature(f)
@ -130,7 +128,7 @@ def install_fdroid_apk(privacy_mode=False):
path=f, fingerprint=fingerprint path=f, fingerprint=fingerprint
) )
if config and config.get('adb'): if common.config and common.config.get('adb'):
if devices(): if devices():
install_apks_to_devices([f]) install_apks_to_devices([f])
os.remove(f) os.remove(f)
@ -194,9 +192,6 @@ def install_apks_to_devices(apks):
def main(): def main():
global config
# Parse command line...
parser = ArgumentParser( parser = ArgumentParser(
usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]" usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]"
) )
@ -228,7 +223,7 @@ def main():
# TODO implement me, including a -y/--yes flag # TODO implement me, including a -y/--yes flag
print('TODO prompt the user if they want to download and install F-Droid.apk') print('TODO prompt the user if they want to download and install F-Droid.apk')
config = common.read_config() common.get_config()
output_dir = 'repo' output_dir = 'repo'
if (options.appid or options.all) and not os.path.isdir(output_dir): if (options.appid or options.all) and not os.path.isdir(output_dir):

2
tests/install.TestCase
View file

@ -196,7 +196,7 @@ class InstallTest(unittest.TestCase):
download_fdroid_apk.side_effect = self._download_raise download_fdroid_apk.side_effect = self._download_raise
fdroidserver.common.config = {'jarsigner': 'fakepath'} fdroidserver.common.config = {'jarsigner': 'fakepath'}
install.install_fdroid_apk(privacy_mode=False) install.install_fdroid_apk(privacy_mode=False)
download_apk.assert_not_called() download_apk.assert_called_once()
download_fdroid_apk.assert_called_once() download_fdroid_apk.assert_called_once()
@patch('fdroidserver.install.download_apk') @patch('fdroidserver.install.download_apk')