| -rw-r--r-- | core/obex/btobex.cpp | 87 | ||||
| -rw-r--r-- | core/obex/btobex.h | 14 |
2 files changed, 57 insertions, 44 deletions
diff --git a/core/obex/btobex.cpp b/core/obex/btobex.cpp index 886f3dc..a5bfe5f 100644 --- a/core/obex/btobex.cpp +++ b/core/obex/btobex.cpp @@ -2,4 +2,4 @@ #include "btobex.h" -#include <opietooth/manager.h> -#include <opietooth/services.h> +#include <manager.h> +#include <services.h> @@ -67,2 +67,10 @@ void BtObex::send( const QString& fileName, const QString& bdaddr) { m_bdaddr = bdaddr; + if (m_send != 0) { + if (m_send->isSending()) + return; + else { + delete m_send; + m_send = 0; + } + } if (m_rec != 0 ) { @@ -127,2 +135,4 @@ void BtObex::slotFoundServices(const QString&, Services::ValueList svcList) void BtObex::sendNow(){ + QString m_dst = ""; + int result; //function call result if ( m_count >= 25 ) { // could not send @@ -133,19 +143,17 @@ void BtObex::sendNow(){ // OProcess inititialisation - m_send = new OProcess(0, "ussp-push"); - m_send->setWorkingDirectory( QFileInfo(m_file).dirPath(true) ); - - // ussp-push --timeo 30 <btaddr:port> file file - *m_send << "ussp-push" << "--timeo 30"; - *m_send << m_bdaddr + "@" + QString::number(m_port); - *m_send << QFile::encodeName(QFileInfo(m_file).fileName()); - *m_send << QFile::encodeName(QFileInfo(m_file).fileName()); - m_send->setUseShell(true); - + m_send = new ObexPush(); // connect to slots Exited and and StdOut - connect(m_send, SIGNAL(processExited(Opie::Core::OProcess*) ), - this, SLOT(slotExited(Opie::Core::OProcess*)) ); - connect(m_send, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int)), - this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) ); + connect(m_send, SIGNAL(sendComplete(int)), + this, SLOT(slotPushComplete(int)) ); + connect(m_send, SIGNAL(sendError(int)), + this, SLOT(slotPushError(int)) ); + connect(m_send, SIGNAL(status(QCString&)), + this, SLOT(slotPushStatus(QCString&) ) ); + + ::sleep(4); // now start it - if (!m_send->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { + result = m_send->send(m_bdaddr, m_port, m_file, m_dst); + if (result > 0) //Sending process is actually running + return; + else if (result < 0) { m_count = 25; @@ -165,5 +173,2 @@ void BtObex::slotExited(OProcess* proc ){ received(); - else if ( proc == m_send ) - sendEnd(); - } @@ -177,2 +182,25 @@ void BtObex::slotStdOut(OProcess* proc, char* buf, int len){ +void BtObex::slotPushComplete(int result) { + if (result == 0) { + delete m_send; + m_send=0; + emit sent(true); + } else { // it failed maybe the other side wasn't ready + // let's try it again + delete m_send; + m_send = 0; + sendNow(); + } +} + +void BtObex::slotPushError(int) { + emit error( -1 ); + delete m_send; + m_send = 0; +} + +void BtObex::slotPushStatus(QCString& str) { + odebug << str << oendl; +} + void BtObex::received() { @@ -191,21 +219,2 @@ void BtObex::received() { -void BtObex::sendEnd() { - if (m_send->normalExit() ) { - if ( m_send->exitStatus() == 0 ) { - delete m_send; - m_send=0; - emit sent(true); - }else if (m_send->exitStatus() != 0 ) { // it failed maybe the other side wasn't ready - // let's try it again - delete m_send; - m_send = 0; - sendNow(); - } - }else { - emit error( -1 ); - delete m_send; - m_send = 0; - } -} - // This probably doesn't do anything useful for bt. diff --git a/core/obex/btobex.h b/core/obex/btobex.h index ba50064..9c1ab70 100644 --- a/core/obex/btobex.h +++ b/core/obex/btobex.h @@ -6,4 +6,5 @@ #include <qobject.h> -#include <opietooth/services.h> -#include <opietooth/manager.h> +#include <services.h> +#include <manager.h> +#include <obexpush.h> @@ -61,3 +62,3 @@ namespace OpieObex { int m_port; - Opie::Core::OProcess *m_send; + ObexPush* m_send; Opie::Core::OProcess *m_rec; @@ -69,2 +70,7 @@ private slots: + // Push process slots + void slotPushStatus(QCString&); + void slotPushComplete(int); + void slotPushError(int); + // the process exited @@ -79,4 +85,2 @@ private slots: void received(); - void sendEnd(); - }; |