refactor: various improvements

GUI is borked. It looks pretty until you try to do anything.

Author: ThisAMJ

.gitignore

@@ -2,7 +2,7 @@
 *.o
 *.obj
 
-# Executables
+# Build artifacts
 *.exe
 *.db
 *.pdb
@@ -13,11 +13,10 @@
 GhostServer/Debug/
 GhostServer/Release/
 .vs/GhostServer/v16/.suo
-
-# Linux build artifacts
 GhostServer/ui_mainwindow.h
 GhostServer/*_qt.cpp
 config.mk
+copy.bat
 ghost_server
 ghost_server_cli
 

GhostServer/GhostServer.vcxproj

@@ -48,6 +48,7 @@
     <TargetExt>.exe</TargetExt>
     <OutDir>$(SolutionDir)GhostServer\Debug\CLI\</OutDir>
     <IntDir>$(SolutionDir)GhostServer\Debug\CLI\obj\</IntDir>
+    <QtMsBuild></QtMsBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCLI|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -56,6 +57,7 @@
     <TargetExt>.exe</TargetExt>
     <OutDir>$(SolutionDir)GhostServer\Release\CLI\</OutDir>
     <IntDir>$(SolutionDir)GhostServer\Release\CLI\obj\</IntDir>
+    <QtMsBuild></QtMsBuild>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
@@ -74,11 +76,11 @@
     <Import Project="$(QtMsBuild)\qt_defaults.props" />
   </ImportGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='DebugGUI|Win32'">
-    <QtInstall>msvc2017</QtInstall>
+    <QtInstall>msvc2019</QtInstall>
     <QtModules>core;gui;widgets</QtModules>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='ReleaseGUI|Win32'">
-    <QtInstall>msvc2017</QtInstall>
+    <QtInstall>msvc2019</QtInstall>
     <QtModules>core;gui;widgets</QtModules>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='DebugCLI|Win32'">
@@ -111,7 +113,10 @@
       <AdditionalDependencies>sfml-system-s-d.lib;sfml-network-s-d.lib;winmm.lib;ws2_32.lib;$(Qt_LIBS_);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>copy /Y "$(TargetPath)" "$(SolutionDir)GhostServer.exe"</Command>
+      <Command>
+        copy /Y "$(TargetPath)" "$(SolutionDir)GhostServer_CLI.exe"
+        if exist "$(SolutionDir)copy.bat" call "$(SolutionDir)copy.bat"
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseGUI|Win32'">
@@ -132,7 +137,10 @@
       <AdditionalDependencies>sfml-system-s.lib;sfml-network-s.lib;winmm.lib;ws2_32.lib;$(Qt_LIBS_);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>copy /Y "$(TargetPath)" "$(SolutionDir)GhostServer.exe"</Command>
+      <Command>
+        copy /Y "$(TargetPath)" "$(SolutionDir)GhostServer_CLI.exe"
+        if exist "$(SolutionDir)copy.bat" call "$(SolutionDir)copy.bat"
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugCLI|Win32'">
@@ -154,7 +162,10 @@
       <AdditionalDependencies>sfml-system-s-d.lib;sfml-network-s-d.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>copy /Y "$(TargetPath)" "$(SolutionDir)GhostServer_CLI.exe"</Command>
+      <Command>
+        copy /Y "$(TargetPath)" "$(SolutionDir)GhostServer_CLI.exe"
+        if exist "$(SolutionDir)copy.bat" call "$(SolutionDir)copy.bat"
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCLI|Win32'">
@@ -176,7 +187,10 @@
       <AdditionalDependencies>sfml-system-s.lib;sfml-network-s.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>copy /Y "$(TargetPath)" "$(SolutionDir)GhostServer_CLI.exe"</Command>
+      <Command>
+        copy /Y "$(TargetPath)" "$(SolutionDir)GhostServer_CLI.exe"
+        if exist "$(SolutionDir)copy.bat" call "$(SolutionDir)copy.bat"
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>

GhostServer/main_cli.cpp

@@ -448,7 +448,10 @@ int main(int argc, char **argv) {
     g_network = &network;
 
     puts("Server starting up");
-    network.StartServer(port);
+    if (!network.StartServer(port)) {
+        printf("Failed to start server on port %d", port);
+        return 1;
+    }
     while (!g_should_stop) {
 #ifdef _WIN32
         if (_kbhit()) {

GhostServer/mainwindow.cpp

@@ -28,7 +28,7 @@ MainWindow::~MainWindow()
 void MainWindow::StartServer()
 {
     if (!this->network.StartServer(ui.port->value())) {
-        this->AddEventLog("Server didn't start ! Please check settings !");
+        this->AddEventLog("Server didn't start! Please check settings!");
         return;
     }
 
@@ -59,7 +59,7 @@ void MainWindow::ResetServer()
 void MainWindow::StartCountdown()
 {
     if (!this->isRunning) {
-        this->AddEventLog("Please start the server before starting a countdown, you moron !");
+        this->AddEventLog("Please start the server before starting a countdown, you moron!");
         return;
     }
 
@@ -87,8 +87,7 @@ void MainWindow::StartCountdown()
     int duration = ui.duration->value();
     this->network.StartCountdown(pre_cmds.toStdString(), post_cmds.toStdString(), duration);
 
-    this->AddEventLog("Countdown will start in " + QString::number(duration));
-    this->AddEventLog("Pre-command : " + pre_cmds);
-    this->AddEventLog("Post-command : " + post_cmds);
+    this->AddEventLog("Countdown starting: " + QString::number(duration) + " seconds");
+    this->AddEventLog("Pre-command: " + pre_cmds);
+    this->AddEventLog("Post-command: " + post_cmds);
 }
-

GhostServer/mainwindow.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>FrenchSaves10TicksBtw</string>
+   <string>Ghost Server</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -73,7 +73,7 @@
             <item row="0" column="0">
              <widget class="QLabel" name="label_4">
               <property name="text">
-               <string>Pre countdowncommands</string>
+               <string>Pre-countdown commands</string>
               </property>
              </widget>
             </item>
@@ -96,7 +96,7 @@
             <item row="1" column="0">
              <widget class="QLabel" name="label_5">
               <property name="text">
-               <string>Post countdown</string>
+               <string>Post-countdown commands</string>
               </property>
              </widget>
             </item>
@@ -119,7 +119,7 @@
             <item row="2" column="0">
              <widget class="QLabel" name="label_6">
               <property name="text">
-               <string>Duration</string>
+               <string>Countdown duration (seconds)</string>
               </property>
              </widget>
             </item>
@@ -186,7 +186,19 @@
              </font>
             </property>
             <property name="text">
-             <string>More settings comming soon TM (maybe...)</string>
+             <string>More settings coming soon TM (maybe...)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLabel" name="label_3">
+            <property name="font">
+             <font>
+              <pointsize>8</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string>French saves 10 ticks, by the way.</string>
             </property>
            </widget>
           </item>

README.md

@@ -6,18 +6,22 @@ Server for the Ghost feature in [SAR](https://github.com/p2sr/SourceAutoRecord)
 
 ## Installation
 
-- Download the latest release in [releases page](https://github.com/p2sr/GhostServer/releases)
+- Download the latest release from the [releases page](https://github.com/p2sr/GhostServer/releases)
 - Unzip the archive
-- Launch ``Server.exe``
+- Launch ``GhostServer.exe``
 - The default port is **53000**. You can change it in the ``Settings`` tab.
-- In the settings of your router, open both UDP and TCP xxxxx port, xxxxx being the port you specified in the ``port`` setting.
+- In the settings of your router, open both UDP and TCP ports to the above setting.
 
 ## Usage
 
+> The GUI mode is currently broken in various ways. Please use the CLI version instead
+> in the meantime. The `help` command will show you the available commands.
+> Run the server with `.\GhostServer_CLI.exe [port=53000]`
+
 - The server will run as soon as you click on the ``Start Server`` button. Your IP address is shown on the first line along with the port the server uses to communicate.
 - Players and spectators connect to the server with the SAR commands `ghost_connect <ip> [port=53000]` or `ghost_spec_connect <ip> [port=53000]`
 - You can set a countdown on the right part of the interface
-  - You can set some commands to execute before and after the countdown. You can write them on one line like `"sv_cheats 0; say lol"` or on multi-line
+  - You can set some commands to execute before and after the countdown. You can write them on one line like `sv_cheats 0; say lol` or on multi-line
 - Server stops by clicking on the ``Stop Server`` button (previously ``Start Server``)
 
 ## Contributing