From d95c77ee40853265645d81ea7d5cdc6fc87d0671 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Mon, 20 Sep 2021 14:08:49 -0400
Subject: [PATCH] Add support for yet another Viatom/Wellue filename variation.

Apparently the Android app is now exporting files with timestamps of the form
"YYYY-MM-DD hh:mm:ss". It turns out that ":" is not a valid character on
macOS, so Mac users using version 2.72 of the Android app will need to rename
their files to end with "YYYYMMDDhhmmss" in order to select and import them.
Windows and Linux won't.

Fortunately the intersection of Android users and Mac users is relatively small.
And this may be reverted in a future version of the Android app.

Also clean up some competing release notes edits.
---
 Htmldocs/release_notes.html                     |  6 +++---
 oscar/SleepLib/loader_plugins/viatom_loader.cpp | 12 ++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index 29c63e06..bebc84cd 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -15,9 +15,11 @@
     <br>Portions of OSCAR are © 2019-2021 by
     <i>The OSCAR Team</i></p>
     <ul>
+      <li>[new] Add support for additional Viatom/Wellue filename conventions.</li>
+      <li>[new] Add support for unreadably low SpO2 samples on Viatom/Wellue oximeters.</li>
       <li>[fix] Check for Updates no longer shows test versions to release users.</li>
       <li>[fix] Rx pressures shown correctly in Profile dialog.</li>
-      <li>[fix] Allow zipping to continue when errors occur (MacOS).</li>
+      <li>[fix] Resolve empty CPAP data card zips on macOS Big Sur.</li>
       <li>[fix] Always prompt for SD card location when zipping SD card.</li>
       <li>[fix] Add script to identify platform in mkDistDeb.sh (Linux building).</li>
       <li>---------- Fixes to previous fixes (do not include in final release notes) ---------</li>
@@ -71,8 +73,6 @@
       <li>[fix] Ignore old sessions should not impact existing data.</li>
       <li>[fix] Fix ocasional misordering of indexes on the Daily page.</li>
       <li>[fix] Add Unclassified Apneas to the Statistics page.</li>
-      <li>[fix] Resolve empty CPAP data card zips on macOS Big Sur.</li>
-      <li>[fix] Add support for unreadably low SpO2 samples on Viatom/Wellue oximeters.</li>
     </ul>
     <p>
     <b>Changes and fixes in OSCAR v1.2.0</b>
diff --git a/oscar/SleepLib/loader_plugins/viatom_loader.cpp b/oscar/SleepLib/loader_plugins/viatom_loader.cpp
index b2c768b7..d4c02d0b 100644
--- a/oscar/SleepLib/loader_plugins/viatom_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/viatom_loader.cpp
@@ -237,7 +237,11 @@ void ViatomLoader::EndEventList(ChannelID channel, qint64 /*t*/)
 QStringList ViatomLoader::getNameFilter()
 {
     // Sometimes the files have a SleepU_ or O2Ring_ prefix.
-    return QStringList("*20[0-5][0-9][01][0-9][0-3][0-9][012][0-9][0-5][0-9][0-5][0-9]");
+    // Sometimes they have punctuation in the timestamp.
+    // Note that ":" is not allowed on macOS, so Mac users will need to rename their files in order to select and import them.
+    return QStringList({"*20[0-5][0-9][01][0-9][0-3][0-9][012][0-9][0-5][0-9][0-5][0-9]",
+                        "*20[0-5][0-9]-[01][0-9]-[0-3][0-9] [012][0-9]:[0-5][0-9]:[0-5][0-9]"
+    });
 }
 
 static bool viatom_initialized = false;
@@ -309,7 +313,11 @@ bool ViatomFile::ParseHeader()
     QDateTime data_timestamp = QDateTime(QDate(year, month, day), QTime(hour, min, sec));
 
     QString date_string = QFileInfo(m_file).fileName().section("_", -1);  // Strip any SleepU_ etc. prefix.
-    QDateTime filename_timestamp = QDateTime::fromString(date_string, "yyyyMMddHHmmss");
+    QString format_string = "yyyyMMddHHmmss";
+    if (date_string.contains(":")) {
+        format_string = "yyyy-MM-dd HH:mm:ss";
+    }
+    QDateTime filename_timestamp = QDateTime::fromString(date_string, format_string);
     if (filename_timestamp.isValid()) {
         if (filename_timestamp != data_timestamp) {
             // TODO: Once there's a better/easier way to adjust session times within OSCAR, we can remove the below.