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

fix #21 - update checker needs to be updated to use gitlab api

This commit is contained in:
Basile Burg 2020-04-07 23:22:34 +02:00
parent 7e5ffba6e7
commit 088ca3cb99
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/u_main.pas
View File

@ -2007,11 +2007,12 @@ end;
function checkForUpdate: string; function checkForUpdate: string;
const const
updURL = 'https://api.github.com/repos/Basile-z/dexed/releases/latest'; updURL = 'https://gitlab.com/api/v4/projects/15908229/repository/tags';
var var
arr: TJSONArray = nil;
dat: TJSONData = nil; dat: TJSONData = nil;
tgg: TJSONData = nil; tgg: TJSONData = nil;
url: TJSONData = nil; url: string;
str: string = ''; str: string = '';
lst: TStringList = nil; lst: TStringList = nil;
res: TResourceStream = nil; res: TResourceStream = nil;
@ -2019,13 +2020,18 @@ var
sva: TSemVer; sva: TSemVer;
begin begin
result := ''; result := '';
if simpleGet(updURL, dat) then if simpleGet(updURL, dat) and (dat.JSONType = jtArray) then
begin begin
try try
url := dat.FindPath('html_url'); arr := TJSONArray(dat);
tgg := dat.FindPath('tag_name'); if (arr.Count > 0) and (arr.Items[0].JSONType = jtObject) then
if url.isNotNil and tgg.isNotNil then
begin begin
dat := arr.Objects[0];
tgg := dat.FindPath('name');
end;
if tgg.isNotNil then
begin
url := 'https://gitlab.com/basile.b/dexed/-/releases/' + tgg.AsString;
res:= TResourceStream.Create(HINSTANCE, 'VERSION', RT_RCDATA); res:= TResourceStream.Create(HINSTANCE, 'VERSION', RT_RCDATA);
lst := TstringList.Create; lst := TstringList.Create;
lst.LoadFromStream(res); lst.LoadFromStream(res);
@ -2034,7 +2040,7 @@ begin
str := tgg.AsString; str := tgg.AsString;
svo.init(str, false); svo.init(str, false);
if svo.valid and sva.valid and (svo > sva) then if svo.valid and sva.valid and (svo > sva) then
result := url.AsString result := url
else else
dlgOkInfo('No new release available'); dlgOkInfo('No new release available');
end; end;

18
src/u_simpleget.pas
View File

@ -5,11 +5,15 @@ unit u_simpleget;
interface interface
uses uses
classes, {$ifdef posix}libcurl,{$else} fphttpclient,{$endif} fpjson, jsonparser, jsonscanner; classes, {$ifdef UNIX}libcurl,{$else} fphttpclient,{$endif} fpjson, jsonparser, jsonscanner;
type type
PStream = ^TStream; PStream = ^TStream;
{$ifdef VER3_2_0}
{$Warning 'workarounds to avoid SSL context errors may be unecessary starting from FCL 3.2.0'}
{$endif}
// Get the content of 'url' in the string 'data' // Get the content of 'url' in the string 'data'
function simpleGet(url: string; var data: string): boolean; overload; function simpleGet(url: string; var data: string): boolean; overload;
// Get the content of 'url' in the stream 'data' // Get the content of 'url' in the stream 'data'
@ -25,7 +29,7 @@ const
implementation implementation
{$ifdef posix} {$ifdef UNIX}
var var
fCurlHandle: CURL = nil; fCurlHandle: CURL = nil;
@ -62,13 +66,13 @@ end;
{$endif} {$endif}
function simpleGet(url: string; var data: string): boolean; overload; function simpleGet(url: string; var data: string): boolean; overload;
{$ifdef posix} {$ifdef UNIX}
var var
c: CURLcode; c: CURLcode;
h: CURL; h: CURL;
{$endif} {$endif}
begin begin
{$ifdef posix} {$ifdef UNIX}
h := curlHandle(); h := curlHandle();
if not assigned(h) then if not assigned(h) then
exit(false); exit(false);
@ -103,13 +107,13 @@ begin
end; end;
function simpleGet(url: string; data: TStream): boolean; overload; function simpleGet(url: string; data: TStream): boolean; overload;
{$ifdef posix} {$ifdef UNIX}
var var
c: CURLcode; c: CURLcode;
h: CURL; h: CURL;
{$endif} {$endif}
begin begin
{$ifdef posix} {$ifdef UNIX}
h := curlHandle(); h := curlHandle();
if not assigned(h) then if not assigned(h) then
exit(false); exit(false);
@ -163,7 +167,7 @@ begin
end; end;
finalization finalization
{$ifdef posix} {$ifdef UNIX}
if assigned(fCurlHandle) then if assigned(fCurlHandle) then
curl_easy_cleanup(fCurlHandle); curl_easy_cleanup(fCurlHandle);
{$endif} {$endif}