Changeset 8237df5

Timestamp:

2007-08-21T22:33:14Z (17 years ago)

Author:

VMiklos <vmiklos@…>

Branches:

master

Children:

43e2e9d

Parents:

924d0f2

Message:

skyped: added daemon code

Location:

skype

Files:

• HACKING (modified) (1 diff)
• NEWS (modified) (1 diff)
• README (modified) (1 diff)
• skyped.py (modified) (4 diffs)

skype/HACKING

@@ -1 +1 @@
 I use the following commands to debug bitlbee itself:
 
-gdb bitlbee
+gdb ./bitlbee
 run -v -n -D
 
 For skyped:
 
-python skyped.py -d
+python skyped.py -n -d

skype/NEWS

@@ -1 +1 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+              - skyped now runs as daemon in the background by default
               - skyped now automatically reconnects on Skype restarts
 0.1.0         - initial release

skype/README

@@ -122 +122 @@
 == What needs to be done (aka. TODO)
 
-- `--daemon` option for `skyped`
-
 - document how do I run skype on a server using vnc
 

skype/skyped.py

@@ -25 +25 @@
 #
 
-# makepkg configuration
-""" GPL """
 import sys
+import os
 import signal
 import locale
@@ -36 +35 @@
 import gobject
 import socket
+import getopt
 
+__version__ = "0.1.1"
 
 SKYPE_SERVICE = 'com.Skype.API'
@@ -70 +71 @@
 
 def dprint(msg):
-        if len(sys.argv) > 1 and sys.argv[1] == "-d":
+        global options
+
+        if options.debug:
                 print msg
 
@@ -114 +117 @@
                 return reply
 
+class Options:
+        def __init__(self):
+                self.daemon = True
+                self.debug = False
+                self.help = False
+                self.port = 2727
+                self.version = False
+
+        def usage(self, ret):
+                print """Usage: skyped [OPTION]...
+
+skyped is a daemon that acts as a tcp server on top of a Skype instance.
+
+Options:
+        -d      --debug         enable debug messages
+        -h      --help          this help
+        -n      --nofork        don't run as daemon in the background
+        -p      --port          set the tcp port (default: %d)
+        -v      --version       display version information""" % self.port
+                sys.exit(ret)
+
 if __name__=='__main__':
+        options = Options()
+        try:
+                opts, args = getopt.getopt(sys.argv[1:], "dhnp:v", ["daemon", "help", "nofork", "port=", "version"])
+        except getopt.GetoptError:
+                options.usage(1)
+        for opt, arg in opts:
+                if opt in ("-d", "--debug"):
+                        options.debug = True
+                elif opt in ("-h", "--help"):
+                        options.help = True
+                elif opt in ("-n", "--nofork"):
+                        options.daemon = False
+                elif opt in ("-p", "--port"):
+                        options.port = arg
+                elif opt in ("-v", "--version"):
+                        options.version = True
+        if options.help:
+                options.usage(0)
+        elif options.version:
+                print "skyped %s" % __version__
+                sys.exit(0)
+        elif options.daemon:
+                pid = os.fork()
+                if pid == 0:
+                        nullin = file('/dev/null', 'r')
+                        nullout = file('/dev/null', 'w')
+                        os.dup2(nullin.fileno(), sys.stdin.fileno())
+                        os.dup2(nullout.fileno(), sys.stdout.fileno())
+                        os.dup2(nullout.fileno(), sys.stderr.fileno())
+                else:
+                        print 'skyped is started on port %s, pid: %d' % (options.port, pid)
+                        sys.exit(0)
         dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
         signal.signal(signal.SIGINT, sig_handler)
         mainloop = gobject.MainLoop()
-        server('localhost', 2727)
+        server('localhost', options.port)
         while True:
                 skype = SkypeApi()