Console type check for config saving, console type in title, memory check fixes

4 files changed, 170 insertions, 141 deletions

diff --git a/Clovershell/ClovershellConnection.cs b/Clovershell/ClovershellConnection.cs
index a4662df0..ec136b95 100644
--- a/Clovershell/ClovershellConnection.cs
+++ b/Clovershell/ClovershellConnection.cs
@@ -438,7 +438,6 @@ namespace com.clusterrr.clovershell
                     if (res != ErrorCode.Ok)

                     {

                         if (repeats >= 10) break;

-                        Debug.WriteLine("write error: " + res);

                         repeats++;

                         Thread.Sleep(100);

                     }

diff --git a/ConfigIni.cs b/ConfigIni.cs
index e2f09d53..12ad6258 100644
--- a/ConfigIni.cs
+++ b/ConfigIni.cs
@@ -617,8 +617,12 @@ namespace com.clusterrr.hakchi_gui
             File.WriteAllLines(fileName, configLines.ToArray());

         }

 

-        public static Dictionary<string, string> GetConfigDictionary()

+        public static Dictionary<string, string> GetConfigDictionary(MainForm.ConsoleType? consoleType = null)

         {

+            MainForm.ConsoleType oldConsoleType = ConsoleType;

+            if (consoleType != null && consoleType != MainForm.ConsoleType.Unknown)

+                ConsoleType = consoleType ?? MainForm.ConsoleType.Unknown;

+

             var config = new Dictionary<string, string>();

             config["clovercon_home_combination"] = ConfigIni.ResetHack ? string.Format("0x{0:X4}", ConfigIni.ResetCombination) : "0x7FFF";

             config["clovercon_autofire"] = ConfigIni.AutofireHack ? "1" : "0";

@@ -630,6 +634,8 @@ namespace com.clusterrr.hakchi_gui
                 config["nes_extra_args"] = ConfigIni.ExtraCommandLineArguments;

             if ((ConfigIni.ConsoleType == MainForm.ConsoleType.SNES || ConfigIni.ConsoleType == MainForm.ConsoleType.SuperFamicom))

                 config["snes_extra_args"] = ConfigIni.ExtraCommandLineArguments;

+

+            ConsoleType = oldConsoleType;

             return config;

         }

     }

diff --git a/MainForm.cs b/MainForm.cs
index afc6f8e1..307f586e 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -182,18 +182,6 @@ namespace com.clusterrr.hakchi_gui
                 InternalMods = from m in Directory.GetFiles(Path.Combine(Program.BaseDirectoryInternal, "mods/hmods")) select Path.GetFileNameWithoutExtension(m);

                 LoadPresets();

                 LoadLanguages();

-                var version = Assembly.GetExecutingAssembly().GetName().Version;

-                Text = string.Format("hakchi2 - v{0}.{1:D2}{2}", version.Major, version.Build, (version.Revision < 10) ?

-                    ("rc" + version.Revision.ToString()) : (version.Revision > 20 ? ((char)('a' + (version.Revision - 20) / 10)).ToString() : ""))

-#if DEBUG

- + " (debug version"

-#if VERY_DEBUG

- + ", very verbose mode"

-#endif

- + ")"

-#endif

-;

-

                 listViewGames.ListViewItemSorter = new GamesSorter();

 

                 // Little tweak for easy translation

@@ -234,71 +222,47 @@ namespace com.clusterrr.hakchi_gui
             }

         }

 

+        void SetWindowTitle()

+        {

+            var version = Assembly.GetExecutingAssembly().GetName().Version;

+            Text = string.Format("hakchi2 - v{0}.{1:D2}{2}", version.Major, version.Build, (version.Revision < 10) ?

+                ("rc" + version.Revision.ToString()) : (version.Revision > 20 ? ((char)('a' + (version.Revision - 20) / 10)).ToString() : ""))

+#if DEBUG

+                + " (debug version"

+#if VERY_DEBUG

+                + ", very verbose mode"

+#endif

+                + ")"

+#endif

+                + " - " + GetConsoleName();

+        }

+

+        public string GetConsoleName(ConsoleType? consoleType = null)

+        {

+            if (consoleType == null || consoleType == ConsoleType.Unknown)

+                consoleType = ConfigIni.ConsoleType;

+            switch (consoleType ?? ConsoleType.Unknown)

+            {

+                case ConsoleType.NES:

+                    return nESMiniToolStripMenuItem.Text;

+                case ConsoleType.Famicom:

+                    return famicomMiniToolStripMenuItem.Text;

+                case ConsoleType.SNES:

+                    return sNESMiniToolStripMenuItem.Text;

+                case ConsoleType.SuperFamicom:

+                    return superFamicomMiniToolStripMenuItem.Text;

+                default:

+                    return "unknown console";

+            }

+        }

+

         void Clovershell_OnConnected()

         {

             try

             {

-                // Trying to autodetect console type

-                var customFirmware = Clovershell.ExecuteSimple("[ -d /var/lib/hakchi/firmware/ ] && [ -f /var/lib/hakchi/firmware/*.hsqs ] && echo YES || echo NO");

-                if (customFirmware == "NO")

-                {

-                    var board = Clovershell.ExecuteSimple("cat /etc/clover/boardtype", 500, true);

-                    var region = Clovershell.ExecuteSimple("cat /etc/clover/REGION", 500, true);

-                    Debug.WriteLine(string.Format("Detected board: {0}", board));

-                    Debug.WriteLine(string.Format("Detected region: {0}", region));

-                    switch (board)

-                    {

-                        default:

-                        case "dp-nes":

-                        case "dp-hvc":

-                            switch (region)

-                            {

-                                case "EUR_USA":

-                                    ConfigIni.ConsoleType = ConsoleType.NES;

-                                    break;

-                                case "JPN":

-                                    ConfigIni.ConsoleType = ConsoleType.Famicom;

-                                    break;

-                            }

-                            break;

-                        case "dp-shvc":

-                            switch (region)

-                            {

-                                case "USA":

-                                case "EUR":

-                                    ConfigIni.ConsoleType = ConsoleType.SNES;

-                                    break;

-                                case "JPN":

-                                    ConfigIni.ConsoleType = ConsoleType.SuperFamicom;

-                                    break;

-                            }

-                            break;

-                    }

-                    Invoke(new Action(SyncConsoleType));

-                }

-

                 ConfigIni.CustomFlashed = true; // Just in case of new installation

-

                 WorkerForm.GetMemoryStats();

                 new Thread(RecalculateSelectedGamesThread).Start();

-

-                /*

-                // It's good idea to sync time... or not?

-                // Requesting autoshutdown state

-                var autoshutdown = Clovershell.ExecuteSimple("cat /var/lib/clover/profiles/0/shutdown.txt");

-                // Disable automatic shutdown

-                if (autoshutdown != "0")

-                {

-                    Clovershell.ExecuteSimple("echo -n 0 > /var/lib/clover/profiles/0/shutdown.txt");

-                    Thread.Sleep(1500);

-                }

-                // Setting actual time for file transfer operations

-                Clovershell.ExecuteSimple(string.Format("date -s \"{0:yyyy-MM-dd HH:mm:ss}\"", DateTime.UtcNow));

-                // Restoring automatic shutdown

-                if (autoshutdown != "0")

-                    Clovershell.ExecuteSimple(string.Format("echo -n {0} > /var/lib/clover/profiles/0/shutdown.txt", autoshutdown));

-                */

-                // It was bad idea

             }

             catch (Exception ex)

             {

@@ -1362,6 +1326,7 @@ namespace com.clusterrr.hakchi_gui
 

             LoadHidden();

             LoadGames();

+            SetWindowTitle();

             lastConsoleType = ConfigIni.ConsoleType;

         }

 

@@ -1607,8 +1572,15 @@ namespace com.clusterrr.hakchi_gui
             {

                 if (WaitingClovershellForm.WaitForDevice(this))

                 {

-                    WorkerForm.SyncConfig(ConfigIni.GetConfigDictionary(), true);

-                    MessageBox.Show(Resources.Done, Resources.Wow, MessageBoxButtons.OK, MessageBoxIcon.Information);

+                    bool customFirmware;

+                    ConsoleType realConsoleType;

+                    WorkerForm.SyncConfig(out customFirmware, out realConsoleType, true);

+                    if (!customFirmware)

+                        MessageBox.Show(Resources.Done, Resources.Wow, MessageBoxButtons.OK, MessageBoxIcon.Information);

+                    else // TODO: Add translation

+                        MessageBox.Show(string.Format("Config saved. Please note that configuration for real console ({0}) was used, not for selected console ({1}).",

+                            GetConsoleName(realConsoleType), GetConsoleName(ConfigIni.ConsoleType)),

+                            Resources.Done, MessageBoxButtons.OK, MessageBoxIcon.Information);

                 }

             }

             catch (Exception ex)

@@ -1879,7 +1851,6 @@ namespace com.clusterrr.hakchi_gui
                     foreach (ListViewItem item in listViewGames.SelectedItems)

                         if (item.Tag is NesMiniApplication)

                             listViewGames.Items.Remove(item);

-                    //MessageBox.Show(this, Resources.Done, Resources.Wow, MessageBoxButtons.OK, MessageBoxIcon.Information);

                 }

                 else LoadGames();

                 timerCalculateGames.Enabled = true;

@@ -1972,7 +1943,7 @@ namespace com.clusterrr.hakchi_gui
                 MessageBox.Show(this, ex.Message, Resources.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);

             }

         }

-        

+

         private void openSelectedGamesFolderInExplorerToolStripMenuItem_Click(object sender, EventArgs e)

         {

             openSelectedInExplorer();

diff --git a/WorkerForm.cs b/WorkerForm.cs
index ba4995e7..b10de693 100644
--- a/WorkerForm.cs
+++ b/WorkerForm.cs
@@ -88,24 +88,7 @@ namespace com.clusterrr.hakchi_gui
         public NesMiniApplication[] addedApplications;

         public static long NandCTotal, NandCUsed, NandCFree, WritedGamesSize, SaveStatesSize;

         public static bool ExternalSaves = false;

-        public static long ReservedMemory

-        {

-            get

-            {

-                if (ExternalSaves)

-                    return 5;

-                switch (ConfigIni.ConsoleType)

-                {

-                    default:

-                    case MainForm.ConsoleType.NES:

-                    case MainForm.ConsoleType.Famicom:

-                        return 10;

-                    case MainForm.ConsoleType.SNES:

-                    case MainForm.ConsoleType.SuperFamicom:

-                        return 30;

-                }

-            }

-        }

+        public const long ReservedMemory = 30;

 

         public static string SubConsoleDirectory

         {

@@ -808,36 +791,42 @@ namespace com.clusterrr.hakchi_gui
             }

         }

 

-        private void File_OnProgress(long Position, long Length)

-        {

-            throw new NotImplementedException();

-        }

-

         public static void GetMemoryStats(string gameSyncStorage = null)

         {

-            string originalGamesPath = NesMiniApplication.GamesCloverPath;

-            const string rootFsPath = "/var/lib/hakchi/rootfs";

-

-            var clovershell = MainForm.Clovershell;

-            if (gameSyncStorage == null) gameSyncStorage = clovershell.ExecuteSimple($"hakchi findGameSyncStorage", 3000, false);

-            var storageDevice = clovershell.ExecuteSimple("df /var/games | sed -n '2p' | awk '{print $1}'", 3000, true);

-            if (storageDevice.Equals("/dev/mapper/root-crypt")) storageDevice = "/dev/nandc";

-            var storageStats = clovershell.ExecuteSimple("df " + storageDevice + " | tail -n 1 | awk '{ print $2 \" | \" $3 \" | \" $4 }'", 3000, true).Split('|');

-

-            ExternalSaves = clovershell.ExecuteSimple("mount | grep /var/lib/clover").Trim().Length > 0;

-            var writedGamesSizeAll = long.Parse(clovershell.ExecuteSimple($"mkdir -p {rootFsPath}{originalGamesPath} && du -s {rootFsPath}{originalGamesPath} | awk '{{ print $1 }}'", 3000, true)) * 1024;

-            if (gameSyncStorage != $"{rootFsPath}{originalGamesPath}")

-                writedGamesSizeAll += long.Parse(clovershell.ExecuteSimple($"mkdir -p {gameSyncStorage}/{SubConsoleDirectory}/ && du -s {gameSyncStorage}/{SubConsoleDirectory}/ | awk '{{ print $1 }}'", 3000, true)) * 1024;

-            WritedGamesSize = writedGamesSizeAll;

-            SaveStatesSize = long.Parse(clovershell.ExecuteSimple("mkdir -p /var/lib/clover/profiles/0/ && du -s /var/lib/clover/profiles/0/ | awk '{ print $1 }'", 3000, true)) * 1024;

-            NandCTotal = long.Parse(storageStats[0]) * 1024;

-            NandCUsed = long.Parse(storageStats[1]) * 1024;

-            NandCFree = long.Parse(storageStats[2]) * 1024;

-            Debug.WriteLine(string.Format("Storage device size: {0:F1}MB, used: {1:F1}MB, free: {2:F1}MB", NandCTotal / 1024.0 / 1024.0, NandCUsed / 1024.0 / 1024.0, NandCFree / 1024.0 / 1024.0));

-            Debug.WriteLine(string.Format("Used by games: {0:F1}MB", WritedGamesSize / 1024.0 / 1024.0));

-            Debug.WriteLine(string.Format("Used by save-states: {0:F1}MB", SaveStatesSize / 1024.0 / 1024.0));

-            Debug.WriteLine(string.Format("Used by other files (mods, configs, etc.): {0:F1}MB", (NandCUsed - WritedGamesSize - SaveStatesSize) / 1024.0 / 1024.0));

-            Debug.WriteLine(string.Format("Available for games: {0:F1}MB", (NandCFree + WritedGamesSize) / 1024.0 / 1024.0));

+            try

+            {

+                string originalGamesPath = NesMiniApplication.GamesCloverPath;

+                const string rootFsPath = "/var/lib/hakchi/rootfs";

+

+                var clovershell = MainForm.Clovershell;

+                if (gameSyncStorage == null) gameSyncStorage = clovershell.ExecuteSimple($"hakchi findGameSyncStorage", 3000, true);

+                var storageDevice = clovershell.ExecuteSimple($"df {gameSyncStorage} | sed -n '2p' | awk '{{print $1}}'", 3000, true);

+                var storageStats = clovershell.ExecuteSimple($"df {storageDevice} | tail -n 1 | awk '{{ print $2 \" | \" $3 \" | \" $4 }}'", 3000, true).Split('|');

+

+                ExternalSaves = clovershell.ExecuteSimple("mount | grep /var/lib/clover").Trim().Length > 0;

+                var writedGamesSizeAll = long.Parse(clovershell.ExecuteSimple($"mkdir -p {rootFsPath}{originalGamesPath} && du -s {rootFsPath}{originalGamesPath} | awk '{{ print $1 }}'", 3000, true)) * 1024;

+                if (gameSyncStorage != $"{rootFsPath}{originalGamesPath}")

+                    writedGamesSizeAll += long.Parse(clovershell.ExecuteSimple($"mkdir -p {gameSyncStorage}/{SubConsoleDirectory}/ && du -s {gameSyncStorage}/{SubConsoleDirectory}/ | awk '{{ print $1 }}'", 3000, true)) * 1024;

+                WritedGamesSize = writedGamesSizeAll;

+                SaveStatesSize = long.Parse(clovershell.ExecuteSimple("mkdir -p /var/lib/clover/profiles/0/ && du -s /var/lib/clover/profiles/0/ | awk '{ print $1 }'", 3000, true)) * 1024;

+                NandCTotal = long.Parse(storageStats[0]) * 1024;

+                NandCUsed = long.Parse(storageStats[1]) * 1024;

+                NandCFree = long.Parse(storageStats[2]) * 1024;

+                Debug.WriteLine(string.Format("Storage device size: {0:F1}MB, used: {1:F1}MB, free: {2:F1}MB", NandCTotal / 1024.0 / 1024.0, NandCUsed / 1024.0 / 1024.0, NandCFree / 1024.0 / 1024.0));

+                Debug.WriteLine(string.Format("Used by games: {0:F1}MB", WritedGamesSize / 1024.0 / 1024.0));

+                Debug.WriteLine(string.Format("Used by save-states: {0:F1}MB", SaveStatesSize / 1024.0 / 1024.0));

+                Debug.WriteLine(string.Format("Used by other files (mods, configs, etc.): {0:F1}MB", (NandCUsed - WritedGamesSize - SaveStatesSize) / 1024.0 / 1024.0));

+                Debug.WriteLine(string.Format("Available for games: {0:F1}MB", (NandCFree + WritedGamesSize) / 1024.0 / 1024.0));

+            }

+            catch (Exception ex)

+            {

+                Debug.WriteLine("Error: " + ex.Message + ex.StackTrace);

+                NandCTotal = -1;

+                NandCUsed = -1;

+                NandCFree = -1;

+                WritedGamesSize = -1;

+                SaveStatesSize = -1;

+            }

         }

 

         public static void ShowSplashScreen()

@@ -917,15 +906,18 @@ namespace com.clusterrr.hakchi_gui
                 {

                     var gameSyncStorage = clovershell.ExecuteSimple($"hakchi findGameSyncStorage", 3000, false);

                     GetMemoryStats(gameSyncStorage);

-                    var maxGamesSize = (NandCFree + WritedGamesSize) - ReservedMemory * 1024 * 1024;

-                    if (stats.TotalSize > maxGamesSize)

+                    if (NandCFree >= 0)

                     {

-                        throw new Exception(string.Format(Resources.MemoryFull, stats.TotalSize / 1024 / 1024) + "\r\n\r\n" +

-                            string.Format(Resources.MemoryStats.Replace("|", "\r\n"),

-                            NandCTotal / 1024.0 / 1024.0,

-                            (NandCFree + WritedGamesSize - ReservedMemory * 1024 * 1024) / 1024 / 1024,

-                            SaveStatesSize / 1024.0 / 1024.0,

-                            (NandCUsed - WritedGamesSize - SaveStatesSize) / 1024.0 / 1024.0));

+                        var maxGamesSize = (NandCFree + WritedGamesSize) - ReservedMemory * 1024 * 1024;

+                        if (stats.TotalSize > maxGamesSize)

+                        {

+                            throw new Exception(string.Format(Resources.MemoryFull, stats.TotalSize / 1024 / 1024) + "\r\n\r\n" +

+                                string.Format(Resources.MemoryStats.Replace("|", "\r\n"),

+                                NandCTotal / 1024.0 / 1024.0,

+                                (NandCFree + WritedGamesSize - ReservedMemory * 1024 * 1024) / 1024 / 1024,

+                                SaveStatesSize / 1024.0 / 1024.0,

+                                (NandCUsed - WritedGamesSize - SaveStatesSize) / 1024.0 / 1024.0));

+                        }

                     }

 

                     using (var gamesTar = new TarStream(tempGamesDirectory))

@@ -948,11 +940,11 @@ namespace com.clusterrr.hakchi_gui
                     }

 

                     SetStatus(Resources.UploadingConfig);

-                    SyncConfig(Config);

+                    SyncConfig();

                 }

                 else // exportGames = true

                 {

-                    SetStatus("Writing games to USB drive...");

+                    SetStatus("Writing games to USB drive..."); // TODO: Add translation

                     maxProgress = (int)(stats.TotalSize / 1024 / 1024 + 20);

                     SetProgress(progress, maxProgress);

                     Directory.CreateDirectory(exportDirectory);

@@ -963,7 +955,7 @@ namespace com.clusterrr.hakchi_gui
                         {

                             if (line.EndsWith("/"))

                             {

-                                SetStatus("Writing games to USB drive... " + line.Replace("/", "\\"));

+                                SetStatus("Writing games to USB drive... " + line.Replace("/", "\\")); // TODO: Add translation

                                 if (!line.StartsWith("deleting"))

                                 {

                                     if (lastDirectory != null && !line.StartsWith(lastDirectory)) // Previous directory transfered

@@ -1028,23 +1020,34 @@ namespace com.clusterrr.hakchi_gui
             }

         }

 

-        public static void SyncConfig(Dictionary<string, string> Config, bool reboot = false)

+        public static void SyncConfig(bool reboot = false)

+        {

+            bool dumb;

+            MainForm.ConsoleType realConsoleType;

+            SyncConfig(out dumb, out realConsoleType, reboot);

+        }

+

+        public static void SyncConfig(out bool customFirmware, out MainForm.ConsoleType realConsoleType, bool reboot = false)

         {

             var clovershell = MainForm.Clovershell;

             const string configPath = "/etc/preinit.d/p0000_config";

 

+            realConsoleType = GetRealConsoleType();

+            customFirmware = realConsoleType != ConfigIni.ConsoleType;

+            var config = ConfigIni.GetConfigDictionary(realConsoleType);

             // Writing config

-            var config = new MemoryStream();

-            if (Config != null && Config.Count > 0)

+            var configStream = new MemoryStream();

+            if (config != null && config.Count > 0)

             {

-                foreach (var key in Config.Keys)

+                foreach (var key in config.Keys)

                 {

-                    var data = Encoding.UTF8.GetBytes(string.Format("cfg_{0}='{1}'\n", key, Config[key].Replace(@"'", @"\'")));

-                    config.Write(data, 0, data.Length);

+                    var data = Encoding.UTF8.GetBytes(string.Format("cfg_{0}='{1}'\n", key, config[key].Replace(@"'", @"\'")));

+                    configStream.Write(data, 0, data.Length);

                 }

             }

-            clovershell.Execute($"cat >> {configPath}", config, null, null, 3000, true);

-            config.Dispose();

+            clovershell.Execute($"cat >> {configPath}", configStream, null, null, 3000, true);

+            configStream.Dispose();

+

             if (reboot)

             {

                 try

@@ -1055,6 +1058,56 @@ namespace com.clusterrr.hakchi_gui
             }

         }

 

+        public static MainForm.ConsoleType GetRealConsoleType() // Retreives real console type

+        {

+            var clovershell = MainForm.Clovershell;

+            var customFirmwareLoaded = clovershell.ExecuteSimple("hakchi currentFirmware") != "_nand_";

+            string board, region;

+            if (!customFirmwareLoaded)

+            {

+                board = clovershell.ExecuteSimple("cat /etc/clover/boardtype", 3000, true);

+                region = clovershell.ExecuteSimple("cat /etc/clover/REGION", 3000, true);

+            }

+            else

+            {

+                clovershell.ExecuteSimple("cryptsetup open /dev/nandb root-crypt --readonly --type plain --cipher aes-xts-plain --key-file /etc/key-file", 3000);

+                clovershell.ExecuteSimple("mkdir -p /var/squashfs-original", 3000, true);

+                clovershell.ExecuteSimple("mount /dev/mapper/root-crypt /var/squashfs-original", 3000, true);

+                board = clovershell.ExecuteSimple("cat /var/squashfs-original/etc/clover/boardtype", 3000, true);

+                region = clovershell.ExecuteSimple("cat /var/squashfs-original/etc/clover/REGION", 3000, true);

+                clovershell.ExecuteSimple("umount /var/squashfs-original", 3000, true);

+                clovershell.ExecuteSimple("rm -rf /var/squashfs-original", 3000, true);

+                clovershell.ExecuteSimple("cryptsetup close root-crypt", 3000, true);

+            }

+            Debug.WriteLine(string.Format("Detected board: {0}", board));

+            Debug.WriteLine(string.Format("Detected region: {0}", region));

+            switch (board)

+            {

+                default:

+                case "dp-nes":

+                case "dp-hvc":

+                    switch (region)

+                    {

+                        case "EUR_USA":

+                            return MainForm.ConsoleType.NES;

+                        case "JPN":

+                            return MainForm.ConsoleType.Famicom;

+                    }

+                    break;

+                case "dp-shvc":

+                    switch (region)

+                    {

+                        case "USA":

+                        case "EUR":

+                            return MainForm.ConsoleType.SNES;

+                        case "JPN":

+                            return MainForm.ConsoleType.SuperFamicom;

+                    }

+                    break;

+            }

+            return MainForm.ConsoleType.Unknown;

+        }

+

         public static Image TakeScreenshot()

         {

             var clovershell = MainForm.Clovershell;