Changeset 6 for trunk

Timestamp:

Aug 3, 2015, 4:17:15 PM (9 years ago)

Author:

chronos

Message:

• Added: Better handling of all three basic new line characters.
• Modified: Colored text need to be activated with -e switch.
• Added: Option to show help

File:

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

trunk/linetime.lpr

@@ -19 +19 @@
     procedure DoRun; override;
   private
+    UseEscapeChars: Boolean;
+    TestMode: Boolean;
+    TestLineDelay: TDateTime;
+    TestString: string;
     FirstLine: Boolean;
+    TextOnLine: Boolean;
     StartTime: TDateTime;
     NewLine: Boolean;
+    NewLineEnding: string;
     ShowTime: Boolean;
     LastLineTime: TDateTime;
@@ -28 +34 @@
     TermString: string;
     TermStringIndex: Integer;
-    function FindLineEnding(Buffer: string; var LineEndingLength: Integer): Integer;
+    function FindLineEnding(Buffer: string; var FoundLineEnding: string): Integer;
     procedure WriteRaw(Text: string);
     procedure WriteLog(Text: string);
     procedure PrintOutput(Output: string);
+    procedure ShowTimePrefix;
     procedure ProcessBuffer(Buffer: string);
   public
@@ -46 +53 @@
   ErrorMsg: String;
   Buffer: string;
-  InputStream: TIOStream;
+  InputStream: TStream;
   Count: Integer;
   LogDir: string;
@@ -52 +59 @@
 begin
   // Quick check parameters
-  ErrorMsg := CheckOptions('hclt:', 'help csv log termstr');
+  ErrorMsg := CheckOptions('hclt:e', 'help csv log termstr escape');
   if ErrorMsg <> '' then begin
     ShowException(Exception.Create(ErrorMsg));
@@ -71 +78 @@
 
   FormatCSV := HasOption('c', 'csv');
+  UseEscapeChars := HasOption('e', 'escape');
   LogEnabled := HasOption('l', 'log');
   if LogEnabled then begin
@@ -85 +93 @@
   LastLineTime := 0;
   TermStringIndex := 1;
+  TextOnLine := False;
   try
-    InputStream := TIOStream.Create(iosInput);
+    if TestMode then begin
+      InputStream := TMemoryStream.Create;
+      InputStream.Write(TestString[1], Length(TestString));
+      InputStream.Position := 0;
+    end else
+      InputStream := TIOStream.Create(iosInput);
     repeat
       SetLength(Buffer, 1000);
@@ -93 +107 @@
       ProcessBuffer(Buffer);
     until (Count = 0) or Terminated;
+    NewLineEnding := LineEnding;
     PrintOutput('');
   finally
@@ -103 +118 @@
 end;
 
-function TMyApplication.FindLineEnding(Buffer: string; var LineEndingLength: Integer): Integer;
+function TMyApplication.FindLineEnding(Buffer: string; var FoundLineEnding: string): Integer;
 const
   LineEnding1 = #13#10;
@@ -112 +127 @@
 begin
   Result := 0;
-  LineEndingLength := 0;
+  FoundLineEnding := '';
 
   P := Pos(LineEnding1, Buffer);
   if (P > 0) and (((Result > 0) and (P < Result)) or (Result = 0)) then begin
     Result := P;
-    LineEndingLength := Length(LineEnding1);
+    FoundLineEnding := LineEnding1;
   end;
   P := Pos(LineEnding2, Buffer);
   if (P > 0) and (((Result > 0) and (P < Result)) or (Result = 0)) then begin
     Result := P;
-    LineEndingLength := Length(LineEnding2);
+    FoundLineEnding := LineEnding2;
   end;
   P := Pos(LineEnding3, Buffer);
   if (P > 0) and (((Result > 0) and (P < Result)) or (Result = 0)) then begin
     Result := P;
-    LineEndingLength := Length(LineEnding3);
+    FoundLineEnding := LineEnding3;
   end;
 end;
@@ -145 +160 @@
 
 procedure TMyApplication.PrintOutput(Output: string);
-var
-  LineTime: TDateTime;
-  TimeStr: string;
 begin
   if NewLine then begin
-    if FormatCSV then begin
-      if not FirstLine then WriteRaw('"' + LineEnding);
-    end else begin
-      if not FirstLine then WriteRaw(LineEnding);
+    if not FirstLine then begin
+      // If previous line was empty then print time prefix before move to next line
+      if (not TextOnLine) then ShowTimePrefix;
+      if FormatCSV then begin
+        WriteRaw('"' + LineEnding);
+      end else begin
+        WriteRaw(NewLineEnding);
+      end;
+      TextOnLine := False;
     end;
     WriteLog(LineEnding);
@@ -159 +176 @@
     FirstLine := False;
   end;
-  if (Length(Output) > 0) and ShowTime then begin
-    LineTime := Now - StartTime;
-    TimeStr := FloatToStrF(LineTime / OneSecond, ffFixed, 10, 2);
-    if FormatCSV then begin
-      WriteRaw(TimeStr + ',' +
-        FloatToStrF((LineTime - LastLineTime) / OneSecond, ffFixed, 10, 2) + ',"');
-    end else begin
-      WriteRaw(#$1b'[0;32m' + TimeStr + #$1b'[0m ');
-    end;
-    WriteLog(TimeStr + ' ');
+  if Length(Output) > 0 then TextOnLine := True;
+  if TextOnLine and ShowTime then begin
+    ShowTimePrefix;
     ShowTime := False;
-    LastLineTime := LineTime;
   end;
   WriteRaw(Output);
   WriteLog(Output);
+end;
+
+procedure TMyApplication.ShowTimePrefix;
+var
+  LineTime: TDateTime;
+  TimeStr: string;
+begin
+  LineTime := Now - StartTime;
+  TimeStr := FloatToStrF(LineTime / OneSecond, ffFixed, 10, 2);
+  if FormatCSV then begin
+    WriteRaw(TimeStr + ',' +
+      FloatToStrF((LineTime - LastLineTime) / OneSecond, ffFixed, 10, 2) + ',"');
+  end else begin
+    if UseEscapeChars then
+      WriteRaw(#$1b'[0;32m' + TimeStr + #$1b'[0m ')
+      else WriteRaw(TimeStr + ' ');
+  end;
+  WriteLog(TimeStr + ' ');
+  LastLineTime := LineTime;
+  Sleep(Trunc(TestLineDelay / OneMillisecond));
 end;
 
@@ -181 +210 @@
   I: Integer;
   Part: string;
-  LineEndingLength: Integer;
-begin
+  FoundLineEnding: string;
+begin
+  NewLineEnding := LineEnding;
   repeat
-    P := FindLineEnding(Buffer, LineEndingLength);
+    FoundLineEnding := '';
+    P := FindLineEnding(Buffer, FoundLineEnding);
     if P > 0 then begin
       Part := Copy(Buffer, 1, P - 1);
@@ -190 +221 @@
         Part := StringReplace(Part, '"', '""', [rfReplaceAll]);
       PrintOutput(Part);
-      Delete(Buffer, 1, P + LineEndingLength - 1);
+      NewLineEnding := FoundLineEnding;
+      Delete(Buffer, 1, P - 1 + Length(FoundLineEnding));
       NewLine := True;
       ShowTime := True;
@@ -214 +246 @@
   inherited Create(TheOwner);
   StopOnException := True;
+  TestLineDelay := 0;
+  TestMode := False;
+  //TestMode := True;
+  if TestMode then begin
+    TestLineDelay := 10 * OneMillisecond;
+    //TestString := 'Line 1'#13#10'Line 2'#13'Line 3'#10'Line 4 abcd abcd xyz'#13#10#13#10'Line 9'#13#13#10'Line 10';
+    TestString := 'sas'#13#13#10'Line 10';
+  end;
 end;
 
@@ -224 +264 @@
 procedure TMyApplication.WriteHelp;
 begin
-  { add your help code here }
-  WriteLn('Usage: ', ExeName, ' -h');
+  WriteLn('Usage: ', ExeName, ' <parameters>');
+  WriteLn(' -h --help        Show this help');
   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');
+  WriteLn(' -e --escape      Use escape characters for color change');
 end;