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

Infer the serial number from Viatom directory if possible.

Browse Source
This commit is contained in:
sawinglogz 2020-01-27 12:26:35 -05:00
parent 780a703f18
commit 277b2a5422
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();
// 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);
qint64 time_ms = v.timestamp();
QDateTime data_timestamp = QDateTime::fromMSecsSinceEpoch(time_ms);
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);

1
oscar/SleepLib/machine.cpp
View File

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