Changeset 3320

Timestamp:

08/03/08 17:24:31 (5 years ago)

Author:

devtar

Message:

Update on interface. UmitBT I/O draft. UBT parser

Location:

branch/BluetoothScanner/umitBluetooth

Files:

• btcore.py (modified) (1 diff)
• db/btdb.dat (deleted)
• db/btdb.db (added)
• interface.py (modified) (1 diff)
• io.py (modified) (4 diffs)
• long.ubt (deleted)
• parser.py (added)
• pixmaps/Thumbs.db (added)
• short.ubt (deleted)
• test.ubt (added)

branch/BluetoothScanner/umitBluetooth/btcore.py

@@ -104 +104 @@
         btmacsearch = [""]
         btnamesearch = [""]
-        # btdb.dat search               
-        if(os.path.exists(os.path.join("db", "btdb.dat"))):
+        # btdb.db search                
+        if(os.path.exists(os.path.join("db", "btdb.db"))):
                 print "start manufac detection"
-                btdb_dir = os.path.abspath(os.path.join("db", "btdb.dat"))
+                btdb_dir = os.path.abspath(os.path.join("db", "btdb.db"))
                 btdb = open(btdb_dir, "rb")
                 while ((len(btname)-1) > count):

branch/BluetoothScanner/umitBluetooth/interface.py

@@ -93 +93 @@
         vbox1.pack_start(hbox1, False, False)
 
-        #Button
-        self.scanbutton = gtk.Button("Probe Devices")
-        self.scanbutton.connect("clicked", self.enter_cb)
-        hbox1.pack_start(self.scanbutton, False, True, 540)
-
         #Progressbar
         self.progb = gtk.ProgressBar()
         self.progb.set_text("")
         self.progb.set_fraction(0)
-        hbox1.pack_end(self.progb, False, True, 10)
+        hbox1.pack_end(self.progb, False, False, 5)
+
+        #Button
+        self.scanbutton = gtk.Button("Probe Devices")
+        self.scanbutton.connect("clicked", self.enter_cb)
+        hbox1.pack_end(self.scanbutton, False, False, 0)
 
         # Paned

branch/BluetoothScanner/umitBluetooth/io.py

@@ -25 +25 @@
 
 import btcore
+import parser
 
 class io:
@@ -39 +40 @@
          save_file, extension = os.path.splitext(save_file)
          save_file = save_file + ".ubt"
-         outfile = open (save_file, "w")
+         string = ""
+         doc = XMLDocument("UmitBT", name="ubt")
          while (len(btcore.btname)-1) > count:
                 count += 1
-                field1 = "<i1>" + btcore.btname[count] + "</i1>"
-                field2 = "<i2>" + btcore.btmac[count] + "</i2>"
-                field3 = "<i3>" + btcore.btmanu[count] + "</i3>"
-                field4 = "<i4>" + btcore.btsdp[count] + "</i4>"
-                event = field1 + field2 + field3 + field4
-                outfile.writelines(event)
-         outfile.close()
+                table = doc.add("table", name=str(count))
+                table.add("info", name="BTname", value=btcore.btname[count])            
+                table.add("info", name="BTmac", value=btcore.btmac[count])            
+                table.add("info", name="BTmanu", value=btcore.btmanu[count])            
+                table.add("info", name="BTsdp", value=btcore.btsdp[count])            
+         print doc
+         string = doc
+         outfile = open (save_file, "w")
+         outfile.write(string.doc.toprettyxml(" "))
+         outfile.close()
 
    def load(self):    
@@ -59 +64 @@
          print "OPEN FILENAME : " + extension
          if(load_file and extension == ".ubt"):
-                 for line in inFile:
-                         count+=1
-                         btnamebuf, buffer = line.split("</i1>")                         
-                         btnamebuf = string.replace(btnamebuf, "<i1>", "")
-                         print btnamebuf
-                         btmacbuf, buffer2 = buffer.split("</i2>")
-                         btmacbuf = string.replace(btmacbuf, "<i2>", "")
-                         print btmacbuf
-                         btmanubuf, buffer3 = buffer2.split("</i3>")
-                         btmanubuf = string.replace(btmanubuf, "<i3>", "")
-                         print btmanubuf
-                         btsdpbuf, buffer4 = buffer3.split("</i4>")
-                         btsdpbuf = string.replace(btsdpbuf, "<i4>", "")
-                         print btsdpbuf
-                         #string formatting \ remove newline
-                         btcore.btname.append(btnamebuf)
-                         btcore.btmac.append(btmacbuf)
-                         btcore.btmanu.append(btmanubuf)
-                         btcore.btsdp.append(btsdpbuf)
-                         #btname[count] = string.replace(btname[count], "\n", " ")
+                xml_load = inFile.read()
+                ndoc = XMLDocument()
+                ndoc.parseString(str(xml_load))
+                root = ndoc.getAll("UmitBT")
+                if root:
+                    db = root[0]
+                    print "Database:", db["ubt"]
+                    for table in db.getAll("table"):
+                        print "Table:", table["name"]
+                        for field in db.getAll("info"):
+                            print "Field:", field["name"], "- Type:", field["value"]
+                            if(field["name"] == "BTname"):
+                                btcore.btname.append(field["value"])
+                            elif(field["name"] == "BTmac"):
+                                btcore.btmac.append(field["value"])
+                            elif(field["name"] == "BTmanu"):
+                                btcore.btmac.append(field["value"])
+                            elif(field["name"] == "BTsdp"):
+                                btcore.btsdp.append(field["value"])
+                            else:
+                                print "I/O error encountered!"
+
          else:
              print "File Load error!"
+                        
 
    def file_browse(self, dialog_action, file_name=""):
@@ -120 +128 @@
    
    def clear_buffer(self):
-    btcore.btname = [""]
-    btcore.btmac = [""]
-    btcore.btmanu = [""]
-    btcore.btsdp = [""]
+        btcore.btname = [""]
+        btcore.btmac = [""]
+        btcore.btmanu = [""]
+        btcore.btsdp = [""]