mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-11 01:30:30 +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():
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):

10
fdroidserver/update.py
View file

@ -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