Changeset 7e5b4bd for protocols

Timestamp:

2013-02-11T12:56:03Z (12 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

3e23850

Parents:

b56c76c

git-author:

Mike Kazantsev <mk.fraggod@…> (11-02-13 12:56:03)

git-committer:

Miklos Vajna <vmiklos@…> (11-02-13 12:56:03)

Message:

skype: add --dont-start-skype option

For cases when case skype start/stop/restart is being handled externally.
Skype4Py seem to be able to handle client going on/off.

Location:

protocols/skype

Files:

• skyped.py (modified) (3 diffs)
• skyped.txt (modified) (1 diff)

protocols/skype/skyped.py

@@ -52 +52 @@
         if options.conn:
                 options.conn.close()
-        # shut down client if it's running
-        try:
-                skype.skype.Client.Shutdown()
-        except NameError:
-                pass
+        if not options.dont_start_skype:
+                # shut down client if it's running
+                try:
+                        skype.skype.Client.Shutdown()
+                except NameError:
+                        pass
         sys.exit("Exiting.")
 
@@ -308 +309 @@
 class SkypeApi:
         def __init__(self, mock):
+                global options
                 if not mock:
                         self.skype = Skype4Py.Skype()
                         self.skype.OnNotify = self.recv
-                        self.skype.Client.Start()
+                        if not options.dont_start_skype:
+                                self.skype.Client.Start()
                 else:
                         self.skype = MockedSkype(mock)
@@ -445 +448 @@
         parser.add_argument('-n', '--nofork',
                 action='store_true', help="don't run as daemon in the background")
+        parser.add_argument('-s', '--dont-start-skype', action='store_true',
+                help="assume that skype is running independently, don't try to start/stop it")
         parser.add_argument('-m', '--mock', help='fake interactions with skype (only useful for tests)')
         parser.add_argument('-d', '--debug', action='store_true', help='enable debug messages')

protocols/skype/skyped.txt

@@ -75 +75 @@
         Don't run as daemon in the background
 
+-s, --dont-start-skype::
+        Assume that skype is running independently, don't try to start/stop it.
+
 -p, --port::
         Set the tcp port (default: 2727)