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

KnownApks: appid is no longer needed at all, remove it.

Browse source
This commit is contained in:
Hans-Christoph Steiner 2024-10-30 14:01:54 +01:00
parent 5032207da0
commit 173c1d67f4
4 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
fdroidserver/common.py
View file

@ -2564,9 +2564,9 @@ class KnownApks:
for version in data["versions"].values(): for version in data["versions"].values():
filename = version["file"]["name"][1:] filename = version["file"]["name"][1:]
date = datetime.fromtimestamp(version["added"] // 1000, tz=timezone.utc) date = datetime.fromtimestamp(version["added"] // 1000, tz=timezone.utc)
self.apks[filename] = (appid, date) self.apks[filename] = date
def recordapk(self, apkName, app, default_date=None): def recordapk(self, apkName, default_date=None):
""" """
Record an APK (if it's new, otherwise does nothing). Record an APK (if it's new, otherwise does nothing).
@ -2578,10 +2578,9 @@ class KnownApks:
if apkName not in self.apks: if apkName not in self.apks:
if default_date is None: if default_date is None:
default_date = datetime.now(timezone.utc) default_date = datetime.now(timezone.utc)
self.apks[apkName] = (app, default_date) self.apks[apkName] = default_date
self.changed = True self.changed = True
_ignored, added = self.apks[apkName] return self.apks[apkName]
return added
def get_file_extension(filename): def get_file_extension(filename):

10
fdroidserver/update.py
View file

@ -690,7 +690,7 @@ def scan_repo_for_ipas(apkcache, repodir, knownapks):
apkcache[ipa_name] = ipa apkcache[ipa_name] = ipa
cachechanged = True cachechanged = True
added = knownapks.recordapk(ipa_name, ipa['packageName']) added = knownapks.recordapk(ipa_name)
if added: if added:
ipa['added'] = added ipa['added'] = added
@ -1549,8 +1549,9 @@ def scan_repo_files(apkcache, repodir, knownapks, use_date_from_file=False):
default_date_param = None default_date_param = None
# Record in knownapks, getting the added date at the same time.. # Record in knownapks, getting the added date at the same time..
added = knownapks.recordapk(repo_file['apkName'], repo_file['packageName'], added = knownapks.recordapk(
default_date=default_date_param) repo_file['apkName'], default_date=default_date_param
)
if added: if added:
repo_file['added'] = added repo_file['added'] = added
@ -2006,8 +2007,7 @@ def process_apk(apkcache, apkfilename, repodir, knownapks, use_date_from_apk=Fal
default_date_param = None default_date_param = None
# Record in known apks, getting the added date at the same time.. # Record in known apks, getting the added date at the same time..
added = knownapks.recordapk(apk['apkName'], apk['packageName'], added = knownapks.recordapk(apk['apkName'], default_date=default_date_param)
default_date=default_date_param)
if added: if added:
apk['added'] = added apk['added'] = added

12
tests/common.TestCase
View file

@ -2945,8 +2945,8 @@ class CommonTest(unittest.TestCase):
now = datetime.now(timezone.utc) now = datetime.now(timezone.utc)
knownapks = fdroidserver.common.KnownApks() knownapks = fdroidserver.common.KnownApks()
for apkName in knownapks.apks: for apkName in knownapks.apks:
knownapks.recordapk(apkName, 'ignored', default_date=now) knownapks.recordapk(apkName, default_date=now)
for appid, added in knownapks.apks.values(): for added in knownapks.apks.values():
self.assertNotEqual(added, now) self.assertNotEqual(added, now)
def test_KnownApks_recordapk_new(self): def test_KnownApks_recordapk_new(self):
@ -2958,14 +2958,14 @@ class CommonTest(unittest.TestCase):
now = datetime.now(timezone.utc) now = datetime.now(timezone.utc)
knownapks = fdroidserver.common.KnownApks() knownapks = fdroidserver.common.KnownApks()
fake_apk = 'fake.apk' fake_apk = 'fake.apk'
knownapks.recordapk(fake_apk, 'ignored', default_date=now) knownapks.recordapk(fake_apk, default_date=now)
for apk, (appid, added) in knownapks.apks.items(): for apk, added in knownapks.apks.items():
if apk == fake_apk: if apk == fake_apk:
self.assertEqual(added, now) self.assertEqual(added, now)
else: else:
self.assertNotEqual(added, now) self.assertNotEqual(added, now)
knownapks.recordapk(fake_apk, 'ignored', default_date=datetime.now(timezone.utc)) knownapks.recordapk(fake_apk, default_date=datetime.now(timezone.utc))
self.assertEqual(knownapks.apks[fake_apk][1], now) self.assertEqual(knownapks.apks[fake_apk], now)
APKS_WITH_JAR_SIGNATURES = ( APKS_WITH_JAR_SIGNATURES = (

6
tests/update.TestCase
View file

@ -2048,12 +2048,10 @@ class TestScanRepoForIpas(unittest.TestCase):
knownapks.recordapk.call_count = 2 knownapks.recordapk.call_count = 2
self.assertTrue( self.assertTrue(
unittest.mock.call('abc.Def_123.ipa', 'abc') unittest.mock.call('abc.Def_123.ipa') in knownapks.recordapk.mock_calls
in knownapks.recordapk.mock_calls
) )
self.assertTrue( self.assertTrue(
unittest.mock.call('xyz.XXX_123.ipa', 'xyz') unittest.mock.call('xyz.XXX_123.ipa') in knownapks.recordapk.mock_calls
in knownapks.recordapk.mock_calls
) )