summary refs log tree commit diff stats
path: root/code/directory.py
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2009-11-24 16:50:20 +0100
committerhut <hut@lavabit.com>2009-11-24 16:50:20 +0100
commitf6f26231a1a2c886f43d9ec965eb7903180067fb (patch)
tree2340d5a6b5dfb97e447b90ab9e1f45a8d4bdffba /code/directory.py
parent798d06a2317a5bb4ee38cec4d1d4f5d428d75593 (diff)
downloadranger-f6f26231a1a2c886f43d9ec965eb7903180067fb.tar.gz
corrected test, added some stuff
Diffstat (limited to 'code/directory.py')
-rw-r--r--code/directory.py22
1 files changed, 19 insertions, 3 deletions
diff --git a/code/directory.py b/code/directory.py
index da7c0948..2554ca72 100644
--- a/code/directory.py
+++ b/code/directory.py
@@ -12,6 +12,7 @@ class Directory(fsobject.FSObject):
 		self.files = None
 		self.filter = None
 		self.pointed_index = None
+		self.pointed_file = None
 	
 	def load_content(self):
 		self.stop_if_frozen()
@@ -22,8 +23,7 @@ class Directory(fsobject.FSObject):
 			basenames = os.listdir(self.path)
 			mapped = map(lambda name: os.path.join(self.path, name), basenames)
 			self.filenames = list(mapped)
-			self.infostring = ' %d' % len(self.filenames)
-			debug.log('infostring set!')
+			self.infostring = ' %d' % len(self.filenames) # update the infostring
 			self.files = []
 			for name in self.filenames:
 				if os.path.isdir(name):
@@ -35,7 +35,23 @@ class Directory(fsobject.FSObject):
 	
 	def load_content_once(self):
 		self.stop_if_frozen()
-		if not self.content_loaded: self.load_content()
+		if not self.content_loaded:
+			self.load_content()
+			return True
+		return False
+
+	def load_content_if_outdated(self):
+		self.stop_if_frozen()
+		if self.load_content_once(): return True
+
+		import os
+		real_mtime = os.stat(self.path).st_mtime
+		cached_mtime = self.stat.st_mtime
+
+		if real_mtime != cached_mtime:
+			self.load_content()
+			return True
+		return False
 
 	def __len__(self):
 		if not self.accessible: raise fsobject.NotLoadedYet()
b57f69fd61552ef'>^
f8a4a457 ^
e5c11a51 ^
f8a4a457 ^





e5c11a51 ^






















f8a4a457 ^


e5c11a51 ^
f8a4a457 ^
204dae92 ^

97eb971b ^
204dae92 ^

97eb971b ^
204dae92 ^

97eb971b ^
204dae92 ^



f8a4a457 ^



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
68
69
70
71
72
73
74



                                                                                          
                                      


                                                
                                                                                                               


                                           


                                                                                                 
                                       
                                      
                             
                            
                            
                                                        
                             
                           





                               






















                                                                                 


         
                             
                         

                                                                                        
                                                                                                                        

                                                                                                                                     
                                                                                       

                                        
                                                                                                                                   



                                                                                                                                                                                                                 



                                     
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>Mu - immutable-error.mu</title>
<meta name="Generator" content="Vim/7.4">
<meta name="plugin-version" content="vim7.4_v2">
<meta name="syntax" content="none">
<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
<meta name="colorscheme" content="minimal">
<style type="text/css">
<!--
pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
a { color:#eeeeee; text-decoration: none; }
a:hover { text-decoration: underline; }
* { font-size: 12pt; font-size: 1em; }
.muRecipe { color: #ff8700; }
.Special { color: #c00000; }
.Comment { color: #9090ff; }
.Comment a { color:#0000ee; text-decoration:underline; }
.Constant { color: #00a0a0; }
.LineNr { color: #444444; }
-->
</style>

<script type='text/javascript'>
<!--

/* function to open any folds containing a jumped-to line before jumping to it */
function JumpToLine()
{
  var lineNum;
  lineNum = window.location.hash;
  lineNum = lineNum.substr(1); /* strip off '#' */

  if (lineNum.indexOf('L') == -1) {
    lineNum = 'L'+lineNum;
  }
  lineElem = document.getElementById(lineNum);
  /* Always jump to new location even if the line was hidden inside a fold, or
   * we corrected the raw number to a line ID.
   */
  if (lineElem) {
    lineElem.scrollIntoView(true);
  }
  return true;
}
if ('onhashchange' in window) {
  window.onhashchange = JumpToLine;
}

-->
</script>
</head>
<body onload='JumpToLine();'>
<pre id='vimCodeElement'>
<span id="L1" class="LineNr"> 1 </span><span class="Comment"># compare mutable.mu</span>
<span id="L2" class="LineNr"> 2 </span>
<span id="L3" class="LineNr"> 3 </span><span class="muRecipe">def</span> <a href='immutable-error.mu.html#L3'>main</a> [
<span id="L4" class="LineNr"> 4 </span>  <span class="Constant">local-scope</span>
<span id="L5" class="LineNr"> 5 </span>  x:&amp;:num <span class="Special">&lt;-</span> new <span class="Constant">number:type</span>
<span id="L6" class="LineNr"> 6 </span>  <a href='immutable-error.mu.html#L9'>foo</a> x
<span id="L7" class="LineNr"> 7 </span>]
<span id="L8" class="LineNr"> 8 </span>
<span id="L9" class="LineNr"> 9 </span><span class="muRecipe">def</span> <a href='immutable-error.mu.html#L9'>foo</a> x:&amp;:num [
<span id="L10" class="LineNr">10 </span>  <span class="Constant">local-scope</span>
<span id="L11" class="LineNr">11 </span>  <span class="Constant">load-ingredients</span>
<span id="L12" class="LineNr">12 </span>  *x <span class="Special">&lt;-</span> copy<span class="Constant"> 34</span>  <span class="Comment"># will cause an error because x is immutable in this function</span>
<span id="L13" class="LineNr">13 </span>]
</pre>
</body>
</html>
<!-- vim: set foldmethod=manual : -->