From dd88dd909d4b3a7a84c97a5fdae982950a5e4bcc Mon Sep 17 00:00:00 2001
From: Joern <joern.rm@gmail.com>
Date: Mon, 13 Feb 2017 17:43:43 +0000
Subject: [PATCH] RideImport ... in addition to DateTime in the .json File name
 (which is in local Time), also check for duplicates using UTC from RideCache
 to avoid duplicate imports if user changes his PC TimeZone (e.g. when
 travelling) ... the problem e.g. occurs in Autoimport where the same files
 would be imported again, if the PC TimeZone changes

---
 src/Core/RideCache.cpp       | 11 +++++++++++
 src/Core/RideCache.h         |  1 +
 src/Gui/RideImportWizard.cpp |  6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/src/Core/RideCache.cpp b/src/Core/RideCache.cpp
index e05b49025..310f246e2 100644
--- a/src/Core/RideCache.cpp
+++ b/src/Core/RideCache.cpp
@@ -843,6 +843,17 @@ RideCache::getRide(QString filename)
     return NULL;
 }
 
+RideItem *
+RideCache::getRide(QDateTime dateTime)
+{
+    foreach(RideItem *item, rides())
+        if (item->dateTime == dateTime)
+            return item;
+    return NULL;
+}
+
+
+
 QHash<QString,int>
 RideCache::getRankedValues(QString field)
 {
diff --git a/src/Core/RideCache.h b/src/Core/RideCache.h
index f0a7459fc..cff8f55e0 100644
--- a/src/Core/RideCache.h
+++ b/src/Core/RideCache.h
@@ -57,6 +57,7 @@ class RideCache : public QObject
         // query the cache
         int count() const { return rides_.count(); }
         RideItem *getRide(QString filename);
+        RideItem *getRide(QDateTime dateTime);
 	    QList<QDateTime> getAllDates();
         QStringList getAllFilenames();
 
diff --git a/src/Gui/RideImportWizard.cpp b/src/Gui/RideImportWizard.cpp
index 72ae3bedf..42d032de3 100644
--- a/src/Gui/RideImportWizard.cpp
+++ b/src/Gui/RideImportWizard.cpp
@@ -23,6 +23,7 @@
 #include "RideItem.h"
 #include "RideFile.h"
 #include "RideImportWizard.h"
+#include "RideCache.h"
 
 #include "RideAutoImportConfig.h"
 #include "HelpWhatsThis.h"
@@ -968,6 +969,11 @@ RideImportWizard::abortClicked()
         // check if a ride at this point of time already exists in /activities - if yes, skip import
         if (QFileInfo(finalActivitiesFulltarget).exists()) { tableWidget->item(i,5)->setText(tr("Error - Activity file exists")); continue; }
 
+        // in addition, also check the RideCache for a Ride with the same point in Time in UTC, which also indicates
+        // that there was already a ride imported - reason is that RideCache start time is in UTC, while the file Name is in "localTime"
+        // which causes problems when importing the same file (for files which do not have time/date in the file name),
+        // while the computer has been set to a different time zone
+        if (context->athlete->rideCache->getRide(ridedatetime.toUTC())) { tableWidget->item(i,5)->setText(tr("Error - Activity file with same start date/time exists")); continue; };
 
         // SAVE STEP 4 - copy the source file to "/imports" directory (if it's not taken from there as source)
         // add the date/time of the target to the source file name (for identification)