summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-01-07 00:52:15 +0100
committerhut <hut@lavabit.com>2010-01-07 00:52:15 +0100
commit3db854eee17ff7e9c29319be04f8ae2b3e966bbf (patch)
tree5cd244585885a5f0eb238a9a5b2bb3900b30bb02
parenta808a661b1368e74cbb67fb1de021e746a1d53d1 (diff)
downloadranger-3db854eee17ff7e9c29319be04f8ae2b3e966bbf.tar.gz
directory: fixed wrong mtime comparison
-rw-r--r--ranger/fsobject/directory.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/ranger/fsobject/directory.py b/ranger/fsobject/directory.py
index f1810915..1079d126 100644
--- a/ranger/fsobject/directory.py
+++ b/ranger/fsobject/directory.py
@@ -1,6 +1,8 @@
+import os
 from collections import deque
 from time import time
 
+from ranger import log
 from ranger.fsobject import BAD_INFO, File, FileSystemObject
 from ranger.shared import SettingsAware
 from ranger.ext.accumulator import Accumulator
@@ -31,6 +33,7 @@ class Directory(FileSystemObject, Accumulator, SettingsAware):
 	scroll_offset = 0
 
 	last_update_time = -1
+	load_content_mtime = -1
 
 	old_show_hidden = None
 	old_directories_first = None
@@ -182,6 +185,7 @@ class Directory(FileSystemObject, Accumulator, SettingsAware):
 			self.last_update_time = time()
 
 		finally:
+			self.load_content_mtime = os.lstat(self.path).st_mtime
 			self.loading = False
 
 	def unload(self):
@@ -329,13 +333,12 @@ class Directory(FileSystemObject, Accumulator, SettingsAware):
 			self.load_content(*a, **k)
 			return True
 
-		import os
 		try:
 			real_mtime = os.lstat(self.path).st_mtime
 		except OSError:
 			real_mtime = None
 		if self.stat:
-			cached_mtime = self.stat.st_mtime
+			cached_mtime = self.load_content_mtime
 		else:
 			cached_mtime = 0
 
3b93acf16d'>^
4d6c426f ^
5e449699 ^
4d6c426f ^
5e449699 ^
4d6c426f ^

a66c4a26 ^
3de15ddd ^
a66c4a26 ^


f027adc0 ^
5c210a96 ^

3de15ddd ^

5c210a96 ^
fb275079 ^

5c210a96 ^
3d566884 ^
a1d7ed6e ^
3d566884 ^
f8e96a97 ^
465bff73 ^





f027adc0 ^
f8e96a97 ^

0b5c4cbe ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67