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

Move PRS1 card detection and info presentation to the new scanner.

Browse Source
This commit is contained in:
sawinglogz 2020-03-09 11:17:59 -04:00
parent 485be366aa
commit 0124cdbf1f
2 changed files with 11 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -408,66 +408,8 @@ const QString PR_STR_PSeries = "P-Series";
// Tests path to see if it has (what looks like) a valid PRS1 folder structure // Tests path to see if it has (what looks like) a valid PRS1 folder structure
bool PRS1Loader::Detect(const QString & path) bool PRS1Loader::Detect(const QString & path)
{ {
QString newpath = checkDir(path); QStringList machines = FindMachinesOnCard(path);
return !machines.isEmpty();
return !newpath.isEmpty();
}
QString PRS1Loader::checkDir(const QString & path)
{
QString newpath = path;
newpath.replace("\\", "/");
if (!newpath.endsWith("/" + PR_STR_PSeries)) {
newpath = path + "/" + PR_STR_PSeries;
}
QDir dir(newpath);
if ((!dir.exists() || !dir.isReadable())) {
return QString();
}
qDebug() << "PRS1Loader::Detect path=" << newpath;
QFile lastfile(newpath+"/last.txt");
bool exists = true;
if (!lastfile.exists()) {
lastfile.setFileName(newpath+"/LAST.TXT");
if (!lastfile.exists())
exists = false;
}
QString machpath;
if (exists) {
if (!lastfile.open(QIODevice::ReadOnly)) {
qDebug() << "PRS1Loader: last.txt exists but I couldn't open it!";
} else {
QTextStream ts(&lastfile);
QString serial = ts.readLine(64).trimmed();
lastfile.close();
machpath = newpath+"/"+serial;
if (!QDir(machpath).exists()) {
machpath = QString();
}
}
}
if (machpath.isEmpty()) {
QDir dir(newpath);
QStringList dirs = dir.entryList(QDir::NoDotAndDotDot | QDir::Dirs);
if (dirs.size() > 0) {
machpath = dir.cleanPath(newpath+"/"+dirs[0]);
}
}
return machpath;
} }
QString PRS1Loader::GetPSeriesPath(const QString & path) QString PRS1Loader::GetPSeriesPath(const QString & path)
@ -644,13 +586,15 @@ bool PRS1Loader::PeekProperties(MachineInfo & info, const QString & filename, Ma
MachineInfo PRS1Loader::PeekInfo(const QString & path) MachineInfo PRS1Loader::PeekInfo(const QString & path)
{ {
QString newpath = checkDir(path); QStringList machines = FindMachinesOnCard(path);
if (newpath.isEmpty()) if (machines.isEmpty()) {
return MachineInfo(); return MachineInfo();
}
// Present information about the newest machine on the card.
QString newpath = machines.last();
MachineInfo info = newInfo(); MachineInfo info = newInfo();
info.serial = newpath.section("/", -1);
if (!PeekProperties(info, newpath+"/properties.txt")) { if (!PeekProperties(info, newpath+"/properties.txt")) {
PeekProperties(info, newpath+"/PROP.TXT"); PeekProperties(info, newpath+"/PROP.TXT");
} }
@ -970,6 +914,9 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machin
// Scan for individual session files // Scan for individual session files
for (int i = 0; i < flist.size(); i++) { for (int i = 0; i < flist.size(); i++) {
#ifndef UNITTEST_MODE
QCoreApplication::processEvents();
#endif
if (isAborted()) { if (isAborted()) {
qDebug() << "received abort signal"; qDebug() << "received abort signal";
break; break;

3
oscar/SleepLib/loader_plugins/prs1_loader.h
View File

@ -387,9 +387,6 @@ class PRS1Loader : public CPAPLoader
PRS1Loader(); PRS1Loader();
virtual ~PRS1Loader(); virtual ~PRS1Loader();
//! \brief Examine path and return it back if it contains what looks to be a valid PRS1 SD card structure
QString checkDir(const QString & path);
//! \brief Peek into PROP.TXT or properties.txt at given path, and return it as a normalized key/value hash //! \brief Peek into PROP.TXT or properties.txt at given path, and return it as a normalized key/value hash
bool PeekProperties(const QString & filename, QHash<QString,QString> & props); bool PeekProperties(const QString & filename, QHash<QString,QString> & props);