v1.5.8

RetroDriven · Nov 9, 2023 · 1e3b9fe · 1e3b9fe
1 parent 3776ed1
commit 1e3b9fe
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 21 deletions.
diff --git a/Forms/Main/Form1.Designer.cs b/Forms/Main/Form1.Designer.cs
diff --git a/Forms/Main/Form1.cs b/Forms/Main/Form1.cs
@@ -9,7 +9,7 @@ namespace Pocket_Updater
 {
     public partial class Form1 : Form
     {
-        private const string VERSION = "1.5.7";
+        private const string VERSION = "1.5.8";
         private const string API_URL = "https://api.github.com/repos/RetroDriven/Pocket_Updater/releases";
         private const string RELEASE_URL = "https://github.com/RetroDriven/Pocket_Updater/releases/latest";
 

diff --git a/Lib/Updater/helpers/GlobalHelper.cs b/Lib/Updater/helpers/GlobalHelper.cs
@@ -13,6 +13,7 @@ public class GlobalHelper
     public string SettingsPath { get; set; }
     public string[] Blacklist { get; set; }
     public List<Core>? Cores { get; set; }
+    public List<Core>? InstalledCores { get; set; }
 
     private GlobalHelper()
     {
@@ -33,4 +34,9 @@ public static GlobalHelper Instance
             }
         }
     }  
+
+    public Core? GetCore(string identifier)
+    {
+        return instance.Cores.Find(i => i.identifier == identifier);
+    }
 }
diff --git a/Lib/Updater/models/Analogue/AnalogueFramework.cs b/Lib/Updater/models/Analogue/AnalogueFramework.cs
@@ -0,0 +1,8 @@
+namespace Analogue;
+
+public class Framework
+{
+    public string target_product { get; set; }
+    public string version_required { get; set; }
+    public bool sleep_supported { get; set; }
+}
diff --git a/Pocket_Updater.csproj b/Pocket_Updater.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
-	  <Version>1.5.7</Version>
+	  <Version>1.5.8</Version>
 	  <RootNamespace>Pocket_Updater</RootNamespace>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
@@ -58,5 +58,4 @@
     <PackageReference Include="Guna.UI2.WinForms" Version="2.0.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
-
 </Project>
diff --git a/lib/Updater/SettingsManager.cs b/lib/Updater/SettingsManager.cs
@@ -37,14 +37,14 @@ public SettingsManager(string settingsPath, List<Core>? cores = null)
         _settingsFile = file;
 
         if(cores != null) {
-            _initializeCoreSettings(cores);
+            InitializeCoreSettings(cores);
         }
 
         SaveSettings();
     }
 
     //loop through every core, and add any missing ones to the settings file
-    private void _initializeCoreSettings(List<Core> cores)
+    public void InitializeCoreSettings(List<Core> cores)
     {
         if(_settings.coreSettings == null) {
             _settings.coreSettings = new Dictionary<string,CoreSettings>();

diff --git a/lib/Updater/Updater.cs b/lib/Updater/Updater.cs
@@ -26,6 +26,7 @@ public class PocketCoreUpdater : Base
     private bool _deleteSkippedCores = true;
     private bool _useConsole = false;
     private bool _renameJotegoCores = true;
+    private bool _jtBeta = false;
 
     private Dictionary<string, string> _platformFiles = new Dictionary<string, string>();
 
@@ -51,10 +52,22 @@ public async Task Initialize()
         LoadSettings();
         await LoadPlatformFiles();
         await LoadCores();
+        await RefreshInstalledCores();
         await LoadArchive();
         await LoadBlacklist();
     }
 
+    private async Task RefreshInstalledCores()
+    {
+        var installedCores = new List<Core>();
+        foreach(Core c in GlobalHelper.Instance.Cores) {
+            if(c.isInstalled()) {
+                installedCores.Add(c);
+            }
+        }
+        GlobalHelper.Instance.InstalledCores = installedCores;
+    }
+
     private async Task LoadPlatformFiles()
     {
         try {
@@ -97,6 +110,7 @@ private async Task LoadBlacklist()
     public async Task LoadCores()
     {
         Factory.GetGlobals().Cores = await CoresService.GetCores();
+        Factory.GetGlobals().SettingsManager.InitializeCoreSettings(Factory.GetGlobals().Cores);
         foreach(Core core in Factory.GetGlobals().Cores) {
             core.StatusUpdated += updater_StatusUpdated; //attach handler to bubble event up
         }
@@ -215,6 +229,10 @@ public async Task RunUpdates(string? id = null)
                     _DeleteCore(core);
                     continue;
                 }
+
+                if (core.requires_license && !_jtBeta) {
+                    continue; //skip if you don't have the key
+                }
 
                 string name = core.identifier;
                 if(name == null) {
@@ -326,6 +344,7 @@ private async Task ExtractBetaKey()
         string keyPath = Path.Combine(Factory.GetGlobals().UpdateDirectory, "betakeys");
         string file = Path.Combine(Factory.GetGlobals().UpdateDirectory, "jtbeta.zip");
         if(File.Exists(file)) {
+            _jtBeta = true;
             _writeMessage("Extracting JT beta key...");
             ZipFile.ExtractToDirectory(file, keyPath, true);
         }
@@ -433,6 +452,7 @@ protected virtual void OnUpdateProcessComplete(UpdateProcessCompleteEventArgs e)
         {
             handler(this, e);
         }
+        RefreshInstalledCores();
     }
 
     public async Task<string> UpdateFirmware()

diff --git a/lib/Updater/models/Analogue/AnalogueCore.cs b/lib/Updater/models/Analogue/AnalogueCore.cs
@@ -4,5 +4,7 @@ public class Core
 {
     public Metadata? metadata { get; set; }
     public string? magic { get; set; }
+
+    public Framework? framework { get; set; }
 
 }
diff --git a/lib/Updater/models/Core.cs b/lib/Updater/models/Core.cs
@@ -17,6 +17,8 @@ public class Core : Base
     public string? date_release { get; set; }
     public string? version { get; set; }
 
+    public bool requires_license { get; set; } = false;
+
     private const string ZIP_FILE_NAME = "core.zip";
     public bool downloadAssets { get; set; } = Factory.GetGlobals().SettingsManager.GetConfig().download_assets;
     public bool buildInstances { get; set; } = Factory.GetGlobals().SettingsManager.GetConfig().build_instance_jsons;
@@ -114,7 +116,7 @@ public void Uninstall()
         return p["platform"];
     }
 
-    public bool UpdatePlatform(string title)
+    public bool UpdatePlatform(string title, string category = null)
     {
         var config = this.getConfig();
         if (config == null)
@@ -133,13 +135,23 @@ public bool UpdatePlatform(string title)
             return false;
         }
 
-        Dictionary<string, Platform> platform = new Dictionary<string, Platform>();
-        this.platform.name = title;
-        platform.Add("platform", this.platform);
-        string json = JsonSerializer.Serialize(platform);
+        if (platform.name != title || platform.category != category)
+        {
+
+            Dictionary<string, Platform> platform = new Dictionary<string, Platform>();
+            this.platform.name = title;
+            if (category != null)
+            {
+                this.platform.category = category;
+            }
+            platform.Add("platform", this.platform);
+            string json = JsonSerializer.Serialize(platform);
+
+            File.WriteAllText(dataFile, json);
+            Factory.GetGlobals().SettingsManager.GetConfig().preserve_platforms_folder = true;
+            Factory.GetGlobals().SettingsManager.SaveSettings();
+        }
 
-        File.WriteAllText(dataFile, json);
-
         return true;
     }
 
@@ -167,7 +179,7 @@ public async Task<Dictionary<string, List<string>>> DownloadAssets()
         Analogue.DataJSON data = ReadDataJSON();
         if(data.data.data_slots.Length > 0) {
             foreach(Analogue.DataSlot slot in data.data.data_slots) {
-                if(slot.filename != null && !Factory.GetGlobals().Blacklist.Contains(slot.filename)) {
+                if(slot.filename != null && !slot.filename.EndsWith(".sav") && !Factory.GetGlobals().Blacklist.Contains(slot.filename)) {
                     string path = Path.Combine(UpdateDirectory, "Assets", info.metadata.platform_ids[0]);
                     if(slot.isCoreSpecific()) {
                         path = Path.Combine(path, this.identifier);
@@ -225,7 +237,7 @@ public async Task<Dictionary<string, List<string>>> DownloadAssets()
                     if(instance.instance.data_slots.Length > 0) {
                         string data_path = instance.instance.data_path;
                         foreach(Analogue.DataSlot slot in instance.instance.data_slots) {
-                            if(!Factory.GetGlobals().Blacklist.Contains(slot.filename)) {
+                            if(!Factory.GetGlobals().Blacklist.Contains(slot.filename) && !slot.filename.EndsWith(".sav")) {
                                 string path = Path.Combine(UpdateDirectory, "Assets", info.metadata.platform_ids[0], "common", data_path, slot.filename);
                                 if(File.Exists(path) && CheckCRC(path)) {
                                     _writeMessage("Already installed: " + slot.filename);