Changeset a316c4e

Timestamp:

2007-08-20T14:50:50Z (17 years ago)

Author:

VMiklos <vmiklos@…>

Branches:

master

Children:

ba20c39

Parents:

94bd28f

Message:

skyped: finish cleanup
hopefully no later cosmetics changes will be necessary now

File:

• skype/skyped.py (modified) (4 diffs)

skype/skyped.py

@@ -35 +35 @@
 
 def sig_handler(signum, frame):
-        print 'Caught signal %d, exiting.' % signum
         mainloop.quit()
 
@@ -41 +40 @@
         input = fd.recv(1024)
         for i in input.split("\n"):
-        if i:
-                fd.send(skype.send(i.strip()) + "\n")
+                if i:
+                        fd.send(skype.send(i.strip()) + "\n")
         return True
+
+def server(host, port):
+        sock = socket.socket()
+        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        sock.bind((host, port))
+        sock.listen(1)
+        gobject.io_add_watch(sock, gobject.IO_IN, listener)
+
+def listener(sock, *args):
+        global conn
+        conn, addr = sock.accept()
+        fileno = conn.fileno()
+        gobject.io_add_watch(conn, gobject.IO_IN, input_handler)
+        return True
+
+def dprint(msg):
+        if len(sys.argv) > 1 and sys.argv[1] == "-d":
+                print msg
 
 class SkypeApi(dbus.service.Object):
         def __init__(self):
                 bus = dbus.SessionBus()
+                try:
+                        self.skype_api = bus.get_object(SKYPE_SERVICE, '/com/Skype')
+                except dbus.exceptions.DBusException:
+                        sys.exit("Can't find any Skype instance. Are you sure you have started Skype?")
 
-        try:
-                self.skype_api = bus.get_object(SKYPE_SERVICE, '/com/Skype')
-        except dbus.exceptions.DBusException:
-                sys.exit("Can't find any Skype instance. Are you sure you have started Skype?")
+                reply = self.send('NAME ' + CLIENT_NAME)
+                if reply != 'OK':
+                        sys.exit('Could not bind to Skype client')
 
-        reply = self.send('NAME ' + CLIENT_NAME)
-        if reply != 'OK':
-                sys.exit('Could not bind to Skype client')
-
-        reply = self.send('PROTOCOL 5')
-        dbus.service.Object.__init__(self, bus, "/com/Skype/Client", bus_name='com.Skype.API')
-
+                reply = self.send('PROTOCOL 5')
+                dbus.service.Object.__init__(self, bus, "/com/Skype/Client", bus_name='com.Skype.API')
 
         # skype -> client (async)
@@ -67 +82 @@
                 global conn
                 text = utf8_decode(msg_text)
-                print '<<', text
+                dprint('<< ' + text)
                 if conn:
                         conn.send(msg_text + "\n")
@@ -75 +90 @@
                 if not len(msg_text):
                         return
-                print '>> ', msg_text
+                dprint('>> ' + msg_text)
                 try:
                         reply = utf8_decode(self.skype_api.Invoke(utf8_encode(msg_text)))
                 except dbus.exceptions.DBusException, s:
                         reply = str(s)
-                print '<< ', reply
+                dprint('<< ' + reply)
                 return reply
 
-dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-skype = SkypeApi()
-signal.signal(signal.SIGINT, sig_handler)
-
-mainloop = gobject.MainLoop()
-
-def server(host, port):
-        '''Initialize server and start listening.'''
-        sock = socket.socket()
-        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        sock.bind((host, port))
-        sock.listen(1)
-        gobject.io_add_watch(sock, gobject.IO_IN, listener)
-def listener(sock, *args):
-        '''Asynchronous connection listener. Starts a handler for each connection.'''
-        global conn
-        conn, addr = sock.accept()
-        fileno = conn.fileno()
-        gobject.io_add_watch(conn, gobject.IO_IN, input_handler)
-        return True
 if __name__=='__main__':
+        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+        skype = SkypeApi()
+        signal.signal(signal.SIGINT, sig_handler)
+        mainloop = gobject.MainLoop()
         server('localhost', 2727)
         mainloop.run()