Fix timezone issues

Xerbo · Nov 23, 2021 · a4c0346 · a4c0346
1 parent 987d36c
commit a4c0346
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/src/decoders/decoder.h b/src/decoders/decoder.h
@@ -65,7 +65,7 @@ class Decoder {
             }
             std::istream stream(&file);
             get_filesize(stream);
-            created = QFileInfo(QString::fromStdString(filename)).birthTime().toSecsSinceEpoch();
+            created = QFileInfo(QString::fromStdString(filename)).birthTime().toUTC().toSecsSinceEpoch();
 
             while (is_running && !stream.eof()) {
                 work(stream);

diff --git a/src/decoders/noaa.h b/src/decoders/noaa.h
@@ -138,16 +138,9 @@ class NOAADecoder : public Decoder {
             }
 
             // Calculate the timestamp of the start of the year
-            struct tm* timeinfo = gmtime(&created);
-            timeinfo->tm_sec = 0;
-            timeinfo->tm_min = 0;
-            timeinfo->tm_hour = 0;
-            timeinfo->tm_mday = 1;
-            timeinfo->tm_wday = 0;
-            timeinfo->tm_yday = 0;
-            timeinfo->tm_mon = 0;
-            time_t year = mktime(timeinfo) - 86400;
-
+            int _year = QDateTime::fromSecsSinceEpoch(created).date().year();
+            double year = QDate(_year, 1, 1).startOfDay(Qt::UTC).toSecsSinceEpoch() - 86400.0;
+
             uint16_t days = repacked[8] >> 1;
             uint32_t ms = (repacked[9] & 0b1111111) << 20 | repacked[10] << 10 | repacked[11];
             double timestamp = (double)year + (double)days*86400.0 + (double)ms/1000.0;