forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup

This commit is contained in:
Basile Burg 2016-11-04 15:41:05 +01:00
parent 5d84f67e46
commit e1cba9ae37
No known key found for this signature in database
GPG Key ID: 1868039F415CB8CF
1 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/ce_common.pas
View File

@ -307,8 +307,6 @@ var
implementation implementation
uses
ce_main;
class function TStringHash.hash(const key: string; maxBucketsPow2: longword): longword; class function TStringHash.hash(const key: string; maxBucketsPow2: longword): longword;
var var
@ -754,7 +752,7 @@ begin
result := false; result := false;
if path.isEmpty then if path.isEmpty then
exit; exit;
//
if path[path.length] = '*' then if path[path.length] = '*' then
begin begin
pth := path[1..path.length-1]; pth := path[1..path.length-1];
@ -870,7 +868,7 @@ begin
if additionalPath.isNotEmpty then if additionalPath.isNotEmpty then
env += PathSeparator + additionalPath; env += PathSeparator + additionalPath;
{$IFNDEF CEBUILD} {$IFNDEF CEBUILD}
if Application <> nil then if Application.isNotNil then
env += PathSeparator + ExtractFileDir(application.ExeName.ExtractFilePath); env += PathSeparator + ExtractFileDir(application.ExeName.ExtractFilePath);
{$ENDIF} {$ENDIF}
exit(ExeSearch(fname, env)); exit(ExeSearch(fname, env));
@ -885,34 +883,21 @@ var
begin begin
if not (poUsePipes in process.Options) then if not (poUsePipes in process.Options) then
exit; exit;
//
// note: list.LoadFromStream() does not work, lines can be split, which breaks message parsing (e.g filename detector).
//
{
Split lines:
------------
The problem comes from TAsynProcess.OnReadData. When the output is read in the
event, it does not always finish on a full line.
Resolution:
-----------
in TAsynProcess.OnReadData Accumulate avalaible output in a stream.
Detects last line terminator in the accumation.
Load TStrings from this stream range.
}
str := TMemoryStream.Create; str := TMemoryStream.Create;
try try
buffSz := process.PipeBufferSize; buffSz := process.PipeBufferSize;
// temp fix: messages are cut if the TAsyncProcess version is used on simple TProcess. // temp fix: messages are cut if the TAsyncProcess version is used on simple TProcess.
if process is TAsyncProcess then begin if process is TAsyncProcess then
while process.Output.NumBytesAvailable <> 0 do begin begin
while process.Output.NumBytesAvailable <> 0 do
begin
str.SetSize(sum + buffSz); str.SetSize(sum + buffSz);
cnt := process.Output.Read((str.Memory + sum)^, buffSz); cnt := process.Output.Read((str.Memory + sum)^, buffSz);
sum += cnt; sum += cnt;
end; end;
end else begin end else
begin
repeat repeat
str.SetSize(sum + buffSz); str.SetSize(sum + buffSz);
cnt := process.Output.Read((str.Memory + sum)^, buffSz); cnt := process.Output.Read((str.Memory + sum)^, buffSz);
@ -935,9 +920,10 @@ const
begin begin
if not (poUsePipes in process.Options) then if not (poUsePipes in process.Options) then
exit; exit;
//
sum := output.Size; sum := output.Size;
while process.Output.NumBytesAvailable <> 0 do begin while process.Output.NumBytesAvailable <> 0 do
begin
output.SetSize(sum + buffSz); output.SetSize(sum + buffSz);
cnt := process.Output.Read((output.Memory + sum)^, buffSz); cnt := process.Output.Read((output.Memory + sum)^, buffSz);
sum += cnt; sum += cnt;
@ -948,7 +934,7 @@ end;
procedure killProcess(var process: TAsyncProcess); procedure killProcess(var process: TAsyncProcess);
begin begin
if process = nil then if process.isNil then
exit; exit;
if process.Running then if process.Running then
process.Terminate(0); process.Terminate(0);
@ -1003,9 +989,11 @@ var
parent: string; parent: string;
begin begin
result := 0; result := 0;
while(true) do begin while true do
begin
parent := fname.extractFileDir; parent := fname.extractFileDir;
if parent = fname then exit; if parent = fname then
exit;
fname := parent; fname := parent;
result += 1; result += 1;
end; end;
@ -1143,7 +1131,7 @@ begin
end; end;
{$ENDIF} {$ENDIF}
function AppIsRunning(const fname: string):Boolean; function AppIsRunning(const fname: string): boolean;
begin begin
Result:= internalAppIsRunning(fname) > 0; Result:= internalAppIsRunning(fname) > 0;
end; end;
@ -1179,8 +1167,8 @@ begin
if str.isEmpty then if str.isEmpty then
exit; exit;
if str[1] = ';' then if str[1] = ';' then
result := true; result := true
if (str.length > 1) and (str[1..2] = '//') then else if (str.length > 1) and (str[1..2] = '//') then
result := true; result := true;
end; end;