config.commands: :linemode and :default_linemode tab completion

2 files changed, 31 insertions, 46 deletions

diff --git a/ranger/config/commands.py b/ranger/config/commands.py
index a92dfa80..9bb203b9 100644
--- a/ranger/config/commands.py
+++ b/ranger/config/commands.py
@@ -423,6 +423,11 @@ class default_linemode(Command):
             for col in self.fm.ui.browser.columns:
                 col.need_redraw = True
 
+    def tab(self):
+        mode = self.arg(1)
+        return (self.arg(0) + " " + linemode
+                for linemode in self.fm.thisfile.linemode_dict.keys())
+
 
 class quit(Command):
     """:quit
@@ -1416,3 +1421,29 @@ class meta(prompt_metadata):
         metadata = self.fm.metadata.get_metadata(self.fm.thisfile.path)
         if key in metadata and metadata[key]:
             return self.arg(0) + " " + metadata[key]
+
+class linemode(default_linemode):
+    """
+    :linemode <mode>
+
+    Change what is displayed as a filename.
+
+    - "mode" may be any of the defined linemodes (see: ranger.core.linemode).
+      "normal" is mapped to "filename".
+    """
+
+    def execute(self):
+        mode = self.arg(1)
+
+        if mode == "normal":
+            mode = DEFAULT_LINEMODE
+
+        if mode not in self.fm.thisfile.linemode_dict:
+            self.notify("Unhandled linemode: `%s'" % mode, bad=True)
+            return
+
+        self.fm.thisdir._set_linemode_of_children(mode)
+
+        # Ask the browsercolumns to redraw
+        for col in self.fm.ui.browser.columns:
+            col.need_redraw = True
diff --git a/ranger/core/actions.py b/ranger/core/actions.py
index 33903859..9c620f20 100644
--- a/ranger/core/actions.py
+++ b/ranger/core/actions.py
@@ -154,52 +154,6 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware):
         """Redraw the window"""
         self.ui.redraw_window()
 
-    def linemode(self, mode, directory=None, depth=0):
-        """
-        Change what is displayed as a filename.
-
-        - "mode" may be: "filename", "permissions", "metatitle", the mode
-          "normal" is mapped to "filename".
-        - "directory" specifies the directory. None means the current directory
-        - "depth" specifies the recursion depth
-        """
-
-        if mode == "normal":
-            mode = DEFAULT_LINEMODE
-
-        if mode not in self.thisfile.linemode_dict:
-            self.notify("Unhandled linemode: `%s'" % mode, bad=True)
-            return
-
-        if directory is None:
-            directory = self.fm.thisdir
-
-        directories = set([directory])
-        bucket = set()
-
-        current_depth = 0
-
-        while True:
-            if current_depth >= depth:
-                for direct in directories:
-                    direct._set_linemode_of_children(mode)
-                break
-
-            else:
-                for direct in directories:
-                    direct._set_linemode_of_children(mode)
-                    for file_ in direct.files:
-                        if file_.is_directory:
-                            bucket.add(file_)
-
-                directories, bucket = bucket, directories
-                bucket.clear()
-                current_depth += 1
-
-        # Ask the browsercolumns to redraw
-        for col in self.ui.browser.columns:
-            col.need_redraw = True
-
     def open_console(self, string='', prompt=None, position=None):
         """Open the console"""
         self.change_mode('normal')