From 7c30138f73db5310d2be674d3da9d6662ea3743f Mon Sep 17 00:00:00 2001
From: Marcel Nijenhof <marceln@pion.xs4all.nl>
Date: Thu, 14 Feb 2019 23:24:56 +0100
Subject: [PATCH] Vervangen van {DATE} en {TIME} toegevoegd

---
 README.md    |  2 +-
 hoek-h10.sip |  2 +-
 siprun       | 32 ++++++++++++++++++++++++++++----
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2d33992..84e9ab0 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ A small test program containing some functions to test the library.
 ### siprun
 
 A prgram to run SIP command files.
-See "siprun -h" for usage information.
+See "siprun -H" for usage information.
 
 #### hoek-h10.sip
 
diff --git a/hoek-h10.sip b/hoek-h10.sip
index 3051643..ca8762e 100644
--- a/hoek-h10.sip
+++ b/hoek-h10.sip
@@ -1,4 +1,4 @@
 LI USER,PASS
 TI LMW
-WN LMW,HOEK,H10,-01:00,12-02-2019,22:00,DATA
+WN LMW,HOEK,H10,-01:00,{DATE},{TIME},DATA
 LO
diff --git a/siprun b/siprun
index d44f9c0..187bdbc 100755
--- a/siprun
+++ b/siprun
@@ -5,8 +5,12 @@ import getopt
 from lmwsip import LmwSip
 
 def usage():
-    print("siprun [-s] [-h <host>] [-p <port>] [<files>]")
+    print("siprun [-H] [-s] [-d <date>] [-t <time>] [-h <host>] [-p <port>] [<files>]")
+    print("\t-H: Show usage")
     print("\t-s: SSL connection")
+    print("\t-d <date>: Date replacement string (2019-02-14)")
+    print("\t-t <time>: Time replacement string (17:00)")
+    print("\t-h <host>: Connect to host")
     print("\t-h <host>: Connect to host")
     print("\t-p <port>: Connect to port")
     print("\t-<files>: LMW commando files")
@@ -20,11 +24,20 @@ def main():
         usage()
         sys.exit(2)
     ssl=False
+    time=None
+    date=None
     host=None
     port=None
     for o, a in opts:
-        if o == "-s":
+        if o == "-H":
+            usage()
+            sys.exit(0)
+        elif o == "-s":
             ssl=True
+        elif o == "-d":
+            date=a
+        elif o == "-t":
+            time=a
         elif o == "-h":
             host=a
         elif o == "-p":
@@ -34,11 +47,22 @@ def main():
         usage()
         sys.exit(3)
     lmwsip = LmwSip(ssl=ssl, host=host, port=port)
+    if (date == None or time == None):
+        # We assume a 10 minut interval so we use H10
+        r = lmwsip.lasttime("H10")
+        print(r)
+        if (date == None):
+            date = r["day"]
+        if (time == None):
+            time = r["time_of_day"]
     for cmdfile in args:
         with open(cmdfile, "r") as f:
             for cmd in f:
-                print("> [%s]" % (cmd.strip('\n')))
-                lmwsip.send(cmd.replace('\n', '\r'))
+                cmd = cmd.replace('{DATE}', date)
+                cmd = cmd.replace('{TIME}', time)
+                cmd = cmd.replace('\n', '\r')
+                print("> [%s]" % (cmd.strip('\r')))
+                lmwsip.send(cmd)
                 print("< [%s]" % (lmwsip.recv().decode('utf-8').strip('\r')))
             f.close()