mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

ADD: Better wcx-plugin error handling

Browse source
This commit is contained in:
Alexander Koblov 2017-05-13 09:53:34 +00:00
commit 69e0a1b745
2 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sdk/wcxplugin.pas
View file

@ -24,6 +24,9 @@ const {Error codes returned to calling application}
E_TOO_MANY_FILES= 23; {Too many files to pack}
E_NOT_SUPPORTED= 24; {Function not supported}
E_HANDLED= -32768; {Handled error}
E_UNKNOWN= +32767; {Unknown error}
{Unpacking flags}
PK_OM_LIST= 0;
PK_OM_EXTRACT= 1;

30
src/filesources/wcxarchive/uwcxarchivetestarchiveoperation.pas
View file

@ -24,8 +24,8 @@ type
FStatistics: TFileSourceTestArchiveOperationStatistics; // local copy of statistics
FCurrentFileSize: Int64;
procedure ShowError(sMessage: String; logOptions: TLogOptions = []);
procedure LogMessage(sMessage: String; logOptions: TLogOptions; logMsgType: TLogMsgType);
procedure ShowError(const sMessage: String; iError: Integer; logOptions: TLogOptions = []);
procedure LogMessage(const sMessage: String; logOptions: TLogOptions; logMsgType: TLogMsgType);
protected
procedure SetProcessDataProc(hArcData: TArcHandle);
@ -210,14 +210,14 @@ begin
if iResult <> E_SUCCESS then
begin
ShowError(Format(rsMsgLogError + rsMsgLogTest,
[FWcxArchiveFileSource.ArchiveFileName + PathDelim +
Header.FileName +
' - ' + GetErrorMsg(iResult)]), [log_arc_op]);
// User aborted operation.
if iResult = E_EABORTED then
Break;
ShowError(Format(rsMsgLogError + rsMsgLogTest,
[FWcxArchiveFileSource.ArchiveFileName + PathDelim +
Header.FileName +
' : ' + GetErrorMsg(iResult)]), iResult, [log_arc_op]);
end // Error
else
begin
@ -236,7 +236,7 @@ begin
ShowError(Format(rsMsgLogError + rsMsgLogTest,
[FWcxArchiveFileSource.ArchiveFileName + PathDelim +
Header.FileName +
' - ' + GetErrorMsg(iResult)]), [log_arc_op]);
' : ' + GetErrorMsg(iResult)]), iResult, [log_arc_op]);
end;
end; // Skip
@ -255,23 +255,23 @@ begin
ClearCurrentOperation;
end;
procedure TWcxArchiveTestArchiveOperation.ShowError(sMessage: String; logOptions: TLogOptions);
procedure TWcxArchiveTestArchiveOperation.ShowError(const sMessage: String;
iError: Integer; logOptions: TLogOptions);
begin
if not gSkipFileOpError then
LogMessage(sMessage, logOptions, lmtError);
if (gSkipFileOpError = False) and (iError > E_SUCCESS) then
begin
if AskQuestion(sMessage, '', [fsourSkip, fsourAbort],
fsourSkip, fsourAbort) = fsourAbort then
begin
RaiseAbortOperation;
end;
end
else
begin
LogMessage(sMessage, logOptions, lmtError);
end;
end;
procedure TWcxArchiveTestArchiveOperation.LogMessage(sMessage: String; logOptions: TLogOptions; logMsgType: TLogMsgType);
procedure TWcxArchiveTestArchiveOperation.LogMessage(const sMessage: String;
logOptions: TLogOptions; logMsgType: TLogMsgType);
begin
case logMsgType of
lmtError: