chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test for Crostini 9p filesystem before looking for /mnt/chromeos/removable

Browse Source
This commit is contained in:
Phil Olynyk 2020-09-09 20:55:42 -04:00
parent 6406545c33
commit fea497aca6
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oscar/mainwindow.cpp
View File

@ -811,6 +811,7 @@ void MainWindow::importCPAPBackups()
QStringList getDriveList() QStringList getDriveList()
{ {
QStringList drivelist; QStringList drivelist;
bool crostini_detected = false;
#if QT_VERSION >= QT_VERSION_CHECK(5,4,0) #if QT_VERSION >= QT_VERSION_CHECK(5,4,0)
#if defined(Q_OS_LINUX) #if defined(Q_OS_LINUX)
@ -833,11 +834,15 @@ QStringList getDriveList()
if (storage.fileSystemType() == VFAT) { if (storage.fileSystemType() == VFAT) {
qDebug() << "Adding" << storage.name() << "on" << storage.rootPath() << "to drivelist"; qDebug() << "Adding" << storage.name() << "on" << storage.rootPath() << "to drivelist";
drivelist.append(storage.rootPath()); drivelist.append(storage.rootPath());
} else if (storage.fileSystemType() == "9p") {
qDebug() << "Crostini filesystem 9p found";
crostini_detected = true;
} }
} }
} }
#endif #endif
#if defined(Q_OS_LINUX) #if defined(Q_OS_LINUX)
if (crostini_detected) {
QString mntName("/mnt/chromeos/removable"); QString mntName("/mnt/chromeos/removable");
QDir mnt(mntName); QDir mnt(mntName);
qDebug() << "Checking for" << mntName; qDebug() << "Checking for" << mntName;
@ -848,6 +853,13 @@ QStringList getDriveList()
qDebug() << "Adding" << dir.filePath() << "to drivelist"; qDebug() << "Adding" << dir.filePath() << "to drivelist";
drivelist.append(dir.filePath() ); drivelist.append(dir.filePath() );
} }
} else {
QMessageBox::warning(nullptr, STR_MessageBox_Warning,
QObject::tr("Chromebook file system detected, but no removable device found\n") +
QObject::tr("You must share your SD card with Linux using the ChromeOS Files program"));
drivelist.clear();
drivelist.append("CROSTINI");
}
} }
#endif #endif
return drivelist; return drivelist;
@ -903,6 +915,8 @@ QList<ImportPath> MainWindow::detectCPAPCards()
do { do {
// Rescan in case card inserted // Rescan in case card inserted
QStringList AutoScannerPaths = getDriveList(); QStringList AutoScannerPaths = getDriveList();
if (AutoScannerPaths.contains("CROSTINI")) // no Crostini removable drives found!
break; // break out of the 20 second wait loop
// AutoScannerPaths.push_back(lastpath); // AutoScannerPaths.push_back(lastpath);
qDebug() << "Drive list size:" << AutoScannerPaths.size(); qDebug() << "Drive list size:" << AutoScannerPaths.size();