diff options
| author | hut <hut@lavabit.com> | 2010-04-14 02:02:30 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-04-14 02:02:30 +0200 |
| commit | eba109b0ed0bf5fd6a39153d67c6150e56d988fb (patch) | |
| tree | d1adf11b9ebf3be7ac68107600fc9d93af2275a6 | |
| parent | 19c1fa4f622ffd1597943f0005ba58a30b170bb4 (diff) | |
| parent | ab5d63be742a6d6ca10443c12d561b0a1c861474 (diff) | |
| download | ranger-eba109b0ed0bf5fd6a39153d67c6150e56d988fb.tar.gz | |
Merge branch 'master' into devel
Conflicts: ranger/core/actions.py
| -rw-r--r-- | ranger/core/actions.py | 19 | ||||
| -rw-r--r-- | ranger/help/console.py | 2 | ||||
| -rw-r--r-- | ranger/help/movement.py | 2 |
3 files changed, 9 insertions, 14 deletions
diff --git a/ranger/core/actions.py b/ranger/core/actions.py index 38744d94..f96caeee 100644 --- a/ranger/core/actions.py +++ b/ranger/core/actions.py @@ -15,14 +15,19 @@ import os import shutil +from os.path import join, isdir +from os import symlink, getcwd from inspect import cleandoc import ranger from ranger.ext.direction import Direction -from ranger.shared import FileManagerAware, EnvironmentAware, SettingsAware from ranger import fsobject +from ranger.ext.direction import Direction +from ranger.shared import FileManagerAware, EnvironmentAware, SettingsAware from ranger.gui.widgets import console_mode as cmode from ranger.fsobject import File +from ranger.ext import shutil_generatorized as shutil_g +from ranger.fsobject.loader import LoadableObject class Actions(FileManagerAware, EnvironmentAware, SettingsAware): search_method = 'ctime' @@ -549,14 +554,7 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware): self.ui.browser.main_column.request_redraw() def paste_symlink(self): - from os import symlink, getcwd - from os.path import join - copied_files = self.env.copy - - if not copied_files: - return - for f in copied_files: try: symlink(f.path, join(getcwd(), f.basename)) @@ -565,9 +563,6 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware): def paste(self, overwrite=False): """Paste the selected items into the current directory""" - from os.path import join, isdir - from ranger.ext import shutil_generatorized as shutil_g - from ranger.fsobject.loader import LoadableObject copied_files = tuple(self.env.copy) if not copied_files: @@ -623,7 +618,7 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware): self.env.copy -= set(selected) if selected: for f in selected: - if os.path.isdir(f.path) and not os.path.islink(f.path): + if isdir(f.path) and not os.path.islink(f.path): try: shutil.rmtree(f.path) except OSError as err: diff --git a/ranger/help/console.py b/ranger/help/console.py index 3a4428f3..76ce9f59 100644 --- a/ranger/help/console.py +++ b/ranger/help/console.py @@ -149,7 +149,7 @@ the flag "-OO" which removes all docstrings.) ============================================================================== 3.4. The Open Console -Open this console by pressing "!" +Open this console by pressing "!" or "s" The Open Console allows you to execute shell commands: !vim * will run vim and open all files in the directory. diff --git a/ranger/help/movement.py b/ranger/help/movement.py index 4ea2b0c3..f6a70eb1 100644 --- a/ranger/help/movement.py +++ b/ranger/help/movement.py @@ -77,7 +77,7 @@ These keys work like in vim: i inspect the content of the file E edit the file - s open a shell, starting in the current directory + S open a shell, starting in the current directory Marking files allows you to use operations on multiple files at once. If there are any marked files in this directory, "yy" will copy them instead |