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

refactored ce_cdbcmd with ce_common process tools

This commit is contained in:
Basile Burg 2014-11-07 14:09:49 +01:00
parent dd65981470
commit 4ef06c984a
1 changed files with 12 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/ce_cdbcmd.pas
View File

@ -33,7 +33,6 @@ type
procedure cdbOutput(sender: TObject);
procedure cdbTerminate(sender: TObject);
procedure cdbOutputToGui;
procedure cdbFree;
public
constructor create(aOwner: TComponent); override;
destructor destroy; override;
@ -62,7 +61,7 @@ end;
destructor TCECdbWidget.destroy;
begin
if Enabled then begin
cdbFree;
killProcess(fCdbProc);
EntitiesConnector.removeObserver(self);
end;
inherited;
@ -100,7 +99,7 @@ begin
outname := fProject.outputFilename;
if not fileExists(outname) then exit;
//
cdbFree;
killProcess(fCdbProc);
fCdbProc := TAsyncProcess.create(nil);
fCdbProc.Executable := 'cdb';
fCdbProc.Parameters.Add('-c');
@ -144,7 +143,7 @@ const
begin
if fCdbProc <> nil then
fCdbProc.Input.Write(cmd[1], length(cmd));
cdbFree;
killProcess(fCdbProc);
end;
procedure TCECdbWidget.txtCdbCmdKeyPress(Sender: TObject; var Key: char);
@ -166,34 +165,20 @@ end;
procedure TCECdbWidget.cdbOutputToGui;
var
str: TMemoryStream;
lst: TStringList;
cnt: Integer;
sum: Integer;
begin
if fCdbProc = nil then exit;
cnt := 0;
sum := 0;
str := TMemoryStream.Create;
//
lst := TStringList.Create;
while fCdbProc.Output.NumBytesAvailable <> 0 do
begin
str.Size := str.Size + 1024;
cnt := fCdbProc.Output.Read((str.Memory + sum)^, 1024);
sum += cnt;
try
processOutputToStrings(fCdbProc, lst);
for cnt := 0 to lst.Count-1 do
lstCdbOut.AddItem(lst.Strings[cnt], nil);
lstCdbOut.Items[lstCdbOut.Items.Count-1].MakeVisible(true);
finally
lst.Free;
end;
str.Size := sum;
lst.LoadFromStream(str);
for cnt := 0 to lst.Count-1 do
lstCdbOut.AddItem(lst.Strings[cnt], nil);
lstCdbOut.Items[lstCdbOut.Items.Count-1].MakeVisible(true);
lst.Free;
str.Free;
end;
procedure TCECdbWidget.cdbOutput(sender: TObject);
@ -204,18 +189,7 @@ end;
procedure TCECdbWidget.cdbTerminate(sender: TObject);
begin
cdbOutputToGui;
cdbFree;
end;
procedure TCECdbWidget.cdbFree;
begin
if fCdbProc = nil then
exit;
//
if fCdbProc.Running then
fCdbProc.Terminate(0);
fCdbProc.Free;
fCdbProc := nil;
killProcess(fCdbProc);
end;
end.