[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=ee195c6

The following commit has been merged in the master branch:
commit ee195c65a8fad4501a60db54c31161aa6ee0cf78
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Jun 8 17:40:38 2011 +0200

    Show an overwrite/rename dialog on incoming file transfers if the file already exists
---
 src/handle-incoming-file-transfer-channel-job.cpp | 40 +++++++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index 519d5d9..e33341a 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -25,6 +25,7 @@
 #include <KLocalizedString>
 #include <KDebug>
 #include <KUrl>
+#include <kio/renamedialog.h>
 
 #include <TelepathyQt4/IncomingFileTransferChannel>
 #include <TelepathyQt4/PendingReady>
@@ -121,12 +122,45 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__start()
     url.setScheme(QLatin1String("file"));
     kDebug() << "File name:" << url;
 
+    QFileInfo fileInfo(url.toLocalFile());
+    if (fileInfo.exists()) // TODO check if it is a dir?
+    {
+        KIO::RenameDialog renameDialog(0,
+                                       i18n("Incoming file exists"),
+                                       KUrl(), //TODO
+                                       url,
+                                       KIO::M_OVERWRITE,
+                                       fileInfo.size(),
+                                       channel->size(),
+                                       fileInfo.created().toTime_t(),
+                                       time_t(-1),
+                                       fileInfo.lastModified().toTime_t(),
+                                       channel->lastModificationTime().toTime_t());
+        renameDialog.exec();
+        switch (renameDialog.result())
+        {
+            case KIO::R_CANCEL:
+                // TODO Cancel file transfer and close channel
+                __k__doEmitResult();
+                return;
+            case KIO::R_RENAME:
+                url = renameDialog.newDestUrl();
+                break;
+            case KIO::R_OVERWRITE:
+                break;
+            default:
+                //TODO Set error
+                __k__doEmitResult();
+        }
+    }
+
+    // TODO check if a .part file already exists ask user if file should be
+    //      resumed and set offset accordingly
+    offset = 0;
+
     file = new QFile(url.toLocalFile(), q->parent());
     kDebug() << "Saving file as" << file->fileName();
 
-    //TODO check if file already exists and if file should be overwritten, resumed or renamed
-    //     (also set offset accordingly)
-    offset = 0;
 
     Tp::PendingOperation* setUrlOperation = channel->setUri(url.url());
     q->connect(setUrlOperation, SIGNAL(finished(Tp::PendingOperation*)),

-- 
ktp-filetransfer-handler packaging