about summary refs log tree commit diff stats
path: root/ranger/core/actions.py
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2011-09-29 01:04:23 +0200
committerhut <hut@lavabit.com>2011-09-29 01:07:01 +0200
commit7eaef14ed1ec4b5ffde48c11827040f9ad711653 (patch)
tree7bc775a03fbf7061bcc51c3ba0d0354467bcaa4d /ranger/core/actions.py
parent9d4aa3bd0441c750601eb0df57ee6c32eb8d19c9 (diff)
downloadranger-7eaef14ed1ec4b5ffde48c11827040f9ad711653.tar.gz
core.actions: replaced internal help with 'man ranger'
I want to remove redundant documentation.  The missing information will
be added to the man page.
Diffstat (limited to 'ranger/core/actions.py')
-rw-r--r--ranger/core/actions.py38
1 files changed, 9 insertions, 29 deletions
diff --git a/ranger/core/actions.py b/ranger/core/actions.py
index 328d4365..59aac65c 100644
--- a/ranger/core/actions.py
+++ b/ranger/core/actions.py
@@ -530,35 +530,15 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware):
 		lines = cleandoc(command.__doc__).split('\n')
 		pager.set_source(lines)
 
-	def display_help(self, topic='index', narg=None):
-		if not hasattr(self.ui, 'open_pager'):
-			return
-
-		from ranger.help import get_help, get_help_by_index
-
-		scroll_to_line = 0
-		if narg is not None:
-			chapter, subchapter = int(str(narg)[0]), str(narg)[1:]
-			help_text = get_help_by_index(chapter)
-			lines = help_text.split('\n')
-			if chapter:
-				chapternumber = str(chapter) + '.' + subchapter + '. '
-				skip_to_content = True
-				for line_number, line in enumerate(lines):
-					if skip_to_content:
-						if line[:10] == '==========':
-							skip_to_content = False
-					else:
-						if line.startswith(chapternumber):
-							scroll_to_line = line_number
-		else:
-			help_text = get_help(topic)
-			lines = help_text.split('\n')
-
-		pager = self.ui.open_pager()
-		pager.set_source(lines)
-		pager.markup = 'help'
-		pager.move(down=scroll_to_line)
+	def display_help(self, narg=None):
+		manualpath = self.relpath('../doc/ranger.1')
+		if os.path.exists(manualpath):
+			process = self.run(['man', manualpath])
+			if process.poll() != 16:
+				return
+		process = self.run(['man', 'ranger'])
+		if process.poll() == 16:
+			self.notify("Could not find manpage.", bad=True)
 
 	def display_log(self):
 		if not hasattr(self.ui, 'open_pager'):