Changeset 127

Timestamp:

06/16/05 21:08:27 (3 years ago)

Author:

athomas

Message:

• Added history management commands (closes #6)
  
• Packaged with distutils.
  

Files:

• fwc/trunk/Config.py (modified) (1 diff)
• fwc/trunk/Engine.py (modified) (4 diffs)
• fwc/trunk/fwc (modified) (1 diff)
• fwc/trunk/MANIFEST (added)
• fwc/trunk/README (added)
• fwc/trunk/setup.py (added)

fwc/trunk/Config.py

@@ -82 +82 @@
-                        text = Config.Template(text).safe_substitute(vars)
-                return text
-
-if __name__ == "__main__":
-        c = Config()
-        c.define('foo-bar', 0, 'The FOO')
-        c.define("x-axis", 1, "The X-Axis")
-        print c.expand("Alec is ${foo-bar} times cooler")
-        c.foo_bar = 10
-        print c.expand("Alec is ${foo-bar} times cooler")
-        for k in c.keys():
-                print c.help(k), ":", c[k]

fwc/trunk/Engine.py

@@ -2 +2 @@
-import sys
-import socket
+import readline
+import textwrap
-from ConfigParser import RawConfigParser
-from Config import Config
@@ -37 +39 @@
-                        'to' : [],
-                }
+                self.existing_input = ''
-
-                # Currently active firewall
@@ -299 +302 @@
-                        },
-                        'quit|exit' : {
+                                GROUP : 20000,
-                                HELP : [ 'quit', 'Exit.' ],
-                                ACTION : {
-                                        HELP : 'Exit.',
-                                        ACTION : self.quit,
+                                },
+                        },
+                        '!\d+' : {
+                                VAR : 'index',
+                                ACTION : lambda ctx, index: self.__set_history(ctx, index[1:]),
+                        },
+                        'history' : {
+                                GROUP : 20000,
+                                HELP : 'Command history management.',
+                                ACTION : {
+                                        HELP : 'Show history.',
+                                        ACTION : self.__list_history,
+                                },
+                                'clear' : {
+                                        HELP : 'Clear history.',
+                                        ACTION : self.__clear_history,
+                                },
+                                '\d+' : {
+                                        VAR : 'index',
+                                        HELP : ('<index>', 'History item index.'),
+                                        ACTION : self.__set_history,
-                                },
-                        },
@@ -516 +541 @@
-                self._parser = Parser(self.__grammar)
-
+        def __list_history(self, ctx):
+                cols = 'COLUMNS' in os.environ and int(os.environ['COLUMNS']) or 80
+                for index in range(1, readline.get_current_history_length() + 1):
+                        #cprint('\n'.join(textwrap.wrap("^B%3i:^B %s" % (index, readline.get_history_item(index)), cols, subsequent_indent = '       ')))
+                        cprint("^B%3i:^B %s" % (index, readline.get_history_item(index)))
+
+        def __clear_history(self, ctx):
+                readline.clear_history()
+
+        def __set_history(self, ctx, index):
+                try:
+                        index = int(index)
+                        if index > readline.get_current_history_length():
+                                raise IndexError()
+                        self.existing_input = readline.get_history_item(index)
+                except:
+                        error("No such history index '%s'" % index)
+
-        def __firewall_set(self, ctx, setting, value):
-                try:

fwc/trunk/fwc

@@ -26 +26 @@
-""" % Engine.version)
-
+try:
+        readline.read_history_file(os.path.expanduser('~/.fwchistory'))
+except:
+        pass
+
-while True:
-
+
+
-
-        if result.state == Result.NOP:
-                continue
-        elif result.state == Result.ENDOFINPUT:
+                try:
+                        readline.write_history_file(os.path.expanduser('~/.fwchistory'))
+                except Exception, e:
+                        error(e)
-                engine.quit()
-        elif result.state == Result.OK: