about summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-08-12 23:13:30 +0200
committerhut <hut@lavabit.com>2010-08-12 23:13:30 +0200
commit0fd09f7318210f6e4f8d91f7f39ecf9b83ce4879 (patch)
tree3e4cd6673db78a9bd49852e82100d741e1d04856 /ranger
parentbd088ce81a220cba9f30f9a1f209bc7b8a93a8d5 (diff)
downloadranger-0fd09f7318210f6e4f8d91f7f39ecf9b83ce4879.tar.gz
shared.mimetype: look for mimetypes in ~/.mime.types
Diffstat (limited to 'ranger')
-rw-r--r--ranger/shared/mimetype.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/ranger/shared/mimetype.py b/ranger/shared/mimetype.py
index c6577056..da6fcd10 100644
--- a/ranger/shared/mimetype.py
+++ b/ranger/shared/mimetype.py
@@ -15,9 +15,12 @@
 
 from ranger import relpath
 import mimetypes
+import os.path
+
 class MimeTypeAware(object):
 	mimetypes = {}
 	def __init__(self):
 		MimeTypeAware.__init__ = lambda _: None  # refuse multiple inits
+		mimetypes.knownfiles.append(os.path.expanduser('~/.mime.types'))
 		MimeTypeAware.mimetypes = mimetypes.MimeTypes()
 		MimeTypeAware.mimetypes.read(relpath('data/mime.types'))
35 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184
class='oid'>3edc9f86 ^
b06433bc ^
7582555b ^
84c49ab7 ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23