tweaks(assets): read notes

- the timeout is now decreased as files are successfully downloaded, making it not have a extremely long timeout if you had to download too many files
- suggests to users to delete cache and assets if it fails

Author: Torwent

osrs/antiban/biometrics.simba

@@ -86,7 +86,7 @@ begin
   end;
 
   hashStr := HashString(EHashAlgo.SHA1, Profiles[ProfileIndex].Name + Profiles[ProfileIndex].Username);
-  WriteLn GetDebugLn('Biometrics', 'Current profile seed: ' + hashStr, ELogLevel.SUCCESS);
+  WriteLn GetDebugLn('Biometrics', 'Current profile seed: ' + hashStr);
 
   Self.Index := ProfileIndex;
   Self._Hash := hashStr.ToBytes();

osrs/finders/itemfinder.simba

@@ -30,7 +30,6 @@ type
 
 function TRSItemFinder._AlignHelper(img: TImage; tBorder, border: TPointArray; out align: TPoint): Boolean;
 var
-  color: TColor;
   pt: TPoint;
 begin
   if border = [] then Exit;
@@ -478,7 +477,6 @@ begin
   img.DrawTPA(bg);
 
   Result := HashData(EHashAlgo.CRC32, img.Data, 4608);
-  WriteLn Result;
 end;
 
 var

osrs/interfaces/login/login.simba

@@ -371,13 +371,13 @@ begin
   begin
     if Self.FindButton(ERSLoginButton.EXISTING_USER) then
     begin
-      WriteLn GetDebugLn('Login', 'Legacy client mode detected.', ELogLevel.SUCCESS);
+      WriteLn GetDebugLn('Login', 'Legacy client mode detected.');
       Exit(ERSLoginMode.LEGACY);
     end;
 
     if Self.FindButton(ERSLoginButton.LAUNCHER) then
     begin
-      WriteLn GetDebugLn('Login', 'Launcher client mode detected.', ELogLevel.SUCCESS);
+      WriteLn GetDebugLn('Login', 'Launcher client mode detected.');
       Exit(ERSLoginMode.LAUNCHER);
     end;
   end;

utils/assets.simba

@@ -10,6 +10,7 @@ type
     JSON: TJSONObject;
     Queue: TStringArray;
     URL: String;
+    Timeout: TCountDown;
   end;
 
 function TWLAssets.GetJSON(url: String): TJSONObject;
@@ -66,17 +67,21 @@ var
   idx: Integer;
 begin
   if not InRange(result.Response.AsInteger, 200, 299) then
-    raise GetDebugLn('WLAssets', result.Exception);
+  begin
+    WriteLn GetDebugLn('WLAssets', result.Exception, ELogLevel.ERROR);
+    raise GetDebugLn('WLAssets', 'If you keep having issues please delete your Assets and Cache folders.');
+  end;
   idx := Self.Queue.IndexOf(result.Data);
   if idx = -1 then
     raise GetDebugLn('WLAssets', 'Can''t find ' + result.Data + ' in the download queue.');
   Delete(Self.Queue, idx, 1);
+  Self.Timeout.Extend(-18 * ONE_SECOND);
 end;
 
 procedure TWLAssets.Update();
 var
   i: Integer;
-  timer, timeout: TCountDown;
+  timer: TCountDown;
   key, path: String;
 begin
   Self.JSON := Self.GetJSON('https://db.waspscripts.dev/storage/v1/object/public/data/');
@@ -91,7 +96,7 @@ begin
   FileDelete(WLEnv.AssetsDir + 'hashes.json');
   TJSONParser(Self.JSON).Save(WLEnv.AssetsDir + 'hashes.json');
 
-  timeout.Start(10);
+  Self.Timeout.Start(1);
   for i := 0 to Self.JSON.Count-1 do
   begin
     key := Self.JSON.Key[i];
@@ -103,7 +108,7 @@ begin
       FileDelete(path);
       DirCreate(PathExtractDir(path));
       Self.Queue += path;
-      timeout.Extend(20 * ONE_SECOND);
+      Self.Timeout.Extend(20 * ONE_SECOND);
       Async.HTTPGetFile(Self.URL + key, path, @Self.DownloadFinished);
     end;
   end;
@@ -116,12 +121,13 @@ begin
     if timer.IsFinished then
     begin
       WriteLn GetDebugLn('WLAssets', 'Downloading files. ' + ToStr(Length(Self.Queue)) + ' files left, please wait.');
-      WriteLn GetDebugLn('WLAssets', 'Files left: ' + ToStr(Self.Queue));
+      WriteLn GetDebugLn('WLAssets', 'Files left: ' + ToStr(Self.Queue).Replace(WLEnv.AssetsDir, ''));
       timer.Restart();
     end;
 
-    if timeout.IsFinished then
+    if Self.Timeout.IsFinished then
     begin
+      if Self.Queue = [] then Exit;
       for i := 0 to High(Self.Queue) do
         FileDelete(Self.Queue[i]);
       raise GetDebugLn('WLAssets', 'Timed out downloading assets: ' + ToStr(Self.Queue));