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

Opkman: Extend TOPMInterface.

Browse Source 
git-svn-id: trunk@56711 -
This commit is contained in:
balazs 2017-12-13 07:27:52 +00:00
parent 48b785c072
commit 640a82f920
1 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
components/onlinepackagemanager/opkman_intf.pas
View File

@ -45,6 +45,8 @@ type
FPackageDependecies: TObjectList; FPackageDependecies: TObjectList;
FPackageLinks: TObjectList; FPackageLinks: TObjectList;
FWaitForIDE: TThreadTimer; FWaitForIDE: TThreadTimer;
FNeedToInit: Boolean;
FBusyUpdating: Boolean;
procedure DoWaitForIDE(Sender: TObject); procedure DoWaitForIDE(Sender: TObject);
procedure DoUpdatePackageLinks(Sender: TObject); procedure DoUpdatePackageLinks(Sender: TObject);
procedure InitOPM; procedure InitOPM;
@ -75,6 +77,7 @@ begin
FPackageLinks := TObjectList.Create(False); FPackageLinks := TObjectList.Create(False);
FPackagesToInstall := TObjectList.Create(False); FPackagesToInstall := TObjectList.Create(False);
FPackageDependecies := TObjectList.Create(False); FPackageDependecies := TObjectList.Create(False);
FNeedToInit := True;
FWaitForIDE := TThreadTimer.Create; FWaitForIDE := TThreadTimer.Create;
FWaitForIDE.Interval := 100; FWaitForIDE.Interval := 100;
FWaitForIDE.OnTimer := @DoWaitForIDE; FWaitForIDE.OnTimer := @DoWaitForIDE;
@ -83,6 +86,8 @@ end;
destructor TOPMInterfaceEx.Destroy; destructor TOPMInterfaceEx.Destroy;
begin begin
FWaitForIDE.StopTimer;
FWaitForIDE.Terminate;
FPackageLinks.Clear; FPackageLinks.Clear;
FPackageLinks.Free; FPackageLinks.Free;
FPackagesToInstall.Clear; FPackagesToInstall.Clear;
@ -99,10 +104,26 @@ end;
procedure TOPMInterfaceEx.DoWaitForIDE(Sender: TObject); procedure TOPMInterfaceEx.DoWaitForIDE(Sender: TObject);
begin begin
if Assigned(LazarusIDE) and Assigned(PackageEditingInterface) then if Assigned(LazarusIDE) and Assigned(PackageEditingInterface) then
begin
if FNeedToInit then
begin begin
InitOPM; InitOPM;
FNeedToInit := False;
FWaitForIDE.StopTimer; FWaitForIDE.StopTimer;
FWaitForIDE.Terminate; FWaitForIDE.Interval := 5000;
FWaitForIDE.StartTimer;
end
else
begin
if FPackageLinks.Count = 0 then
begin
PackageDownloader.DownloadJSON(Options.ConTimeOut*1000);
Exit;
end;
if (not FBusyUpdating) then
if (Assigned(OnPackageListAvailable)) then
OnPackageListAvailable(Self);
end;
end; end;
end; end;
@ -114,7 +135,6 @@ begin
SerializablePackages.OnUpdatePackageLinks := @DoUpdatePackageLinks; SerializablePackages.OnUpdatePackageLinks := @DoUpdatePackageLinks;
PackageDownloader := TPackageDownloader.Create(Options.RemoteRepository[Options.ActiveRepositoryIndex]); PackageDownloader := TPackageDownloader.Create(Options.RemoteRepository[Options.ActiveRepositoryIndex]);
InstallPackageList := TObjectList.Create(True); InstallPackageList := TObjectList.Create(True);
PackageDownloader.DownloadJSON(Options.ConTimeOut*1000);
end; end;
procedure TOPMInterfaceEx.DoUpdatePackageLinks(Sender: TObject); procedure TOPMInterfaceEx.DoUpdatePackageLinks(Sender: TObject);
@ -147,6 +167,10 @@ var
PackageLink: TPackageLink; PackageLink: TPackageLink;
FileName, Name, URL: String; FileName, Name, URL: String;
begin begin
if FBusyUpdating then
Exit;
FBusyUpdating := True;
try
PkgLinks.ClearOnlineLinks; PkgLinks.ClearOnlineLinks;
FPackageLinks.Clear; FPackageLinks.Clear;
for I := 0 to SerializablePackages.Count - 1 do for I := 0 to SerializablePackages.Count - 1 do
@ -170,6 +194,9 @@ begin
end; end;
end; end;
end; end;
finally
FBusyUpdating := False;
end;
end; end;
procedure TOPMInterfaceEx.AddToInstallList(const AName, AURL: String); procedure TOPMInterfaceEx.AddToInstallList(const AName, AURL: String);