Adding help to the debug prompt

[theonering] / src / channel / debug_prompt.py

diff --git a/src/channel/debug_prompt.py b/src/channel/debug_prompt.py
index 79b64be..97a3ab2 100644 (file)
--- a/src/channel/debug_prompt.py
+++ b/src/channel/debug_prompt.py
@@ -6,13 +6,14 @@ import logging
 
 import telepathy
 
+import tp
 import gtk_toolbox
 
 
 _moduleLogger = logging.getLogger("channel.text")
 
 
-class DebugPromptChannel(telepathy.server.ChannelTypeText, cmd.Cmd):
+class DebugPromptChannel(tp.ChannelTypeText, cmd.Cmd):
        """
        Look into implementing ChannelInterfaceMessages for rich text formatting
        """
@@ -23,40 +24,12 @@ class DebugPromptChannel(telepathy.server.ChannelTypeText, cmd.Cmd):
 
                cmd.Cmd.__init__(self, "Debug Prompt")
                self.use_rawinput = False
-               try:
-                       # HACK Older python-telepathy way
-                       telepathy.server.ChannelTypeText.__init__(self, connection, contactHandle)
-                       self._requested = props[telepathy.interfaces.CHANNEL_INTERFACE + '.Requested']
-                       self._implement_property_get(
-                               telepathy.interfaces.CHANNEL_INTERFACE,
-                               {"Requested": lambda: self._requested}
-                       )
-               except TypeError:
-                       # HACK Newer python-telepathy way
-                       telepathy.server.ChannelTypeText.__init__(self, connection, manager, props)
+               tp.ChannelTypeText.__init__(self, connection, manager, props)
                self.__nextRecievedId = 0
                self.__lastMessageTimestamp = datetime.datetime(1, 1, 1)
 
                self.__otherHandle = contactHandle
 
-               # HACK Older python-telepathy doesn't provide this
-               self._immutable_properties = {
-                       'ChannelType': telepathy.server.interfaces.CHANNEL_INTERFACE,
-                       'TargetHandle': telepathy.server.interfaces.CHANNEL_INTERFACE,
-                       'Interfaces': telepathy.server.interfaces.CHANNEL_INTERFACE,
-                       'TargetHandleType': telepathy.server.interfaces.CHANNEL_INTERFACE,
-                       'TargetID': telepathy.server.interfaces.CHANNEL_INTERFACE,
-                       'Requested': telepathy.server.interfaces.CHANNEL_INTERFACE
-               }
-
-       def get_props(self):
-               # HACK Older python-telepathy doesn't provide this
-               props = dict()
-               for prop, iface in self._immutable_properties.items():
-                       props[iface + '.' + prop] = \
-                               self._prop_getters[iface][prop]()
-               return props
-
        @gtk_toolbox.log_exception(_moduleLogger)
        def Send(self, messageType, text):
                if messageType != telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL:
@@ -79,10 +52,8 @@ class DebugPromptChannel(telepathy.server.ChannelTypeText, cmd.Cmd):
                self.close()
 
        def close(self):
-               telepathy.server.ChannelTypeText.Close(self)
-               if self.__manager.channel_exists(self.__props):
-                       # HACK Older python-telepathy requires doing this manually
-                       self.__manager.remove_channel(self)
+               _moduleLogger.debug("Closing debug")
+               tp.ChannelTypeText.Close(self)
                self.remove_from_connection()
 
        def _report_new_message(self, message):
@@ -106,6 +77,9 @@ class DebugPromptChannel(telepathy.server.ChannelTypeText, cmd.Cmd):
                except Exception, e:
                        self._report_new_message(str(e))
 
+       def help_reset_state_machine(self):
+               self._report_new_message("Reset the refreshing state machine")
+
        def do_get_state(self, args):
                if args:
                        self._report_new_message("No arguments supported")
@@ -117,6 +91,9 @@ class DebugPromptChannel(telepathy.server.ChannelTypeText, cmd.Cmd):
                except Exception, e:
                        self._report_new_message(str(e))
 
+       def help_get_state(self):
+               self._report_new_message("Print the current state the refreshing state machine is in")
+
        def do_is_authed(self, args):
                if args:
                        self._report_new_message("No arguments supported")
@@ -128,6 +105,9 @@ class DebugPromptChannel(telepathy.server.ChannelTypeText, cmd.Cmd):
                except Exception, e:
                        self._report_new_message(str(e))
 
+       def help_is_authed(self):
+               self._report_new_message("Print whether logged in to Google Voice")
+
        def do_is_dnd(self, args):
                if args:
                        self._report_new_message("No arguments supported")
@@ -139,6 +119,9 @@ class DebugPromptChannel(telepathy.server.ChannelTypeText, cmd.Cmd):
                except Exception, e:
                        self._report_new_message(str(e))
 
+       def help_is_dnd(self):
+               self._report_new_message("Print whether Do-Not-Disturb mode enabled on the Google Voice account")
+
        def do_get_account_number(self, args):
                if args:
                        self._report_new_message("No arguments supported")
@@ -150,6 +133,9 @@ class DebugPromptChannel(telepathy.server.ChannelTypeText, cmd.Cmd):
                except Exception, e:
                        self._report_new_message(str(e))
 
+       def help_get_account_number(self):
+               self._report_new_message("Print the Google Voice account number")
+
        def do_get_callback_numbers(self, args):
                if args:
                        self._report_new_message("No arguments supported")
@@ -165,6 +151,9 @@ class DebugPromptChannel(telepathy.server.ChannelTypeText, cmd.Cmd):
                except Exception, e:
                        self._report_new_message(str(e))
 
+       def help_get_callback_numbers(self):
+               self._report_new_message("Print a list of all configured callback numbers")
+
        def do_get_callback_number(self, args):
                if args:
                        self._report_new_message("No arguments supported")
@@ -176,6 +165,9 @@ class DebugPromptChannel(telepathy.server.ChannelTypeText, cmd.Cmd):
                except Exception, e:
                        self._report_new_message(str(e))
 
+       def help_get_callback_number(self):
+               self._report_new_message("Print the callback number currently enabled")
+
        def do_call(self, args):
                if len(args) != 1:
                        self._report_new_message("Must specify the phone number and only the phone nunber")
@@ -187,6 +179,9 @@ class DebugPromptChannel(telepathy.server.ChannelTypeText, cmd.Cmd):
                except Exception, e:
                        self._report_new_message(str(e))
 
+       def help_call(self):
+               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):
                if 1 < len(args):
                        self._report_new_message("Must specify the phone number and then message")
@@ -198,3 +193,6 @@ class DebugPromptChannel(telepathy.server.ChannelTypeText, cmd.Cmd):
                        self._conn.session.backend.send_sms(number, message)
                except Exception, e:
                        self._report_new_message(str(e))
+
+       def help_send_sms(self):
+               self._report_new_message("\n".join(["send_sms NUMBER MESSAGE0 MESSAGE1 ...", "Send an sms to number NUMBER"]))