chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for yet another Viatom/Wellue filename variation.

Browse Source 
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.
This commit is contained in:
sawinglogz 2021-09-20 14:08:49 -04:00
parent 9134093af6
commit d95c77ee40
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Htmldocs/release_notes.html
View File

@ -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>

12
oscar/SleepLib/loader_plugins/viatom_loader.cpp
View File

@ -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.