Changeset 3 for trunk

Timestamp:

Jul 23, 2015, 1:42:15 PM (9 years ago)

Author:

chronos

Message:

Added new feature log console output to log files located in user home directory.

File:

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

trunk/linetime.lpr

@@ -24 +24 @@
     ShowTime: Boolean;
     LastLineTime: TDateTime;
+    LogFile: TFileStream;
+    LogEnabled: Boolean;
+    procedure WriteRaw(Text: string);
+    procedure WriteLog(Text: string);
     procedure PrintOutput(Output: string);
     procedure ProcessBuffer(Buffer: string);
@@ -41 +45 @@
   InputStream: TIOStream;
   Count: Integer;
+  LogDir: string;
+  FileName: string;
 begin
-  FormatCSV := False;
-
-  // quick check parameters
-  ErrorMsg := CheckOptions('hc', 'help csv');
+  // Quick check parameters
+  ErrorMsg := CheckOptions('hcl', 'help csv log');
   if ErrorMsg <> '' then begin
     ShowException(Exception.Create(ErrorMsg));
@@ -52 +56 @@
   end;
 
-  // parse parameters
+  // Parse parameters
   if HasOption('h', 'help') then begin
     WriteHelp;
@@ -59 +63 @@
   end;
 
-  if HasOption('c', 'csv') then begin
-    FormatCSV := True;
+  FormatCSV := HasOption('c', 'csv');
+  LogEnabled := HasOption('l', 'log');
+  if LogEnabled then begin
+    LogDir := GetUserDir + DirectorySeparator + '.linetime' + DirectorySeparator + 'logs';
+    ForceDirectories(LogDir);
+    FileName := LogDir + DirectorySeparator + FormatDateTime('yyyymmddhhnnss', Now) + '.log';
+    LogFile := TFileStream.Create(FileName, fmCreate);
   end;
 
@@ -77 +86 @@
     until Count = 0;
 
-    if FormatCSV then begin
-      if not FirstLine then WriteLn('"');
-    end;
+    PrintOutput('');
   finally
     InputStream.Free;
   end;
-  WriteLn;
+  WriteRaw(LineEnding);
+  WriteLog(LineEnding);
 
   // stop program loop
@@ -89 +97 @@
 end;
 
+procedure TMyApplication.WriteRaw(Text: string);
+begin
+  Write(Text);
+end;
+
+procedure TMyApplication.WriteLog(Text: string);
+begin
+  if LogEnabled then begin
+    if Length(Text) > 0 then
+      LogFile.Write(Text[1], Length(Text));
+  end;
+end;
+
 procedure TMyApplication.PrintOutput(Output: string);
 var
   LineTime: TDateTime;
+  TimeStr: string;
 begin
   if NewLine then begin
     if FormatCSV then begin
-      if not FirstLine then WriteLn('"');
+      if not FirstLine then WriteRaw('"' + LineEnding);
     end else begin
-      if not FirstLine then WriteLn('');
+      if not FirstLine then WriteRaw(LineEnding);
     end;
+    WriteLog(LineEnding);
     NewLine := False;
     FirstLine := False;
@@ -104 +127 @@
   if (Length(Output) > 0) and ShowTime then begin
     LineTime := Now - StartTime;
+    TimeStr := FloatToStrF(LineTime / OneSecond, ffFixed, 10, 2);
     if FormatCSV then begin
-      Write(FloatToStrF(LineTime / OneSecond, ffFixed, 10, 2) + ',' +
+      WriteRaw(TimeStr + ',' +
         FloatToStrF((LineTime - LastLineTime) / OneSecond, ffFixed, 10, 2) + ',"');
     end else begin
-      Write(#$1b'[0;32m' + FloatToStrF(LineTime / OneSecond, ffFixed, 10, 2) + #$1b'[0m ');
+      WriteRaw(#$1b'[0;32m' + TimeStr + #$1b'[0m ');
     end;
+    WriteLog(TimeStr + ' ');
     ShowTime := False;
     LastLineTime := LineTime;
   end;
-  Write(Output);
+  WriteRaw(Output);
+  WriteLog(Output);
 end;
 
@@ -144 +170 @@
 destructor TMyApplication.Destroy;
 begin
+  FreeAndNil(LogFile);
   inherited Destroy;
 end;
@@ -152 +179 @@
   WriteLn('Usage: ', ExeName, ' -h');
   WriteLn(' -c --csv Print lines in CSV format');
+  WriteLn(' -l --log Log output to log files in ~/.linetime/logs');
 end;