Merge branch 'master' of https://github.com/Zaczero/SharpLoader

Author: Zaczero

SharpLoader/MainForm.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Windows.Forms;
 
 namespace SharpLoader
@@ -9,6 +10,12 @@ public partial class MainForm : Form
 
         public MainForm()
         {
+            if (Program.DragDropPaths.Count == 0 &&
+                !File.Exists(Program.ConfigPath))
+            {
+                new SelectForm().ShowDialog();
+            }
+
             InitializeComponent();
 
             AuthorText.Value2 = Program.Author;
@@ -61,6 +68,7 @@ private void CompileClick(object sender, EventArgs e)
 
         private void CloseClick(object sender, EventArgs e)
         {
+            Program.CleanTemp();
             Application.Exit();
         }
     }

SharpLoader/Program.cs

@@ -45,13 +45,13 @@ public static class Program
         private const string ConfigFileName = "SharpLoader.ini";
         private static readonly string MyPath = Process.GetCurrentProcess().MainModule.FileName;
         private static readonly string MyDirectory = Path.GetDirectoryName(MyPath);
-        private static readonly string ConfigPath = Path.Combine(MyDirectory, ConfigFileName);
+        public static string ConfigPath = Path.Combine(MyDirectory, ConfigFileName);
 
+        public static List<string> DragDropPaths;
         public static int Seed = -1;
         public static string Hash;
 
         private static MainForm _form;
-        private static List<string> _dragDropPaths;
         private static bool _outToConsole;
 
         [STAThread]
@@ -62,7 +62,7 @@ public static void Main(string[] args)
             // Hide cmd
             ShowWindow(GetConsoleWindow(), SW_HIDE);
 
-            _dragDropPaths = new List<string>();
+            DragDropPaths = new List<string>();
 
             var cmdMode = false;
 
@@ -74,32 +74,20 @@ public static void Main(string[] args)
                     // Directory
                     if (File.GetAttributes(args[i]).HasFlag(FileAttributes.Directory))
                     {
-                        _dragDropPaths.AddRange(GetFilesFromDirectory(args[i]));
+                        DragDropPaths.AddRange(GetFilesFromDirectory(args[i]));
                     }
                     // File
                     else
                     {
                         // Zip
                         if (Path.GetExtension(args[i]) == ".zip")
                         {
-                            var zipBytes = File.ReadAllBytes(args[i]);
-                            var zipHash = MD5.Create().ComputeHash(zipBytes);
-
-                            var tempDir = Path.GetTempPath() + ByteArrayToString(zipHash);
-
-                            if (Directory.Exists(tempDir))
-                            {
-                                Directory.Delete(tempDir, true);
-                            }
-
-                            ZipFile.ExtractToDirectory(args[i], tempDir);
-
-                            _dragDropPaths.AddRange(ScanDir(tempDir));
+                           ProcessZip(args[i]);
                         }
                         // Normal
                         else
                         {
-                            _dragDropPaths.Add(args[i]);
+                            DragDropPaths.Add(args[i]);
                         }
                     }
                 }
@@ -136,25 +124,41 @@ public static void Main(string[] args)
                 Seed = new Random(Environment.TickCount).Next(0, int.MaxValue);
             }
 
+            // Show UI
             if (!cmdMode)
             {
                 Application.EnableVisualStyles();
                 Application.SetCompatibleTextRenderingDefault(false);
                 Application.Run(_form = new MainForm());
-
-                return;
             }
-
             // Show cmd
-            ShowWindow(GetConsoleWindow(), SW_SHOW);
-            _outToConsole = true;
-
-            var compileResult = Compile();
-            if (compileResult != 0)
+            else
             {
-                Console.ReadKey();
+                // Data file not found
+                if (!File.Exists(ConfigPath))
+                {
+                    WinApi.WritePrivateProfileString("SharpLoader", "References", "", ConfigPath);
+                    WinApi.WritePrivateProfileString("SharpLoader", "Directory", "", ConfigPath);
+                    WinApi.WritePrivateProfileString("SharpLoader", "Sources", "", ConfigPath);
+                    WinApi.WritePrivateProfileString("SharpLoader", "Output", "SharpLoader", ConfigPath);
+                    WinApi.WritePrivateProfileString("SharpLoader", "Arguments", "/platform:anycpu32bitpreferred", ConfigPath);
+                    WinApi.WritePrivateProfileString("SharpLoader", "AutoRun", "false", ConfigPath);
+
+                    Environment.Exit(1);
+                }
+
+                ShowWindow(GetConsoleWindow(), SW_SHOW);
+                _outToConsole = true;
+
+                var compileResult = Compile();
+                if (compileResult != 0)
+                {
+                    Console.ReadKey();
+                }
+
+                CleanTemp();
+                Environment.Exit(compileResult);
             }
-            Environment.Exit(compileResult);
         }
 
         public static int Compile()
@@ -175,21 +179,11 @@ public static int Compile()
             Out("");
 
             // Data file not found
-            if (!File.Exists(ConfigFileName))
+            if (!File.Exists(ConfigPath))
             {
                 Console.ForegroundColor = ConsoleColor.Red;
                 Out($"-=: Config file not found ({ConfigFileName})");
 
-                WinApi.WritePrivateProfileString("SharpLoader", "References", "", ConfigPath);
-                WinApi.WritePrivateProfileString("SharpLoader", "Directory", "", ConfigPath);
-                WinApi.WritePrivateProfileString("SharpLoader", "Sources", "", ConfigPath);
-                WinApi.WritePrivateProfileString("SharpLoader", "Output", "SharpLoader", ConfigPath);
-                WinApi.WritePrivateProfileString("SharpLoader", "Arguments", "/platform:anycpu32bitpreferred", ConfigPath);
-                WinApi.WritePrivateProfileString("SharpLoader", "AutoRun", "false", ConfigPath);
-
-                Console.ForegroundColor = ConsoleColor.Red;
-                Out($"-=: Default config file generated");
-
                 return 1;
             }
 
@@ -218,9 +212,9 @@ public static int Compile()
             var autoRun = autoRunReadSb.ToString().Equals("true", StringComparison.OrdinalIgnoreCase);
 
             // Drag n Drop
-            if (_dragDropPaths.Count != 0)
+            if (DragDropPaths.Count != 0)
             {
-                userSourcePaths = _dragDropPaths.ToArray();
+                userSourcePaths = DragDropPaths.ToArray();
             }
             // Read from config
             else
@@ -450,6 +444,44 @@ public static void Out(object obj)
             }
         }
 
+        public static void ProcessZip(string path)
+        {
+            var zipBytes = File.ReadAllBytes(path);
+            var zipHash = MD5.Create().ComputeHash(zipBytes);
+
+            var tempDir = Path.GetTempPath() + @"SharpLoader\" + ByteArrayToString(zipHash);
+
+            if (Directory.Exists(tempDir))
+            {
+                Directory.Delete(tempDir, true);
+            }
+
+            ZipFile.ExtractToDirectory(path, tempDir);
+
+            var unzipFiles = ScanDir(tempDir);
+
+            foreach (var unzipFile in unzipFiles)
+            {
+                if (unzipFile.EndsWith(ConfigFileName))
+                {
+                    ConfigPath = unzipFile;
+                }
+                else
+                {
+                    DragDropPaths.Add(unzipFile);
+                }
+            }
+        }
+
+        public static void CleanTemp()
+        {
+            var path = Path.GetTempPath() + "SharpLoader";
+            if (Directory.Exists(path))
+            {
+                Directory.Delete(path, true);
+            }
+        }
+
         private static IEnumerable<string> GetFilesFromDirectory(string directory)
         {
             var dir = new DirectoryInfo(directory);