[spp] [PATCH 2/2] spp_vf: update to improve usability

[ogawa.yasufumi@lab.ntt.co.jp]

From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>

This update is same as previous patch for spp.py.

* Override emptyline() of Shell class to not repeat previous command.

* Override default() to accept comment line. To find the comment, add
  is_comment_line() which support python and C style comment.

* Remove lower() for user's input to avoid unexpected behaviour.

Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
 src/spp_vf.py | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/spp_vf.py b/src/spp_vf.py
index 0d706ee..4325c28 100755
--- a/src/spp_vf.py
+++ b/src/spp_vf.py
@@ -301,7 +301,7 @@ def check_sec_cmds(cmds):
     return valid
 
 
-class Shell(cmd.Cmd):
+class Shell(cmd.Cmd, object):
     """SPP command prompt"""
 
     intro = 'Welcome to the spp.   Type help or ? to list commands.\n'
@@ -311,6 +311,36 @@ class Shell(cmd.Cmd):
     COMMANDS = ['status', 'add', 'patch', 'ring', 'vhost',
                 'reset', 'exit', 'forward', 'stop', 'clear']
 
+    def is_comment_line(self, line):
+        input_line = line.strip()
+        if len(input_line) > 0:
+            if (input_line[0] == '#') or (input_line[0:2] == '//'):
+                return True
+            else:
+                return False
+
+    def default(self, line):
+        """Define defualt behaviour
+
+        If user input is commend styled, controller simply echo as a comment.
+        Supported styles are
+          - python ('#')
+          - C ('//')
+        """
+
+        if self.is_comment_line(line):
+            print("%s" % line.strip())
+        else:
+            super(Shell, self).default(line)
+
+    def emptyline(self):
+        """Do nothin for empty input
+
+        It override Cmd.emptyline() which runs previous input as default
+        to do nothing.
+        """
+        pass
+
     def complete_pri(self, text, line, begidx, endidx):
         """Completion for primary process commands"""
 
@@ -375,15 +405,14 @@ class Shell(cmd.Cmd):
             with open(arg) as recorded_file:
                 lines = []
                 for line in recorded_file:
-                    if line.strip().startswith("#"):
-                        continue
+                    if not self.is_comment_line(line):
+                        lines.append("# %s" % line)
                     lines.append(line)
                 self.cmdqueue.extend(lines)
         except IOError:
             print("Error: File does not exist.")
 
     def precmd(self, line):
-        line = line.lower()
         if self.recorded_file and 'playback' not in line:
             print(line, file=self.recorded_file)
         return line
-- 
2.7.4