summary refs log tree commit diff stats
path: root/code/fm.py
diff options
context:
space:
mode:
Diffstat (limited to 'code/fm.py')
-rw-r--r--code/fm.py36
1 files changed, 25 insertions, 11 deletions
diff --git a/code/fm.py b/code/fm.py
index 76316a9d..8029d915 100644
--- a/code/fm.py
+++ b/code/fm.py
@@ -1,38 +1,52 @@
-import time
 import sys
-from code import ui, debug
+import ui, debug, directory
 
 class FM():
-	def __init__(self, options):
-		self.singleton = None
+	def __init__(self, options, environment):
 		self.options = options
-		self.ui = ui.UI()
+		self.env = environment
+
+	def setup(self, path, ui):
+		self.ui = ui
+		self.enter_dir(path)
+
+	def enter_dir(self, path):
+		self.env.path = path
+		try:
+			self.pwd = self.env.directories[path]
+		except KeyError:
+			self.env.pwd = directory.Directory(path)
+			self.env.directories[path] = self.env.pwd
+
+		self.env.pwd.load_files()
+		if len(self.env.pwd) > 0: self.env.cf = self.env.pwd[0]
 
 	def run(self):
 		try:
 			while 1:
 				try:
+					self.ui.feed(self.env.directories, self.env.pwd, self.env.cf, self.env.termsize)
 					self.ui.draw()
 				except KeyboardInterrupt:
 					self.interrupt()
 				except:
-					debug.log(sys.exc_info()[1])
+					raise
 
 				try:
-					key = None
-#					key = curses.getch()
-#					curses.flushinp()
+					key = self.ui.get_next_key()
 					self.press(key)
 				except KeyboardInterrupt:
 					self.interrupt()
 		except:
+			self.ui.exit()
 			raise
-			pass
 
 	def press(self, key):
-		pass
+		if (key == ord('q')):
+			raise SystemExit()
 
 	def interrupt(self):
+		import time
 		self.buffer = ""
 		time.sleep(0.2)
 
c79c36fd1dd2c9bb0'>60338448 ^
ce2c1efc ^
60338448 ^
e99038ea ^
ce2c1efc ^
60338448 ^
9a777801 ^
34c84469 ^















ce2c1efc ^
34c84469 ^















762107fd ^
34c84469 ^
52daf072 ^






2104d1a7 ^

52daf072 ^









2104d1a7 ^
52daf072 ^

33352536 ^
52daf072 ^

33352536 ^
52daf072 ^

ec73ed12 ^
52daf072 ^
33352536 ^
2104d1a7 ^
33352536 ^




86351aaf ^












ec73ed12 ^
86351aaf ^


















52daf072 ^
86351aaf ^
















34c84469 ^



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
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152