- Improved boxart folder detection.

- Fixed scaling for 9.5.0+.
KirovAir · Sep 25, 2019 · 2f83d4b · 2f83d4b
1 parent bfe484e
commit 2f83d4b
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 17 deletions.
diff --git a/TwilightBoxart.UX/MainForm.Designer.cs b/TwilightBoxart.UX/MainForm.Designer.cs
diff --git a/TwilightBoxart.UX/MainForm.cs b/TwilightBoxart.UX/MainForm.cs
@@ -37,7 +37,7 @@ private void DetectSd()
                 path = allDrives[0].RootDirectory.FullName;
                 foreach (var drive in allDrives)
                 {
-                    if (Directory.Exists(Path.Combine(drive.RootDirectory.FullName, "_nds")))
+                    if (Directory.Exists(Path.Combine(drive.RootDirectory.FullName, BoxartConfig.MagicDir)))
                     {
                         path = drive.RootDirectory.FullName;
                         break;
@@ -71,6 +71,9 @@ private void Go()
         // UI STUFF
         private void SetUx()
         {
+            if (!_isInitialized)
+                return;
+
             btnBrowseBoxart.Enabled = chkManualBoxartLocation.Checked;
 
             if (!chkManualBoxartLocation.Checked && !string.IsNullOrEmpty(txtSdRoot.Text))
@@ -113,7 +116,6 @@ private void MainForm_Load(object sender, EventArgs e)
             if (!string.IsNullOrEmpty(_config.SdRoot))
             {
                 txtSdRoot.Text = _config.SdRoot;
-                txtBoxart.Text = _config.GetBoxartPath();
             }
             else
             {
@@ -174,16 +176,6 @@ private void chkBoxartSize_CheckedChanged(object sender, EventArgs e)
             SetUx();
         }
 
-        private void txtSdRoot_TextChanged(object sender, EventArgs e)
-        {
-            SetUx();
-        }
-
-        private void txtBoxart_TextChanged(object sender, EventArgs e)
-        {
-            SetUx();
-        }
-
         private void btnGithub_Click(object sender, EventArgs e)
         {
             if (MessageBox.Show(BoxartConfig.Credits + Environment.NewLine + Environment.NewLine + "Visit Github now?", "Hello", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK)

diff --git a/TwilightBoxart/BoxartConfig.cs b/TwilightBoxart/BoxartConfig.cs
@@ -15,7 +15,7 @@ public class BoxartConfig : IniSettings
         public int BoxartHeight { get; set; } = 115;
         public bool AdjustAspectRatio { get; set; } = true;
 
-
+        public const string MagicDir = "_nds";
         public const string FileName = "TwilightBoxart.ini";
         public static string Credits = "TwilightBoxart - Created by KirovAir." + Environment.NewLine + "Loads of love to the devs of TwilightMenu++, LibRetro, GameTDB and the maintainers of the No-Intro DB.";
 
@@ -36,6 +36,33 @@ public string GetBoxartPath(string root = "")
                 return BoxartPath;
             }
 
+            if (root.Contains(Path.DirectorySeparatorChar.ToString()))
+            {
+                try
+                {
+                    var split = root.Split(Path.DirectorySeparatorChar);
+                    var tmpReplace = "";
+                    for (var i = split.Length; i-- > 0;)
+                    {
+                        tmpReplace = split[i] + Path.DirectorySeparatorChar + tmpReplace;
+                        tmpReplace = tmpReplace.TrimEnd(Path.DirectorySeparatorChar);
+
+                        // Remove where we are.
+                        var place = root.LastIndexOf(tmpReplace);
+                        if (place == -1)
+                            break;
+                        var correctRoot = root.Remove(place, tmpReplace.Length);
+
+                        if (Directory.Exists(Path.Combine(correctRoot, MagicDir)))
+                        {
+                            root = correctRoot;
+                            break;
+                        }
+                    }
+                }
+                catch { }
+            }
+
             return Path.Combine(root.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar, BoxartPath.Replace("{sdroot}", "").TrimStart(Path.DirectorySeparatorChar));
         }
 
@@ -85,13 +112,18 @@ public string GetBoxartPath(string root = "")
 
         public static Dictionary<ConsoleType, Size> AspectRatioMapping = new Dictionary<ConsoleType, Size>
         {
+            // FDS / GBC / GB
             {ConsoleType.FamicomDiskSystem, new Size(1, 1)},
-
+            {ConsoleType.GameBoy, new Size(1, 1)},
+            {ConsoleType.GameBoyColor, new Size(1, 1)},
+
+            // NES / GEN/MD / SFC / MS/ GG
             {ConsoleType.NintendoEntertainmentSystem, new Size(84, 115)},
-            {ConsoleType.SegaGameGear, new Size(84, 115)},
             {ConsoleType.SegaGenesis, new Size(84, 115)},
             {ConsoleType.SegaMasterSystem, new Size(84, 115)},
+            {ConsoleType.SegaGameGear, new Size(84, 115)},
 
+            // SNES
             {ConsoleType.SuperNintendoEntertainmentSystem, new Size(158, 115)}
         };
     }

diff --git a/TwilightBoxart/Helpers/ImgDownloader.cs b/TwilightBoxart/Helpers/ImgDownloader.cs
@@ -31,6 +31,13 @@ public void DownloadAndResize(string url, string targetFile)
 
         public void SetSizeAdjustedToAspectRatio(Size aspectRatio)
         {
+            if (_width == aspectRatio.Width || _height == aspectRatio.Height)
+            {
+                _height = aspectRatio.Height;
+                _width = aspectRatio.Width;
+                return;
+            }
+
             var sourceWidth = aspectRatio.Width;
             var sourceHeight = aspectRatio.Height;
             var dWidth = _width;

diff --git a/TwilightBoxart/Models/Base/Rom.cs b/TwilightBoxart/Models/Base/Rom.cs
@@ -103,6 +103,22 @@ public static IRom FromFile(string filename)
                     }
                 }
 
+                //if (filename.ToLower().Contains(".lz77."))
+                //{
+                //    fs.Seek(0, SeekOrigin.Begin);
+                //    using (var decompressedFileStream = new MemoryStream())
+                //    {
+                //        using (DeflateStream decompressionStream = new DeflateStream(fs, CompressionMode.Decompress))
+                //        {
+                //            decompressionStream.CopyTo(decompressedFileStream);
+                //        }
+
+                //        decompressedFileStream.Seek(0, SeekOrigin.Begin);
+                //        return FromStream(decompressedFileStream, filename);
+
+                //    }
+                //}
+
                 return FromStream(fs, filename);
             }
         }