Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions baseunits/GitHubRepoV3.pas
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ TGitHubRepo = class
function GetLastCommitMessage(const FRepoPath: String): String;
function GetTree: Boolean;
function GetUpdate: Boolean;
function CheckConnection: Boolean;
function CheckRateLimited: Boolean;
function GetDownloadURL(const AName: String): String;
end;
Expand Down Expand Up @@ -303,6 +304,18 @@ function TGitHubRepo.GetUpdate: Boolean;
FDirty := Result;
end;


function TGitHubRepo.CheckConnection: Boolean;
begin
Result := False;
HTTP.ResetBasic;

if HTTP.GET(api_url) then
begin
Result := True;
end;
end;

function TGitHubRepo.CheckRateLimited: Boolean;
var
s: String;
Expand Down
2 changes: 1 addition & 1 deletion baseunits/StatusBarDownload.pas
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ procedure TStatusBarDownload.SyncCreate;
StatusBarResize(FStatusBar);

FTimerRepaint := TTimer.Create(FStatusBar);
FTimerRepaint.Interval := 500;
FTimerRepaint.Interval := 50;
FTimerRepaint.OnTimer := @TimerRepaintTimer;
FTimerRepaint.Enabled := True;
FNeedRepaint := True;
Expand Down
18 changes: 16 additions & 2 deletions baseunits/imagemagickmanager.pas
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ TImageMagickManager = class
function IdentifyCommand(const QueryCommand: String): TStringList;
procedure CacheSupportedFormats;
procedure CacheCompressionTypes;
function ExecuteMagickCommand(const Params: array of String; TimeoutMS: Cardinal = 300000): Boolean;
function ExecuteMagickCommand(const Params: array of String; TimeoutMS: Cardinal = 600000): Boolean;
function StreamToString(Stream: TMemoryStream): String;
constructor CreatePrivate;

Expand Down Expand Up @@ -501,7 +501,7 @@ function TImageMagickManager.IsFormatSupported(const Format: String): Boolean;
end;
end;

function TImageMagickManager.ExecuteMagickCommand(const Params: array of String; TimeoutMS: Cardinal = 300000): Boolean;
function TImageMagickManager.ExecuteMagickCommand(const Params: array of String; TimeoutMS: Cardinal = 600000): Boolean;
var
Process: TProcess;
Param, ErrorStreamOutput: String;
Expand Down Expand Up @@ -667,6 +667,20 @@ function TImageMagickManager.ConvertImage(InputFile, OutputDir: String): Boolean
OutputFile := QuoteStr((OutputDir + '%[filename:name].' + FSaveAs), '"');
OutputDir := QuoteStr(ExcludeTrailingPathDelimiter(OutputDir), '"');

// if FMogrify then:
// 'mogrify' command first
// 'path' command for OutputDir
// input directory to mogrify

// else:
// input file list first
// 'adjoin' command to treat each file in list as a seperate command
// 'set filename:name' command to set output file name same as input
// output file with directory and file name

// 'quality' command to set output image quality
// 'compress' command for compression type
// 'format' command to set output file format
Result := ExecuteMagickCommand([
IFThen(FMogrify, 'mogrify', InputFile),
'-quality', GetQualityString,
Expand Down
14 changes: 9 additions & 5 deletions baseunits/uBaseUnit.pas
Original file line number Diff line number Diff line change
Expand Up @@ -236,13 +236,13 @@ interface
{$ifdef windows}
// MAX_PATH = 260
// MAX_PATH - 12 - 1
MAX_PATHDIR = 247;
MAX_PATHDIR = 246;
// fmd max file extension = 4
// max path + file in windows explorer is 259
// = MAX_PATH - fmd max file extension - 1
// 1 is pahtdelim "/"
FMDMaxImageFilePath = 255;
// if directory length is max_pathdir, the remaining allowed filename is 7
FMDMaxImageFilePath = 254;
// if directory length is MAX_PATHDIR, the remaining allowed filename is 7
// = 259 - fmd max file extension - 1
{$endif}

Expand Down Expand Up @@ -2207,8 +2207,12 @@ function CreateFQDNName(AFileName: String): String;
var
UniqueTimestampName: String;
begin
UniqueTimestampName := StringReplace(ExtractFileName(AFileName), ExtractFileExt(AFileName), '', [rfReplaceAll])+ '_' + FormatDateTime('yyyy-mm-dd_hh-nn-ss', Now);
Result := StringReplace(('FQDNList_' + UniqueTimestampName), ' ', '_', [rfReplaceAll]);
UniqueTimestampName := StringReplace(ExtractFileName(AFileName), ExtractFileExt(AFileName), '', [rfReplaceAll]);
UniqueTimestampName := RemoveSymbols(UniqueTimestampName);
Delete(UniqueTimestampName, 100, 200);
UniqueTimestampName := UniqueTimestampName + '_' + FormatDateTime('yyyy-mm-dd_hh-nn-ss', Now);
UniqueTimestampName := StringReplace(('FQDNList_' + UniqueTimestampName), ' ', '_', [rfReplaceAll]);
Result := UniqueTimestampName;
end;

function CreateFQDNFolder(Sender: TObject; ACurrentDir, AFileName: String): String;
Expand Down
10 changes: 8 additions & 2 deletions baseunits/uDownloadsManager.pas
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ function TTaskThread.Convert: Boolean;
end
else
begin
FilePath := AppendPathDelim(ExpandFileName(TempPath)) + '*' + ExtractFileExt(FilePath);
FilePath := AppendPathDelim(ExpandFileName(TempPath)) + '*';
end;

Result := ImageMagick.ConvertImage(FilePath, CurrentWorkingDir);
Expand Down Expand Up @@ -762,12 +762,18 @@ procedure TTaskThread.SetCurrentWorkingDir(AValue: String);
begin
if FCurrentWorkingDir = AValue then Exit;
FCurrentWorkingDir := CorrectPathSys(AValue);

{$IFDEF Windows}
s := UTF8Decode(FCurrentWorkingDir);

if MainForm.cbOptionEnableLongNamePaths.Checked then
FCurrentMaxFileNameLength := FMDMaxImageFilePath + Length(s)
begin
FCurrentMaxFileNameLength := FMDMaxImageFilePath + Length(s);
end
else
begin
FCurrentMaxFileNameLength := FMDMaxImageFilePath - Length(s);
end;
{$ENDIF}
end;

Expand Down
10 changes: 8 additions & 2 deletions languages/fmd.de.po
Original file line number Diff line number Diff line change
Expand Up @@ -187,14 +187,20 @@ msgstr "Herunterladen abschließen"

#: frmluamodulesupdater.rs_githubconnectfail
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Please try again later."
"Failed to connect to GitHub API.\n"
"Please check your internet connection or try again later."
msgstr ""

#: frmluamodulesupdater.rs_githubconnecting
msgid "Connecting to GitHub..."
msgstr ""

#: frmluamodulesupdater.rs_githubratelimited
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Change the network or try again after 15 minutes"
msgstr ""

#: frmluamodulesupdater.rs_githubratestats
#, object-pascal-format
msgid "GitHub API core rate - call limit: %d, remaining calls: %d, used calls: %d, limit refresh: %s"
Expand Down
10 changes: 8 additions & 2 deletions languages/fmd.el_GR.po
Original file line number Diff line number Diff line change
Expand Up @@ -187,14 +187,20 @@ msgstr ""

#: frmluamodulesupdater.rs_githubconnectfail
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Please try again later."
"Failed to connect to GitHub API.\n"
"Please check your internet connection or try again later."
msgstr ""

#: frmluamodulesupdater.rs_githubconnecting
msgid "Connecting to GitHub..."
msgstr ""

#: frmluamodulesupdater.rs_githubratelimited
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Change the network or try again after 15 minutes"
msgstr ""

#: frmluamodulesupdater.rs_githubratestats
#, object-pascal-format
msgid "GitHub API core rate - call limit: %d, remaining calls: %d, used calls: %d, limit refresh: %s"
Expand Down
14 changes: 12 additions & 2 deletions languages/fmd.en.po
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,13 @@ msgid "Finish download"
msgstr "Finish download"

#: frmluamodulesupdater.rs_githubconnectfail
#, fuzzy
#| msgid ""
#| "Failed to connect to GitHub API for latest module updates.\n"
#| "Please try again later."
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Please try again later."
"Failed to connect to GitHub API.\n"
"Please check your internet connection or try again later."
msgstr ""
"Failed to connect to GitHub API for latest module updates.\n"
"Please try again later."
Expand All @@ -196,6 +200,12 @@ msgstr ""
msgid "Connecting to GitHub..."
msgstr "Connecting to GitHub..."

#: frmluamodulesupdater.rs_githubratelimited
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Change the network or try again after 15 minutes"
msgstr ""

#: frmluamodulesupdater.rs_githubratestats
#, object-pascal-format
msgid "GitHub API core rate - call limit: %d, remaining calls: %d, used calls: %d, limit refresh: %s"
Expand Down
10 changes: 8 additions & 2 deletions languages/fmd.es.po
Original file line number Diff line number Diff line change
Expand Up @@ -187,14 +187,20 @@ msgstr "Descarga terminada"

#: frmluamodulesupdater.rs_githubconnectfail
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Please try again later."
"Failed to connect to GitHub API.\n"
"Please check your internet connection or try again later."
msgstr ""

#: frmluamodulesupdater.rs_githubconnecting
msgid "Connecting to GitHub..."
msgstr ""

#: frmluamodulesupdater.rs_githubratelimited
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Change the network or try again after 15 minutes"
msgstr ""

#: frmluamodulesupdater.rs_githubratestats
#, object-pascal-format
msgid "GitHub API core rate - call limit: %d, remaining calls: %d, used calls: %d, limit refresh: %s"
Expand Down
10 changes: 8 additions & 2 deletions languages/fmd.fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -187,14 +187,20 @@ msgstr "Finir le téléchargement"

#: frmluamodulesupdater.rs_githubconnectfail
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Please try again later."
"Failed to connect to GitHub API.\n"
"Please check your internet connection or try again later."
msgstr ""

#: frmluamodulesupdater.rs_githubconnecting
msgid "Connecting to GitHub..."
msgstr ""

#: frmluamodulesupdater.rs_githubratelimited
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Change the network or try again after 15 minutes"
msgstr ""

#: frmluamodulesupdater.rs_githubratestats
#, object-pascal-format
msgid "GitHub API core rate - call limit: %d, remaining calls: %d, used calls: %d, limit refresh: %s"
Expand Down
14 changes: 12 additions & 2 deletions languages/fmd.id_ID.po
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,13 @@ msgid "Finish download"
msgstr "Selesai mengunduh"

#: frmluamodulesupdater.rs_githubconnectfail
#, fuzzy
#| msgid ""
#| "Failed to connect to GitHub API for latest module updates.\n"
#| "Please try again later."
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Please try again later."
"Failed to connect to GitHub API.\n"
"Please check your internet connection or try again later."
msgstr ""
"Gagal menyambung ke GitHub API untuk pemutakhiran modul terbaru.\n"
"Silakan coba lagi nanti."
Expand All @@ -200,6 +204,12 @@ msgstr ""
msgid "Connecting to GitHub..."
msgstr "Menyambungkan GitHub..."

#: frmluamodulesupdater.rs_githubratelimited
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Change the network or try again after 15 minutes"
msgstr ""

#: frmluamodulesupdater.rs_githubratestats
#, object-pascal-format
msgid "GitHub API core rate - call limit: %d, remaining calls: %d, used calls: %d, limit refresh: %s"
Expand Down
10 changes: 8 additions & 2 deletions languages/fmd.pl_PL.po
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,20 @@ msgstr ""

#: frmluamodulesupdater.rs_githubconnectfail
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Please try again later."
"Failed to connect to GitHub API.\n"
"Please check your internet connection or try again later."
msgstr ""

#: frmluamodulesupdater.rs_githubconnecting
msgid "Connecting to GitHub..."
msgstr ""

#: frmluamodulesupdater.rs_githubratelimited
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Change the network or try again after 15 minutes"
msgstr ""

#: frmluamodulesupdater.rs_githubratestats
#, object-pascal-format
msgid "GitHub API core rate - call limit: %d, remaining calls: %d, used calls: %d, limit refresh: %s"
Expand Down
10 changes: 8 additions & 2 deletions languages/fmd.pot
Original file line number Diff line number Diff line change
Expand Up @@ -173,14 +173,20 @@ msgstr ""

#: frmluamodulesupdater.rs_githubconnectfail
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Please try again later."
"Failed to connect to GitHub API.\n"
"Please check your internet connection or try again later."
msgstr ""

#: frmluamodulesupdater.rs_githubconnecting
msgid "Connecting to GitHub..."
msgstr ""

#: frmluamodulesupdater.rs_githubratelimited
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Change the network or try again after 15 minutes"
msgstr ""

#: frmluamodulesupdater.rs_githubratestats
#, object-pascal-format
msgid "GitHub API core rate - call limit: %d, remaining calls: %d, used calls: %d, limit refresh: %s"
Expand Down
10 changes: 8 additions & 2 deletions languages/fmd.pt_BR.po
Original file line number Diff line number Diff line change
Expand Up @@ -186,14 +186,20 @@ msgstr "Terminar donwload"

#: frmluamodulesupdater.rs_githubconnectfail
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Please try again later."
"Failed to connect to GitHub API.\n"
"Please check your internet connection or try again later."
msgstr ""

#: frmluamodulesupdater.rs_githubconnecting
msgid "Connecting to GitHub..."
msgstr ""

#: frmluamodulesupdater.rs_githubratelimited
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Change the network or try again after 15 minutes"
msgstr ""

#: frmluamodulesupdater.rs_githubratestats
#, object-pascal-format
msgid "GitHub API core rate - call limit: %d, remaining calls: %d, used calls: %d, limit refresh: %s"
Expand Down
10 changes: 8 additions & 2 deletions languages/fmd.ru_RU.po
Original file line number Diff line number Diff line change
Expand Up @@ -186,14 +186,20 @@ msgstr "Скачано"

#: frmluamodulesupdater.rs_githubconnectfail
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Please try again later."
"Failed to connect to GitHub API.\n"
"Please check your internet connection or try again later."
msgstr ""

#: frmluamodulesupdater.rs_githubconnecting
msgid "Connecting to GitHub..."
msgstr ""

#: frmluamodulesupdater.rs_githubratelimited
msgid ""
"Failed to connect to GitHub API for latest module updates.\n"
"Change the network or try again after 15 minutes"
msgstr ""

#: frmluamodulesupdater.rs_githubratestats
#, object-pascal-format
msgid "GitHub API core rate - call limit: %d, remaining calls: %d, used calls: %d, limit refresh: %s"
Expand Down
Loading