paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 06:49:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Opkman: Optimization(faster tree) + fixed a small bug on install.

Browse Source 
git-svn-id: trunk@53766 -
This commit is contained in:
balazs 2016-12-23 08:52:49 +00:00
parent 2773818d1f
commit 4e0a04d655
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/onlinepackagemanager/opkman_installer.pas
View File

@ -299,15 +299,18 @@ begin
DoOnPackageInstallProgress(imPackageCompleted, PackageFile);
end;
end;
if (InstallPackageList.Count > 0) and (not FNeedToBreak) then
if InstallPackageList.Count > 0 then
begin
PkgInstallInIDEFlags := [piiifQuiet];
if PackageEditingInterface.InstallPackages(InstallPackageList, PkgInstallInIDEFlags) = mrOk then
begin
if ErrCnt = 0 then
FInstallStatus := isSuccess
else
FInstallStatus := isPartiallyFailed;
if not FNeedToBreak then
begin
if ErrCnt = 0 then
FInstallStatus := isSuccess
else
FInstallStatus := isPartiallyFailed;
end;
end;
end;
if Assigned(FOnPackageInstallCompleted) then

1
components/onlinepackagemanager/opkman_mainfrm.pas
View File

@ -707,7 +707,6 @@ begin
Exit;
CanGo := True;
VisualTree.UpdatePackageStates;
PackageListFrm := TPackageListFrm.Create(MainFrm);
try
PackageListFrm.lbMessage.Caption := rsMainFrm_PackageAlreadyInstalled;

21
components/onlinepackagemanager/opkman_visualtree.pas
View File

@ -39,6 +39,8 @@ type
PData = ^TData;
TData = record
DataType: Integer;
PID: Integer;
PFID: Integer;
Repository: String;
PackageState: TPackageState;
PackageName: String;
@ -312,6 +314,7 @@ begin
Node := FVST.AddChild(RootNode);
Node^.CheckType := ctTriStateCheckBox;
Data := FVST.GetNodeData(Node);
Data^.PID := I;
Data^.PackageName := SerializablePackages.Items[I].Name;
Data^.PackageDisplayName := SerializablePackages.Items[I].DisplayName;
Data^.PackageState := SerializablePackages.Items[I].PackageState;
@ -329,6 +332,8 @@ begin
ChildNode^.CheckType := ctTriStateCheckBox;
FVST.IsDisabled[ChildNode] := FVST.IsDisabled[ChildNode^.Parent];
ChildData := FVST.GetNodeData(ChildNode);
ChildData^.PID := I;
ChildData^.PFID := J;
ChildData^.PackageFileName := PackageFile.Name;
ChildData^.InstalledVersion := PackageFile.InstalledFileVersion;
ChildData^.UpdateVersion := PackageFile.UpdateVersion;
@ -1044,7 +1049,7 @@ begin
Data := FVST.GetNodeData(Node);
if Data^.DataType = 1 then
begin
Package := SerializablePackages.FindPackage(Data^.PackageName, fpbPackageName);
Package := SerializablePackages.Items[Data^.PID];
if Package <> nil then
begin
if (FVST.CheckState[Node] = csCheckedNormal) or (FVST.CheckState[Node] = csMixedNormal) then
@ -1055,7 +1060,7 @@ begin
end;
if Data^.DataType = 2 then
begin
PackageFile := SerializablePackages.FindPackageFile(Data^.PackageFileName);
PackageFile := TPackageFile(SerializablePackages.Items[Data^.PID].PackageFiles.Items[Data^.PFID]);
if PackageFile <> nil then
begin
if FVST.CheckState[Node] = csCheckedNormal then
@ -1082,7 +1087,7 @@ begin
Data := FVST.GetNodeData(Node);
if (Data^.DataType = 1) then
begin
Package := SerializablePackages.FindPackage(Data^.PackageName, fpbPackageName);
Package := SerializablePackages.Items[Data^.PID];
if Package <> nil then
begin
Data^.PackageState := Package.PackageState;
@ -1093,7 +1098,7 @@ begin
end;
if Data^.DataType = 2 then
begin
PackageFile := SerializablePackages.FindPackageFile(Data^.PackageFileName);
PackageFile := TPackageFile(SerializablePackages.Items[Data^.PID].PackageFiles.Items[Data^.PFID]);
if PackageFile <> nil then
begin
Data^.InstalledVersion := PackageFile.InstalledFileVersion;
@ -1119,7 +1124,7 @@ begin
Data := FVST.GetNodeData(Node);
if (Data^.DataType = 1) then
begin
Package := SerializablePackages.FindPackage(Data^.PackageName, fpbPackageName);
Package := SerializablePackages.Items[Data^.PID];
if Package <> nil then
begin
Data^.DownloadZipURL := Package.DownloadZipURL;
@ -1133,7 +1138,7 @@ begin
end;
if Data^.DataType = 2 then
begin
PackageFile := SerializablePackages.FindPackageFile(Data^.PackageFileName);
PackageFile := TPackageFile(SerializablePackages.Items[Data^.PID].PackageFiles.Items[Data^.PFID]);
if PackageFile <> nil then
begin
Data^.UpdateVersion := PackageFile.UpdateVersion;
@ -1251,7 +1256,7 @@ begin
DataSearch := FVST.GetNodeData(NodeSearch);
if DataSearch^.DataType = 2 then
begin
DependencyPackage := SerializablePackages.FindPackageFile(DataSearch^.PackageFileName);
DependencyPackage := TPackageFile(SerializablePackages.Items[DataSearch^.PID].PackageFiles.Items[DataSearch^.PFID]);
if (FVST.CheckState[NodeSearch] <> csCheckedNormal) and
(UpperCase(DataSearch^.PackageFileName) = UpperCase(PackageFileName)) and
((SerializablePackages.IsDependencyOk(TPackageDependency(PackageList.Items[I]), DependencyPackage)) and
@ -1683,7 +1688,7 @@ begin
Data^.Rating := Trunc((FHoverP.X - R.Left - 1)/16) + 1;
if Data^.Rating > 5 then
Data^.Rating := 5;
Package := SerializablePackages.FindPackage(Data^.PackageName, fpbPackageName);
Package := SerializablePackages.Items[Data^.PID];
if Package <> nil then
Package.Rating := Data^.Rating;
if Data^.PackageDisplayName <> '' then