From: Dmitriy Bogdanov <d@di72nn.com>
Date: Sun, 26 Jun 2016 15:18:50 +0000 (+0400)
Subject: Pass default date to KnownApks.recordapk()
X-Git-Tag: 0.7.0~33^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b7f28fa576868a35535b13ed1dd4b7e96e68ed0d;hp=063d581b71d06b108e4e6fbe98c2bc20b7dd4855;p=fdroidserver.git

Pass default date to KnownApks.recordapk()

... if --use-date-from-apks option is used
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index f27177fe..88477b18 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1570,9 +1570,11 @@ class KnownApks:
 
     # Record an apk (if it's new, otherwise does nothing)
     # Returns the date it was added.
-    def recordapk(self, apk, app):
+    def recordapk(self, apk, app, default_date=None):
         if apk not in self.apks:
-            self.apks[apk] = (app, time.gmtime(time.time()))
+            if default_date is None:
+                default_date = time.gmtime(time.time())
+            self.apks[apk] = (app, default_date)
             self.changed = True
         _, added = self.apks[apk]
         return added
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 7cd18f41..b35f9287 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -698,13 +698,14 @@ def scan_apks(apps, apkcache, repodir, knownapks, use_date_from_apk=False):
                 shutil.copyfile(baseline,
                                 os.path.join(get_icon_dir(repodir, '0'), iconfilename))
 
+            if use_date_from_apk and manifest.date_time[1] != 0:
+                default_date_param = datetime(*manifest.date_time).utctimetuple()
+            else:
+                default_date_param = None
+
             # Record in known apks, getting the added date at the same time..
-            added = knownapks.recordapk(apk['apkname'], apk['id'])
+            added = knownapks.recordapk(apk['apkname'], apk['id'], default_date=default_date_param)
             if added:
-                if use_date_from_apk and manifest.date_time[1] != 0:
-                    added = datetime(*manifest.date_time).timetuple()
-                    logging.debug("Using date from APK")
-
                 apk['added'] = added
 
             apkcache[apkfilename] = apk