kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-19 21:30:10 +01:00
Code Activity

Set ArchivePolicy based on VercodeOperation/signature

Browse Source
This commit is contained in:
linsui 2022-11-15 18:50:09 +08:00
parent 9016bb4ca0
commit d25995c084
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdroidserver/update.py
View File

@ -1862,6 +1862,10 @@ def archive_old_apks(apps, apks, archapks, repodir, archivedir, defaultkeepversi
keepversions = int(app['ArchivePolicy'][:-9]) keepversions = int(app['ArchivePolicy'][:-9])
else: else:
keepversions = defaultkeepversions keepversions = defaultkeepversions
if app.get('VercodeOperation'):
keepversions *= len(app['VercodeOperation'])
if common.metadata_find_developer_signing_files(appid, app['CurrentVersionCode']):
keepversions *= 2
logging.debug(_("Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}") logging.debug(_("Checking archiving for {appid} - apks:{integer}, keepversions:{keep}, archapks:{arch}")
.format(appid=appid, integer=len(apks), keep=keepversions, arch=len(archapks))) .format(appid=appid, integer=len(apks), keep=keepversions, arch=len(archapks)))

21
tests/update.TestCase
View File

@ -1781,6 +1781,27 @@ class UpdateTest(unittest.TestCase):
apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False, apps) apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False, apps)
self.assertEqual([], apks) self.assertEqual([], apks)
def test_archive_old_apks(self):
app = fdroidserver.metadata.App()
app.id = 'test'
app.VercodeOperation = ['%c+1', '%c+2', '%c+3', '%c+4']
apps = {app.id: app}
with self.assertLogs(level='DEBUG') as cm:
fdroidserver.update.archive_old_apks(apps, [], [], '', '', 3)
self.assertEqual(cm.output, [
"DEBUG:root:Checking archiving for test - apks:0, keepversions:12, archapks:0"
])
app = fdroidserver.metadata.App()
app.id = 'org.smssecure.smssecure'
app.CurrentVersionCode = 135
apps = {app.id: app}
with self.assertLogs(level='DEBUG') as cm:
fdroidserver.update.archive_old_apks(apps, [], [], '', '', 3)
self.assertEqual(cm.output, [
"DEBUG:root:Checking archiving for org.smssecure.smssecure - apks:0, keepversions:6, archapks:0"
])
if __name__ == "__main__": if __name__ == "__main__":
os.chdir(os.path.dirname(__file__)) os.chdir(os.path.dirname(__file__))