Changeset eeab8bc

Timestamp:

2010-12-17T20:57:04Z (14 years ago)

Author:

Philippe Crama <pcfeb0009@…>

Branches:

master

Children:

5a54ec8

Parents:

a618ea6

Message:

Remove dependency on gobject and use select standard module

This is a restart of the windows-skyped branch based on the updated
bitlbee-skype using the builtin SSL libs of Python.

This version connects, but hangs for long times... to be continued

File:

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

skype/skyped.py

@@ -26 +26 @@
 import locale
 import time
-import gobject
 import socket
 import getopt
@@ -34 +33 @@
 from traceback import print_exception
 import ssl
+import select
 
 __version__ = "0.1.1"
@@ -42 +42 @@
         if type != KeyboardInterrupt:
                 print_exception(type, value, tb)
-        gobject.MainLoop().quit()
         options.conn.close()
         # shut down client if it's running
@@ -94 +93 @@
 
 def bitlbee_idle_handler(skype):
+        global options
         if options.conn:
                 try:
@@ -103 +103 @@
         return True
 
-def server(host, port):
+def server(host, port, skype):
         global options
         sock = socket.socket()
@@ -109 +109 @@
         sock.bind((host, port))
         sock.listen(1)
-        gobject.io_add_watch(sock, gobject.IO_IN, listener)
-
-def listener(sock, *args):
+        dprint("Waiting for connection...")
+        listener(sock, skype)
+
+def listener(sock, skype):
         global options
         rawsock, addr = sock.accept()
@@ -140 +141 @@
                 dprint("Username and password OK.")
                 options.conn.send("PASSWORD OK\n")
-                gobject.io_add_watch(options.conn, gobject.IO_IN, input_handler)
+                serverloop(options, skype)
                 return True
         else:
@@ -191 +192 @@
                         if options.conn:
                                 try:
+                                        # I called the send function really_send
                                         send(options.conn, e + "\n")
                                 except Exception, s:
@@ -252 +254 @@
         -v      --version       display version information""" % (self.cfgpath, self.host, self.port)
                 sys.exit(ret)
+
+def serverloop(options, skype):
+        timeout = 1; # in seconds
+        skype_ping_period = 5
+        bitlbee_ping_period = 30
+        skype_ping_start_time = time.time()
+        bitlbee_ping_start_time = time.time()
+        while 1:
+                ready_to_read, ready_to_write, in_error = \
+                        select.select([options.conn], [], [], timeout)
+                now = time.time()
+                if len(ready_to_read) == 1:
+                        input_handler(ready_to_read.pop(), options)
+                        # don't ping bitlbee/skype if they already received data
+                        bitlbee_ping_start_time = now
+                        skype_ping_start_time = now
+                if now - skype_ping_period > skype_ping_start_time:
+                        skype_idle_handler(skype)
+                        skype_ping_start_time = now
+                if now - bitlbee_ping_period > bitlbee_ping_start_time:
+                        bitlbee_idle_handler(skype)
+                        bitlbee_ping_start_time = now
 
 if __name__=='__main__':
@@ -317 +341 @@
         else:
                 dprint('skyped is started on port %s' % options.port)
-        server(options.host, options.port)
         try:
                 skype = SkypeApi()
         except Skype4Py.SkypeAPIError, s:
                 sys.exit("%s. Are you sure you have started Skype?" % s)
-        gobject.timeout_add(2000, skype_idle_handler, skype)
-        gobject.timeout_add(60000, bitlbee_idle_handler, skype)
-        gobject.MainLoop().run()
+        server(options.host, options.port, skype)