projects
/
valheim_web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Display '<none>' if there is no active player.
[valheim_web.git]
/
backend
/
src
/
valheim_controller.rs
diff --git
a/backend/src/valheim_controller.rs
b/backend/src/valheim_controller.rs
index
0aa92de
..
a89c442
100644
(file)
--- a/
backend/src/valheim_controller.rs
+++ b/
backend/src/valheim_controller.rs
@@
-38,7
+38,11
@@
impl ValheimExe {
}
\r
\r
pub fn format_active_players(&self) -> String {
\r
}
\r
\r
pub fn format_active_players(&self) -> String {
\r
- self.active_players.join(", ")
\r
+ if self.active_players.len() == 0 {
\r
+ String::from("<none>")
\r
+ } else {
\r
+ self.active_players.join(", ")
\r
+ }
\r
}
\r
\r
pub fn format_last_backup(&self) -> String {
\r
}
\r
\r
pub fn format_last_backup(&self) -> String {
\r
@@
-79,7
+83,7
@@
fn get_active_players() -> Vec<String> {
\r
journal.seek_tail().unwrap();
\r
\r
\r
journal.seek_tail().unwrap();
\r
\r
- let mut number_of_connections =
-1
;
\r
+ let mut number_of_connections =
0
;
\r
let mut players : Vec<String> = Vec::new();
\r
\r
loop {
\r
let mut players : Vec<String> = Vec::new();
\r
\r
loop {
\r
@@
-91,8
+95,8
@@
fn get_active_players() -> Vec<String> {
if let Some(pos) = mess.find("Got character ZDOID from") {
\r
let character_str = mess.get(pos+25..).unwrap();
\r
if let Some(pos_end) = character_str.find(" : ") {
\r
if let Some(pos) = mess.find("Got character ZDOID from") {
\r
let character_str = mess.get(pos+25..).unwrap();
\r
if let Some(pos_end) = character_str.find(" : ") {
\r
- let player_name = String::from(character_str.get(0..pos_end));
\r
- if !players.contains(player_name) {
\r
+ let player_name = String::from(character_str.get(0..pos_end)
.unwrap()
);
\r
+ if !players.contains(
&
player_name) {
\r
players.push(player_name);
\r
if players.len() == number_of_connections {
\r
return players;
\r
players.push(player_name);
\r
if players.len() == number_of_connections {
\r
return players;
\r