From 10470e40b182ca07a4abd906b3b7efc5db0f8e5e Mon Sep 17 00:00:00 2001
From: Nabile Rahmani <nabile13.pc@gmail.com>
Date: Thu, 5 Jul 2018 21:36:41 +0200
Subject: [PATCH] - Read zipped ROM images. - Change window title on cartridge
 swap.

---
 DotN64.Desktop/Program.cs | 31 ++++++++++++++++++++++---------
 DotN64/Cartridge.cs       | 11 ++---------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/DotN64.Desktop/Program.cs b/DotN64.Desktop/Program.cs
index 7613e63..c07986d 100644
--- a/DotN64.Desktop/Program.cs
+++ b/DotN64.Desktop/Program.cs
@@ -1,8 +1,9 @@
 using System;
 using System.IO;
+using System.IO.Compression;
+using System.Linq;
 using System.Reflection;
 using DotN64.Desktop;
-using System.Linq;
 
 [assembly: AssemblyTitle(nameof(DotN64))]
 [assembly: AssemblyDescription("Nintendo 64 emulator.")]
@@ -148,34 +149,46 @@ namespace DotN64.Desktop
 
         private static void Repair() => Update(force: true);
 
+        private static Cartridge LoadCartridge(string path)
+        {
+            var file = new FileInfo(path);
+
+            if (file.Extension.ToLower() == ".zip")
+            {
+                using (var input = ZipFile.OpenRead(file.FullName).Entries.First().Open())
+                using (var output = new MemoryStream())
+                {
+                    input.CopyTo(output);
+                    return new Cartridge(output.ToArray());
+                }
+            }
+
+            return new Cartridge(file);
+        }
+
         private static void Run(Options options)
         {
             var nintendo64 = new Nintendo64();
-            Window window = null;
 
             if (options.UseDebugger)
                 nintendo64.Debugger = new Debugger(nintendo64);
 
             if (!options.NoVideo)
             {
-                window = new Window(nintendo64, size: options.VideoResolution)
+                var window = new Window(nintendo64, size: options.VideoResolution)
                 {
                     IsFullScreen = options.FullScreenVideo,
                     IsBorderless = options.BorderlessWindow
                 };
                 nintendo64.VideoOutput = window;
+                nintendo64.CartridgeSwapped += (n, c) => window.Title = nameof(DotN64) + (c != null ? $" - {c.ImageName.Trim()}" : string.Empty);
             }
 
             if (options.BootROM != null)
                 nintendo64.PIF.BootROM = File.ReadAllBytes(options.BootROM);
 
             if (options.Cartridge != null)
-            {
-                nintendo64.Cartridge = Cartridge.FromFile(new FileInfo(options.Cartridge));
-
-                if (window != null)
-                    window.Title += $" - {nintendo64.Cartridge.ImageName.Trim()}";
-            }
+                nintendo64.Cartridge = LoadCartridge(options.Cartridge);
 
             nintendo64.PowerOn();
             nintendo64.Run();
diff --git a/DotN64/Cartridge.cs b/DotN64/Cartridge.cs
index 98ce96e..655fddd 100644
--- a/DotN64/Cartridge.cs
+++ b/DotN64/Cartridge.cs
@@ -43,16 +43,9 @@ namespace DotN64
         {
             ROM = rom;
         }
-        #endregion
 
-        #region Methods
-        public static Cartridge FromFile(FileInfo file)
-        {
-            using (var reader = new BinaryReader(file.OpenRead()))
-            {
-                return new Cartridge(reader.ReadBytes((int)reader.BaseStream.Length));
-            }
-        }
+        public Cartridge(FileInfo file)
+            : this(File.ReadAllBytes(file.FullName)) { }
         #endregion
     }
 }