Changeset 4 for trunk

Timestamp:

Jul 28, 2015, 1:54:42 PM (9 years ago)

Author:

chronos

Message:

• Added: New parameter -t for program termination if given string found.

File:

• trunk/linetime.lpr (modified) (9 diffs)

trunk/linetime.lpr

@@ -26 +26 @@
     LogFile: TFileStream;
     LogEnabled: Boolean;
+    TermString: string;
+    TermStringIndex: Integer;
     procedure WriteRaw(Text: string);
     procedure WriteLog(Text: string);
@@ -49 +51 @@
 begin
   // Quick check parameters
-  ErrorMsg := CheckOptions('hcl', 'help csv log');
+  ErrorMsg := CheckOptions('hclt:', 'help csv log termstr');
   if ErrorMsg <> '' then begin
     ShowException(Exception.Create(ErrorMsg));
@@ -62 +64 @@
     Exit;
   end;
+
+  if HasOption('t', 'termstr') then begin
+    TermString := GetOptionValue('t', 'termstr');
+  end else TermString := '';
 
   FormatCSV := HasOption('c', 'csv');
@@ -77 +83 @@
   StartTime := Now;
   LastLineTime := 0;
+  TermStringIndex := 1;
   try
     InputStream := TIOStream.Create(iosInput);
@@ -84 +91 @@
       SetLength(Buffer, Count);
       ProcessBuffer(Buffer);
-    until Count = 0;
-
+    until (Count = 0) or Terminated;
     PrintOutput('');
   finally
@@ -93 +99 @@
   WriteLog(LineEnding);
 
-  // stop program loop
   Terminate;
 end;
@@ -145 +150 @@
 var
   P: Integer;
+  I: Integer;
   Part: string;
 begin
@@ -158 +164 @@
       ShowTime := True;
     end;
+
+    // Search for termination string
+    if TermString <> '' then
+    for I := 1 to Length(Buffer) - 1 do begin
+      if TermStringIndex > Length(TermString) then begin
+        Terminate;
+        Break;
+      end;
+      if Buffer[I] = TermString[TermStringIndex] then
+        Inc(TermStringIndex)
+        else TermStringIndex := 1;
+    end;
   until P = 0;
   PrintOutput(Buffer);
@@ -178 +196 @@
   { add your help code here }
   WriteLn('Usage: ', ExeName, ' -h');
-  WriteLn(' -c --csv Print lines in CSV format');
-  WriteLn(' -l --log Log output to log files in ~/.linetime/logs');
+  WriteLn(' -c --csv         Print lines in CSV format');
+  WriteLn(' -l --log         Log output to log files in ~/.linetime/logs');
+  WriteLn(' -t --termstr <string> Termination string');
 end;