Changeset 2 for trunk

Timestamp:

Aug 18, 2017, 10:28:14 AM (7 years ago)

Author:

chronos

Message:

• Modified: Much faster parsing of lshistory output using state machine.

Location:

trunk

Files:

• . (modified) (1 prop)
• CC2SVN.lpi (modified) (1 diff)
• Packages/Common (modified) (1 prop)
• Packages/TemplateGenerics (modified) (1 prop)
• UFormMain.lfm (modified) (3 diffs)
• UFormMain.pas (modified) (2 diffs)

trunk/CC2SVN.lpi

@@ -2 +2 @@
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="10"/>
     <PathDelim Value="\"/>
     <General>

trunk/UFormMain.lfm

@@ -11 +11 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '1.6.4.0'
   WindowState = wsMaximized
   object ListView1: TListView
@@ -89 +89 @@
     object EditDir: TEdit
       Left = 136
-      Height = 28
+      Height = 23
       Top = 8
       Width = 600
@@ -107 +107 @@
     object Label1: TLabel
       Left = 8
-      Height = 20
+      Height = 15
       Top = 13
-      Width = 90
+      Width = 72
       Caption = 'ClearCase dir:'
       ParentColor = False

trunk/UFormMain.pas

@@ -207 +207 @@
 
 procedure TFormMain.JobLoad(Job: TJob);
+type
+  TParseState = (psTime, psHumanName, psUserName, psOperation, psLocation,
+    psElementType, psCommand, psComment, psNewLine);
 var
   Lines: TStringList;
   HistoryItem: THistoryItem;
   Content: string;
+  State: TParseState;
+  Text: string;
+  StartIndex: Integer;
+  I: Integer;
 begin
   Lines := TStringList.Create;
@@ -219 +226 @@
   Lines.LoadFromFile('log.txt');
 {$ENDIF}
-  Job.Progress.Max := Lines.Count;
   Content := Lines.Text;
-  while Length(Content) > 0 do begin
-    HistoryItem := THistoryItem.Create;
-    HistoryItem.Time := XMLTimeToDateTime(ParseLine(Content, '|'));
-    HistoryItem.HumanName := ParseLine(Content, '|');
-    HistoryItem.UserName := ParseLine(Content, '|');
-    HistoryItem.Operation := ParseLine(Content, '|');
-    HistoryItem.Location := ParseLine(Content, '|');
-    HistoryItem.ElementType := ParseLine(Content, '|');
-    HistoryItem.Command := ParseLine(Content, '|');
-    HistoryItem.LabelName := ParseLine(Content, '|');
-    HistoryItem.Comment := ParseLine(Content, '|');
-    if Copy(Content, 1, 2) = #13#10 then Delete(Content, 1, 2);
-    History.Add(HistoryItem);
+  Job.Progress.Max := Length(Content);
+  StartIndex := 1;
+  State := psTime;
+  I := 1;
+  while I < Length(Content) do begin
+    if Content[I] = '|' then begin
+      Text := Copy(Content, StartIndex, I - StartIndex);
+      StartIndex := I + 1;
+      if State = psTime then begin
+        HistoryItem := THistoryItem.Create;
+        HistoryItem.Time := XMLTimeToDateTime(Text);
+        State := psHumanName;
+      end else
+      if State = psHumanName then begin
+        HistoryItem.HumanName := Text;
+        State := psUserName;
+      end else
+      if State = psUserName then begin
+        HistoryItem.UserName := Text;
+        State := psOperation;
+      end else
+      if State = psOperation then begin
+        HistoryItem.Operation := Text;
+        State := psLocation;
+      end else
+      if State = psLocation then begin
+        HistoryItem.Location := Text;
+        State := psElementType;
+      end else
+      if State = psElementType then begin
+        HistoryItem.ElementType := Text;
+        State := psCommand;
+      end else
+      if State = psCommand then begin
+        HistoryItem.Command := Text;
+        State := psComment;
+      end else
+      if State = psComment then begin
+        HistoryItem.Comment := Text;
+        History.Add(HistoryItem);
+        State := psNewLine;
+      end;
+    end else
+    if State = psNewLine then begin
+      if Content[I] = #10 then begin
+        State := psTime;
+        StartIndex := I + 1;
+      end;
+    end;
+    Inc(I);
+
+    Job.Progress.Value := I;
     if Job.Terminate then Break;
   end;