fix empty server detection and add option to manage existing instances

config.sample.toml

@@ -9,6 +9,7 @@ name = "Spire" # server name. optional, defaults to "Spire"
 tv_name = "SpireTV" # stv name. optional, defaults to "SpireTV"
 image = "spiretf/docker-spire-server" # docker image for the tf2 server. optional, defaults to "spiretf/docker-spire-server"
 ssh_key = "ssh-rsa AAAA..." # ssh key to add to the server. optional
+manage_existing = false # whether to detect and manage server that are already running, optional, disabled by default
 
 [vultr]
 api_key = "xxx"

src/config.rs

@@ -72,6 +72,8 @@ pub struct ServerConfig {
     #[serde(default = "server_default_tv_name")]
     pub tv_name: String,
     pub ssh_key: Option<String>,
+    #[serde(default)]
+    pub manage_existing: bool,
 }
 
 fn server_default_image() -> String {

src/main.rs

@@ -130,7 +130,15 @@ async fn run_loop(
     start_schedule: Schedule,
     stop_schedule: Schedule,
 ) {
-    let mut active_server: Option<Server> = None;
+    let mut active_server = if config.server.manage_existing {
+        cloud
+            .list()
+            .await
+            .map(|servers| servers.into_iter().next())
+            .unwrap_or_default()
+    } else {
+        None
+    };
 
     loop {
         let next_start = start_schedule.upcoming(Utc).next().unwrap();

src/rcon.rs

@@ -14,6 +14,7 @@ impl Rcon {
         let player_lines = status
             .lines()
             .filter(|line| line.starts_with('#'))
+            .filter(|line| !line.contains("# userid"))
             .filter(|line| !line.contains(" BOT "));
         Ok(player_lines.count())
     }