Changeset 3091

Timestamp:

07/06/08 15:27:00 (5 years ago)

Author:

devtar

Message:

Updates:
1. Info of devices displayed when icon clicked
2. SDP scanning works
3. SDP info displayed based on icon clicked
4. Restructuring process

-main.py
-threading

5. SDP bug fixed. (btsdp out of bounds error when sdp mode disabled)

Location:

branch/BluetoothScanner/umitBluetooth

Files:

• __init__.py (modified) (1 diff)
• btcore.py (modified) (5 diffs)
• interface.py (modified) (5 diffs)
• main.py (added)

branch/BluetoothScanner/umitBluetooth/__init__.py

@@ -19 +19 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+__author__ = "Devtar Singh <devtar@gmail.com>"
+__date__ = "7 July 2008"
+__version__ = "100" # build version

branch/BluetoothScanner/umitBluetooth/btcore.py

@@ -26 +26 @@
 import interface
 
+btname = [""]
+btmac = [""]
+btmanu = [""]
+btsdp = [""]
+sdpstatus = ""
+
 class btcore:
 
    def __init__(self):
-        self.btname = [""]
-        self.btmac = [""]
-        self.btmanu = [""]
-        self.btsdp = [""]
+        global btname
+        global btmac
+        global btmanu
+        global btsdp
+        global sdpstatus
         #entry_text = entry.get_active_text()
         #print "BT Address Entered: %s" % entry_text
@@ -38 +45 @@
    def scan(self, interface):
         print "Refresh Interface"
-        interface.progb.set_text("")                
-        interface.progb.set_fraction(0)
-        #interface.mapmodel.clear()
-        self.btname = [""]
-        self.btmac = [""]
-        self.btmanu = [""]
-        self.btsdp = [""]
+        self.clear_int(interface)
+        global btname
+        global btmac
+        global btsdp
+        global sdpstatus
+        count = 1
         btdevices = bluetooth.discover_devices(lookup_names = True)
         for addr, name in btdevices:                 
                 if (name == ""):
                    name = "N/A"
-                self.btname.append(name)
-                self.btmac.append(addr)         
+                btname.append(name)
+                btmac.append(addr)
+                print sdpstatus
+                if (sdpstatus == "Enabled"):
+                 # first entry of btdevice is at index 1 hence +1 on initial
+                 self.sdp_scan(count)
+                count+=1
                 print "\n" + name + "\n" + addr + "\n"
          # BTMAC input test
         interface.progb.set_text("40%")
         interface.progb.set_fraction(.4)
-        self.manufac(self.btmac)
+        self.manufac()
         interface.progb.set_text("75%")
         interface.progb.set_fraction(.75)
-        self.map(self.btname, self.btmanu, interface)
+        self.map(interface)
         interface.progb.set_text("100%")
         interface.progb.set_fraction(1)
         message_id = interface.status_bar.push(interface.context_id, "Scanning Completed")
 
-   #def get_scan
+   def sdp_scan(self, btid):
+        global sdpstatus
+        global btmac
+        global btsdp
+        print "BTID: " + str(btid)
+        sdpservices=bluetooth.find_service(address=btmac[btid])
+        if len(sdpservices) > 0:
+                 for svc in sdpservices:
+                         sdpbrowseinfo = "\nService Name: " + str(svc["name"]) + "\n Description: " + str(svc["description"]) + "\n Provided By: " + str(svc["provider"]) + "\n Protocol: " + str(svc["protocol"]) + "\n channel/PSM: " + str(svc["port"]) + "\n svc classes: " + str(svc["service-classes"]) + "\n profiles:  " + str(svc["profiles"]) + "\n service id: " + str(svc["service-id"])
+                         btsdp.append("\nFound " + str(len(sdpservices)) + " services\n\n" + sdpbrowseinfo)
+                         print sdpbrowseinfo
+        else:
+                 sdpbrowseinfo = "no services found"
+                 btsdp.append(sdpbrowseinfo)
+                 print sdpbrowseinfo
+   
 
-   def manufac(self, btmac):
+   def manufac(self):
+        global btname
+        global btmac
+        global btmanu
         print "manufacturer detection"
         #Running from source directory
@@ -73 +102 @@
         btmacsearch = [""]
         btnamesearch = [""]
-        while ((len(self.btname)-1) > count):
+        while ((len(btname)-1) > count):
                 count+= 1
                 count2 = 0
@@ -94 +123 @@
                                 btmacsearch.append(btbuf1)
                                 btnamesearch.append(btbuf2)
-                        if(self.btmac[count][:8] == btmacsearch[count2]):
-                                self.btmanu.append(btnamesearch[count2])
-                                print "Manufacturer detected : " + self.btmac[count] + "\n" + self.btmanu[count]
+                        if(btmac[count][:8] == btmacsearch[count2]):
+                                btmanu.append(btnamesearch[count2])
+                                print "Count: " + str(count) + "\nNAME: " + btname[count] + "\nMAC : " + btmac[count] + "\nManufacturer detected : " + btmanu[count]
                                 endsearch = True
                 endread = True
                 print "Status : " + str(endsearch)
                 if(endsearch == False):
-                        print "Null: " + __main__.btmac[count][:8]
-                        self.btmanu.append("null")
+                        print "Null: " + btmac[count][:8]
+                        btmanu.append("null")
         btdb.close()
 
-   def map(self, btname, btmanu, interface):
+   def map(self, interface):    
+        global btname
+        global btmac
+        global btmanu
         count = 0
-        while ((len(self.btname)-1) > count):
+        while ((len(btname)-1) > count):
          count+=1
          if(btmanu[count].find("Nokia") > -1 ):
@@ -122 +154 @@
           interface.mapmodel.append([btname[count], pixbuf])
 
-        def onclick(self, interface):
-         print "Selected: " + interface.btmap.get_selected_items()
-         
-             
+   def set_info(self, interface, btid):
+         global btname
+         global btmac
+         global btmanu
+         global sdpstatus
+         btid+=1
+         print "Selected: " + str(interface.btmap.get_selected_items()) + "\n" + str(btid)       
+         interface.label.set_text("Device Details\t\t\t\t\n\nName: " + btname[btid] + "\nMAC: " + btmac[btid] + "\nManufacturer: " + btmanu[btid])
+         if (sdpstatus == "Enabled"):
+          interface.sdpview.get_buffer().set_text(btsdp[btid])
 
-   def sdpscan(self):
-        print "sdpinfo"
+   def set_sdp(self, status):
+         # Status of Enabled or Disabled
+         global sdpstatus
+         sdpstatus = status
+
+   def clear_int(self, interface):    
+        interface.progb.set_text("")                
+        interface.progb.set_fraction(0)
+        #interface.mapmodel.clear()
 
 
-

branch/BluetoothScanner/umitBluetooth/interface.py

@@ -26 +26 @@
 import about
 import btcore
+
 
 class interface:
@@ -128 +129 @@
 
         # Labels  
-        self.btname_label = ""
-        self.btmac_label = ""
-        self.btmanu_label = ""
-        self.label = gtk.Label("Device Details\t\t\t\t\n\nName: " + self.btname_label + "\nMAC: " + self.btmac_label + "\nManufacturer: " + self.btmanu_label)
+        self.label = gtk.Label("Device Details\t\t\t\t\n\nName: " + "\nMAC: " + "\nManufacturer: ")
         self.label.set_selectable(True)
         self.label.set_alignment(0.4,0)
@@ -155 +153 @@
         #Output test
         pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("pixmaps", "bt.png")))
-        self.mapmodel.append(["Test1", pixbuf])
-        self.mapmodel.append(["Test2", pixbuf])
+        #self.mapmodel.append(["Test1", pixbuf])
+        #self.mapmodel.append(["Test2", pixbuf])
 
         self.window.show_all()
@@ -170 +168 @@
 
     def sdp_cb(self, action):
-        # action has not toggled yet 
-        text = ('Enabled', 'Disabled')[action.get_active()==False]
-        message_id = self.status_bar.push(self.context_id, "SDP Browsing is %s"%text)        
-        return
+        # action has not toggled yet         
+                text = ('Enabled', 'Disabled')[action.get_active()==False]        
+                message_id = self.status_bar.push(self.context_id, "SDP Browsing is %s"%text)
+                btcore.btcore().set_sdp(text)        
+                return
 
     def iconclick_cb(self, path, action):        
-                print "clicked"
                 iter = self.btmap.get_cursor()
+                buffer = str(iter[0])[:2].replace("(","")
+                btid = int(buffer)
+                print "Clicked Icon: "+ str(buffer)
+                btcore.btcore().set_info(self, btid)
                 #outputs the location of the icon numerically
-                print "\n" + str(iter[0])[:2].replace("(","")
         
     def on_about(self, action):
@@ -185 +186 @@
             self._about = about.about_dialog()
             self._about.get_about()
-
-if __name__ == '__main__':
-    ubt = interface()
-    gtk.main()