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: Unrar - Show error message when Rar executable not found (fixes #1388)

Browse source
This commit is contained in:
Alexander Koblov 2023-12-09 14:36:35 +03:00
commit 0f6cf04319
7 changed files with 107 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/wcx/unrar/language/unrar.be.po
View file

@ -69,6 +69,20 @@ msgstr ""
msgid "&Extract"
msgstr ""
#: rarlng.rsmsgpasswordenter
msgid "Please enter the password:"
msgstr ""
#: rarlng.rsmsgexecutablenotfound
#, object-pascal-format
msgid ""
"Cannot find RAR executable!\n"
"\n"
"%s\n"
"\n"
"Please check the plugin settings."
msgstr ""
#: rarlng.rsmsglibrarynotfound
#, object-pascal-format
msgid "Cannot load library %s! Please check your installation."

14
plugins/wcx/unrar/language/unrar.hu.po
View file

@ -76,6 +76,20 @@ msgstr ""
msgid "&Extract"
msgstr ""
#: rarlng.rsmsgpasswordenter
msgid "Please enter the password:"
msgstr ""
#: rarlng.rsmsgexecutablenotfound
#, object-pascal-format
msgid ""
"Cannot find RAR executable!\n"
"\n"
"%s\n"
"\n"
"Please check the plugin settings."
msgstr ""
#: rarlng.rsmsglibrarynotfound
#, object-pascal-format
msgid "Cannot load library %s! Please check your installation."

14
plugins/wcx/unrar/language/unrar.po → plugins/wcx/unrar/language/unrar.pot
View file

@ -58,6 +58,20 @@ msgstr ""
msgid "&Extract"
msgstr ""
#: rarlng.rsmsgpasswordenter
msgid "Please enter the password:"
msgstr ""
#: rarlng.rsmsgexecutablenotfound
#, object-pascal-format
msgid ""
"Cannot find RAR executable!\n"
"\n"
"%s\n"
"\n"
"Please check the plugin settings."
msgstr ""
#: rarlng.rsmsglibrarynotfound
#, object-pascal-format
msgid "Cannot load library %s! Please check your installation."

19
plugins/wcx/unrar/language/unrar.ru.po
View file

@ -58,6 +58,25 @@ msgstr "О&тмена"
msgid "&Extract"
msgstr "&Распаковать"
#: rarlng.rsmsgpasswordenter
msgid "Please enter the password:"
msgstr "Введите пароль:"
#: rarlng.rsmsgexecutablenotfound
#, object-pascal-format
msgid ""
"Cannot find RAR executable!\n"
"\n"
"%s\n"
"\n"
"Please check the plugin settings."
msgstr ""
"Исполняемый файл RAR не найден!\n"
"\n"
"%s\n"
"\n"
"Проверьте настройки плагина."
#: rarlng.rsmsglibrarynotfound
#, object-pascal-format
msgid "Cannot load library %s! Please check your installation."

14
plugins/wcx/unrar/language/unrar.zh_CN.po
View file

@ -58,6 +58,20 @@ msgstr ""
msgid "&Extract"
msgstr ""
#: rarlng.rsmsgpasswordenter
msgid "Please enter the password:"
msgstr ""
#: rarlng.rsmsgexecutablenotfound
#, object-pascal-format
msgid ""
"Cannot find RAR executable!\n"
"\n"
"%s\n"
"\n"
"Please check the plugin settings."
msgstr ""
#: rarlng.rsmsglibrarynotfound
#, object-pascal-format
msgid "Cannot load library %s! Please check your installation."

39
plugins/wcx/unrar/src/rarfunc.pas
View file

@ -3,7 +3,7 @@
-------------------------------------------------------------------------
Wcx plugin for packing RAR archives
Copyright (C) 2015-2022 Alexander Koblov (alexx2000@mail.ru)
Copyright (C) 2015-2023 Alexander Koblov (alexx2000@mail.ru)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -42,7 +42,7 @@ implementation
uses
Process, LazUTF8, DCConvertEncoding, DCProcessUtf8, DCOSUtils, UnRARFunc,
RarConfDlg;
RarConfDlg, RarLng, Extension;
const
UTF16LEBOM: WideChar = #$FEFF;
@ -63,11 +63,24 @@ begin
9: Result:= E_ECREATE; // File create error
10: Result:= E_BAD_DATA; // No files matching the specified mask and options were found
11: Result:= E_BAD_DATA; // Wrong password
12: Result:= E_EREAD; // Read error
255: Result:= E_EABORTED; // User break
else Result:= E_UNKNOWN; // Unknown
end;
end;
function RarExists(const FileName: String): Boolean;
var
Message: String;
begin
Result:= mbFileExists(FileName);
if not Result then
begin
Message:= Format(rsMsgExecutableNotFound, [FileName]);
gStartupInfo.MessageBox(PAnsiChar(Message), nil, MB_OK or MB_ICONERROR);
end;
end;
function ExecuteRar(Process: TProcessUtf8; FileList : UnicodeString): Integer;
var
TempFile: THandle;
@ -139,14 +152,18 @@ end;
function DeleteFilesW(PackedFile, DeleteList: PWideChar): Integer; dcpcall; export;
var
FileName : UnicodeString;
FolderName: UnicodeString;
Rar: String;
Process : TProcessUtf8;
FileName : UnicodeString;
FileList : UnicodeString;
FolderName: UnicodeString;
begin
Rar:= mbExpandEnvironmentStrings(WinRar);
if not RarExists(Rar) then Exit(E_HANDLED);
Process := TProcessUtf8.Create(nil);
try
Process.Executable:= mbExpandEnvironmentStrings(WinRar);
Process.Executable:= Rar;
Process.Parameters.Add('d');
Process.Parameters.Add('-c-');
Process.Parameters.Add('-r-');
@ -184,15 +201,19 @@ end;
function PackFilesW(PackedFile: PWideChar; SubPath: PWideChar; SrcPath: PWideChar; AddList: PWideChar; Flags: Integer): Integer;dcpcall; export;
var
FileName: UnicodeString;
FolderName: UnicodeString;
Rar: String;
Process : TProcessUtf8;
FileList: UnicodeString;
FileName: UnicodeString;
FolderName: UnicodeString;
Password: array[0..MAX_PATH] of AnsiChar;
begin
Rar:= mbExpandEnvironmentStrings(WinRar);
if not RarExists(Rar) then Exit(E_HANDLED);
Process := TProcessUtf8.Create(nil);
try
Process.Executable:= mbExpandEnvironmentStrings(WinRar);
Process.Executable:= Rar;
if FileIsConsoleExe(Process.Executable) then begin
Process.Options:= [poUsePipes, poNoConsole, poNewProcessGroup];
@ -220,7 +241,7 @@ begin
if (Flags and PK_PACK_ENCRYPT <> 0) then
begin
FillChar(Password, SizeOf(Password), #0);
if gStartupInfo.InputBox('Rar', 'Please enter the password:', True, PAnsiChar(Password), MAX_PATH) then
if gStartupInfo.InputBox('Rar', PAnsiChar(rsMsgPasswordEnter), True, PAnsiChar(Password), MAX_PATH) then
begin
if Encrypt then
Process.Parameters.Add('-hp' + Password)

2
plugins/wcx/unrar/src/rarlng.pas
View file

@ -33,8 +33,10 @@ resourcestring
rsMsgButtonCancel = '&Cancel';
rsMsgButtonExtract = '&Extract';
rsDictLargeWarning = 'Large dictionary warning';
rsMsgPasswordEnter = 'Please enter the password:';
rsDictNotAllowed = '%u GB dictionary exceeds %u GB limit and needs more than %u GB memory to unpack.';
rsMsgLibraryNotFound = 'Cannot load library %s! Please check your installation.';
rsMsgExecutableNotFound = 'Cannot find RAR executable!'#10#10'%s'#10#10'Please check the plugin settings.';
procedure TranslateResourceStrings;