[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=f71f498

The following commit has been merged in the master branch:
commit f71f49812548f1371e496d30a880ffe64c664f6b
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Sun Jun 21 12:32:18 2015 -0700

    Removed unused code
---
 plugins/sftp/mounter.cpp    | 53 +++++++++++++++------------------------------
 plugins/sftp/mounter.h      |  8 +------
 plugins/sftp/sftpplugin.cpp |  3 +--
 3 files changed, 19 insertions(+), 45 deletions(-)

diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
index 02061fd..916b102 100644
--- a/plugins/sftp/mounter.cpp
+++ b/plugins/sftp/mounter.cpp
@@ -18,13 +18,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "mounter.h"
+
 #include <QDir>
-#include <QTimerEvent>
 #include <QDebug>
 
 #include <KLocalizedString>
 
-#include "mounter.h"
+#include "mountloop.h"
 #include "sftp_debug.h"
 #include <kdeconnectconfig.h>
 
@@ -32,12 +33,10 @@ Mounter::Mounter(SftpPlugin* sftp)
     : QObject(sftp)
     , m_sftp(sftp)
     , m_proc(0)
-    , m_id(generateId())
-    , m_mpoint(m_sftp->mountPoint())
+    , m_mountPoint(sftp->mountPoint())
     , m_started(false)
-{ 
-    Q_ASSERT(sftp);
-  
+{
+
     connect(m_sftp, SIGNAL(packageReceived(NetworkPackage)), this, SLOT(onPakcageReceived(NetworkPackage)));
 
     connect(&m_connectTimer, SIGNAL(timeout()), this, SLOT(onMountTimeout()));
@@ -81,9 +80,6 @@ void Mounter::onPakcageReceived(const NetworkPackage& np)
         unmount();
         return;
     }
-    
-    //TODO implement on android side
-    //if (np.get<int>("id") != m_id) return;
 
     //This is the previous code, to access sftp server using KIO. Now we are
     //using the external binary sshfs, and accessing it as a local filesystem.
@@ -106,8 +102,7 @@ void Mounter::onPakcageReceived(const NetworkPackage& np)
     connect(m_proc.data(), SIGNAL(error(QProcess::ProcessError)), SLOT(onError(QProcess::ProcessError)));
     connect(m_proc.data(), SIGNAL(finished(int,QProcess::ExitStatus)), SLOT(onFinished(int,QProcess::ExitStatus)));
 
-    const QString mpoint = m_sftp->mountPoint();
-    QDir().mkpath(mpoint);
+    QDir().mkpath(m_mountPoint);
 
     const QString program = "sshfs";
 
@@ -120,9 +115,8 @@ void Mounter::onPakcageReceived(const NetworkPackage& np)
             .arg(np.get<QString>("user"))
             .arg(np.get<QString>("ip"))
             .arg(path)
-        << mpoint            
+        << m_mountPoint
         << "-p" << np.get<QString>("port")
-        << "-d"
         << "-f"
         << "-o" << "IdentityFile=" + KdeConnectConfig::instance()->privateKeyPath()
         << "-o" << "StrictHostKeyChecking=no" //Do not ask for confirmation because it is not a known host
@@ -146,10 +140,12 @@ void Mounter::onStarted()
     m_started = true;
     Q_EMIT mounted();
     
-    connect(m_proc.data(), SIGNAL(readyReadStandardError()), this, SLOT(readProcessOut()));
-    connect(m_proc.data(), SIGNAL(readyReadStandardOutput()), this, SLOT(readProcessOut()));
-    
-    m_lastActivity = QDateTime::currentDateTime();
+    connect(m_proc.data(), &KProcess::readyReadStandardError, [this]() {
+        qCDebug(KDECONNECT_PLUGIN_SFTP) << "stderr: " << m_proc->readAll();
+    });
+    connect(m_proc.data(), &KProcess::readyReadStandardOutput, [this]() {
+        qCDebug(KDECONNECT_PLUGIN_SFTP) << "stdout:" << m_proc->readAll();
+    });
 }
 
 void Mounter::onError(QProcess::ProcessError error)
@@ -171,7 +167,7 @@ void Mounter::onFinished(int exitCode, QProcess::ExitStatus exitStatus)
     }
     else
     {
-        qCDebug(KDECONNECT_PLUGIN_SFTP) << "Process failed (exit code: " << exitCode << ")";
+        qCDebug(KDECONNECT_PLUGIN_SFTP) << "Process failed (exit code:" << exitCode << ")";
         Q_EMIT failed(i18n("Error when accessing to filesystem"));
     }
     
@@ -186,34 +182,19 @@ void Mounter::onMountTimeout()
     Q_EMIT failed(i18n("Failed to mount filesystem: device not responding"));
 }
 
-
-void Mounter::readProcessOut()
-{
-    Q_ASSERT(m_proc.data());
-    m_lastActivity = QDateTime::currentDateTime();
-    m_proc->readAll();
-}
-
 void Mounter::start()
 {
     NetworkPackage np(PACKAGE_TYPE_SFTP);
     np.set("startBrowsing", true);
-    np.set("start", true);
-    np.set("id", m_id);
     m_sftp->sendPackage(np);
     
     m_connectTimer.start();
 }
 
-int Mounter::generateId()
-{
-    static int id = 0;
-    return id++;
-}
-
 void Mounter::cleanMountPoint()
 {
-    KProcess::execute(QStringList() << "fusermount" << "-u" << m_mpoint, 10000);
+    qCDebug(KDECONNECT_PLUGIN_SFTP()) << "cleanMountPoint";
+    KProcess::execute(QStringList() << "fusermount" << "-u" << m_mountPoint, 10000);
 }
 
 void Mounter::unmount()
diff --git a/plugins/sftp/mounter.h b/plugins/sftp/mounter.h
index eeea759..76ac860 100644
--- a/plugins/sftp/mounter.h
+++ b/plugins/sftp/mounter.h
@@ -25,7 +25,6 @@
 #include <KProcess>
 
 #include "sftpplugin.h"
-#include "mountloop.h"
 
 class Mounter
     : public QObject
@@ -50,22 +49,17 @@ private Q_SLOTS:
     void onError(QProcess::ProcessError error);
     void onFinished(int exitCode, QProcess::ExitStatus exitStatus);
     void onMountTimeout();
-    void readProcessOut();
     void start();
 
 private: 
-    int generateId();
     void cleanMountPoint();
     void unmount();
     
 private:
     SftpPlugin* m_sftp;
     QScopedPointer<KProcess> m_proc;
-    int m_id;
-    const QString m_mpoint;
     QTimer m_connectTimer;
-    QDateTime m_lastActivity;
-    MountLoop m_loop;
+    QString m_mountPoint;
     bool m_started;
 };
 
diff --git a/plugins/sftp/sftpplugin.cpp b/plugins/sftp/sftpplugin.cpp
index 834e335..1f10290 100644
--- a/plugins/sftp/sftpplugin.cpp
+++ b/plugins/sftp/sftpplugin.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "sftpplugin.h"
-#include "sftp_debug.h"
 
 #include <QDBusConnection>
 #include <QDir>
@@ -32,6 +31,7 @@
 #include <KPluginFactory>
 
 #include "mounter.h"
+#include "sftp_debug.h"
 
 K_PLUGIN_FACTORY_WITH_JSON( KdeConnectPluginFactory, "kdeconnect_sftp.json", registerPlugin< SftpPlugin >(); )
 
@@ -85,7 +85,6 @@ void SftpPlugin::removeFromDolphin()
 void SftpPlugin::connected()
 {
     bool state = QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableContents);
-    qCDebug(KDECONNECT_PLUGIN_SFTP) << "Exposing DBUS interface: " << state;
 }
 
 void SftpPlugin::mount()

-- 
kdeconnect packaging