From 9294ec11a78ea329bea9c2b5178cf2df99c85782 Mon Sep 17 00:00:00 2001 From: Li Date: Mon, 25 Jul 2022 21:45:21 +1200 Subject: [PATCH] Update MPN00BS --- .../HISPd/Resources/DEBIAN/control | 2 +- .../LibHISP/Properties/AssemblyInfo.cs | 4 +-- HorseIsleServer/MPN00BS/App.axaml.cs | 11 +++++++- HorseIsleServer/MPN00BS/Program.cs | 4 +++ .../MPN00BS/Properties/AssemblyInfo.cs | 4 +-- HorseIsleServer/MPN00BS/ServerStarter.cs | 28 ++++++++++--------- 6 files changed, 34 insertions(+), 19 deletions(-) diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index bd8b66c..3ad3e2f 100755 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.7.120 +Version: 1.7.121 Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Maintainer: Li Homepage: https://islehorse.com diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs index 0db7e51..86deb25 100755 --- a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.7.120.0")] -[assembly: AssemblyFileVersion("1.7.120.0")] +[assembly: AssemblyVersion("1.7.121.0")] +[assembly: AssemblyFileVersion("1.7.121.0")] diff --git a/HorseIsleServer/MPN00BS/App.axaml.cs b/HorseIsleServer/MPN00BS/App.axaml.cs index 5a2d37e..d237816 100755 --- a/HorseIsleServer/MPN00BS/App.axaml.cs +++ b/HorseIsleServer/MPN00BS/App.axaml.cs @@ -1,13 +1,19 @@ using Avalonia; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; -using HISP.Server; using MPN00BS.ViewModels; +using System.IO; +using System.Runtime.InteropServices; namespace MPN00BS { public partial class App : Application { +#if OS_LINUX + [DllImport("libc", SetLastError = true)] + private static extern int chmod(string pathname, int mode); + +#endif public App() { this.DataContext = new HispViewModel(); @@ -16,6 +22,9 @@ namespace MPN00BS public override void Initialize() { AvaloniaXamlLoader.Load(this); +#if OS_LINUX + chmod(Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "LINUX", "flash.elf"), 777); +#endif } public override void OnFrameworkInitializationCompleted() diff --git a/HorseIsleServer/MPN00BS/Program.cs b/HorseIsleServer/MPN00BS/Program.cs index bd550eb..df08bbf 100755 --- a/HorseIsleServer/MPN00BS/Program.cs +++ b/HorseIsleServer/MPN00BS/Program.cs @@ -2,11 +2,15 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; using System; +using System.Runtime.InteropServices; namespace MPN00BS { internal class Program { + + + // Initialization code. Don't use any Avalonia, third-party APIs or any // SynchronizationContext-reliant code before AppMain is called: things aren't initialized // yet and stuff might break. diff --git a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs index 416e8a1..14bf052 100755 --- a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.7.120.0")] -[assembly: AssemblyFileVersion("1.7.120.0")] +[assembly: AssemblyVersion("1.7.121.0")] +[assembly: AssemblyFileVersion("1.7.121.0")] diff --git a/HorseIsleServer/MPN00BS/ServerStarter.cs b/HorseIsleServer/MPN00BS/ServerStarter.cs index b5ad953..a2b79f1 100755 --- a/HorseIsleServer/MPN00BS/ServerStarter.cs +++ b/HorseIsleServer/MPN00BS/ServerStarter.cs @@ -10,7 +10,6 @@ using HTTP; using System; using System.Diagnostics; using System.IO; -using System.Runtime.InteropServices; using static MPN00BS.MessageBox; namespace MPN00BS @@ -19,10 +18,6 @@ namespace MPN00BS public class ServerStarter { -#if OS_LINUX - [DllImport("libc", SetLastError = true)] - private static extern int chmod(string pathname, int mode); -#endif public static bool HasServerStarted = false; private static Process clientProcess = new Process(); private static Action HorseIsleClientExitCallback; @@ -37,9 +32,9 @@ namespace MPN00BS cs.Contents.Add(ci); } - public static void ShutdownHTTPServer(){ - cs.Shutdown(); - } + public static void ShutdownHTTPServer(){ + cs.Shutdown(); + } public static void ShowCrash(bool error, string type, string text) { @@ -63,16 +58,22 @@ namespace MPN00BS { HorseIsleClientExitCallback = callback; + clientProcess = new Process(); #if OS_WINDOWS - clientProcess.StartInfo.FileName = Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "WINDOWS", "flash.exe"); + string executable = Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "WINDOWS", "flash.exe"); #elif OS_LINUX - clientProcess.StartInfo.FileName = Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "LINUX", "flash.elf"); - chmod(clientProcess.StartInfo.FileName, 777); + string executable = Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "LINUX", "flash.elf"); #else - MessageBox.Show(null,"ERROR: No path for flash projector specified on this platform", "Porting error", MessageBoxButtons.Ok); + MessageBox.Show(null,"ERROR: No path for flash projector specified on this platform", "Porting error", MessageBoxButtons.Ok); #endif + if (!File.Exists(executable)) + { + MessageBox.Show(null, "ERROR: Cannot find file: \"" + executable + "\"", "File not Found error", MessageBoxButtons.Ok); + } + + clientProcess.StartInfo.FileName = executable; #if OS_LINUX clientProcess.StartInfo.Arguments = "http://"+cs.ipaddr+":"+cs.portnum+"/horseisle_mapfix.swf?SERVER=" + serverIp + "&PORT=" + serverPort.ToString(); @@ -81,10 +82,11 @@ namespace MPN00BS #endif clientProcess.StartInfo.RedirectStandardOutput = true; clientProcess.StartInfo.RedirectStandardError = true; - clientProcess.EnableRaisingEvents = true; clientProcess.Exited += HorseIsleClientExited; clientProcess.Start(); + + } public static void ReadServerProperties()