temp fix: move jtbeta file to new common location (#198)

* temp fix: move jtbeta file to new common location * removed code
mattpannella · Dec 8, 2023 · a20edaa · a20edaa
1 parent a9649d2
commit a20edaa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/pocket_updater.csproj b/pocket_updater.csproj
@@ -6,7 +6,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>2.37.0</Version>
+    <Version>2.38.0</Version>
     <Description>Keep your Analogue Pocket up to date</Description>
     <Copyright>2023 Matt Pannella</Copyright>
     <Authors>Matt Pannella</Authors>

diff --git a/src/Program.cs b/src/Program.cs
@@ -170,8 +170,6 @@ private static async Task Main(string[] args)
                 }
             }
 
-            //path = "/Users/mattpannella/pocket-test";
-
             updater = new PocketCoreUpdater(path);
             settings = new SettingsManager(path);
 

diff --git a/src/Updater.cs b/src/Updater.cs
@@ -341,8 +341,11 @@ private async Task JotegoRename(Core core)
     private async Task CopyBetaKey(Core core)
     {
         if(core.JTBetaCheck()) {
-            core.platform_id = core.identifier.Split('.')[1]; //whatever
-            string path = Path.Combine(Factory.GetGlobals().UpdateDirectory, "Assets", core.platform_id, "common");
+            //core.platform_id = core.identifier.Split('.')[1]; //whatever
+            string path = Path.Combine(Factory.GetGlobals().UpdateDirectory, "Assets", "jtpatreon", "common");
+            if(!Directory.Exists(path)) {
+                Directory.CreateDirectory(path);
+            }
             string keyPath = Path.Combine(Factory.GetGlobals().UpdateDirectory, "betakeys");
             if(Directory.Exists(keyPath) && Directory.Exists(path)) {
                 Util.CopyDirectory(keyPath, path, false, true);

diff --git a/src/models/Core.cs b/src/models/Core.cs
@@ -242,6 +242,10 @@ public async Task<Dictionary<string, Object>> DownloadAssets()
                     if(instance.instance.data_slots.Length > 0) {
                         string data_path = instance.instance.data_path;
                         foreach(Analogue.DataSlot slot in instance.instance.data_slots) {
+                            var plat = info.metadata.platform_ids[0];
+                            if(info.metadata.author == "jotego") {
+                                plat = "jtpatreon";
+                            }
                             if(!CheckBetaMD5(slot, info.metadata.platform_ids[0])) {
                                 _writeMessage("Invalid or missing beta key.");
                                 missingBetaKey = true;
-Original file line number
+Diff line change
@@ Expand Up / @@ -170,8 +170,6 @@ private static async Task Main(string[] args) @@
                     }
                 }
-                //path = "/Users/mattpannella/pocket-test";
                 updater = new PocketCoreUpdater(path);
                 settings = new SettingsManager(path);
@@ Expand Down @@