Fixing indentation issue
[theonering] / src / channel / debug_prompt.py
index 7c8df1c..47a31dd 100644 (file)
@@ -11,11 +11,12 @@ import telepathy
 
 import constants
 import tp
-import gtk_toolbox
+import util.misc as misc_utils
+import util.go_utils as gobject_utils
 import gvoice
 
 
-_moduleLogger = logging.getLogger("channel.debug_prompt")
+_moduleLogger = logging.getLogger(__name__)
 
 
 class DebugPromptChannel(tp.ChannelTypeText, cmd.Cmd):
@@ -32,7 +33,7 @@ class DebugPromptChannel(tp.ChannelTypeText, cmd.Cmd):
 
                self.__otherHandle = contactHandle
 
-       @gtk_toolbox.log_exception(_moduleLogger)
+       @misc_utils.log_exception(_moduleLogger)
        def Send(self, messageType, text):
                if messageType != telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL:
                        raise telepathy.errors.NotImplemented("Unhandled message type: %r" % messageType)
@@ -51,7 +52,7 @@ class DebugPromptChannel(tp.ChannelTypeText, cmd.Cmd):
                if stdoutData:
                        self._report_new_message(stdoutData)
 
-       @gtk_toolbox.log_exception(_moduleLogger)
+       @misc_utils.log_exception(_moduleLogger)
        def Close(self):
                self.close()
 
@@ -112,13 +113,56 @@ class DebugPromptChannel(tp.ChannelTypeText, cmd.Cmd):
        def help_get_state(self):
                self._report_new_message("Print the current state the refreshing state machine is in")
 
+       def do_get_polling(self, args):
+               if args:
+                       self._report_new_message("No arguments supported")
+                       return
+               self._report_new_message("\n".join((
+                       "Contacts:", repr(self._conn.session.addressbookStateMachine)
+               )))
+               self._report_new_message("\n".join((
+                       "Voicemail:", repr(self._conn.session.voicemailsStateMachine)
+               )))
+               self._report_new_message("\n".join((
+                       "Texts:", repr(self._conn.session.textsStateMachine)
+               )))
+
+       def help_get_polling(self):
+               self._report_new_message("Prints the frequency each of the state machines updates")
+
+       def do_get_state_status(self, args):
+               if args:
+                       self._report_new_message("No arguments supported")
+                       return
+               self._report_new_message("\n".join((
+                       "Contacts:", str(self._conn.session.addressbookStateMachine)
+               )))
+               self._report_new_message("\n".join((
+                       "Voicemail:", str(self._conn.session.voicemailsStateMachine)
+               )))
+               self._report_new_message("\n".join((
+                       "Texts:", str(self._conn.session.textsStateMachine)
+               )))
+
+       def help_get_state_status(self):
+               self._report_new_message("Prints the current setting for the state machines")
+
        def do_is_authed(self, args):
+               le = gobject_utils.AsyncLinearExecution(self._conn.session.pool, self._is_authed)
+               le.start(args)
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _is_authed(self, args):
                if args:
                        self._report_new_message("No arguments supported")
                        return
 
                try:
-                       isAuthed = self._conn.session.backend.is_authed()
+                       isAuthed = yield (
+                               self._conn.session.backend.is_authed,
+                               (),
+                               {}
+                       )
                        self._report_new_message(str(isAuthed))
                except Exception, e:
                        self._report_new_message(str(e))
@@ -127,12 +171,21 @@ class DebugPromptChannel(tp.ChannelTypeText, cmd.Cmd):
                self._report_new_message("Print whether logged in to Google Voice")
 
        def do_is_dnd(self, args):
+               le = gobject_utils.AsyncLinearExecution(self._conn.session.pool, self._is_dnd)
+               le.start(args)
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _is_dnd(self, args):
                if args:
                        self._report_new_message("No arguments supported")
                        return
 
                try:
-                       isDnd = self._conn.session.backend.is_dnd()
+                       isDnd = yield (
+                               self._conn.session.backend.is_dnd,
+                               (),
+                               {}
+                       )
                        self._report_new_message(str(isDnd))
                except Exception, e:
                        self._report_new_message(str(e))
@@ -201,13 +254,22 @@ class DebugPromptChannel(tp.ChannelTypeText, cmd.Cmd):
                self._report_new_message("Print the callback number currently enabled")
 
        def do_call(self, args):
+               le = gobject_utils.AsyncLinearExecution(self._conn.session.pool, self._call)
+               le.start(args)
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _call(self, args):
                if not args:
                        self._report_new_message("Must specify the phone number and only the phone nunber")
                        return
 
                try:
                        number = args
-                       self._conn.session.backend.call(number)
+                       yield (
+                               self._conn.session.backend.call,
+                               (number),
+                               {}
+                       )
                except Exception, e:
                        self._report_new_message(str(e))
 
@@ -215,6 +277,11 @@ class DebugPromptChannel(tp.ChannelTypeText, cmd.Cmd):
                self._report_new_message("\n".join(["call NUMBER", "Initiate a callback, Google forwarding the call to the callback number"]))
 
        def do_send_sms(self, args):
+               le = gobject_utils.AsyncLinearExecution(self._conn.session.pool, self._send_sms)
+               le.start(args)
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _send_sms(self, args):
                args = args.split(" ")
                if 1 < len(args):
                        self._report_new_message("Must specify the phone number and then message")
@@ -223,7 +290,11 @@ class DebugPromptChannel(tp.ChannelTypeText, cmd.Cmd):
                try:
                        number = args[0]
                        message = " ".join(args[1:])
-                       self._conn.session.backend.send_sms(number, message)
+                       yield (
+                               self._conn.session.backend.send_sms,
+                               ([number], message),
+                               {},
+                       )
                except Exception, e:
                        self._report_new_message(str(e))
 
@@ -239,30 +310,13 @@ class DebugPromptChannel(tp.ChannelTypeText, cmd.Cmd):
        def help_version(self):
                self._report_new_message("Prints the version (hint: %s-%s)" % (constants.__version__, constants.__build__))
 
-       def do_get_polling(self, args):
-               if args:
-                       self._report_new_message("No arguments supported")
-                       return
-               self._report_new_message("\n".join((
-                       "Contacts:", repr(self._conn.session.addressbookStateMachine)
-               )))
-               self._report_new_message("\n".join((
-                       "Voicemail:", repr(self._conn.session.voicemailsStateMachine)
-               )))
-               self._report_new_message("\n".join((
-                       "Texts:", repr(self._conn.session.textsStateMachine)
-               )))
-
-       def help_get_polling(self):
-               self._report_new_message("Prints the frequency each of the state machines updates")
-
        def do_grab_log(self, args):
                if args:
                        self._report_new_message("No arguments supported")
                        return
 
                try:
-                       publishProps = self._conn._generate_props(telepathy.CHANNEL_TYPE_FILE_TRANSFER, self.__otherHandle, False)
+                       publishProps = self._conn.generate_props(telepathy.CHANNEL_TYPE_FILE_TRANSFER, self.__otherHandle, False)
                        self._conn._channel_manager.channel_for_props(publishProps, signal=True)
                except Exception, e:
                        self._report_new_message(str(e))