Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 02:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

soliduiserver: implement network share unmounting

Browse source
This commit is contained in:
Ivailo Monev 2022-05-17 22:36:56 +03:00
parent 3892372c80
commit a827f81b4f
1 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
soliduiserver/soliduiserver.cpp
View file

@ -74,6 +74,27 @@ static int doMount(const QString &deviceuuid, const QString &devicenode, const Q
return int(Solid::ErrorType::OperationFailed); return int(Solid::ErrorType::OperationFailed);
} }
static int doUnmount(const QString &devicemountpoint)
{
KAuth::Action unmountaction("org.kde.soliduiserver.mountunmounthelper.unmount");
unmountaction.setHelperID("org.kde.soliduiserver.mountunmounthelper");
unmountaction.addArgument("mountpoint", devicemountpoint);
KAuth::ActionReply unmountreply = unmountaction.execute();
// qDebug() << "unmount" << unmountreply.errorCode() << unmountreply.errorDescription();
if (unmountreply == KAuth::ActionReply::SuccessReply) {
return int(Solid::ErrorType::NoError);
}
if (unmountreply == KAuth::ActionReply::UserCancelled) {
return int(Solid::ErrorType::UserCanceled);
} else if (unmountreply == KAuth::ActionReply::AuthorizationDenied) {
return int(Solid::ErrorType::UnauthorizedOperation);
}
return int(Solid::ErrorType::OperationFailed);
}
K_PLUGIN_FACTORY(SolidUiServerFactory, K_PLUGIN_FACTORY(SolidUiServerFactory,
registerPlugin<SolidUiServer>(); registerPlugin<SolidUiServer>();
) )
@ -179,7 +200,7 @@ int SolidUiServer::mountDevice(const QString &udi)
break; break;
} }
default: { default: {
kWarning() << "invalid network share type" << networkshare->type(); kWarning() << "Invalid network share type" << networkshare->type();
return int(Solid::ErrorType::InvalidOption); return int(Solid::ErrorType::InvalidOption);
} }
} }
@ -250,25 +271,21 @@ int SolidUiServer::mountDevice(const QString &udi)
int SolidUiServer::unmountDevice(const QString &udi) int SolidUiServer::unmountDevice(const QString &udi)
{ {
Solid::Device device(udi); Solid::Device device(udi);
Solid::StorageVolume *storagevolume = device.as<Solid::StorageVolume>();
Solid::NetworkShare *networkshare = device.as<Solid::NetworkShare>();
Solid::StorageAccess *storageaccess = device.as<Solid::StorageAccess>(); Solid::StorageAccess *storageaccess = device.as<Solid::StorageAccess>();
if (networkshare && storageaccess) {
return doUnmount(storageaccess->filePath());
}
Solid::StorageVolume *storagevolume = device.as<Solid::StorageVolume>();
if (!storagevolume || !storageaccess) { if (!storagevolume || !storageaccess) {
return int(Solid::ErrorType::InvalidOption); return int(Solid::ErrorType::InvalidOption);
} }
KAuth::Action unmountaction("org.kde.soliduiserver.mountunmounthelper.unmount"); const int unmountresult = doUnmount(storageaccess->filePath());
unmountaction.setHelperID("org.kde.soliduiserver.mountunmounthelper"); if (unmountresult != int(Solid::ErrorType::NoError)) {
unmountaction.addArgument("mountpoint", storageaccess->filePath()); return unmountresult;
KAuth::ActionReply unmountreply = unmountaction.execute();
// qDebug() << "unmount" << unmountreply.errorCode() << unmountreply.errorDescription();
if (unmountreply == KAuth::ActionReply::UserCancelled) {
return int(Solid::ErrorType::UserCanceled);
} else if (unmountreply == KAuth::ActionReply::AuthorizationDenied) {
return int(Solid::ErrorType::UnauthorizedOperation);
} else if (unmountreply != KAuth::ActionReply::SuccessReply) {
return int(Solid::ErrorType::OperationFailed);
} }
if (storagevolume->usage() == Solid::StorageVolume::Encrypted) { if (storagevolume->usage() == Solid::StorageVolume::Encrypted) {