Ticket #2097: console-additions-and-spelling-fix.patch

deluge/ui/console/commands/info.py

@@ -97 +97 @@
 
     option_list = BaseCommand.option_list + (
             make_option('-v', '--verbose', action='store_true', default=False, dest='verbose',
-                        help='shows more information per torrent'),
+                        help='Shows more information per torrent'),
+            make_option('-I', '--intense-match', action='store_true', default=False, dest='intense_match',
+                        help='Consider torrents which have the pattern anywhere in the name a match(slower)'),
             make_option('-i', '--id', action='store_true', default=False, dest='tid',
-                        help='use internal id instead of torrent name'),
+                        help='Use internal id instead of torrent name'),
             make_option('-s', '--state', action='store', dest='state',
                         help="Only retrieve torrents in state STATE. "
                         "Allowable values are: %s "%(", ".join(states))),
     )
 
-    usage =  "Usage: info [-v | -i | -s <state>] [<torrent-id> [<torrent-id> ...]]\n"\
+    usage =  "Usage: info [-v | -i | -I | -s <state>] [<torrent-id> [<torrent-id> ...]]\n"\
              "       info -s <state> will show only torrents in state <state>\n"\
              "       You can give the first few characters of a torrent-id to identify the torrent."
 
@@ -116 +118 @@
         # Compile a list of torrent_ids to request the status of
         torrent_ids = []
         for arg in args:
-            torrent_ids.extend(self.console.match_torrent(arg))
+            torrent_ids.extend(self.console.match_torrent(arg, options['intense_match']))
 
         if not args:
-            torrent_ids.extend(self.console.match_torrent(""))
+            torrent_ids.extend(self.console.match_torrent("", options['intense_match']))
 
         def on_torrents_status(status):
             # Print out the information for each torrent
@@ -134 +136 @@
         if options["state"]:
             if options["state"] not in states:
                 self.console.write("Invalid state: %s"%options["state"])
-                self.console.write("Allowble values are: %s."%(", ".join(states)))
+                self.console.write("Allowable values are: %s."%(", ".join(states)))
                 return
             else:
                 status_dict["state"] = options["state"]

deluge/ui/console/commands/move.py

@@ -33 +33 @@
 #
 #
 
+import os.path
+from optparse import make_option
+
 from deluge.ui.console.main import BaseCommand
 from deluge.ui.client import client
 import deluge.component as component
 
-import os.path
-
-
 class Command(BaseCommand):
     """Move torrents' storage location"""
-    usage = "Usage: move <torrent-id> [<torrent-id> ...] <path>"
+    option_list = BaseCommand.option_list + (
+            make_option('-I', '--intense-match', action='store_true', default=False, dest='intense_match',
+                        help='Consider torrents which have the pattern anywhere in the name a match(slower)'),
+    )
+    usage = "Usage: move [ -I ] <torrent-id> [<torrent-id> ...] <path>"
 
     def handle(self, *args, **options):
         self.console = component.get("ConsoleUI")
@@ -59 +63 @@
 
         ids = []
         for i in args[:-1]:
-            ids.extend(self.console.match_torrent(i))
+            ids.extend(self.console.match_torrent(i, options['intense_match']))
 
         names = []
         for i in ids:

deluge/ui/console/commands/pause.py

@@ -33 +33 @@
 #    statement from all source files in the program, then also delete it here.
 #
 #
+from optparse import make_option
+
 from deluge.ui.console.main import BaseCommand
 from deluge.ui.client import client
 import deluge.ui.console.colors as colors
@@ -40 +42 @@
 
 class Command(BaseCommand):
     """Pause a torrent"""
-    usage = "Usage: pause [ * | <torrent-id> [<torrent-id> ...] ]"
+    option_list = BaseCommand.option_list + (
+            make_option('-I', '--intense-match', action='store_true', default=False, dest='intense_match',
+                        help='Consider torrents which have the pattern anywhere in the name a match(slower)'),
+    )
+    usage = "Usage: pause [ -I ] [ * | <torrent-id> [<torrent-id> ...] ]"
     def handle(self, *args, **options):
         self.console = component.get("ConsoleUI")
 
@@ -53 +59 @@
 
         torrent_ids = []
         for arg in args:
-            torrent_ids.extend(self.console.match_torrent(arg))
+            torrent_ids.extend(self.console.match_torrent(arg, options['intense_match']))
 
         if torrent_ids:
             return client.core.pause_torrent(torrent_ids)

deluge/ui/console/commands/recheck.py

@@ -32 +32 @@
 #    statement from all source files in the program, then also delete it here.
 #
 #
+from optparse import make_option
+
 from deluge.ui.console.main import BaseCommand
 from deluge.ui.client import client
 import deluge.ui.console.colors as colors
@@ -39 +41 @@
 
 class Command(BaseCommand):
     """Forces a recheck of the torrent data"""
-    usage = "Usage: recheck [ * | <torrent-id> [<torrent-id> ...] ]"
+    option_list = BaseCommand.option_list + (
+            make_option('-I', '--intense-match', action='store_true', default=False, dest='intense_match',
+                        help='Consider torrents which have the pattern anywhere in the name a match(slower)'),
+    )
+    usage = "Usage: recheck [ -I ] [ * | <torrent-id> [<torrent-id> ...] ]"
     def handle(self, *args, **options):
         self.console = component.get("ConsoleUI")
 
@@ -47 +53 @@
             self.console.write(self.usage)
             return
         if len(args) > 0 and args[0].lower() == '*':
-            client.core.force_recheck(self.console.match_torrent(""))
+            client.core.force_recheck(self.console.match_torrent("", options['intense_match']))
             return
 
         torrent_ids = []
         for arg in args:
-            torrent_ids.extend(self.console.match_torrent(arg))
+            torrent_ids.extend(self.console.match_torrent(arg, options['intense_match']))
 
         if torrent_ids:
             return client.core.force_recheck(torrent_ids)

deluge/ui/console/commands/resume.py

@@ -33 +33 @@
 #    statement from all source files in the program, then also delete it here.
 #
 #
+from optparse import make_option
 
 from deluge.ui.console.main import BaseCommand
 from deluge.ui.client import client
@@ -41 +42 @@
 
 class Command(BaseCommand):
     """Resume a torrent"""
-    usage = "Usage: resume [ * | <torrent-id> [<torrent-id> ...] ]"
+    option_list = BaseCommand.option_list + (
+            make_option('-I', '--intense-match', action='store_true', default=False, dest='intense_match',
+                        help='Consider torrents which have the pattern anywhere in the name a match(slower)'),
+    )
+    usage = "Usage: resume [ -I ] [ * | <torrent-id> [<torrent-id> ...] ]"
     def handle(self, *args, **options):
         self.console = component.get("ConsoleUI")
 
@@ -54 +59 @@
 
         torrent_ids = []
         for arg in args:
-            torrent_ids.extend(self.console.match_torrent(arg))
+            torrent_ids.extend(self.console.match_torrent(arg, options['intense_match']))
 
         if torrent_ids:
             return client.core.resume_torrent(torrent_ids)

deluge/ui/console/commands/rm.py

@@ -33 +33 @@
 #    statement from all source files in the program, then also delete it here.
 #
 #
+from optparse import make_option
+
 from deluge.ui.console.main import BaseCommand
 import deluge.ui.console.colors as colors
 from deluge.ui.client import client
 import deluge.component as component
 
-from optparse import make_option
-
-
 class Command(BaseCommand):
     """Remove a torrent"""
-    usage = "Usage: rm <torrent-id>"
-    aliases = ['del']
-
     option_list = BaseCommand.option_list + (
+            make_option('-I', '--intense-match', action='store_true', default=False, dest='intense_match',
+                        help='Consider torrents which have the pattern anywhere in the name a match(slower)'),
             make_option('--remove_data', action='store_true', default=False,
                         help="remove the torrent's data"),
     )
+    usage = "Usage: rm [ -I ] <torrent-id>"
+    aliases = ['del']
 
     def handle(self, *args, **options):
         self.console = component.get("ConsoleUI")
@@ -58 +58 @@
 
         torrent_ids = []
         for arg in args:
-            torrent_ids.extend(self.console.match_torrent(arg))
+            torrent_ids.extend(self.console.match_torrent(arg, options['intense_match']))
 
         for torrent_id in torrent_ids:
             client.core.remove_torrent(torrent_id, options['remove_data'])

deluge/ui/console/commands/update-tracker.py

@@ -33 +33 @@
 #    statement from all source files in the program, then also delete it here.
 #
 #
+from optparse import make_option
+
 from deluge.ui.console.main import BaseCommand
 import deluge.ui.console.colors as colors
 from deluge.ui.client import client
 import deluge.component as component
 
-from optparse import make_option
-
-
 class Command(BaseCommand):
     """Update tracker for torrent(s)"""
-    usage = "Usage: update-tracker [ * | <torrent-id> [<torrent-id> ...] ]"
+    option_list = BaseCommand.option_list + (
+            make_option('-I', '--intense-match', action='store_true', default=False, dest='intense_match',
+                        help='Consider torrents which have the pattern anywhere in the name a match(slower)'),
+    )
+    usage = "Usage: update-tracker [ -I ] [ * | <torrent-id> [<torrent-id> ...] ]"
     aliases = ['reannounce']
 
     def handle(self, *args, **options):
@@ -56 +59 @@
             
         torrent_ids = []
         for arg in args:
-            torrent_ids.extend(self.console.match_torrent(arg))
+            torrent_ids.extend(self.console.match_torrent(arg, options['intense_match']))
 
         client.core.force_reannounce(torrent_ids)
 

deluge/ui/console/main.py

@@ -293 +293 @@
             client.core.get_session_state().addCallback(on_session_state)
 
             
-    def match_torrent(self, string):
+    def match_torrent(self, string, intense_match):
         """
         Returns a list of torrent_id matches for the string.  It will search both
         torrent_ids and torrent names, but will only return torrent_ids.
 
         :param string: str, the string to match on
+        :param intense_match: bool, whether we want to match anywhere or just from beginning
 
         :returns: list of matching torrent_ids. Will return an empty list if
             no matches are found.
 
         """
         if self.interactive and isinstance(self.screen,deluge.ui.console.modes.legacy.Legacy):
-            return self.screen.match_torrent(string)
+            return self.screen.match_torrent(string, intense_match)
         ret = []
         string = string.decode(self.encoding)
-        for tid, name in self.torrents:
-            if tid.startswith(string) or name.startswith(string):
-                ret.append(tid)
+        if intense_match:
+            for tid, name in self.torrents:
+                if tid.startswith(string) or string in name:
+                    ret.append(tid)
+        else:
+            for tid, name in self.torrents:
+                if tid.startswith(string) or name.startswith(string):
+                    ret.append(tid)
 
         return ret
 

deluge/ui/console/modes/legacy.py

@@ -578 +578 @@
 
         return None
 
-    def match_torrent(self, string):
+    def match_torrent(self, string, intense_match):
         """
         Returns a list of torrent_id matches for the string.  It will search both
         torrent_ids and torrent names, but will only return torrent_ids.
 
         :param string: str, the string to match on
+        :param intense_match: bool, whether we want to match anywhere or just from beginning
 
         :returns: list of matching torrent_ids. Will return an empty list if
             no matches are found.
 
         """
         ret = []
-        for tid, name in self.torrents:
-            if tid.startswith(string) or name.startswith(string):
-                ret.append(tid)
+        if intense_match:
+            for tid, name in self.torrents:
+                if tid.startswith(string) or string in name:
+                    ret.append(tid)
+        else:
+            for tid, name in self.torrents:
+                if tid.startswith(string) or name.startswith(string):
+                    ret.append(tid)
 
         return ret