Added FTV 1.9.9.6; made folders neat; fixed caret bug; added manager …

…version 1.0.8 update link

DelBinObjFolders.bat

@@ -0,0 +1,5 @@
+::Run App With Args
+@ECHO OFF
+cd /D %~dp0
+start DelBinObjFolders.exe -Run
+pause

README.md

@@ -26,6 +26,8 @@ https://dotnet.microsoft.com/download/visual-studio-sdks
 
 If you would like to use the `.yaml` file please type `yes` in the cmd console.
 
+Default username and password: u=`admin` p=`password`.
+
 Note: You will have to setup additional parameters as shown in the image below.
 
 * Examples

WPF/FreeTAKServer_Manager_WPF/Classes/UpdateChecker/CurrentVersion.xml

@@ -3,7 +3,7 @@
 	<currentVersion>
 		<major>1</major>
 		<minor>0</minor>
-		<build>7</build>
+		<build>8</build>
 	</currentVersion>
-	<path>https://github.com/Cale-Torino/FreeTAKServer_Manager/releases/download/1.0.0.7/FreeTAKServer_Manager_WPF_Installer.msi</path>
+	<path>https://github.com/Cale-Torino/FreeTAKServer_Manager/releases/download/1.0.0.8/FreeTAKServer_Manager_WPF_Installer.msi</path>
 </FreeTAKServer_Manager_WPF>

WPF/FreeTAKServer_Manager_WPF/Forms/MainWindow.xaml.cs

@@ -375,10 +375,10 @@ private void Installserver_button_Click(object sender, RoutedEventArgs e)
                 {
                     ForceCursor = true;
                     Cursor = Cursors.Wait;
-                    int _Install = CMD_Class.SendCMDCommandNormal("/c pip install -r requirements.txt&&python -m pip install FreeTAKServer[ui]==1.9.9", AppDomain.CurrentDomain.BaseDirectory);
-                    File.Copy(AppDomain.CurrentDomain.BaseDirectory + @"\FTSConfig.yaml", Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\FTSConfig.yaml", true);
-                    File.Copy(AppDomain.CurrentDomain.BaseDirectory + @"\config.py", Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer-UI\config.py", true);
-                    File.Copy(AppDomain.CurrentDomain.BaseDirectory + @"\MainConfig.py", Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\controllers\configuration\MainConfig.py", true);
+                    int _Install = CMD_Class.SendCMDCommandNormal("/c pip install -r TextFiles\\requirements.txt&&python -m pip install FreeTAKServer[ui]==1.9.9.6", AppDomain.CurrentDomain.BaseDirectory);
+                    File.Copy(AppDomain.CurrentDomain.BaseDirectory + @"\YamlScripts\FTSConfig.yaml", Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\FTSConfig.yaml", true);
+                    File.Copy(AppDomain.CurrentDomain.BaseDirectory + @"\PythonScripts\config.py", Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer-UI\config.py", true);
+                    File.Copy(AppDomain.CurrentDomain.BaseDirectory + @"\PythonScripts\MainConfig.py", Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\controllers\configuration\MainConfig.py", true);
                     replaceText();
                     LoggerClass.WriteLine(" *** Install Server PID=" + _Install + " [MainForm] ***");
                     Richtextbox.AppendText("[" + DateTime.Now.ToString() + "] : Install Server PID=" + _Install + Environment.NewLine);

WPF/FreeTAKServer_Manager_WPF/Forms/ReadMeWindow.xaml

@@ -12,7 +12,7 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
-        <RichTextBox x:Name="Richtextbox" IsReadOnly="True" HorizontalAlignment="Left" Height="391" Margin="10,10,0,0" VerticalAlignment="Top" Width="506" Cursor="IBeam" AutomationProperties.HelpText="Read Me" IsInactiveSelectionHighlightEnabled="True" Block.LineHeight="2" Background="Black" Foreground="White"/>
+        <RichTextBox x:Name="Richtextbox" IsReadOnly="True" HorizontalAlignment="Left" Height="391" Margin="10,10,0,0" VerticalAlignment="Top" Width="506" Cursor="IBeam" AutomationProperties.HelpText="Read Me" IsInactiveSelectionHighlightEnabled="True" Block.LineHeight="2" Background="Black" Foreground="White" TextChanged="Richtextbox_TextChanged"/>
 
     </Grid>
 </Window>

WPF/FreeTAKServer_Manager_WPF/Forms/ReadMeWindow.xaml.cs

@@ -21,13 +21,18 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
             {
                 //Clear Richtextbox and add the content of ReadMe.txt
                 Richtextbox.Document.Blocks.Clear();
-                Richtextbox.AppendText(File.ReadAllText("ReadMe.txt"));
+                Richtextbox.AppendText(File.ReadAllText("TextFiles\\ReadMe.txt"));
             }
             catch (Exception ex)
             {
                 MessageBox.Show(ex.Message, "Read Me Error!", MessageBoxButton.OK, MessageBoxImage.Error);
                 return;
             }
         }
+
+        private void Richtextbox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+        {
+
+        }
     }
 }

WPF/FreeTAKServer_Manager_WPF/Forms/Test_APIWindow.xaml

@@ -77,8 +77,7 @@
                 </Label>
             </Canvas>
         </GroupBox>
-        <RichTextBox x:Name="Richtextbox" IsReadOnly="True" HorizontalAlignment="Left" Height="247" Margin="10,158,0,0" VerticalAlignment="Top" Width="491" Block.LineHeight="2" AutomationProperties.HelpText="Result Textbox" IsReadOnlyCaretVisible="True" Background="Black" Foreground="White">
-        </RichTextBox>
+        <RichTextBox x:Name="Richtextbox" IsReadOnly="True" HorizontalAlignment="Left" Height="247" Margin="10,158,0,0" VerticalAlignment="Top" Width="491" Block.LineHeight="2" AutomationProperties.HelpText="Result Textbox" Background="Black" Foreground="White"/>
 
     </Grid>
 </Window>

WPF/FreeTAKServer_Manager_WPF/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.7")]
-[assembly: AssemblyFileVersion("1.0.7")]
+[assembly: AssemblyVersion("1.0.8")]
+[assembly: AssemblyFileVersion("1.0.8")]

WPF/FreeTAKServer_Manager_WPF/PythonScripts/MainConfig.py

@@ -11,13 +11,13 @@ class MainConfig:
     """
 
     # the version information of the server (recommended to leave as default)
-    version = 'FreeTAKServer-1.9.8 Public'
+    version = 'FreeTAKServer-1.9.9.6 Public'
     #
     yaml_path = str(os.environ.get('FTS_CONFIG_PATH', '</text>Lib\\site-packages\\FreeTAKServer\\FTSConfig.yaml'))
 
-    #python_version = 'python3.8'
+    # python_version = 'python3.8'
 
-    #userpath = '/usr/local/lib/'
+    userpath = '</text>Lib'
 
     try:
         import socket
@@ -113,7 +113,7 @@ class MainConfig:
         CRLFile = str(os.environ.get('FTS_CRLDIR', fr"{certsPath}\\FTS_CRL.json"))
 
         # set to None if you don't want a message sent
-        ConnectionMessage = f'Welcome to the Windows FreeTAKServer {version}. The Parrot is not dead. It’s just resting'
+        ConnectionMessage = f'Welcome to FreeTAKServer {version}. The Parrot is not dead. It’s just resting'
 
         DataBaseType = str("SQLite")
 
@@ -127,7 +127,7 @@ class MainConfig:
         if yamlConfig.get("System"):
             MainLoopDelay = int(os.environ.get('FTS_MAINLOOP_DELAY', yamlConfig["System"].get("FTS_MAINLOOP_DELAY", 1)))
             # set to None if you don't want a message sent
-            ConnectionMessage = str(os.environ.get("FTS_CONNECTION_MESSAGE", yamlConfig["System"].get("FTS_CONNECTION_MESSAGE", f'Welcome to the Windows FreeTAKServer {version}. The Parrot is not dead. It’s just resting')))
+            ConnectionMessage = str(os.environ.get("FTS_CONNECTION_MESSAGE", yamlConfig["System"].get("FTS_CONNECTION_MESSAGE", f'Welcome to FreeTAKServer {version}. The Parrot is not dead. It’s just resting')))
             DataBaseType = str(os.environ.get("FTS_DATABASE_TYPE", yamlConfig["System"].get("FTS_DATABASE_TYPE", "SQLite")))
             OptimizeAPI = bool(os.environ.get("FTS_OPTIMIZE_API", yamlConfig["System"].get("FTS_OPTIMIZE_API", True)))
             SecretKey = str(os.environ.get('FTS_SECRET_KEY', yamlConfig["System"].get("FTS_SECRET_KEY", 'vnkdjnfjknfl1232#')))
@@ -136,7 +136,7 @@ class MainConfig:
 
         else:
             MainLoopDelay = int(os.environ.get('FTS_MAINLOOP_DELAY',  1))
-            ConnectionMessage = str(os.environ.get("FTS_CONNECTION_MESSAGE", f'Welcome to the Windows FreeTAKServer {version}. The Parrot is not dead. It’s just resting'))
+            ConnectionMessage = str(os.environ.get("FTS_CONNECTION_MESSAGE", f'Welcome to FreeTAKServer {version}. The Parrot is not dead. It’s just resting'))
             DataBaseType = str(os.environ.get("FTS_DATABASE_TYPE", "SQLite"))
             OptimizeAPI = bool(os.environ.get("FTS_OPTIMIZE_API", True))
 
@@ -189,15 +189,15 @@ class MainConfig:
             # whether or not to save CoT's to the DB
             SaveCoTToDB = bool(os.environ.get('FTS_COT_TO_DB', yamlConfig["FileSystem"].get("FTS_COT_TO_DB")))
 
-            MainPath = str(os.environ.get("FTS_MAINPATH", yamlConfig["FileSystem"].get("FTS_MAINPATH", Path(fr'</text>Lib\\site-packages\\FreeTAKServer'))))
+            MainPath = str(os.environ.get("FTS_MAINPATH", yamlConfig["FileSystem"].get("FTS_MAINPATH", Path(fr'{userpath}\\site-packages\\FreeTAKServer'))))
 
             certsPath = str(os.environ.get('FTS_CERTS_PATH', yamlConfig["FileSystem"].get("FTS_CERTS_PATH", fr'{MainPath}\\certs')))
 
             ExCheckMainPath = str(os.environ.get('FTS_EXCHECK_PATH', yamlConfig["FileSystem"].get("FTS_EXCHECK_PATH",Path(fr'{MainPath}\\ExCheck'))))
 
             ExCheckFilePath = str(os.environ.get('FTS_EXCHECK_TEMPLATE_PATH', yamlConfig["FileSystem"].get("FTS_EXCHECK_TEMPLATE_PATH", Path(fr'{MainPath}\\ExCheck\\template'))))
 
-            ExCheckChecklistFilePath = str(os.environ.get("FTS_EXCHECK_CHECKLIST_PATH", yamlConfig["FileSystem"].get("FTS_EXCHECK_CHECKLIST_PATH", Path(fr'{MainPath}\\ExCheck/checklist'))))
+            ExCheckChecklistFilePath = str(os.environ.get("FTS_EXCHECK_CHECKLIST_PATH", yamlConfig["FileSystem"].get("FTS_EXCHECK_CHECKLIST_PATH", Path(fr'{MainPath}\\ExCheck\\checklist'))))
 
             DataPackageFilePath = str(os.environ.get("FTS_DATAPACKAGE_PATH", yamlConfig["FileSystem"].get("FTS_DATAPACKAGE_PATH", Path(fr'{MainPath}\\FreeTAKServerDataPackageFolder'))))
 
@@ -211,7 +211,7 @@ class MainConfig:
             DBFilePath = str(os.environ.get('FTS_DB_PATH', r'</text>Lib\\site-packages\\FreeTAKServer\\FTSDataBase.db'))
 
             MainPath = str(
-                os.environ.get("FTS_MAINPATH", Path(fr'</text>Lib\\site-packages\\FreeTAKServer')))
+                os.environ.get("FTS_MAINPATH", Path(fr'{userpath}\\site-packages\\FreeTAKServer')))
 
             certsPath = str(os.environ.get('FTS_CERTS_PATH', fr'{MainPath}\\certs'))
 
@@ -306,4 +306,4 @@ class MainConfig:
     # location to backup client packages
     clientPackages = str(Path(fr'{MainPath}\\certs\\ClientPackages'))
 
-    first_start = False
+    first_start = False

WPF/FreeTAKServer_Manager_WPF/PythonScripts/config.py

@@ -14,7 +14,7 @@ class Config(object):
     SECRET_KEY = 'key'
 
     # This will connect to the FTS db
-    SQLALCHEMY_DATABASE_URI = 'sqlite:///' + '</text>Lib\\site-packages\\FreeTAKServer\\FTSServer-UI.db'
+    SQLALCHEMY_DATABASE_URI = 'sqlite:///' + '</text>Lib\\site-packages\\FreeTAKServer\\FTSDataBase-UI.db'
 
     # certificates path
     certpath = "</text>Lib\\site-packages\\FreeTAKServer\\certs\\"