summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-03-14 19:38:36 +0100
committerhut <hut@lavabit.com>2010-03-14 19:38:36 +0100
commita44749f63848740e95d1f168d73300c874ecf6c5 (patch)
tree5d22d43c1fa7e71d1c5f6a51c21b0df17907b1c4
parent9341b0d68e0a87e8187fbfa3d6c85cf10f2fe2d1 (diff)
downloadranger-a44749f63848740e95d1f168d73300c874ecf6c5.tar.gz
use `file` for reliably identifying text files
-rw-r--r--ranger/defaults/apps.py5
-rw-r--r--ranger/fsobject/fsobject.py11
2 files changed, 15 insertions, 1 deletions
diff --git a/ranger/defaults/apps.py b/ranger/defaults/apps.py
index 7e522df9..01f11f24 100644
--- a/ranger/defaults/apps.py
+++ b/ranger/defaults/apps.py
@@ -80,9 +80,12 @@ class CustomApplications(Applications):
 		if f.image:
 			return self.either(c, 'feh', 'eye_of_gnome', 'mirage')
 
-		if f.document:
+		if f.document or f.filetype.startswith('text'):
 			return self.app_editor(c)
 
+		raise Exception(f.filetype)
+
+
 	# ----------------------------------------- application definitions
 	def app_pager(self, c):
 		return tup('less', *c)
diff --git a/ranger/fsobject/fsobject.py b/ranger/fsobject/fsobject.py
index 80ce1e48..8ad6d489 100644
--- a/ranger/fsobject/fsobject.py
+++ b/ranger/fsobject/fsobject.py
@@ -30,6 +30,7 @@ class FileSystemObject(MimeTypeAware, FileManagerAware):
 	basename = None
 	basename_lower = None
 	_shell_escaped_basename = None
+	_filetype = None
 	dirname = None
 	extension = None
 	exists = False
@@ -86,6 +87,16 @@ class FileSystemObject(MimeTypeAware, FileManagerAware):
 			self._shell_escaped_basename = shell_escape(self.basename)
 		return self._shell_escaped_basename
 
+	@property
+	def filetype(self):
+		if self._filetype is None:
+			import subprocess
+			got = subprocess.Popen(["file", '-Lb', '--mime-type', self.path],\
+					stdout=subprocess.PIPE) \
+					.communicate()[0]
+			self._filetype = got
+		return self._filetype
+
 	def get_description(self):
 		return "Loading " + str(self)
 
='#n195'>195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285