summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/obex/btobex.cpp3
-rw-r--r--core/obex/obexsend.cpp39
2 files changed, 26 insertions, 16 deletions
diff --git a/core/obex/btobex.cpp b/core/obex/btobex.cpp
index b8556da..886f3dc 100644
--- a/core/obex/btobex.cpp
+++ b/core/obex/btobex.cpp
@@ -1,230 +1,229 @@
#include "btobex.h"
#include <opietooth/manager.h>
#include <opietooth/services.h>
/* OPIE */
#include <opie2/oprocess.h>
#include <opie2/odebug.h>
/* QT */
#include <qfileinfo.h>
#include <qstring.h>
#include <qmap.h>
#include <qmessagebox.h>
using namespace OpieObex;
using namespace Opie::Core;
/* TRANSLATOR OpieObex::Obex */
using namespace OpieTooth;
BtObex::BtObex( QObject *parent, const char* name )
: QObject(parent, name )
{
m_rec = 0;
m_send=0;
m_count = 0;
m_receive = false;
connect( this, SIGNAL(error(int) ), // for recovering to receive
SLOT(slotError() ) );
connect( this, SIGNAL(sent(bool) ),
SLOT(slotError() ) );
btManager = NULL;
};
BtObex::~BtObex() {
- if (btManager)
- delete btManager;
+ delete btManager;
delete m_rec;
delete m_send;
}
void BtObex::receive() {
m_receive = true;
m_outp = QString::null;
m_rec = new OProcess();
// TODO mbhaynie: No idea if this actually works -- maybe opd is better.
*m_rec << "obexftpd" << "-b";
// connect to the necessary slots
connect(m_rec, SIGNAL(processExited(Opie::Core::OProcess*) ),
this, SLOT(slotExited(Opie::Core::OProcess*) ) );
connect(m_rec, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ),
this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) );
if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
emit done( false );
delete m_rec;
m_rec = 0;
}
}
void BtObex::send( const QString& fileName, const QString& bdaddr) {
// if currently receiving stop it send receive
m_count = 0;
m_file = fileName;
m_bdaddr = bdaddr;
if (m_rec != 0 ) {
if (m_rec->isRunning() ) {
emit error(-1 );
delete m_rec;
m_rec = 0;
}else{
emit error( -1 ); // we did not delete yet but it's not running slotExited is pending
return;
}
}
//Now we need to find out if the OBEX push is supported for this device
//And get the port number
if (!btManager) {
btManager = new Manager("hci0");
connect(btManager,
SIGNAL(foundServices(const QString&, Services::ValueList)),
this, SLOT(slotFoundServices(const QString&, Services::ValueList)));
}
btManager->searchServices(bdaddr);
}
/**
* This function reacts on the service discovery finish
*/
void BtObex::slotFoundServices(const QString&, Services::ValueList svcList)
{
QValueList<OpieTooth::Services>::Iterator it;
QMap<int, QString> classList; //The classes list
QMap<int, QString>::Iterator classIt; //Iterator in the class list
int portNum = -1; //The desired port number
odebug << "BtObex slotFoundServices" << oendl;
if (svcList.isEmpty()) {
QMessageBox::critical(NULL, tr("Object send"), tr("No services found"));
emit error(-1);
return;
}
for (it = svcList.begin(); it != svcList.end(); it++) {
classList = (*it).classIdList();
classIt = classList.begin();
if (classIt == classList.end())
continue;
////We really need symbolic names for service IDs
//Ok, we have found the object push service
if (classIt.key() == 4357) {
portNum = (*it).protocolDescriptorList().last().port();
break;
}
}
if (portNum == -1) {
QMessageBox::critical(NULL, tr("Object send"),
tr("No OBEX Push service"));
emit error(-1);
return;
}
m_port = portNum;
sendNow();
}
void BtObex::sendNow(){
if ( m_count >= 25 ) { // could not send
emit error(-1 );
emit sent(false);
return;
}
// 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);
// 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) ) );
// now start it
if (!m_send->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
m_count = 25;
emit error(-1 );
delete m_send;
m_send=0;
}
// end
m_count++;
emit currentTry( m_count );
}
void BtObex::slotExited(OProcess* proc ){
odebug << proc->name() << " exited with result "
<< proc->exitStatus() << oendl;
if (proc == m_rec ) // receive process
received();
else if ( proc == m_send )
sendEnd();
}
void BtObex::slotStdOut(OProcess* proc, char* buf, int len){
if ( proc == m_rec ) { // only receive
QByteArray ar( len );
memcpy( ar.data(), buf, len );
m_outp.append( ar );
}
}
void BtObex::received() {
if (m_rec->normalExit() ) {
if ( m_rec->exitStatus() == 0 ) { // we got one
QString filename = parseOut();
emit receivedFile( filename );
}
}else{
emit done(false);
};
delete m_rec;
m_rec = 0;
receive();
}
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.
QString BtObex::parseOut(){
QString path;
QStringList list = QStringList::split("\n", m_outp);
QStringList::Iterator it;
for (it = list.begin(); it != list.end(); ++it ) {
odebug << (*it) << oendl;
if ( (*it).startsWith("Wrote" ) ) {
int pos = (*it).findRev('(' );
if ( pos > 0 ) {
path = (*it).remove( pos, (*it).length() - pos );
path = path.mid(6 );
path = path.stripWhiteSpace();
}
}
}
return path;
}
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index dbbb7b3..8432d16 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -1,241 +1,252 @@
// 7-Jul-2005 mbh@sdgsystems.com: replace hand coded form with one
// generated via QT2 Designer. The new form supports
// selection of target devices, as opposed to sending to
// all.
#include "obex.h"
#include "btobex.h"
#include "obexsend.h"
using namespace OpieObex;
/* OPIE */
#include <opie2/odebug.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/resource.h>
using namespace Opie::Core;
/* QT */
#include <qlabel.h>
#include <qpushbutton.h>
#include <qpixmap.h>
#include <qlistview.h>
#include <unistd.h>
/* TRANSLATOR OpieObex::SendWidget */
SendWidget::SendWidget( QWidget* parent, const char* name )
: obexSendBase( parent, name ) {
initUI();
}
SendWidget::~SendWidget() {
}
void SendWidget::initUI() {
m_obex = new Obex(this, "obex");
connect(m_obex, SIGNAL(error(int) ),
this, SLOT(slotIrError(int) ) );
connect(m_obex, SIGNAL(sent(bool) ),
this, SLOT(slotIrSent(bool) ) );
connect(m_obex, SIGNAL(currentTry(unsigned int) ),
this, SLOT(slotIrTry(unsigned int) ) );
QCopChannel* chan = new QCopChannel("QPE/IrDaAppletBack", this );
connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
this, SLOT(dispatchIrda(const QCString&,const QByteArray&) ) );
m_btobex = new BtObex(this, "btobex");
connect(m_btobex, SIGNAL(error(int) ),
this, SLOT(slotBtError(int) ) );
connect(m_btobex, SIGNAL(sent(bool) ),
this, SLOT(slotBtSent(bool) ) );
connect(m_btobex, SIGNAL(currentTry(unsigned int) ),
this, SLOT(slotBtTry(unsigned int) ) );
chan = new QCopChannel("QPE/BluetoothBack", this );
connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
this, SLOT(dispatchBt(const QCString&,const QByteArray&) ) );
}
/*
* in send we'll first set everything up
* and then wait for a list of devices.
*/
void SendWidget::send( const QString& file, const QString& desc ) {
m_file = file;
m_irDa.clear();
m_start = 0;
fileToSend->setText(desc.isEmpty() ? file : desc );
scan_for_receivers();
}
int SendWidget::addReceiver(const char *r, const char *icon)
{
QListViewItem * item = new QListViewItem( receiverList, 0 );
item->setText( 0, r);
item->setPixmap( 1, Resource::loadPixmap( icon ) );
int id=receivers.count();
receivers[id]=item;
return id;
}
bool SendWidget::receiverSelected(int id)
{
return (bool)(receivers[id]->pixmap(2) != NULL);
}
void SendWidget::setReceiverStatus( int id, const QString& status ) {
if ( !receivers.contains(id) ) return;
receivers[id]->setText(3, status );
}
void SendWidget::slotIrDaDevices( const QStringList& list) {
- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
- int id = addReceiver(*it, "obex/irda.png");
- m_irDa.insert( id, (*it) );
+ for (QStringList::ConstIterator it = list.begin();
+ it != list.end(); ++it ) {
+ int id = addReceiver(*it, "obex/irda.png");
+ m_irDa.insert( id, (*it) );
}
irdaStatus->setText( tr("ready."));
m_irDaIt = m_irDa.begin();
}
void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) {
- for(QMap<QString, QString>::ConstIterator it = str.begin(); it != str.end(); ++it ) {
- int id = addReceiver(it.key(), "obex/bt.png");
+ for(QMap<QString, QString>::ConstIterator it = str.begin();
+ it != str.end(); ++it ) {
+ int id = addReceiver(it.key(), "obex/bt.png");
m_bt.insert( id, Pair( it.key(), it.data() ) );
}
btStatus->setText(tr("ready."));
m_btIt = m_bt.begin();
}
void SendWidget::slotSelectedDevice( int, int ) {
/* if ( name == m_irDeSearch ) {
for (QMap<int, QString>::Iterator it= m_irDa.begin(); it != m_irDa.end(); ++it )
m_devBox->removeDevice( it.key() );
QCopEnvelope e2("QPE/IrDaApplet", "listDevices()");
}*/
}
void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) {
if ( str == "devices(QStringList)" ) {
QDataStream stream( ar, IO_ReadOnly );
QStringList list;
stream >> list;
slotIrDaDevices( list );
}
}
void SendWidget::slotIrError( int ) {
irdaStatus->setText(tr("error :("));
}
void SendWidget::slotIrSent( bool b) {
QString text = b ? tr("Sent") : tr("Failure");
setReceiverStatus( m_irDaIt.key(), text );
++m_irDaIt;
slotStartIrda();
}
void SendWidget::slotIrTry(unsigned int trI) {
setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) ));
}
void SendWidget::slotStartIrda() {
- if ( !m_irDa.count() ) return;
- if ( m_irDaIt == m_irDa.end() ) {
+ if ( !m_irDa.count() )
+ return;
+ if ( m_irDaIt == m_irDa.end() || !receiverSelected(m_irDaIt.key())) {
irdaStatus->setText(tr("complete."));
return;
}
setReceiverStatus( m_irDaIt.key(), tr("Start sending") );
m_obex->send( m_file );
}
void SendWidget::dispatchBt( const QCString& str, const QByteArray& ar ) {
if ( str == "devices(QStringMap)" ) {
QDataStream stream( ar, IO_ReadOnly );
- QMap<QString, QString> btmap;
+ QMap<QString, QString> btmap;
stream >> btmap;
slotBTDevices( btmap );
}
}
void SendWidget::slotBtError( int ) {
btStatus->setText(tr("error :("));
}
void SendWidget::slotBtSent( bool b) {
QString text = b ? tr("Sent") : tr("Failure");
setReceiverStatus( m_btIt.key(), text );
++m_btIt;
slotStartBt();
}
void SendWidget::slotBtTry(unsigned int trI) {
setReceiverStatus( m_btIt.key(), tr("Try %1").arg( QString::number( trI ) ) );
}
void SendWidget::slotStartBt() {
// skip past unselected receivers
while((m_btIt != m_bt.end()) && !receiverSelected(m_btIt.key()))
- ++m_btIt;
+ ++m_btIt;
if (m_btIt == m_bt.end() ) {
btStatus->setText(tr("complete."));
return;
}
setReceiverStatus( m_btIt.key(), tr("Start sending") );
m_btobex->send( m_file, m_btIt.data().second() );
}
void SendWidget::send_to_receivers() {
slotStartIrda();
slotStartBt();
}
void SendWidget::scan_for_receivers()
{
receiverList->clear();
receivers.clear();
sendButton->setDisabled( true );
if ( !QCopChannel::isRegistered("QPE/IrDaApplet") )
{
irdaStatus->setText(tr("not enabled."));
}
else
{
QCopEnvelope e1("QPE/IrDaApplet", "enableIrda()");
irdaStatus->setText(tr("searching..."));
sendButton->setEnabled( true );
QCopEnvelope e2("QPE/IrDaApplet", "listDevices()");
}
if ( !QCopChannel::isRegistered("QPE/Bluetooth") )
{
btStatus->setText(tr("not enabled."));
}
else
{
QCopEnvelope e1("QPE/Bluetooth", "enableBluetooth()");
btStatus->setText(tr("searching..."));
sendButton->setEnabled( true );
QCopEnvelope e3("QPE/Bluetooth", "listDevices()");
}
}
void SendWidget::toggle_receiver(QListViewItem* item)
{
// toggle the state of an individual receiver.
if(item->pixmap(2))
item->setPixmap(2,QPixmap());
else
- item->setPixmap(2,Resource::loadPixmap("backup/check.png"));
+ item->setPixmap(2,Resource::loadPixmap("obex/check.png"));
}
-void SendWidget::closeEvent( QCloseEvent* e) {
- obexSendBase::closeEvent(e);
- QCopEnvelope e0("QPE/IrDaApplet", "disableIrda()");
- QCopEnvelope e1("QPE/Bluetooth", "disableBluetooth()");
+void SendWidget::closeEvent( QCloseEvent* evt) {
+ delete m_obex;
+ m_obex = NULL;
+ delete m_btobex;
+ m_btobex = NULL;
+ obexSendBase::closeEvent(evt);
+ {
+ QCopEnvelope e("QPE/IrDaApplet", "disableIrda()");
+ }
+ {
+ QCopEnvelope e("QPE/Bluetooth", "disableBluetooth()");
+ }
}
void SendWidget::userDone() {
close();
}
QString SendWidget::file()const {
return m_file;
}