TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Hide underlying partitions/devices in use by device mapper and friends from the media:/ tdeioslave

Browse Source
pull/2/head
Timothy Pearson 10 years ago
parent d8bc25b05d
commit 119d2fdb65
1 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File

76
tdeioslave/media/mediamanager/tdehardwarebackend.cpp
Unescape View File

@ -152,7 +152,13 @@ void TDEBackend::AddDevice(TDEStorageDevice * sdevice, bool allowNotification)
&& !(sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio)) && !(sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio))
&& !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) && !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank))
) { ) {
// //
}
/* We also don't display devices that underlie other devices;
/* e.g. the raw partition of a device mapper volume
*/
else if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice)) {
//
} }
else { else {
// Create medium // Create medium
@ -168,7 +174,7 @@ void TDEBackend::AddDevice(TDEStorageDevice * sdevice, bool allowNotification)
medium->setHidden(false); medium->setHidden(false);
} }
} }
// Insert medium into list // Insert medium into list
m_mediaList.addMedium(medium, allowNotification); m_mediaList.addMedium(medium, allowNotification);
@ -211,7 +217,7 @@ void TDEBackend::AddDevice(TDEStorageDevice * sdevice, bool allowNotification)
// Create medium // Create medium
Medium* medium = new Medium(sdevice->uniqueID(), driveUDIFromDeviceUID(sdevice->uniqueID()), ""); Medium* medium = new Medium(sdevice->uniqueID(), driveUDIFromDeviceUID(sdevice->uniqueID()), "");
setVolumeProperties(medium); setVolumeProperties(medium);
// Insert medium into list // Insert medium into list
m_mediaList.addMedium(medium, allowNotification); m_mediaList.addMedium(medium, allowNotification);
@ -240,7 +246,7 @@ void TDEBackend::AddDevice(TDEStorageDevice * sdevice, bool allowNotification)
&& !(sdevice->isDiskOfType(TDEDiskDeviceType::Floppy)) && !(sdevice->isDiskOfType(TDEDiskDeviceType::Floppy))
&& !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) && !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank))
) { ) {
// //
} }
else { else {
// Create medium // Create medium
@ -386,7 +392,7 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat
&& !(sdevice->isDiskOfType(TDEDiskDeviceType::Floppy)) && !(sdevice->isDiskOfType(TDEDiskDeviceType::Floppy))
&& !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) && !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank))
) { ) {
// //
} }
else { else {
// Do not list the LUKS backend device if it has been unlocked elsewhere // Do not list the LUKS backend device if it has been unlocked elsewhere
@ -536,7 +542,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
diskLabel = i18n("Blank Mount Ranier CD-RW-W"); diskLabel = i18n("Blank Mount Ranier CD-RW-W");
} }
} }
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDROM)) { if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDROM)) {
mimeType = "media/dvd" + MOUNT_SUFFIX; mimeType = "media/dvd" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) { if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
@ -545,7 +551,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
diskLabel = i18n("Blank DVD-ROM"); diskLabel = i18n("Blank DVD-ROM");
} }
} }
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDRAM)) { if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDRAM)) {
mimeType = "media/dvd" + MOUNT_SUFFIX; mimeType = "media/dvd" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) { if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
@ -680,7 +686,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
diskLabel = i18n("Blank HDDVD-RW"); diskLabel = i18n("Blank HDDVD-RW");
} }
} }
if (sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio)) { if (sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio)) {
mimeType = "media/audiocd"; mimeType = "media/audiocd";
medium->unmountableState("audiocd:/?device=" + sdevice->deviceNode()); medium->unmountableState("audiocd:/?device=" + sdevice->deviceNode());
@ -696,7 +702,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::BDVideo)) { if (sdevice->isDiskOfType(TDEDiskDeviceType::BDVideo)) {
mimeType = "media/bdvideo"; mimeType = "media/bdvideo";
} }
medium->setIconName(TQString::null); medium->setIconName(TQString::null);
} }
else { else {
@ -784,7 +790,7 @@ bool TDEBackend::setFloppyProperties(Medium* medium)
else { else {
medium->setEncrypted(false); medium->setEncrypted(false);
} }
// USAGE: mountableState(Device node, Mount point, Filesystem type, Mounted ?) // USAGE: mountableState(Device node, Mount point, Filesystem type, Mounted ?)
medium->mountableState(sdevice->deviceNode(), sdevice->mountPath(), sdevice->fileSystemName(), !sdevice->mountPath().isNull()); medium->mountableState(sdevice->deviceNode(), sdevice->mountPath(), sdevice->fileSystemName(), !sdevice->mountPath().isNull());
} }
@ -819,11 +825,11 @@ bool TDEBackend::setFloppyProperties(Medium* medium)
} }
medium->setLabel(diskLabel); medium->setLabel(diskLabel);
} }
/** @todo Mimetype for JAZ drives ? */ /** @todo Mimetype for JAZ drives ? */
medium->setIconName(TQString::null); medium->setIconName(TQString::null);
return true; return true;
} }
@ -867,7 +873,7 @@ void TDEBackend::setFloppyMountState( Medium *medium )
KMountPoint::List mtab = KMountPoint::currentMountPoints(); KMountPoint::List mtab = KMountPoint::currentMountPoints();
KMountPoint::List::iterator it = mtab.begin(); KMountPoint::List::iterator it = mtab.begin();
KMountPoint::List::iterator end = mtab.end(); KMountPoint::List::iterator end = mtab.end();
TQString fstype; TQString fstype;
TQString mountpoint; TQString mountpoint;
for (; it!=end; ++it) { for (; it!=end; ++it) {
@ -1104,36 +1110,36 @@ bool TDEBackend::setMountoptions(const TQString &name, const TQStringList &optio
TQString drive_udi = driveUDIFromDeviceUID(medium->id()); TQString drive_udi = driveUDIFromDeviceUID(medium->id());
kdDebug(1219) << "setMountoptions " << name << " " << options << endl; kdDebug(1219) << "setMountoptions " << name << " " << options << endl;
TDEConfig config("mediamanagerrc"); TDEConfig config("mediamanagerrc");
config.setGroup(drive_udi); config.setGroup(drive_udi);
TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(options); TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(options);
const char *names[] = { "use_defaults", "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; const char *names[] = { "use_defaults", "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
for (int index = 0; names[index]; ++index) { for (int index = 0; names[index]; ++index) {
if (valids.contains(names[index])) { if (valids.contains(names[index])) {
config.writeEntry(names[index], valids[names[index]] == "true"); config.writeEntry(names[index], valids[names[index]] == "true");
} }
} }
if (valids.contains("shortname")) { if (valids.contains("shortname")) {
config.writeEntry("shortname", valids["shortname"]); config.writeEntry("shortname", valids["shortname"]);
} }
if (valids.contains("journaling")) { if (valids.contains("journaling")) {
config.writeEntry("journaling", valids["journaling"]); config.writeEntry("journaling", valids["journaling"]);
} }
if (!mountoptions(name).contains(TQString("mountpoint=%1").arg(valids["mountpoint"]))) { if (!mountoptions(name).contains(TQString("mountpoint=%1").arg(valids["mountpoint"]))) {
config.writeEntry("mountpoint", valids["mountpoint"]); config.writeEntry("mountpoint", valids["mountpoint"]);
} }
if (valids.contains("automount")) { if (valids.contains("automount")) {
config.setGroup(drive_udi); config.setGroup(drive_udi);
config.writeEntry("automount", valids["automount"]); config.writeEntry("automount", valids["automount"]);
} }
return true; return true;
} }
@ -1152,14 +1158,14 @@ TQString TDEBackend::mount(const Medium *medium)
if (medium->isMounted()) { if (medium->isMounted()) {
return TQString(); // that was easy return TQString(); // that was easy
} }
TQString mountPoint = isInFstab(medium); TQString mountPoint = isInFstab(medium);
if (!mountPoint.isNull()) if (!mountPoint.isNull())
{ {
struct mount_job_data data; struct mount_job_data data;
data.completed = false; data.completed = false;
data.medium = medium; data.medium = medium;
TDEIO::Job *job = TDEIO::mount( false, 0, medium->deviceNode(), mountPoint ); TDEIO::Job *job = TDEIO::mount( false, 0, medium->deviceNode(), mountPoint );
connect(job, TQT_SIGNAL( result (TDEIO::Job *)), TQT_SLOT( slotResult( TDEIO::Job *))); connect(job, TQT_SIGNAL( result (TDEIO::Job *)), TQT_SLOT( slotResult( TDEIO::Job *)));
mount_jobs[job] = &data; mount_jobs[job] = &data;
@ -1170,7 +1176,7 @@ TQString TDEBackend::mount(const Medium *medium)
} }
// Return the error message (if any) to the caller // Return the error message (if any) to the caller
return (data.error) ? data.errorMessage : TQString::null; return (data.error) ? data.errorMessage : TQString::null;
} }
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@ -1181,9 +1187,9 @@ TQString TDEBackend::mount(const Medium *medium)
} }
TQString diskLabel; TQString diskLabel;
TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id()));
TQString mount_point = valids["mountpoint"]; TQString mount_point = valids["mountpoint"];
if (mount_point.startsWith("/media/")) { if (mount_point.startsWith("/media/")) {
diskLabel = mount_point.mid(7); diskLabel = mount_point.mid(7);
@ -1196,7 +1202,7 @@ TQString TDEBackend::mount(const Medium *medium)
diskLabel = medium->label() + " (" + node + ")"; diskLabel = medium->label() + " (" + node + ")";
diskLabel.replace("/", "_"); diskLabel.replace("/", "_");
} }
TQString qerror = i18n("Cannot mount encrypted drives!"); TQString qerror = i18n("Cannot mount encrypted drives!");
if (!medium->isEncrypted()) { if (!medium->isEncrypted()) {
@ -1228,7 +1234,7 @@ TQString TDEBackend::mount(const Medium *medium)
m_decryptDialog = new Dialog(sdevice->deviceNode(), iconName); m_decryptDialog = new Dialog(sdevice->deviceNode(), iconName);
m_decryptDialog->show(); m_decryptDialog->show();
connect(m_decryptDialog, TQT_SIGNAL (user1Clicked()), this, TQT_SLOT (slotPasswordReady())); connect(m_decryptDialog, TQT_SIGNAL (user1Clicked()), this, TQT_SLOT (slotPasswordReady()));
connect(m_decryptDialog, TQT_SIGNAL (cancelClicked()), this, TQT_SLOT (slotPasswordCancel())); connect(m_decryptDialog, TQT_SIGNAL (cancelClicked()), this, TQT_SLOT (slotPasswordCancel()));
connect(this, TQT_SIGNAL (signalDecryptionPasswordError(TQString)), m_decryptDialog, TQT_SLOT (slotDialogError(TQString))); connect(this, TQT_SIGNAL (signalDecryptionPasswordError(TQString)), m_decryptDialog, TQT_SLOT (slotDialogError(TQString)));
@ -1316,18 +1322,18 @@ TQString TDEBackend::mount(const TQString &_udi)
if (!medium) { if (!medium) {
return i18n("No such medium: %1").arg(_udi); return i18n("No such medium: %1").arg(_udi);
} }
return mount(medium); return mount(medium);
} }
TQString TDEBackend::unmount(const TQString &_udi) TQString TDEBackend::unmount(const TQString &_udi)
{ {
const Medium* medium = m_mediaList.findById(_udi); const Medium* medium = m_mediaList.findById(_udi);
if ( !medium ) { if ( !medium ) {
return i18n("No such medium: %1").arg(_udi); return i18n("No such medium: %1").arg(_udi);
} }
if (!medium->isMounted()) { if (!medium->isMounted()) {
return TQString(); // that was easy return TQString(); // that was easy
} }
@ -1338,7 +1344,7 @@ TQString TDEBackend::unmount(const TQString &_udi)
struct mount_job_data data; struct mount_job_data data;
data.completed = false; data.completed = false;
data.medium = medium; data.medium = medium;
TDEIO::Job *job = TDEIO::unmount( medium->mountPoint(), false ); TDEIO::Job *job = TDEIO::unmount( medium->mountPoint(), false );
connect(job, TQT_SIGNAL( result (TDEIO::Job *)), TQT_SLOT( slotResult( TDEIO::Job *))); connect(job, TQT_SIGNAL( result (TDEIO::Job *)), TQT_SLOT( slotResult( TDEIO::Job *)));
mount_jobs[job] = &data; mount_jobs[job] = &data;
@ -1501,7 +1507,7 @@ TQString TDEBackend::listUsingProcesses(const Medium* medium)
while (!is.atEnd()) { while (!is.atEnd()) {
tmp = is.readLine(); tmp = is.readLine();
tmp = TQStyleSheet::escape(tmp) + "\n"; tmp = TQStyleSheet::escape(tmp) + "\n";
proclist += tmp; proclist += tmp;
if (counter++ > 10) { if (counter++ > 10) {
proclist += "..."; proclist += "...";
@ -1542,7 +1548,7 @@ TQString TDEBackend::killUsingProcesses(const Medium* medium)
while (!is.atEnd()) { while (!is.atEnd()) {
tmp = is.readLine(); tmp = is.readLine();
tmp = TQStyleSheet::escape(tmp) + "\n"; tmp = TQStyleSheet::escape(tmp) + "\n";
proclist += tmp; proclist += tmp;
if (counter++ > 10) { if (counter++ > 10) {
proclist += "..."; proclist += "...";

Write Preview
Loading…
Cancel
Save