Bug Fixes

baseunits/DBUpdater.pas

@@ -158,10 +158,13 @@ procedure TDBUpdaterThread.Execute;
 
           if used then
             Synchronize(@SyncCloseUsed)
-          else
-          if dataProcess.WebsiteLoaded(FModule.ID) then
+          else if dataProcess.WebsiteLoaded(FModule.ID) then
+          begin
             Synchronize(@SyncRemoveAttached);
+          end;
+
           with TProcess.Create(nil) do
+          begin
             try
               UpdateStatusText(Format('[%d/%d] ' + RS_Extracting, [FIndex + 1, FItems.Count, FModule.Name]));
               Executable := CURRENT_ZIP_EXE;
@@ -173,16 +176,25 @@ procedure TDBUpdaterThread.Execute;
               Options := Options + [poWaitOnExit];
               ShowWindow := swoHIDE;
               Execute;
+
               cont := ExitStatus = 0;
               if cont then
-                DeleteFile(currentfilename)
+              begin
+                DeleteFile(currentfilename);
+              end
               else
+              begin
                 FFailedList.Add(RS_FailedExtract, [FModule.Name, ExitStatus]);
+              end;
             finally
               Free;
             end;
+          end;
+
           if cont and used then
+          begin
             Synchronize(@SyncReopenUsed);
+          end;
         end;
 
         dataProcess.Open(FModule.ID);

baseunits/FMDOptions.pas

@@ -103,6 +103,7 @@ interface
   OptionLetFMDDo: TFMDDo = DO_NOTHING;
   OptionDeleteCompletedTasksOnClose: Boolean = False;
   OptionSortDownloadsOnNewTasks: Boolean = False;
+  OptionLongNamePaths: Boolean = False;
 
   // saveto
   OptionChangeUnicodeCharacter: Boolean = False;
@@ -125,6 +126,9 @@ interface
   OptionPNGCompressionLevel: Integer = 1;
   OptionJPEGQuality: Integer = 80;
 
+  // image properties
+  OptionImageServerTime: Boolean = True;
+
   // connections
   OptionConnectionTimeout: Integer = 30;
   OptionMaxFavoriteThreads: Integer = 1;
@@ -176,7 +180,7 @@ interface
   CL_BSUnfocesedSelectionText: TColor = clWindowText;
   CL_BSOdd: TColor = clBtnFace;
   CL_BSEven: TColor = clWindow;
-  CL_BSSortedColumn: TColor = $F8E6D6;
+  CL_BSSortedColumn: TColor = $F0F0F0;
   CL_BSEnabledWebsiteSettings: TColor = clYellow;
 
   // mangalist color
@@ -198,7 +202,7 @@ interface
 
   // custom color darkmode
   // basiclist
-  CL_BSSortedColumnDark: TColor = $E19650;
+  CL_BSSortedColumnDark: TColor = $202020;
   CL_BSEnabledWebsiteSettingsDark: TColor = $009696;
 
   // mangalist color
@@ -306,10 +310,13 @@ procedure doInitialization;
 var
   i: Integer;
 begin
-  AppParams:=TStringList.Create;
-  AppParams.Sorted:=False;
-  for i:=1 to ParamCount do
+  AppParams := TStringList.Create;
+  AppParams.Sorted := False;
+  for i := 1 to ParamCount do
+  begin
     AppParams.Add(ParamStr(i));
+  end;
+
   GetProgramVersion(FMD_VERSION_NUMBER);
   FMD_VERSION_STRING := ProgramversionToStr(FMD_VERSION_NUMBER);
   SetFMDdirectory(ExtractFilePath(Application.ExeName));

baseunits/GitHubRepoV3.pas

@@ -39,6 +39,7 @@   TGitHubRepo = class
     tree_sha,
     tree_etag: String;
 
+    APIResetTime: TDateTime;
     Tree: TTreeItems;
   public
     constructor Create(const AConfigFile, AWorkFile: String; const AThread: TBaseThread = nil);
@@ -47,7 +48,8 @@   TGitHubRepo = class
     function GetLastCommitMessage(const FRepoPath: String): String;
     function GetTree: Boolean;
     function GetUpdate: Boolean;
-    function CheckRateLimited: Boolean;
+    function CheckConnection: Boolean;
+    procedure CheckRateLimited(AThread: TBaseThread);
     function GetDownloadURL(const AName: String): String;
   end;
 
@@ -303,39 +305,89 @@ function TGitHubRepo.GetUpdate: Boolean;
   FDirty := Result;
 end;
 
-function TGitHubRepo.CheckRateLimited: Boolean;
+
+function TGitHubRepo.CheckConnection: Boolean;
+begin
+  Result := False; 
+  HTTP.ResetBasic;
+
+  if HTTP.GET(api_url) then
+  begin
+    Result := True;
+  end;
+end;
+
+procedure TGitHubRepo.CheckRateLimited(AThread: TBaseThread);
 var
-  s: String;
-  d: TJSONData;
+  AUpdateThread: TCheckUpdateThread;
+  url, apiMessage: String;
+  jsonData, jsonCoreData: TJSONData;
   coreLimit, coreRemaining, coreReset, coreUsed: Integer;
-  convertedLocalTime: TDateTime;
 begin
-  Result := True;
   HTTP.ResetBasic;
-  s := AppendURLDelim(api_url) + 'rate_limit';
+  url := AppendURLDelim(api_url) + 'rate_limit';
+
+  if not (AThread is TCheckUpdateThread) then
+  begin
+    Exit;
+  end;
 
-  if HTTP.GET(s) then
+  AUpdateThread := TCheckUpdateThread(AThread);
+
+  if not HTTP.GET(url) then
   begin
-    d := GetJSON(HTTP.Document);
-    if Assigned(d) then
-    begin
-      try
-        if d.JSONType = jtObject then
-        begin
-          coreLimit := TJSONObject(d).FindPath('resources.core.limit').AsInteger;
-          coreRemaining := TJSONObject(d).FindPath('resources.core.remaining').AsInteger;
-          coreReset := TJSONObject(d).FindPath('resources.core.reset').AsInteger;
-          coreUsed := TJSONObject(d).FindPath('resources.core.used').AsInteger;
+    AUpdateThread.DoSyncGitHubConnectFail;
+    Exit;
+  end;
 
-          convertedLocalTime := UniversalTimeToLocal(UnixToDateTime(coreReset));
-          Logger.Send(Self.ClassName + ': ' + Format(RS_GitHubRateStats, [coreLimit, coreRemaining, coreUsed, DateTimeToStr(convertedLocalTime)]));
+  jsonData := GetJSON(HTTP.Document);
 
-          Result := coreRemaining = 0;
-        end;
-      except
+  if not Assigned(jsonData) then
+  begin
+    AUpdateThread.DoSyncGitHubErrorMessage(False);
+    Exit;
+  end;
+
+  try
+    if jsonData.JSONType <> jtObject then
+    begin
+      AUpdateThread.DoSyncGitHubErrorMessage(False);
+      Exit;
+    end;
+
+    jsonCoreData := TJSONObject(jsonData).FindPath('resources.core');
+    if not Assigned(jsonCoreData) then
+    begin
+      apiMessage := TJSONObject(jsonData).Get('message', '');
+
+      if apiMessage <> '' then
+      begin
+        AUpdateThread.DoSyncGitHubErrorMessage;
+        Logger.SendWarning(Self.ClassName + ': ' + apiMessage);
+      end
+      else
+      begin
+        AUpdateThread.DoSyncGitHubErrorMessage(False);
       end;
-      d.Free;
+
+      Exit;
+    end;
+
+    coreLimit := TJSONObject(jsonCoreData).Get('limit', 0);
+    coreRemaining := TJSONObject(jsonCoreData).Get('remaining', 0);
+    coreReset := TJSONObject(jsonCoreData).Get('reset', 0);
+    coreUsed := TJSONObject(jsonCoreData).Get('used', 0);
+
+    APIResetTime := UniversalTimeToLocal(UnixToDateTime(coreReset));
+    Logger.Send(Self.ClassName + ': ' + Format(RS_GitHubRateStats, [coreLimit, coreRemaining, coreUsed, DateTimeToStr(APIResetTime)]));
+
+    if coreRemaining = 0 then
+    begin
+      AUpdateThread.DoSyncGitHubRateLimited;
     end;
+
+  finally
+    jsonData.Free;
   end;
 end;
 
@@ -348,6 +400,7 @@ function TGitHubRepo.GetDownloadURL(const AName: String): String;
   begin
     lpath := lpath + '/';
   end;
+
   Result := AppendURLDelim(download_url) + owner + '/' + name + '/' + ref + '/' + lpath + AName;
 end;
 

baseunits/StatusBarDownload.pas

@@ -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;

baseunits/imagemagickmanager.pas

@@ -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;
 
@@ -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;
@@ -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,

baseunits/lua/LuaBase.pas

@@ -218,9 +218,13 @@ function LuaLoadFromStreamOrFile(const L: Plua_State;
   const AStream: TMemoryStream; const AFileName: String): Integer;
 begin
   if (not AlwaysLoadLuaFromFile) and (AStream <> nil) then
-    Result := luaL_loadbuffer(L, AStream.Memory, AStream.Size, PAnsiChar(AFileName))
+  begin
+    Result := luaL_loadbuffer(L, AStream.Memory, AStream.Size, PAnsiChar(AFileName));
+  end
   else
+  begin
     Result := luaL_loadfile(L, PAnsiChar(AFileName));
+  end;
 end;
 
 procedure LuaExecute(const L: Plua_State; const AStream: TMemoryStream;

baseunits/lua/LuaHandler.pas

@@ -97,14 +97,20 @@ function TLuaHandler.LoadChunkExecute(const AName: String;
   l: Integer;
 begin
   Result := 0;
+
   l := FLoadedChunks.IndexOf(AName);
   if (l <> -1) then
   begin
     if AlwaysLoadLuaFromFile then
-      FLoadedChunks.Delete(l)
+    begin
+      FLoadedChunks.Delete(l);
+    end
     else
+    begin
       Exit;
+    end;
   end;
+
   Result := LuaLoadFromStreamOrFile(FHandle, AChunk, AName);
   if Result = 0 then
   begin