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

Merge internal openUrl with internal openFile

Browse source
This commit is contained in:
Nicolas Fella 2019-06-17 21:35:53 +00:00
parent 7236ffda3b
commit 8406e0de99
2 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
plugins/share/shareplugin.cpp
View file

@ -192,13 +192,14 @@ void SharePlugin::openDestinationFolder()
QDesktopServices::openUrl(destinationDir()); QDesktopServices::openUrl(destinationDir());
} }
void SharePlugin::shareUrl(const QUrl& url) void SharePlugin::shareUrl(const QUrl& url, bool open)
{ {
NetworkPacket packet(PACKET_TYPE_SHARE_REQUEST); NetworkPacket packet(PACKET_TYPE_SHARE_REQUEST);
if(url.isLocalFile()) { if (url.isLocalFile()) {
QSharedPointer<QIODevice> ioFile(new QFile(url.toLocalFile())); QSharedPointer<QIODevice> ioFile(new QFile(url.toLocalFile()));
packet.setPayload(ioFile, ioFile->size()); packet.setPayload(ioFile, ioFile->size());
packet.set<QString>(QStringLiteral("filename"), QUrl(url).fileName()); packet.set<QString>(QStringLiteral("filename"), QUrl(url).fileName());
packet.set<bool>(QStringLiteral("open"), open);
} else { } else {
packet.set<QString>(QStringLiteral("url"), url.toString()); packet.set<QString>(QStringLiteral("url"), url.toString());
} }
@ -207,7 +208,7 @@ void SharePlugin::shareUrl(const QUrl& url)
void SharePlugin::shareUrls(const QStringList& urls) { void SharePlugin::shareUrls(const QStringList& urls) {
for(const QString& url : urls) { for(const QString& url : urls) {
shareUrl(QUrl(url)); shareUrl(QUrl(url), false);
} }
} }
@ -218,18 +219,6 @@ void SharePlugin::shareText(const QString& text)
sendPacket(packet); sendPacket(packet);
} }
void SharePlugin::openFile(const QUrl& url)
{
NetworkPacket packet(PACKET_TYPE_SHARE_REQUEST);
if(url.isLocalFile()) {
QSharedPointer<QIODevice> ioFile(new QFile(url.toLocalFile()));
packet.setPayload(ioFile, ioFile->size());
packet.set<QString>(QStringLiteral("filename"), QUrl(url).fileName());
packet.set<bool>(QStringLiteral("open"), true);
}
sendPacket(packet);
}
QString SharePlugin::dbusPath() const QString SharePlugin::dbusPath() const
{ {
return QStringLiteral("/modules/kdeconnect/devices/") + device()->id() + QStringLiteral("/share"); return QStringLiteral("/modules/kdeconnect/devices/") + device()->id() + QStringLiteral("/share");

7
plugins/share/shareplugin.h
View file

@ -41,10 +41,10 @@ public:
explicit SharePlugin(QObject* parent, const QVariantList& args); explicit SharePlugin(QObject* parent, const QVariantList& args);
///Helper method, QDBus won't recognize QUrl ///Helper method, QDBus won't recognize QUrl
Q_SCRIPTABLE void shareUrl(const QString& url) { shareUrl(QUrl(url)); } Q_SCRIPTABLE void shareUrl(const QString& url) { shareUrl(QUrl(url), false); }
Q_SCRIPTABLE void shareUrls(const QStringList& urls); Q_SCRIPTABLE void shareUrls(const QStringList& urls);
Q_SCRIPTABLE void shareText(const QString& text); Q_SCRIPTABLE void shareText(const QString& text);
Q_SCRIPTABLE void openFile(const QString& file) { openFile(QUrl(file)); } Q_SCRIPTABLE void openFile(const QString& file) { shareUrl(QUrl(file), true); }
bool receivePacket(const NetworkPacket& np) override; bool receivePacket(const NetworkPacket& np) override;
void connected() override {} void connected() override {}
@ -58,8 +58,7 @@ Q_SIGNALS:
private: private:
void finished(KJob* job, const qint64 dateModified); void finished(KJob* job, const qint64 dateModified);
void shareUrl(const QUrl& url); void shareUrl(const QUrl& url, bool open);
void openFile(const QUrl& url);
QUrl destinationDir() const; QUrl destinationDir() const;
QUrl getFileDestination(const QString filename) const; QUrl getFileDestination(const QString filename) const;
void setDateModified(const QUrl& destination, const qint64 timestamp); void setDateModified(const QUrl& destination, const qint64 timestamp);