From 277b2a54229f94759013d98eb3aee7ae3d3b078c Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Mon, 27 Jan 2020 12:26:35 -0500
Subject: [PATCH] Infer the serial number from Viatom directory if possible.

---
 .../SleepLib/loader_plugins/viatom_loader.cpp  | 18 ++++++++++++------
 oscar/SleepLib/machine.cpp                     |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/viatom_loader.cpp b/oscar/SleepLib/loader_plugins/viatom_loader.cpp
index 43da5e7e..abe9db14 100644
--- a/oscar/SleepLib/loader_plugins/viatom_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/viatom_loader.cpp
@@ -113,12 +113,17 @@ Session* ViatomLoader::ParseFile(const QString & filename)
         return nullptr;
     }
 
-    // TODO: Figure out what to do about machine ID. Right now OSCAR generates a random ID since we don't specify one.
-    // That means you won't be able to import multiple Viatom devices in a single session/profile.
-    MachineInfo  info = newInfo();
-    Machine     *mach = p_profile->CreateMachine(info);
-    qint64    time_ms = v.timestamp();
-    QDateTime data_timestamp = QDateTime::fromMSecsSinceEpoch(time_ms);
+    MachineInfo info = newInfo();
+    // Check whether the enclosing folder looks like a Viatom serial number, and if so, use it.
+    QString foldername = QFileInfo(filename).dir().dirName();
+    if (foldername.length() >= 9) {
+        bool numeric;
+        foldername.right(4).toInt(&numeric);
+        if (numeric) {
+            info.serial = foldername;
+        }
+    }
+    Machine *mach = p_profile->CreateMachine(info);
 
     if (mach->SessionExists(v.sessionid())) {
         // Skip already imported session
@@ -126,6 +131,7 @@ Session* ViatomLoader::ParseFile(const QString & filename)
         return nullptr;
     }
 
+    qint64 time_ms = v.timestamp();
     m_session = new Session(mach, v.sessionid());
     m_session->set_first(time_ms);
 
diff --git a/oscar/SleepLib/machine.cpp b/oscar/SleepLib/machine.cpp
index 6320f097..10c65f33 100644
--- a/oscar/SleepLib/machine.cpp
+++ b/oscar/SleepLib/machine.cpp
@@ -615,6 +615,7 @@ void Machine::setInfo(MachineInfo inf)
 
 const QString Machine::getDataPath()
 {    
+    // TODO: Rework the underlying database so that file storage doesn't rely on consistent presence or absence of the serial number.
     m_dataPath = p_pref->Get("{home}/Profiles/")+profile->user->userName()+"/"+info.loadername + "_"
                  + (info.serial.isEmpty() ? hexid() : info.serial) + "/";
     return m_dataPath;