update CmlLibWinFormSample

RiversideValley · Nov 13, 2021 · 28e1b08 · 28e1b08
1 parent 9524a13
commit 28e1b08
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 36 deletions.
diff --git a/CmlLibWinFormSample/CmlLibWinFormSample.csproj b/CmlLibWinFormSample/CmlLibWinFormSample.csproj
@@ -107,6 +107,12 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Util.cs" />
+    <Compile Include="VersionSortOptionForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="VersionSortOptionForm.Designer.cs">
+      <DependentUpon>VersionSortOptionForm.cs</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="ChangeLog.resx">
       <DependentUpon>ChangeLog.cs</DependentUpon>
     </EmbeddedResource>
@@ -144,6 +150,9 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <EmbeddedResource Include="VersionSortOptionForm.resx">
+      <DependentUpon>VersionSortOptionForm.cs</DependentUpon>
+    </EmbeddedResource>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

diff --git a/CmlLibWinFormSample/GameLog.cs b/CmlLibWinFormSample/GameLog.cs
@@ -1,23 +1,31 @@
 using System;
 using System.Collections.Concurrent;
+using System.Diagnostics;
 using System.Windows.Forms;
 
 namespace CmlLibWinFormSample
 {
     public partial class GameLog : Form
     {
-        public GameLog()
+        public GameLog(Process process)
         {
             InitializeComponent();
+
+            process.ErrorDataReceived += Process_DataReceived;
+            process.OutputDataReceived += Process_DataReceived;
+            output(process.StartInfo.Arguments);
         }
+
+        private readonly ConcurrentQueue<string> logQueue = new ConcurrentQueue<string>();
 
-        static ConcurrentQueue<string> logQueue = new ConcurrentQueue<string>();
-
-        public static void AddLog(string msg)
+        private void Process_DataReceived(object sender, DataReceivedEventArgs e)
         {
-            logQueue.Enqueue(msg);
+            if (!string.IsNullOrEmpty(e.Data))
+                logQueue.Enqueue(e.Data);
         }
-
+
+        private void output(string msg) => logQueue.Enqueue(msg);
+
         private void timer1_Tick(object sender, EventArgs e)
         {
             string msg;

diff --git a/CmlLibWinFormSample/MainForm.Designer.cs b/CmlLibWinFormSample/MainForm.Designer.cs
diff --git a/CmlLibWinFormSample/MainForm.cs b/CmlLibWinFormSample/MainForm.cs
@@ -11,6 +11,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using CmlLib.Core.Downloader;
+using CmlLib.Core.Version;
 
 namespace CmlLibWinFormSample
 {
@@ -26,8 +27,6 @@ public MainForm(MSession session)
         readonly MSession session;
         MinecraftPath gamePath; 
         string javaPath;
-
-        GameLog logForm;
 
         private async void MainForm_Shown(object sender, EventArgs e)
         {
@@ -40,6 +39,7 @@ private async void MainForm_Shown(object sender, EventArgs e)
 
         private async Task initializeLauncher(MinecraftPath path)
         {
+            lbUsername.Text = session.Username;
             txtPath.Text = path.BasePath;
             this.gamePath = path;
 
@@ -78,6 +78,13 @@ private void btnSetLastVersion_Click(object sender, EventArgs e)
         {
             cbVersion.Text = launcher.Versions?.LatestReleaseVersion?.Name;
         }
+
+        private void btnSortFilter_Click(object sender, EventArgs e)
+        {
+            var form = new VersionSortOptionForm(launcher, new MVersionSortOption());
+            form.ShowDialog();
+
+        }
 
         // Start Game
         private async void Btn_Launch_Click(object sender, EventArgs e)
@@ -160,6 +167,9 @@ private async void Btn_Launch_Click(object sender, EventArgs e)
 
                 // process.Start(); // Just start game, or
                 StartProcess(process); // Start Process with debug options
+
+                var gameLog = new GameLog(process);
+                gameLog.Show();
             }
             catch (FormatException fex) // int.Parse exception
             {
@@ -184,13 +194,6 @@ private async void Btn_Launch_Click(object sender, EventArgs e)
             }
             finally
             {
-                // re open log form
-                if (logForm != null)
-                    logForm.Close();
-
-                logForm = new GameLog();
-                logForm.Show();
-
                 // enable ui
                 setUIEnabled(true);
             }
@@ -293,37 +296,19 @@ private void btnForgeInstall_Click(object sender, EventArgs e)
         private void StartProcess(Process process)
         {
             File.WriteAllText("launcher.txt", process.StartInfo.Arguments);
-            output(process.StartInfo.Arguments);
-
+
             // process options to display game log
 
             process.StartInfo.UseShellExecute = false;
             process.StartInfo.RedirectStandardError = true;
             process.StartInfo.RedirectStandardOutput = true;
             process.EnableRaisingEvents = true;
-            process.ErrorDataReceived += Process_ErrorDataReceived;
-            process.OutputDataReceived += Process_OutputDataReceived;
 
             process.Start();
             process.BeginErrorReadLine();
             process.BeginOutputReadLine();
         }
 
-        private void Process_OutputDataReceived(object sender, DataReceivedEventArgs e)
-        {
-            output(e.Data);
-        }
-
-        private void Process_ErrorDataReceived(object sender, DataReceivedEventArgs e)
-        {
-            output(e.Data);
-        }
-
-        void output(string msg)
-        {
-            GameLog.AddLog(msg);
-        }
-
         private void btnChangelog_Click(object sender, EventArgs e)
         {
             // Game Changelog