tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow sharing more than one file

Browse source 
Eg: --share *.mp3
This commit is contained in:
Albert Vaca 2018-02-17 13:50:13 +01:00
parent 9aaebd1dd6
commit 3a955f0ced
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cli/kdeconnect-cli.cpp
View file

@ -134,15 +134,27 @@ int main(int argc, char** argv)
parser.showHelp(1); parser.showHelp(1);
} }
if(parser.isSet(QStringLiteral("share"))) { if (parser.isSet(QStringLiteral("share"))) {
QUrl url = QUrl::fromUserInput(parser.value(QStringLiteral("share")), QDir::currentPath()); QList<QUrl> urls;
parser.clearPositionalArguments(); QUrl url = QUrl::fromUserInput(parser.value(QStringLiteral("share")));
if(!url.isEmpty() && !device.isEmpty()) { urls.append(url);
//In case there are more arguments, check if they are files and then send them
for (const QString& file : parser.positionalArguments()) {
QUrl url = QUrl::fromUserInput(file, QDir::currentPath());
if (!url.isLocalFile()) {
QTextStream(stderr) << i18n("Can't find the file: %1", url.toString()) << endl;
return 1;
} else {
urls.append(url);
}
}
for (const QUrl& url : urls) {
QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.kdeconnect"), "/modules/kdeconnect/devices/"+device+"/share", QStringLiteral("org.kde.kdeconnect.device.share"), QStringLiteral("shareUrl")); QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.kdeconnect"), "/modules/kdeconnect/devices/"+device+"/share", QStringLiteral("org.kde.kdeconnect.device.share"), QStringLiteral("shareUrl"));
msg.setArguments(QVariantList() << url.toString()); msg.setArguments(QVariantList() << url.toString());
blockOnReply(QDBusConnection::sessionBus().asyncCall(msg)); blockOnReply(QDBusConnection::sessionBus().asyncCall(msg));
} else { QTextStream(stdout) << i18n("Sent %1", url.toString()) << endl;
QTextStream(stderr) << (i18n("Couldn't share %1", url.toString())) << endl;
} }
} else if(parser.isSet(QStringLiteral("pair"))) { } else if(parser.isSet(QStringLiteral("pair"))) {
DeviceDbusInterface dev(device); DeviceDbusInterface dev(device);