paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-16 04:20:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Opkman: Changing RepositoryDate from TDate to TDateTime to match packagelink LPKFileDate.

Browse Source 
git-svn-id: trunk@56468 -
This commit is contained in:
balazs 2017-11-22 13:13:39 +00:00
parent 0a6fb60c9f
commit 7278c5ac87
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/onlinepackagemanager/opkman_createrepositoryfrm.pas
View File

@ -143,7 +143,7 @@ type
FRepositoryFileName: String;
FRepositoryFileSize: Int64;
FRepositoryFileHash: String;
FRepositoryDate: TDate;
FRepositoryDate: TDateTime;
FAuthor: String;
FDescription: String;
FLicense: String;

2
components/onlinepackagemanager/opkman_createrepositorypackagefrm.pas
View File

@ -1028,7 +1028,7 @@ begin
MetaPkg.RepositoryFileName := ExtractFileName(FPackageFile);
MetaPkg.RepositoryFileSize := FileUtil.FileSize(FPackageFile);
MetaPkg.RepositoryFileHash := MD5Print(MD5File(FPackageFile));
MetaPkg.RepositoryDate := Trunc(now);
MetaPkg.RepositoryDate := now;
MetaPkg.PackageBaseDir := RootData^.FPackageBaseDir;
if Trim(RootData^.FDisplayName) <> '' then
MetaPkg.DisplayName := RootData^.FDisplayName

20
components/onlinepackagemanager/opkman_intf.pas
View File

@ -130,8 +130,7 @@ var
MetaPackage: TMetaPackage;
LazPackage: TLazarusPackage;
PackageLink: TPackageLink;
URL, Name: String;
Version: TPkgVersion;
FileName, Name, URL: String;
begin
for I := 0 to SerializablePackages.Count - 1 do
begin
@ -139,17 +138,18 @@ begin
for J := 0 to MetaPackage.LazarusPackages.Count - 1 do
begin
LazPackage := TLazarusPackage(MetaPackage.LazarusPackages.Items[J]);
URL := Options.RemoteRepository[Options.ActiveRepositoryIndex] + MetaPackage.RepositoryFileName;
FileName := Options.LocalRepositoryPackages + MetaPackage.PackageBaseDir + LazPackage.PackageRelativePath + LazPackage.Name;
Name := StringReplace(LazPackage.Name, '.lpk', '', [rfReplaceAll, rfIgnoreCase]);
Version := Lazpackage.Version;
URL := Options.RemoteRepository[Options.ActiveRepositoryIndex] + MetaPackage.RepositoryFileName;
if not IsInList(Name, URL) then
begin
PackageLink := PkgLinks.AddOnlineLink(Url, Name, Version);
PackageLink.Name := Name;
PackageLink.LPLFileDate := MetaPackage.RepositoryDate;
PackageLink.LPKFilename := Options.LocalRepositoryPackages + MetaPackage.PackageBaseDir + LazPackage.PackageRelativePath + LazPackage.Name;
PackageLink.LPKUrl := URL;
FOPMPackageLinks.Add(PackageLink);
PackageLink := PkgLinks.AddOnlineLink(FileName, Name, URL);
if PackageLink <> nil then
begin
PackageLink.Version.Assign(LazPackage.Version);
PackageLink.LPKFileDate := MetaPackage.RepositoryDate;
FOPMPackageLinks.Add(PackageLink);
end;
end;
end;
end;

8
components/onlinepackagemanager/opkman_serializablepackages.pas
View File

@ -175,7 +175,7 @@ type
FRepositoryFileSize: Int64;
FRepositoryFileHash: String;
FChecked: Boolean;
FRepositoryDate: TDate;
FRepositoryDate: TDateTime;
FPackageState: TPackageState;
FPackageStates: TPackageStates;
FPackageBaseDir: String;
@ -217,7 +217,7 @@ type
property RepositoryFileName: String read FRepositoryFileName write FRepositoryFileName;
property RepositoryFileSize: int64 read FRepositoryFileSize write FRepositoryFileSize;
property RepositoryFileHash: String read FRepositoryFileHash write FRepositoryFileHash;
property RepositoryDate: TDate read FRepositoryDate write FRepositoryDate;
property RepositoryDate: TDateTime read FRepositoryDate write FRepositoryDate;
property PackageBaseDir: String read FPackageBaseDir write FPackageBaseDir;
property LazarusPackages: TCollection read FLazarusPackages write FLazarusPackages;
property HomePageURL: String read FHomePageURL write FHomePageURL;
@ -1443,7 +1443,7 @@ var
begin
Package1 := TMetaPackage(Item1);
Package2 := TMetaPackage(Item2);
Result := CompareDate(Package1.RepositoryDate, Package2.RepositoryDate);
Result := CompareDateTime(Package1.RepositoryDate, Package2.RepositoryDate);
end;
function SortByDateDsc(Item1, Item2: TCollectionItem): Integer;
@ -1452,7 +1452,7 @@ var
begin
Package1 := TMetaPackage(Item1);
Package2 := TMetaPackage(Item2);
Result := CompareDate(Package2.RepositoryDate, Package1.RepositoryDate);
Result := CompareDateTime(Package2.RepositoryDate, Package1.RepositoryDate);
end;
procedure TSerializablePackages.Sort(const ASortType: TSortType;

2
components/onlinepackagemanager/opkman_visualtree.pas
View File

@ -66,7 +66,7 @@ type
RepositoryFileName: String;
RepositoryFileSize: Int64;
RepositoryFileHash: String;
RepositoryDate: TDate;
RepositoryDate: TDateTime;
HomePageURL: String;
DownloadURL: String;
DownloadZipURL: String;