From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Wed, 13 Jul 2016 11:43:33 +0000 (+0000)
Subject: Merge branch 'use_date_from_apk_in_known_apks' into 'master'
X-Git-Tag: 0.7.0~33
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=21404e8622b87420136bedc9bfd38af5b75221ff;hp=64d9eb3b13a1be316d3309f2d1fa43be02b1afe3;p=fdroidserver.git

Merge branch 'use_date_from_apk_in_known_apks' into 'master'

Pass a date from APK to KnownApks.recordapk()

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

Essentially, it just expands influence of `--use-date-from-apks` option to `stats/known_apks.txt`.

See merge request !141
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 2c2bb4e0..ce81b385 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 dba1a409..e4d2ff3c 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -784,13 +784,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