diff --git a/fdroidserver/common.py b/fdroidserver/common.py index bc9413c1..2bdd54c5 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -2564,9 +2564,9 @@ class KnownApks: for version in data["versions"].values(): filename = version["file"]["name"][1:] 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). @@ -2578,10 +2578,9 @@ class KnownApks: if apkName not in self.apks: if default_date is None: default_date = datetime.now(timezone.utc) - self.apks[apkName] = (app, default_date) + self.apks[apkName] = default_date self.changed = True - _ignored, added = self.apks[apkName] - return added + return self.apks[apkName] def get_file_extension(filename): diff --git a/fdroidserver/update.py b/fdroidserver/update.py index d5c3d922..c561199a 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -690,7 +690,7 @@ def scan_repo_for_ipas(apkcache, repodir, knownapks): apkcache[ipa_name] = ipa cachechanged = True - added = knownapks.recordapk(ipa_name, ipa['packageName']) + added = knownapks.recordapk(ipa_name) if added: ipa['added'] = added @@ -1549,8 +1549,9 @@ def scan_repo_files(apkcache, repodir, knownapks, use_date_from_file=False): default_date_param = None # Record in knownapks, getting the added date at the same time.. - added = knownapks.recordapk(repo_file['apkName'], repo_file['packageName'], - default_date=default_date_param) + added = knownapks.recordapk( + repo_file['apkName'], default_date=default_date_param + ) if 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 # Record in known apks, getting the added date at the same time.. - added = knownapks.recordapk(apk['apkName'], apk['packageName'], - default_date=default_date_param) + added = knownapks.recordapk(apk['apkName'], default_date=default_date_param) if added: apk['added'] = added diff --git a/tests/common.TestCase b/tests/common.TestCase index e4a144ac..f04df702 100755 --- a/tests/common.TestCase +++ b/tests/common.TestCase @@ -2945,8 +2945,8 @@ class CommonTest(unittest.TestCase): now = datetime.now(timezone.utc) knownapks = fdroidserver.common.KnownApks() for apkName in knownapks.apks: - knownapks.recordapk(apkName, 'ignored', default_date=now) - for appid, added in knownapks.apks.values(): + knownapks.recordapk(apkName, default_date=now) + for added in knownapks.apks.values(): self.assertNotEqual(added, now) def test_KnownApks_recordapk_new(self): @@ -2958,14 +2958,14 @@ class CommonTest(unittest.TestCase): now = datetime.now(timezone.utc) knownapks = fdroidserver.common.KnownApks() fake_apk = 'fake.apk' - knownapks.recordapk(fake_apk, 'ignored', default_date=now) - for apk, (appid, added) in knownapks.apks.items(): + knownapks.recordapk(fake_apk, default_date=now) + for apk, added in knownapks.apks.items(): if apk == fake_apk: self.assertEqual(added, now) else: self.assertNotEqual(added, now) - knownapks.recordapk(fake_apk, 'ignored', default_date=datetime.now(timezone.utc)) - self.assertEqual(knownapks.apks[fake_apk][1], now) + knownapks.recordapk(fake_apk, default_date=datetime.now(timezone.utc)) + self.assertEqual(knownapks.apks[fake_apk], now) APKS_WITH_JAR_SIGNATURES = ( diff --git a/tests/update.TestCase b/tests/update.TestCase index ce91339d..2489d646 100755 --- a/tests/update.TestCase +++ b/tests/update.TestCase @@ -2048,12 +2048,10 @@ class TestScanRepoForIpas(unittest.TestCase): knownapks.recordapk.call_count = 2 self.assertTrue( - unittest.mock.call('abc.Def_123.ipa', 'abc') - in knownapks.recordapk.mock_calls + unittest.mock.call('abc.Def_123.ipa') in knownapks.recordapk.mock_calls ) self.assertTrue( - unittest.mock.call('xyz.XXX_123.ipa', 'xyz') - in knownapks.recordapk.mock_calls + unittest.mock.call('xyz.XXX_123.ipa') in knownapks.recordapk.mock_calls )