Added file sending.

1 files changed, 88 insertions, 11 deletions

diff --git a/noncore/net/opietooth/manager/obexftpdialog.cpp b/noncore/net/opietooth/manager/obexftpdialog.cpp
index c77d49d..80a81b4 100644
--- a/noncore/net/opietooth/manager/obexftpdialog.cpp
+++ b/noncore/net/opietooth/manager/obexftpdialog.cpp
@@ -14,2 +14,6 @@
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
 #include <qpushbutton.h>
@@ -17,2 +21,4 @@
 #include <qmultilineedit.h>
+#include <qspinbox.h>
+#include <qcombobox.h>
 #include <qlistview.h>
@@ -51,2 +57,3 @@ ObexFtpDialog::ObexFtpDialog(const QString& device, int port,
     client = NULL;
+    nRetries = 3;
     transport = OBEX_TRANS_BLUETOOTH;
@@ -70,2 +77,3 @@ ObexFtpDialog::ObexFtpDialog(const QString& device, int port,
     localLayout->addWidget(destFile);
+    nReries->setValue(nRetries);
     connect(browseOK, SIGNAL(clicked()), SLOT(slotBrowse()));
@@ -76,2 +84,5 @@ ObexFtpDialog::ObexFtpDialog(const QString& device, int port,
         SLOT(getFile()));
+    connect(putButton,
+        SIGNAL(clicked()),
+        SLOT(putFile()));
     connect(destFile, 
@@ -96,7 +107,8 @@ void ObexFtpDialog::slotBrowse()
     void *dir; //Directory to read
-    const uint8_t use_uuid[] = __UUID_FBS_bytes;
-    int len = sizeof(UUID_FBS);
+    const uint8_t* use_uuid; //uuid
+    int len; //uuid length
     FileListItem* root; //root node
-    stat_entry_t* st; //File statistics
     int fsize; //file size
+    bool numOk; //true if the string is a number 
+    int tmp; //just a temp var
     
@@ -107,3 +119,20 @@ void ObexFtpDialog::slotBrowse()
     progressStatus = 0;
+    fileProgress->setTotalSteps(MAX_PROGRESS);
     fileProgress->reset();
+
+    //Get parameters
+    tmp = nReries->text().toInt(&numOk);
+    if (numOk)
+        nRetries = tmp;
+    if (uuidType->currentText() == "FBS") {
+        use_uuid = UUID_FBS;
+        len = sizeof(UUID_FBS);
+    } else if (uuidType->currentText() == "S45") {
+        use_uuid = UUID_S45;
+        len = sizeof(UUID_S45);
+    } else {
+        use_uuid = UUID_FBS;
+        len = sizeof(UUID_FBS);
+    }
+
     if (!cli_connect_uuid(use_uuid, len)) {
@@ -123,9 +152,6 @@ void ObexFtpDialog::slotBrowse()
         FileListItem* a; //List view item
-#if 0 //Causes sigsegv        
     	if (ent->mode != 16877) {
-            st = obexftp_stat(client, ent->name);
-            fsize = st->size;
+            fsize = ent->size;
         }
         else
-#endif        
             fsize = 0;
@@ -224,2 +250,6 @@ void ObexFtpDialog::getFile()
     if (file->gettype() == IS_FILE) {
+        if (client == NULL) {
+            errBox("No connection established");
+            return;
+        }
         file2get += curdir;
@@ -231,2 +261,3 @@ void ObexFtpDialog::getFile()
         progressStatus = 0;
+        fileProgress->setTotalSteps(file->getsize() / 1024);
         fileProgress->reset();
@@ -247,2 +278,50 @@ void ObexFtpDialog::getFile()
 
+/*
+ * Put the file
+ */
+void ObexFtpDialog::putFile()
+{
+    int result; //OPeration result
+    int idx; //Index of a symbol in the string
+    struct stat localFStat; //Local file information
+    
+    if (client == NULL) {
+        errBox("No connection established");
+        return;
+    }
+    local = destFile->selectedName();
+    if (local == "") {
+        errBox("No file slected");
+        return;
+    }
+    result = stat(local, &localFStat);
+    if (result < 0) {
+        errBox(tr("Wrong file selected ") + local + tr(" ") + 
+            tr(strerror(errno)));
+        return;
+    }
+    idx = local.findRev('/');
+    if (idx > 0) {
+        file2get = local.right(local.length() - idx - 1);
+    }
+    else 
+        file2get = local;
+    
+    odebug << "Copy " << local << " to " << file2get << oendl;
+    progressStatus = 0;
+    fileProgress->setTotalSteps(localFStat.st_size / 1024);
+    fileProgress->reset();
+    status(tr("Sending file ") + local);
+    result = obexftp_put_file(client, local, file2get);
+    if (result < 0) {
+        log(local + QString(" send ERROR")); 
+        errBox(local + QString(" send ERROR"));
+        status(local + QString(" send ERROR"));
+    }
+    else {
+        log(local + QString(" sent")); 
+        status(local + QString(" sent")); 
+    }
+}
+
 /* connect with given uuid. re-connect every time */
@@ -263,3 +342,3 @@ int ObexFtpDialog::cli_connect_uuid(const uint8_t *uuid, int uuid_len)
         client->quirks &= ~OBEXFTP_SPLIT_SETPATH;
-    for (retry = 0; retry < 3; retry++) {
+    for (retry = 0; retry < nRetries; retry++) {
         /* Connect */
@@ -311,6 +390,4 @@ void ObexFtpDialog::incProgress()
 {
-    odebug << "Progress " << progressStatus << oendl;
-    if (progressStatus < MAX_PROGRESS) {
+    if (progressStatus < fileProgress->totalSteps())
         fileProgress->setProgress(progressStatus++);
-    }
 }