FIX: Remote source menus blank under some conditions

Author: Nick Daniels

Nabu.Lib/Emulator.cs

@@ -7,10 +7,10 @@
     public static class Emulator
     {
         public const string Branch = "release";
-        public const int Build = 1;
+        public const int Build = 2;
         public const int Major = 1;
         public const int Minor = 3;
-        public const int Release = 2;
+        public const int Release = 3;
         public static readonly string Id = $"NABU NetSim v{Version}";
         public static readonly string Version = $"{Major}.{Minor}.{Build}-{Branch}{Release}";
     }

Nabu.Lib/Network/NabuNetwork.cs

@@ -6,6 +6,7 @@
 using Nabu.Sources;
 using Napa;
 using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Concurrent;
 using System.Data;
 using System.Reactive.Linq;
@@ -59,7 +60,7 @@ IOptions<CacheOptions> cacheOptions
     }
 
     private static ConcurrentDictionary<(AdaptorSettings, ProgramSource, int), Memory<byte>> PakCache { get; } = new();
-    private static ConcurrentDictionary<ProgramSource, IEnumerable<NabuProgram>> SourceCache { get; } = new();
+    private static DataDictionary<IEnumerable<NabuProgram>> SourceCache { get; } = new();
     private IFileCache FileCache { get; set; }
     private HttpCache Http { get; }
     private IPackageManager Packages { get; }
@@ -89,7 +90,7 @@ public IEnumerable<NabuProgram> Programs(ProgramSource? source)
     {
         if (source is null)
             return [];
-        if (SourceCache.TryGetValue(source, out IEnumerable<NabuProgram>? value))
+        if (SourceCache.TryGetValue(source.Name, out IEnumerable<NabuProgram>? value))
             return value;
 
         return Array.Empty<NabuProgram>();
@@ -107,7 +108,7 @@ public IEnumerable<NabuProgram> Programs(ProgramSource? source)
         if (source is null)
             return (ImageType.None, Array.Empty<byte>());
 
-        if (SourceCache.ContainsKey(source) is false)
+        if (SourceCache.ContainsKey(source.Name) is false)
             return (ImageType.None, Array.Empty<byte>());
 
         if (PakCache.TryGetValue((settings, source, pak), out var value))
@@ -133,7 +134,7 @@ 1 when Empty(settings.Program) || source.EnableExploitLoader => FormatTriple(1),
         if (targetProgram == null)
             return (ImageType.None, Array.Empty<byte>());
 
-        var program = SourceCache[source].FirstOrDefault(p => p.Name == targetProgram);
+        var program = SourceCache[source.Name].FirstOrDefault(p => p.Name == targetProgram);
 
         //BECAUSE: A package using the exploit loader should not have to bundle a menu.
         if (program is null /* && pak > Constants.CycleMenuNumber */)
@@ -267,9 +268,9 @@ public void UnCachePak(AdaptorSettings settings, int pak)
 
         foreach (var task in tasks)
         {
-            var (isList, programs) = await task;
-            if (isList) return (isList, programs);
-        }
+            var (isList, programs) = await task;
+            if (isList) return (isList, ListCache[source.Path] = programs);            
+        }        if (ListCache.TryGetValue(source.Path, out var progs))            return (true, progs);
         return (false, Array.Empty<NabuProgram>());
     }
 
@@ -291,7 +292,7 @@ private async Task CacheSource(ProgramSource source)
     {
         if (source is null || 
             source.SourceType is not SourceType.Remote || 
-            !SourceCache.TryGetValue(source, out IEnumerable<NabuProgram>? programs)
+            !SourceCache.TryGetValue(source.Name, out IEnumerable<NabuProgram>? programs)
         )   return;
 
         foreach (var program in from p in programs where !p.IsPakMenu select p)
@@ -384,7 +385,7 @@ await Task.Run(async () =>
                         ));
                     }
 
-                    SourceCache[source] = programs;
+                    SourceCache[source.Name] = programs;
 
                 }
                 else if (checkLocal && source.SourceType is SourceType.Local)
@@ -439,7 +440,7 @@ await Task.Run(async () =>
                         ));
                     }
 
-                    SourceCache[source] = programs;
+                    SourceCache[source.Name] = programs;
                 }
                 else if (checkLocal && source.SourceType is SourceType.Package)
                 {
@@ -473,7 +474,7 @@ from program in from p in package.Programs select p with { }
 
                     if (programs.Count != 0)
                     {
-                        SourceCache[source] = programs;
+                        SourceCache[source.Name] = programs;
                     }
                 }
             });
@@ -518,19 +519,17 @@ from program in from p in package.Programs select p with { }
     public static string BlankIconPtrnStr { get; } = Convert.ToBase64String(BlankIconPattern);
 
     const string Empty = " ";
-
+    DataDictionary<NabuProgram[]> ListCache = new();
     protected async Task<(bool, NabuProgram[])> IsNabuCaJson(ProgramSource source)
     {
         var uri = source.Path;
         if (!(uri.EndsWith(".json") && uri.Contains("nabu.ca"))) { return (false, Array.Empty<NabuProgram>()); }
         var (_, found, cached, _, _, _, _) = await Http.GetPathStatus(uri);
-        if (!found && !cached) { return (false, []); }
+        if (!found && !cached) {             return (false, []);         }
 
-       
         try
         {            var json = await Http.GetString(uri);
-            var progs = new List<NabuProgram>();
-            var sections = JObject.Parse(json)["Items"];
+            var progs = new List<NabuProgram>();            JToken? sections = null;            while (sections == null)                try                {                    sections = JObject.Parse(json)["Items"];                }                catch { }
             if (sections is null) { return (false, []); }
 
             string[] skipSections = ["NABU Cycles", "Demos", "Utilities"];
@@ -576,9 +575,9 @@ from program in from p in package.Programs select p with { }
                     ));
                 }
             }
-            return (true, progs.ToArray());
+            return (true, ListCache[uri] = progs.ToArray());
         }
-        catch { return (false, []); }
+        catch {            return (false, []);         }
     }
 
     protected async Task<(bool, NabuProgram[])> IsNabuNetworkList(ProgramSource source)

Nabu.NetSim.UI/ViewModels/AdaptorSettingsViewModel.cs

@@ -290,7 +290,7 @@ void Select(AdaptorSettings? selected)
             if (SettingsModel != null)
                 SettingsModel.PropertyChanged += (s, e) =>
                 {
-                    Task.Run(RefreshPrograms);                    Selected.SetChanged();
+                    RefreshPrograms();                    Selected.SetChanged();
                 };
 
             RefreshPrograms();