Fix Service/Profile parser

2 files changed, 46 insertions, 16 deletions

diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index 177c94e..23506b3 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -101,21 +101,23 @@ void Manager::removeServices( const QStringList& list){
     QStringList::ConstIterator it;
     for (it = list.begin(); it != list.end(); ++it )
         removeService( (*it) );
 }
 void Manager::searchServices( const QString& remDevice ){
     OProcess *m_sdp =new OProcess();
     *m_sdp << "sdptool" << "browse" << remDevice;
     m_sdp->setName( remDevice.latin1() );
+    qWarning("search Services for %s", remDevice.latin1() );
     connect(m_sdp, SIGNAL(processExited(OProcess*) ),
             this, SLOT(slotSDPExited(OProcess* ) ) );
     connect(m_sdp, SIGNAL(receivedStdout(OProcess*, char*,  int ) ),
             this, SLOT(slotSDPOut(OProcess*, char*, int) ) );
     if (!m_sdp->start(OProcess::NotifyOnExit,  OProcess::AllOutput) ) {
+        qWarning("could not start sdptool" );
         delete m_sdp;
         Services::ValueList list;
         emit foundServices( remDevice, list );
     }
 }
 void Manager::searchServices( const RemoteDevice& dev){
     searchServices( dev.mac() );
 }
@@ -132,40 +134,45 @@ void Manager::slotProcessExited(OProcess* proc ) {
 
     QString name = QString::fromLatin1(proc->name() );
     emit available( name, conn );
     delete proc;
 }
 void Manager::slotSDPOut(OProcess* proc, char* ch, int len)
 {
     QCString str(ch,  len+1 );
+    qWarning("SDP:%s", str.data() );
     QMap<QString, QString>::Iterator it;
     it = m_out.find(proc->name() );
+    QString string;
     if ( it != m_out.end() ) {
-        QString string = it.data();
-        string.append( str );
-        m_out.replace( proc->name(), string );
+        string = it.data();
     }
+    string.append( str );
+    m_out.replace( proc->name(), string );
 
 }
 void Manager::slotSDPExited( OProcess* proc)
 {
+    qWarning("proc name %s", proc->name() );
     Services::ValueList  list;
     if (proc->normalExit()  ) {
         QMap<QString, QString>::Iterator it = m_out.find( proc->name() );
         if ( it != m_out.end() ) {
+	    qWarning("found process" );
             list = parseSDPOutput( it.data() );
             m_out.remove( it );
         }
     }
     emit foundServices( proc->name(), list );
     delete proc;
 }
 Services::ValueList Manager::parseSDPOutput( const QString& out ) {
     Services::ValueList list;
+    qWarning("parsing output" );
     Parser parser( out );
     list = parser.services();
     return list;
 }
 
 void Manager::slotHCIExited(OProcess* proc ) {
     qWarning("process exited");
     RemoteDevice::ValueList list;
diff --git a/noncore/net/opietooth/lib/parser.cc b/noncore/net/opietooth/lib/parser.cc
index 18d534e..00ec84a 100644
--- a/noncore/net/opietooth/lib/parser.cc
+++ b/noncore/net/opietooth/lib/parser.cc
@@ -8,30 +8,39 @@ using namespace OpieTooth;
 namespace {
 
 
     // "Test Foo Bar" (0x3456)
     // @param ret Test Foo Bar
     // @eturn 13398
     // tactic find " (
 int convert( const QString& line, QString& ret ) {
+//    qWarning("called");
     ret = QString::null;
     int i = 0;
     int pos = line.findRev("\" (");
     if ( pos > 0 ) { // it shouldn't be at pos 0
-        ret = line.left(pos-1 ).stripWhiteSpace();
-        qWarning("ret: %s",  ret.latin1() );
+        ret = line.left(pos ).stripWhiteSpace();
+        //      qWarning("ret: %s",  ret.latin1() );
         ret = ret.replace(QRegExp("[\"]"), "");
-        qWarning("ret: %s", ret.latin1() );
-        QString dummy = line.mid(pos + 4 );
-        qWarning("dummy: %s",  dummy.latin1() );
-        dummy = dummy.remove( dummy.length() -1, 1 ); // remove the (
+        //qWarning("ret: %s", ret.latin1() );
+        QString dummy = line.mid(pos + 5 );
+        //qWarning("dummy: %s",  dummy.latin1() );
+        dummy = dummy.replace(QRegExp("[)]"), "");
+        //qWarning("dummy: %s", dummy.latin1() );
+//        dummy = dummy.remove( dummy.length() -2, 1 ); // remove the )
         bool ok;
         i = dummy.toInt(&ok, 16 );
+        //if (ok ) {
+        //     qWarning("converted %d",  i);
+        //}else qWarning("failed" );
+        //qWarning("exiting");
+        return i;
     }
+    //qWarning("output %d", i );
     return i;
 }
 
 };
 
 
 Parser::Parser(const QString& output ) {
     parse( output );
@@ -40,61 +49,75 @@ void Parser::setText(const QString& output) {
     parse( output );
 }
 Services::ValueList Parser::services() const {
     return m_list;
 }
 void Parser::parse( const QString& string) {
     m_list.clear();
     m_complete = true;
-    QStringList list = QStringList::split('\n', string );
+    QStringList list = QStringList::split('\n', string,TRUE );
     QStringList::Iterator it;
     for (it = list.begin(); it != list.end(); ++it ) {
+        qWarning("line:%s:line", (*it).latin1() );
         if ( (*it).startsWith("Browsing") ) continue;
 
-        if ( (*it).isEmpty() ) { // line is empty because a new Service begins
-        // now see if complete and add
+        if ( (*it).stripWhiteSpace().isEmpty() ) { // line is empty because a new Service begins
+            qWarning("could add");
+            // now see if complete and add
             if (m_complete ) {
-                m_list.append( m_item );
+                if (!m_item.serviceName().isEmpty() )
+                    m_list.append( m_item );
                 Services serv;
                 m_item = serv;
                 m_complete = true;
                 continue;
             }
         }
         if (parseName(      (*it) ) ) ;//continue;
         if (parseRecHandle( (*it) ) ) ;//continue;
         if (parseClassId(   (*it) ) ) ;//continue;
         if (parseProtocol(  (*it) ) ) ;//continue;
         if (parseProfile(   (*it) ) ) ;//continue;
     }
     // missed the last one
     if (m_complete) {
-        m_list.append(m_item );
+        qWarning("adding");
+        if (!m_item.serviceName().isEmpty() )
+            m_list.append(m_item );
+    }
+    QValueList<Services>::Iterator it2;
+
+    if (m_list.isEmpty() )
+        qWarning("m_list is empty");
+    for (it2 = m_list.begin(); it2 != m_list.end(); ++it2 ) {
+        qWarning("name %s", (*it2).serviceName().latin1() );
     }
 }
 bool Parser::parseName( const QString& str) {
     if (str.startsWith("Service Name:") ) {
         m_item.setServiceName( str.mid(13).stripWhiteSpace() );
         qWarning(m_item.serviceName() );
         return true;
     }
     return false;
 }
 bool Parser::parseRecHandle( const QString& str) {
     if (str.startsWith("Service RecHandle:" ) ) {
         QString out = str.mid(18 ).stripWhiteSpace();
         qWarning("out %s", out.latin1() );
-        int value = out.toInt(&m_ok, 16 );
+        int value = out.mid(2).toInt(&m_ok, 16 );
         if (m_ok && (value != -1) )
             m_complete = true;
         else
             m_complete = false;
-        return true;
+        qWarning("rec handle %d",  value);
         m_item.setRecHandle( value );
+        return true;
+
     }
     return false;
 }
 bool Parser::parseClassId( const QString& str) {
     if (str.startsWith("Service Class ID List:") ) {
         m_classOver = true;
         return true;
     }else if ( m_classOver ) { // ok now are the informations in place