Changeset 925dcd

Timestamp:

04/28/2009 01:15:12 AM (16 years ago)

Author:

Andrew Resch <andrewresch@gmail.com>

Branches:

2.0.x, develop, extjs4-port, master

Children:

7b72d7

Parents:

d4cfeb

Message:

Fix up tab-completion to use the commands 'complete' method

Location:

deluge/ui/console

Files:

• commands/config.py (modified) (1 diff)
• commands/debug.py (modified) (2 diffs)
• commands/help.py (modified) (1 diff)
• commands/info.py (modified) (2 diffs)
• commands/pause.py (modified) (1 diff)
• commands/resume.py (modified) (1 diff)
• commands/rm.py (modified) (1 diff)
• main.py (modified) (4 diffs)

deluge/ui/console/commands/config.py

@@ -135 +135 @@
         client.core.set_config({key: val}).addCallback(on_set_config)
 
-"""
-    def complete(self, text, *args):
-        keys = []
-        def _on_get_config(config):
-            keys.extend(config.keys())
-        client.get_config(_on_get_config)
-        client.force_call()
-        return [ k for k in keys if k.startswith(text) ]
-
-    def split(self, text):
-        return str.split(text)"""
+    def complete(self, text):
+        return [ k for k in component.get("CoreConfig").keys() if k.startswith(text) ]

deluge/ui/console/commands/debug.py

@@ -27 +27 @@
 import deluge.ui.console.colors as colors
 import deluge.log
+import deluge.component as component
 
 class Command(BaseCommand):
@@ -37 +38 @@
             deluge.log.setLoggerLevel("error")
         else:
-            console.write("{!error!}%s" % usage)
+            component.get("ConsoleUI").write("{!error!}%s" % usage)
 
-#    def complete(self, text, *args):
-#        return [ x for x in ['on', 'off'] if x.startswith(text) ]
+    def complete(self, text):
+        return [x for x in ['on', 'off'] if x.startswith(text)]

deluge/ui/console/commands/help.py

@@ -55 +55 @@
             self.console.write(" ")
             self.console.write('For help on a specific command, use "<command> --help"')
+
+    def complete(self, line):
+        return [x for x in component.get("ConsoleUI")._commands if x.startswith(line)]

deluge/ui/console/commands/info.py

@@ -93 +93 @@
              "       You can give the first few characters of a torrent-id to identify the torrent."
 
-
     def handle(self, *args, **options):
         self.console = component.get("ConsoleUI")
@@ -198 +197 @@
 
                 self.console.write(s[:-1])
+
+    def complete(self, line):
+        # We use the ConsoleUI torrent tab complete method
+        return component.get("ConsoleUI").tab_complete_torrent(line)

deluge/ui/console/commands/pause.py

@@ -47 +47 @@
         if torrent_ids:
             client.core.pause_torrent(torrent_ids)
+
+    def complete(self, line):
+        # We use the ConsoleUI torrent tab complete method
+        return component.get("ConsoleUI").tab_complete_torrent(line)

deluge/ui/console/commands/resume.py

@@ -47 +47 @@
         if torrent_ids:
             client.core.resume_torrent(torrent_ids)
+
+    def complete(self, line):
+        # We use the ConsoleUI torrent tab complete method
+        return component.get("ConsoleUI").tab_complete_torrent(line)

deluge/ui/console/commands/rm.py

@@ -51 +51 @@
 
         client.core.remove_torrent(torrent_ids, options['remove_data'])
+
+    def complete(self, line):
+        # We use the ConsoleUI torrent tab complete method
+        return component.get("ConsoleUI").tab_complete_torrent(line)

deluge/ui/console/main.py

@@ -226 +226 @@
         """
         Called when the user hits 'tab' and will autocomplete or show options.
+        If a command is already supplied in the line, this function will call the
+        complete method of the command.
 
         :param line: str, the current input string
@@ -238 +240 @@
         # command that needs to be completed.
         if " " not in line:
-            if len(line) == 0:
-                # We only print these out if it's a second_hit
-                if second_hit:
-                    # There is nothing in line so just print out all possible commands
-                    # and return.
-                    self.write(" ")
-                    for cmd in self._commands:
-                        self.write(cmd)
-                return ("", 0)
+            possible_matches = []
             # Iterate through the commands looking for ones that startwith the
             # line.
-            possible_matches = []
             for cmd in self._commands:
                 if cmd.startswith(line):
@@ -255 +248 @@
 
             line_prefix = ""
-
         else:
-            # This isn't a command so treat it as a torrent_id or torrent name
-            name = line.split(" ")[-1]
-            if len(name) == 0:
-                # There is nothing in the string, so just display all possible options
-                if second_hit:
-                    self.write(" ")
-                    # Display all torrent_ids and torrent names
-                    for torrent_id, name in self.torrents:
-                        self.write(torrent_id)
-                        self.write(name)
+            cmd = line.split(" ")[0]
+            if cmd in self._commands:
+                # Call the command's complete method to get 'er done
+                possible_matches = self._commands[cmd].complete(line.split(" ")[-1])
+                line_prefix = " ".join(line.split(" ")[:-1]) + " "
+            else:
+                # This is a bogus command
                 return (line, cursor)
-
-            # Find all possible matches
-            possible_matches = []
-            for torrent_id, torrent_name in self.torrents:
-                if torrent_id.startswith(name):
-                    possible_matches.append(torrent_id)
-                elif torrent_name.startswith(name):
-                    possible_matches.append(torrent_name)
-
-            # Set the line prefix that should be prepended to any input line match
-            line_prefix = " ".join(line.split(" ")[:-1]) + " "
 
         # No matches, so just return what we got passed
@@ -293 +271 @@
                 # Only print these out if it's a second_hit
                 self.write(" ")
-                for cmd in possible_matches:
-                    self.write(cmd)
+                for match in possible_matches:
+                    self.write(match)
             return (line, cursor)
+
+    def tab_complete_torrent(self, line):
+        """
+        Completes torrent_ids or names.
+
+        :param line: str, the string to complete
+
+        :returns: list of matches
+
+        """
+
+        possible_matches = []
+
+        # Find all possible matches
+        for torrent_id, torrent_name in self.torrents:
+            if torrent_id.startswith(line):
+                possible_matches.append(torrent_id)
+            if torrent_name.startswith(line):
+                possible_matches.append(torrent_name)
+
+        return possible_matches
 
     def get_torrent_name(self, torrent_id):