瀏覽代碼

Tweak archive extraction mode logging.

Martijn Laan 3 月之前
父節點
當前提交
c48d7bef4d
共有 2 個文件被更改,包括 8 次插入3 次删除
  1. 6 0
      Projects/Src/Compression.SevenZipDllDecoder.pas
  2. 2 3
      Projects/Src/Setup.ScriptDlg.pas

+ 6 - 0
Projects/Src/Compression.SevenZipDllDecoder.pas

@@ -20,6 +20,7 @@ uses
 procedure InitSevenZipLibrary(const DllFilename: String);
 procedure InitSevenZipLibrary(const DllFilename: String);
 
 
 function IsExtractArchiveRedirAvailable: Boolean;
 function IsExtractArchiveRedirAvailable: Boolean;
+function GetSevenZipLibraryName: String;
 
 
 procedure ExtractArchiveRedir(const DisableFsRedir: Boolean;
 procedure ExtractArchiveRedir(const DisableFsRedir: Boolean;
   const ArchiveFilename, DestDir, Password: String; const FullPaths: Boolean;
   const ArchiveFilename, DestDir, Password: String; const FullPaths: Boolean;
@@ -436,6 +437,11 @@ begin
   Result := Assigned(CreateSevenZipObject);
   Result := Assigned(CreateSevenZipObject);
 end;
 end;
 
 
+function GetSevenZipLibraryName: String;
+begin
+  Result := SevenZipLibraryName;
+end;
+
 procedure ExtractArchiveRedir(const DisableFsRedir: Boolean;
 procedure ExtractArchiveRedir(const DisableFsRedir: Boolean;
   const ArchiveFilename, DestDir, Password: String;
   const ArchiveFilename, DestDir, Password: String;
   const FullPaths: Boolean; const OnExtractionProgress: TOnExtractionProgress);
   const FullPaths: Boolean; const OnExtractionProgress: TOnExtractionProgress);

+ 2 - 3
Projects/Src/Setup.ScriptDlg.pas

@@ -1187,14 +1187,13 @@ begin
 end;
 end;
 
 
 procedure TExtractionWizardPage.Extract;
 procedure TExtractionWizardPage.Extract;
-const
-  SExtractionMode: array[Boolean] of String = ('Built-in', 'Using 7z(xa).dll');
 begin
 begin
   FAbortedByUser := False;
   FAbortedByUser := False;
 
 
   const ExtractArchiveRedirAvailable = IsExtractArchiveRedirAvailable;
   const ExtractArchiveRedirAvailable = IsExtractArchiveRedirAvailable;
 
 
-  LogFmt('Archive extraction mode: %s', [SExtractionMode[ExtractArchiveRedirAvailable]]);
+  LogFmt('Archive extraction mode: %s',
+    [IfThen(ExtractArchiveRedirAvailable, Format('Using %s', [GetSevenZipLibraryName]), 'Built-in')]);
 
 
   for var A in FArchives do begin
   for var A in FArchives do begin
     { Don't need to set DownloadTemporaryFileOrExtractArchiveProcessMessages before extraction since we already process messages ourselves }
     { Don't need to set DownloadTemporaryFileOrExtractArchiveProcessMessages before extraction since we already process messages ourselves }