Changeset 4 for trunk

Timestamp:

Mar 2, 2022, 11:00:51 PM (3 years ago)

Author:

chronos

Message:

• Modified: Generalized svn info parsing.
• Added: Language files for translation of text strings.

Location:

trunk

Files:

• . (modified) (1 prop)
• Install/deb/build.sh (modified) (1 diff)
• Languages (added)
• Languages/svnzero.cs.po (added)
• Languages/svnzero.pot (added)
• SVNZero.lpi (modified) (1 diff)
• USubversion.pas (modified) (3 diffs)
• USvnZero.pas (modified) (4 diffs)

trunk/Install/deb/build.sh

@@ -4 +4 @@
 #ARCH=x86_64-linux
 
-BUILD_ROOT=/tmp/build-root/2048
+BUILD_ROOT=/tmp/build-root/SVNZero
 mkdir -p $BUILD_ROOT
 cp -r -f ../.. $BUILD_ROOT

trunk/SVNZero.lpi

@@ -14 +14 @@
       <ResourceType Value="res"/>
     </General>
+    <i18n>
+      <EnableI18N Value="True"/>
+      <OutDir Value="Languages"/>
+    </i18n>
     <BuildModes>
       <Item Name="Debug" Default="True"/>

trunk/USubversion.pas

@@ -10 +10 @@
 
 type
+  TSubversionInfo = record
+    Checksum: string;
+    Revision: string;
+    URL: string;
+    Path: string;
+  end;
 
   { TExecute }
@@ -21 +27 @@
     procedure Execute(Parameters: array of string); virtual;
     procedure ExecuteOutput(Parameters: array of string);
+    function GetInfo(Text: string): TSubversionInfo;
   end;
 
@@ -97 +104 @@
 end;
 
+function TExecute.GetInfo(Text: string): TSubversionInfo;
+var
+  Index: Integer;
+  Lines: TStringList;
+  I: Integer;
+  Line: string;
+  Name: string;
+  Value: string;
+begin
+  Lines := TStringList.Create;
+  try
+    Lines.Text := Text;
+    for I := 0 to Lines.Count - 1 do begin
+      Line := Trim(Lines[I]);
+      Index := Pos(':', Line);
+      if Index > 0 then begin
+        Name := Trim(Copy(Line, 1, Index - 1));
+        Value := Trim(Copy(Line, Index + 1, MaxInt));
+        if Name = 'Checksum' then Result.Checksum := Value
+        else if Name = 'Revision' then Result.Revision := Value
+        else if Name = 'Path' then Result.Path := Value
+        else if Name = 'URL' then Result.URL := Value;
+      end;
+    end;
+  finally
+    Lines.Free;
+  end;
+end;
+
 { TSubversionAdmin }
 

trunk/USvnZero.pas

@@ -21 +21 @@
     procedure ZeroPristine;
     procedure RestorePristine;
-    function GetFileChecksum(Text: string): string;
-    function GetFileRevision(Text: string): string;
-    function GetFileURL(Text: string): string;
     function GetWorkingCopyRootPathFromText(Text: string): string;
     function GetSvnDir(FileName: string): string;
@@ -81 +78 @@
 procedure TSvnZero.RestorePristine;
 begin
-
-end;
-
-function TSvnZero.GetFileChecksum(Text: string): string;
-var
-  Index: Integer;
-const
-  StartText = 'Checksum: ';
-begin
-  Index := Pos(StartText, Text);
-  if Index > 0 then begin
-    Result := Copy(Text, Index + Length(StartText), MaxInt);
-    Index := Pos(LineEnding, Result);
-    if Index > 0 then begin
-      Delete(Result, Index, MaxInt);
-    end;
-  end;
-end;
-
-function TSvnZero.GetFileRevision(Text: string): string;
-var
-  Index: Integer;
-const
-  StartText = 'Revision: ';
-begin
-  Index := Pos(StartText, Text);
-  if Index > 0 then begin
-    Result := Copy(Text, Index + Length(StartText), MaxInt);
-    Index := Pos(LineEnding, Result);
-    if Index > 0 then begin
-      Delete(Result, Index, MaxInt);
-    end;
-  end;
-end;
-
-function TSvnZero.GetFileURL(Text: string): string;
-var
-  Index: Integer;
-const
-  StartText = 'URL: ';
-begin
-  Index := Pos(StartText, Text);
-  if Index > 0 then begin
-    Result := Copy(Text, Index + Length(StartText), MaxInt);
-    Index := Pos(LineEnding, Result);
-    if Index > 0 then begin
-      Delete(Result, Index, MaxInt);
-    end;
-  end;
 end;
 
@@ -226 +174 @@
 var
   FileName: string;
-  FileChecksum: string;
   I: Integer;
   ExportedFileName: string;
   PristineFileName: string;
-  FileURL: string;
-  Revision: string;
+  Info: TSubversionInfo;
 begin
   Result := False;
@@ -243 +189 @@
 
       Subversion.Execute(['info', FileName]);
-      FileChecksum := GetFileChecksum(Subversion.StandardOutput);
-      Revision := GetFileRevision(Subversion.StandardOutput);
-      FileURL := GetFileURL(Subversion.StandardOutput);
+      Info := GetInfo(Subversion.StandardOutput);
       ExportedFileName := GetSvnDir(FileName) + DirectorySeparator + 'tmp' +
         DirectorySeparator + 'ExportedFile.bin';
-      PristineFileName := GetPristineDir(FileName) + DirectorySeparator + Copy(FileChecksum, 1, 2) +
-        DirectorySeparator + FileChecksum + '.svn-base';
-      Subversion.Execute(['export', '-r', Revision, '--force', FileURL, ExportedFileName]);
+      PristineFileName := GetPristineDir(FileName) + DirectorySeparator + Copy(Info.Checksum, 1, 2) +
+        DirectorySeparator + Info.Checksum + '.svn-base';
+      Subversion.Execute(['export', '-r', Info.Revision, '--force', Info.URL, ExportedFileName]);
       MakeFileWriteable(PristineFileName);
       CopyFile(ExportedFileName, PristineFileName);