[spp] [PATCH 2/3] spp: add record file check

ogawa.yasufumi at lab.ntt.co.jp ogawa.yasufumi at lab.ntt.co.jp
Tue Oct 3 12:42:13 CEST 2017


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

record and playback command should be given a record file name
but there are no checking if it is given.

This change adds checking for record file in do_record and
do_playback methods.

Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi at lab.ntt.co.jp>
---
 src/spp.py | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/spp.py b/src/spp.py
index 4aa0c62..4bbbb44 100755
--- a/src/spp.py
+++ b/src/spp.py
@@ -477,29 +477,35 @@ class Shell(cmd.Cmd):
             print ("first %s" % cmds[1])
             self.response(CMD_ERROR, "invalid format")
 
-    def do_record(self, arg):
+    def do_record(self, fname):
         """Save future commands to filename:  RECORD filename.cmd"""
 
-        self.recorded_file = open(arg, 'w')
-        self.response(CMD_OK, "record")
+        if fname == '':
+            print("Record file is required!")
+        else:
+            self.recorded_file = open(fname, 'w')
+            self.response(CMD_OK, "record")
 
-    def do_playback(self, arg):
+    def do_playback(self, fname):
         """Playback commands from a file:  PLAYBACK filename.cmd"""
 
-        self.close()
-        try:
-            with open(arg) as recorded_file:
-                lines = []
-                for line in recorded_file:
-                    if line.strip().startswith("#"):
-                        continue
-                    lines.append(line)
-                self.cmdqueue.extend(lines)
-                self.response(CMD_OK, "playback")
-        except IOError:
-            message = "Error: File does not exist."
-            print(message)
-            self.response(CMD_NG, message)
+        if fname == '':
+            print("Record file is required!")
+        else:
+            self.close()
+            try:
+                with open(fname) as recorded_file:
+                    lines = []
+                    for line in recorded_file:
+                        if line.strip().startswith("#"):
+                            continue
+                        lines.append(line)
+                    self.cmdqueue.extend(lines)
+                    self.response(CMD_OK, "playback")
+            except IOError:
+                message = "Error: File does not exist."
+                print(message)
+                self.response(CMD_NG, message)
 
     def precmd(self, line):
         line = line.lower()
-- 
2.13.1



More information about the spp mailing list