| -rw-r--r-- | noncore/net/opietooth/manager/obexftpdialog.cpp | 29 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/obexftpdialog.h | 4 |
2 files changed, 24 insertions, 9 deletions
diff --git a/noncore/net/opietooth/manager/obexftpdialog.cpp b/noncore/net/opietooth/manager/obexftpdialog.cpp index 2f04ecf..efb3ff2 100644 --- a/noncore/net/opietooth/manager/obexftpdialog.cpp +++ b/noncore/net/opietooth/manager/obexftpdialog.cpp @@ -67,367 +67,380 @@ ObexFtpDialog::ObexFtpDialog(const QString& device, int port, progressStatus = 0; localCurdir = "/"; browseLog->setEdited(FALSE); fileList->setSorting(1); fileList->clear(); fileProgress->setTotalSteps(MAX_PROGRESS); statusBar->clear(); localLayout = new QVBoxLayout(localFs); localLayout->setSpacing( 0 ); localLayout->setMargin( 0 ); destFile = new OFileSelector(localFs, OFileSelector::FileSelector, OFileSelector::ExtendedAll, localCurdir, ""); destFile->setCloseVisible(false); destFile->setNewVisible(false); localLayout->addWidget(destFile); nReries->setValue(nRetries); connect(browseOK, SIGNAL(clicked()), SLOT(slotBrowse())); connect(fileList, SIGNAL(clicked(QListViewItem*)), SLOT(slotCd(QListViewItem*))); connect(getButton, SIGNAL(clicked()), SLOT(getFile())); connect(putButton, SIGNAL(clicked()), SLOT(putFile())); connect(delButton, SIGNAL(clicked()), SLOT(delFile())); connect(destFile, SIGNAL(dirSelected (const QString&)), SLOT(updateDir(const QString&))); connect(saveButton, SIGNAL(clicked()), SLOT(slotSaveLog())); connect(browseButton, SIGNAL(clicked()), SLOT(slotBrowseLog())); } ObexFtpDialog::~ObexFtpDialog() { if (client != NULL) { obexftp_disconnect(client); obexftp_close(client); } } +void ObexFtpDialog::slotBrowse() +{ + doBrowse(TRUE); +} + /* * Do device browsing */ -void ObexFtpDialog::slotBrowse() +void ObexFtpDialog::doBrowse(bool reconnect) { stat_entry_t* ent; //Directory entry void *dir; //Directory to read const uint8_t* use_uuid; //uuid int len; //uuid length FileListItem* root; //root node int fsize; //file size bool numOk; //true if the string is a number int tmp; //just a temp var status(tr("Connecting to ") + m_device); odebug << "Browse device " << m_device << oendl; browseLog->clear(); fileList->clear(); 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)) { + if (!cli_connect_uuid(use_uuid, len, reconnect)) { log(tr("Connection failed: ") + tr(strerror(errno))); errBox("Connection failed"); status("Connection failed"); return; } else { log(QString("Connected to ") + m_device); status(QString("Connected to ") + m_device); } /* List folder */ root = new FileListItem(fileList, NULL); dir = obexftp_opendir(client, curdir); while ((ent = obexftp_readdir(dir)) != NULL) { FileListItem* a; //List view item if (ent->mode != 16877) { fsize = ent->size; } else fsize = 0; log(QString(ent->name) + QString(" ") + QString::number(ent->mode)); a = new FileListItem(fileList, ent, fsize); } obexftp_closedir(dir); } //Error message box int ObexFtpDialog::errBox(QCString msg) { return QMessageBox::critical(this, tr("ObexFTP error"), msg); } int ObexFtpDialog::errBox(QString msg) { return QMessageBox::critical(this, tr("ObexFTP error"), msg); } int ObexFtpDialog::errBox(const char* msg) { return QMessageBox::critical(this, tr("ObexFTP error"), tr(msg)); } //Text in the status bar void ObexFtpDialog::status(QCString msg) { statusBar->setText(msg); statusBar->repaint(); } void ObexFtpDialog::status(QString msg) { statusBar->setText(msg); statusBar->repaint(); } void ObexFtpDialog::status(const char* msg) { statusBar->setText(msg); statusBar->repaint(); } /* * Change directory with item under the cursor */ void ObexFtpDialog::slotCd(QListViewItem* item) { FileListItem* file = (FileListItem*)item; int idx; if (file == NULL) return; odebug << "Item " << file->text(0) << " clicked" << oendl; if (file->gettype() == IS_DIR) { if (file->text(0) == "../") { if (curdir.right(1) == "/") curdir.remove(curdir.length() - 1, 1); idx = curdir.findRev('/'); if (idx >= 0) curdir.remove(idx, curdir.length() - idx); else curdir = ""; } else { if (curdir != "" && curdir.right(1) != "/") curdir += "/"; curdir += file->text(0); } odebug << "Browse " << curdir << oendl; if (obexftp_setpath(client, curdir, 0) < 0) log(tr("CD failed: ") + tr(strerror(errno))); - slotBrowse(); + doBrowse(); } } /* * Copy file from a remote device to the local device */ void ObexFtpDialog::getFile() { FileListItem* file = (FileListItem*)fileList->selectedItem(); int result; if (file == NULL) return; file2get = "/"; local = localCurdir; if (local == "") { errBox("Select a destination first"); return; } if (local.right(1) != "/") local += "/"; if (file->gettype() == IS_FILE) { if (client == NULL) { errBox("No connection established"); return; } file2get += curdir; if (curdir != "" && curdir.right(1) != "/") file2get += "/"; file2get += file->text(0); local += file->text(0); odebug << "Copy " << file2get << " to " << local << oendl; progressStatus = 0; fileProgress->setTotalSteps(file->getsize() / 1024); fileProgress->reset(); status(tr("Receiving file ") + file2get); result = obexftp_get(client, local, file2get); if (result < 0) { log(file2get + QString(" receive ERROR:\n") + tr(strerror(errno))); errBox(file2get + QString(" receive ERROR")); status(file2get + QString(" receive ERROR")); } else { log(file2get + QString(" received")); status(file2get + QString(" received")); destFile->reread(); } } } /* * Copy file from the local device to a remote device */ 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:\n") + tr(strerror(errno))); errBox(local + QString(" send ERROR")); status(local + QString(" send ERROR")); } else { - slotBrowse(); + doBrowse(); log(local + QString(" sent")); status(local + QString(" sent")); } } /* * Delete file on a remote device */ void ObexFtpDialog::delFile() { FileListItem* file = (FileListItem*)fileList->selectedItem(); int result; if (file == NULL) return; file2get = "/"; if (file->gettype() == IS_FILE) { if (client == NULL) { errBox("No connection established"); return; } file2get += curdir; if (curdir != "" && curdir.right(1) != "/") file2get += "/"; file2get += file->text(0); } result = QMessageBox::warning(this, tr("Remove File"), tr("Do you want to remove\n") + file2get, "Yes", "No"); if (result != 0) return; odebug << "Remove " << file2get << oendl; result = obexftp_del(client, file2get); if (result < 0) { log(file2get + QString(" remove ERROR\n") + tr(strerror(errno))); errBox(file2get + QString(" remove ERROR")); status(file2get + QString(" remove ERROR")); } else { - slotBrowse(); + doBrowse(); log(file2get + QString(" removed")); status(file2get + QString(" removed")); } } /* connect with given uuid. re-connect every time */ -int ObexFtpDialog::cli_connect_uuid(const uint8_t *uuid, int uuid_len) +int ObexFtpDialog::cli_connect_uuid(const uint8_t *uuid, int uuid_len, + bool reconnect) { int retry; - if (client != NULL) - return TRUE; + if (client != NULL) { + if (reconnect) { + obexftp_disconnect(client); + obexftp_close(client); + sleep(3); + } + else + return TRUE; + } /* Open */ client = obexftp_open (transport, NULL, info_cb, this); if(client == NULL) { errBox("Error opening obexftp-client"); return FALSE; } if (!use_conn) client->quirks &= ~OBEXFTP_CONN_HEADER; if (!use_path) client->quirks &= ~OBEXFTP_SPLIT_SETPATH; for (retry = 0; retry < nRetries; retry++) { /* Connect */ switch (transport) { case OBEX_TRANS_IRDA: if (obexftp_connect_uuid(client, NULL, 0, uuid, uuid_len) >= 0) return TRUE; break; case OBEX_TRANS_BLUETOOTH: if (obexftp_connect_uuid(client, m_device, m_port, uuid, uuid_len) >= 0) return TRUE; break; default: errBox("Transport type unknown"); return FALSE; } log(tr("Still trying to connect")); } client = NULL; return FALSE; } /* * Put a message to the log window */ void ObexFtpDialog::log(QString str) { browseLog->append(str); } void ObexFtpDialog::log(QCString str) { browseLog->append(str); } void ObexFtpDialog::log(QString& str) { diff --git a/noncore/net/opietooth/manager/obexftpdialog.h b/noncore/net/opietooth/manager/obexftpdialog.h index 75ee95b..45699d2 100644 --- a/noncore/net/opietooth/manager/obexftpdialog.h +++ b/noncore/net/opietooth/manager/obexftpdialog.h @@ -1,71 +1,73 @@ /* $Id$ */ /* OBEX file browser dialog */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ /* * This code uses and is based on ObexFTP project code: http://triq.net/obexftp/ */ #ifndef _OBEXFTPDIALOG_H_ #define _OBEXFTPDIALOG_H_ #include "obexftpdialogbase.h" #include <qstring.h> #include <obexftp.h> #include <uuid.h> #include <client.h> #include <opie2/ofileselector.h> #include <qlayout.h> namespace OpieTooth { class ObexFtpDialog : public ObexFtpDialogBase { Q_OBJECT public: ObexFtpDialog(const QString& device = 0, int port = 0, QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0); ~ObexFtpDialog(); void log(QString str); void log(QCString str); void log(const char* str); void log(QString& str); void incProgress(); void doneProgress(); protected: - int cli_connect_uuid(const uint8_t *uuid, int uuid_len); + int cli_connect_uuid(const uint8_t *uuid, int uuid_len, + bool reconnect = FALSE); int errBox(QCString msg); //Error message box int errBox(QString msg); //Error message box int errBox(const char* msg); //Error message box void status(QCString msg); //Text in the status bar void status(QString msg); //Text in the status bar void status(const char* msg); //Text in the status bar + void doBrowse(bool reconnect = FALSE); //Browse device protected: QString m_device; //device MAC address int m_port; //port int transport; //transport type bool use_conn; bool use_path; obexftp_client_t* client; //Obex ftp client handler QString curdir; //Current directory on device QString localCurdir; //Local current directory QString file2get; //Remote file name QString local; //Local file name int progressStatus; //Progress status Opie::Ui::OFileSelector* destFile; //Destination file or directory QVBoxLayout* localLayout; //Window layout int nRetries; //Number of retries (on connection) private slots: void slotBrowse(); void slotCd(QListViewItem* item); void getFile(); void putFile(); void delFile(); void updateDir(const QString& newdir); void slotSaveLog(); void slotBrowseLog(); }; }; #endif |