Updaters json license bug fix (#357)

* fixed license file check wipe updaters.json before installing cores * patch bump * constant
mattpannella · Nov 2, 2024 · ece664f · ece664f
1 parent aa018ed
commit ece664f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/pupdate.csproj b/pupdate.csproj
@@ -6,7 +6,7 @@
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
-    <Version>3.19.0</Version>
+    <Version>3.19.1</Version>
     <Description>Keep your Analogue Pocket up to date</Description>
     <Copyright>2024 Matt Pannella</Copyright>
     <Authors>Matt Pannella</Authors>

diff --git a/src/services/CoresService.Helpers.cs b/src/services/CoresService.Helpers.cs
@@ -184,6 +184,10 @@ private bool CheckLicenseMd5(DataSlot slot, string licenseSlotId, string platfor
 
     public bool CheckLicenseFile(Core core)
     {
-         return File.Exists(Path.Combine(this.installPath, LICENSE_EXTRACT_LOCATION, core.updaters?.license.filename));
+        if (core.updaters?.license.filename != null)
+        {
+            return File.Exists(Path.Combine(this.installPath, LICENSE_EXTRACT_LOCATION, core.updaters.license.filename));
+        }
+        return false;
     }
 }
diff --git a/src/services/CoresService.Json.cs b/src/services/CoresService.Json.cs
@@ -73,7 +73,7 @@ public Video ReadVideoJson(string identifier)
 
     public Updaters ReadUpdatersJson(string identifier)
     {
-        string file = Path.Combine(this.installPath, "Cores", identifier, "updaters.json");
+        string file = Path.Combine(this.installPath, "Cores", identifier, UPDATERS_FILE);
 
         if (!File.Exists(file))
         {

diff --git a/src/services/CoresService.Replace.cs b/src/services/CoresService.Replace.cs
@@ -8,7 +8,7 @@ public partial class CoresService
 {
     public Substitute[] GetSubstitutes(string identifier)
     {
-        string file = Path.Combine(this.installPath, "Cores", identifier, "updaters.json");
+        string file = Path.Combine(this.installPath, "Cores", identifier, UPDATERS_FILE);
 
         if (!File.Exists(file))
         {

diff --git a/src/services/CoresService.cs b/src/services/CoresService.cs
@@ -9,6 +9,8 @@ public partial class CoresService : BaseProcess
 {
     private const string CORES_END_POINT = "https://openfpga-cores-inventory.github.io/analogue-pocket/api/v2/cores.json";
     private const string CORES_FILE = "cores.json";
+
+    private const string UPDATERS_FILE = "updaters.json";
     private const string ZIP_FILE_NAME = "core.zip";
 
     private readonly string installPath;
@@ -222,6 +224,8 @@ public bool Install(Core core, bool clean = false)
             return false;
         }
 
+        this.ClearUpdatersFile(core.identifier);
+
         if (clean && this.IsInstalled(core.identifier))
         {
             this.Delete(core.identifier, core.platform_id);
@@ -254,6 +258,16 @@ public bool Install(Core core, bool clean = false)
         return false;
     }
 
+    public void ClearUpdatersFile(string identifier)
+    {
+        string file = Path.Combine(this.installPath, "Cores", identifier, UPDATERS_FILE);
+
+        if (this.IsInstalled(identifier) && File.Exists(file))
+        {
+            File.Delete(file);
+        }
+    }
+
     public void Uninstall(string identifier, string platformId, bool nuke = false)
     {
         WriteMessage($"Uninstalling {identifier}...");