| -rw-r--r-- | noncore/net/opietooth/lib/parser.cc | 13 | ||||
| -rw-r--r-- | noncore/net/opietooth/lib/remotedevice.cc | 6 | ||||
| -rw-r--r-- | noncore/net/opietooth/lib/remotedevice.h | 4 |
3 files changed, 18 insertions, 5 deletions
diff --git a/noncore/net/opietooth/lib/parser.cc b/noncore/net/opietooth/lib/parser.cc index 0699309..8baf284 100644 --- a/noncore/net/opietooth/lib/parser.cc +++ b/noncore/net/opietooth/lib/parser.cc @@ -1,194 +1,199 @@ #include <qstringlist.h> #include "parser.h" 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 ).stripWhiteSpace(); // qWarning("ret: %s", ret.latin1() ); ret = ret.replace(QRegExp("[\"]"), ""); //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 ); } 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,TRUE ); QStringList::Iterator it; for (it = list.begin(); it != list.end(); ++it ) { - qWarning("line:%s:line", (*it).latin1() ); + //qWarning("line:%s:line", (*it).latin1() ); if ( (*it).startsWith("Browsing") ) continue; if ( (*it).stripWhiteSpace().isEmpty() ) { // line is empty because a new Service begins qWarning("could add"); // now see if complete and add if (m_complete ) { 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) { - qWarning("adding"); +// 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.mid(2).toInt(&m_ok, 16 ); if (m_ok && (value != -1) ) m_complete = true; else m_complete = false; 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:") ) { + qWarning("found class id" ); + qWarning("line:%s", str.latin1() ); m_classOver = true; return true; }else if ( m_classOver && str.startsWith(" " ) ){ // ok now are the informations in place - + qWarning("line with class id" ); + qWarning("%s",str.latin1() ); // "Obex Object Push" (0x1105) // find backwards the " and the from 0 to pos and the mid pos+1 // then stripWhiteSpace add name replace '"' with "" // and then convert 0x1105 toInt() QString classes; int ids; ids = convert( str, classes ); qWarning("ids %d", ids ); m_item.insertClassId( ids, classes ); return true; - }else + }else{ + qWarning("Else %d", m_classOver ); m_classOver = false; + } return false; } bool Parser::parseProtocol( const QString& str) { if (str.startsWith("Protocol Descriptor List:") ) { m_protocolOver = true; m_protocolAdded = false; return true; }else if (m_protocolOver && str.startsWith(" ") ) { // "L2CAP" (0x0100) qWarning("double protocol filter"); if (!m_protocolAdded ) { // the protocol does neither supply a channel nor port so add it now Services::ProtocolDescriptor desc( m_protName, m_protId ); m_item.insertProtocolDescriptor( desc ); } m_protocolAdded = false; { // the find function m_protId = convert(str, m_protName ); } return true; }else if (m_protocolOver && str.startsWith(" ") ) { qWarning("tripple protocol filter"); m_protocolAdded = true; QString dummy = str.stripWhiteSpace(); int pos = dummy.findRev(':'); if ( pos > -1 ) { int port = dummy.mid(pos+1 ).stripWhiteSpace().toInt(); Services::ProtocolDescriptor desc( m_protName, m_protId, port ); m_item.insertProtocolDescriptor( desc ); } return true; }else if (m_protocolOver ) { m_protocolOver = false; } return false; } bool Parser::parseProfile( const QString& str) { if (str.startsWith("Profile Descriptor List:") ) { m_profOver = true; }else if ( m_profOver && str.startsWith(" ") ) { m_profId = convert( str, m_profName ); }else if ( m_profOver && str.startsWith(" ") ) { // now find int pos = str.findRev(':'); if ( pos > 0 ) { int dummy = str.mid(pos+1 ).stripWhiteSpace().toInt(); qWarning("dummyInt:%d", dummy ); Services::ProfileDescriptor desc( m_profName, m_profId, dummy ); m_item.insertProfileDescriptor(desc); } }else m_profOver = false; return false; } diff --git a/noncore/net/opietooth/lib/remotedevice.cc b/noncore/net/opietooth/lib/remotedevice.cc index 08fb397..9cf0cac 100644 --- a/noncore/net/opietooth/lib/remotedevice.cc +++ b/noncore/net/opietooth/lib/remotedevice.cc @@ -1,48 +1,54 @@ #include "remotedevice.h" using namespace OpieTooth; bool operator==(const RemoteDevice& rem1, const RemoteDevice& rem2){ if( ( rem1.mac() == rem2.mac() ) && (rem1.name() == rem2.name() ) ) return true; return false; } RemoteDevice::RemoteDevice(){ } RemoteDevice::RemoteDevice(const RemoteDevice& ole ){ (*this) = ole; } RemoteDevice::RemoteDevice(const QString &mac, const QString& name ){ m_mac = mac; m_name = name; } RemoteDevice::~RemoteDevice(){ } bool RemoteDevice::isEmpty() const { if( m_name.isEmpty() && m_mac.isEmpty() ) return true; return false; }; RemoteDevice& RemoteDevice::operator=( const RemoteDevice& rem1){ m_name = rem1.m_name; m_mac = rem1.m_mac; return *this; } QString RemoteDevice::mac() const { return m_mac; } void RemoteDevice::setMac( const QString& mac ){ m_mac = mac; } QString RemoteDevice::name() const{ return m_name; } void RemoteDevice::setName( const QString& name ){ m_name = name; } +bool RemoteDevice::equals( const RemoteDevice& dev ) const { + if ( m_mac == dev.m_mac && m_name == dev.m_name ) + return true; + else + return false; +}; diff --git a/noncore/net/opietooth/lib/remotedevice.h b/noncore/net/opietooth/lib/remotedevice.h index 23f98bd..f268ccc 100644 --- a/noncore/net/opietooth/lib/remotedevice.h +++ b/noncore/net/opietooth/lib/remotedevice.h @@ -1,28 +1,30 @@ #ifndef OpieToothRemoteDevice #define OpieToothRemoteDevice #include <qvaluelist.h> namespace OpieTooth{ class RemoteDevice { public: typedef QValueList<RemoteDevice> ValueList; RemoteDevice(); RemoteDevice(const RemoteDevice& ); RemoteDevice(const QString &mac, const QString &name ); ~RemoteDevice(); - friend bool operator==(const RemoteDevice&, const RemoteDevice&); +// friend bool operator==(const RemoteDevice&, const RemoteDevice&); RemoteDevice &operator=(const RemoteDevice& ); bool isEmpty()const; QString mac()const; void setMac(const QString& mac ); QString name()const; void setName( const QString& name ); + bool equals( const RemoteDevice& )const; private: QString m_name; QString m_mac; }; + bool operator==( const RemoteDevice&, const RemoteDevice& ); }; #endif |