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

Minor autoscanner tweak for Linux

Browse Source
This commit is contained in:
Mark Watkins 2014-04-29 04:39:58 +10:00
parent f0e523212e
commit 945e72afe9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sleepyhead/mainwindow.cpp
View File

@ -336,9 +336,9 @@ QStringList getDriveList()
int num_mounts = getmntinfo(&mounts, MNT_WAIT); int num_mounts = getmntinfo(&mounts, MNT_WAIT);
if (num_mounts >= 0) { if (num_mounts >= 0) {
for (int i = 0; i < num_mounts; i++) { for (int i = 0; i < num_mounts; i++) {
// TODO: need to check on what BSD calls FAT filesystems
QString name = mounts[i].f_mntonname; QString name = mounts[i].f_mntonname;
// Only interested in drives mounted under /Volumes
if (name.toLower().startsWith("/volumes/")) { if (name.toLower().startsWith("/volumes/")) {
drivelist.push_back(name); drivelist.push_back(name);
// qDebug() << QString("Disk type '%1' mounted at: %2").arg(mounts[i].f_fstypename).arg(mounts[i].f_mntonname); // qDebug() << QString("Disk type '%1' mounted at: %2").arg(mounts[i].f_fstypename).arg(mounts[i].f_mntonname);
@ -357,10 +357,13 @@ QStringList getDriveList()
struct statfs fs; struct statfs fs;
if ((mnt.mnt_dir != NULL) && (statfs(mnt.mnt_dir, &fs) == 0)) { if ((mnt.mnt_dir != NULL) && (statfs(mnt.mnt_dir, &fs) == 0)) {
QString name = mnt.mnt_dir; QString name = mnt.mnt_dir;
drivelist.push_back(name);
quint64 size = fs.f_blocks * fs.f_bsize; quint64 size = fs.f_blocks * fs.f_bsize;
quint64 free = fs.f_bfree * fs.f_bsize;
quint64 avail = fs.f_bavail * fs.f_bsize; if (size > 0) { // this should theoretically ignore /dev, /proc, /sys etc..
drivelist.push_back(name);
}
// quint64 free = fs.f_bfree * fs.f_bsize;
// quint64 avail = fs.f_bavail * fs.f_bsize;
} }
} }
endmntent(mtab); endmntent(mtab);