Changeset 67 for scripts/usr/local/lib/7dtd/playerlog.sh

Timestamp:

Jul 10, 2014, 9:59:02 PM (10 years ago)

Author:

alloc

Message:

v25: Fixes #22, #23. Also adds new serverconfig options

File:

• scripts/usr/local/lib/7dtd/playerlog.sh (modified) (7 diffs)

scripts/usr/local/lib/7dtd/playerlog.sh

@@ -1 +1 @@
 #!/bin/bash
+
+PLAYERSXML=$(getInstancePath $1)/players.xml
+PLAYERSLOG=$(getInstancePath $1)/logs/$(date '+%Y-%m-%d_%H-%M-%S')_players.log
 
 timestamp() {
@@ -6 +9 @@
 
 # Create empty player list if not existing
-# Params:
-#   1: Instance name
 createPlayerList() {
-        PLAYERLIST=$(getInstancePath $1)/players.xml
-        if [ ! -f $PLAYERLIST ]; then
-                echo "<Players/>" > $PLAYERLIST
+        if [ ! -f $PLAYERSXML ]; then
+                echo "<Players/>" > $PLAYERSXML
         fi
 }
 
 # Set all players for an instance to offline (on startup/shutdown)
-# Params:
-#   1: Instance name
 setAllPlayersOffline() {
-        PLAYERLIST=$(getInstancePath $1)/players.xml
-        createPlayerList "$1"
+        createPlayerList
         $XMLSTARLET ed -L \
                 -u "/Players/Player/@online" -v "false" \
-                $PLAYERLIST
+                $PLAYERSXML
 }
 
@@ -33 +30 @@
 #   4: Nick name
 logPlayerConnect() {
-        PLAYERLOG=$(getInstancePath $1)/players.log
-        PLAYERLIST=$(getInstancePath $1)/players.xml
         ENTITYID="$2"
         STEAMID="$3"
         NICKNAME="$4"
 
-        echo "$(timestamp) +++ $ENTITYID $NICKNAME $STEAMID" >> $PLAYERLOG
+        echo "$(timestamp) +++ $ENTITYID $NICKNAME $STEAMID" >> $PLAYERSLOG
 
-        createPlayerList "$1"
+        createPlayerList
         
         XPATHBASE="/Players/Player[@steamid='$STEAMID']"
 
-        if [ -z $($XMLSTARLET sel -t -v "$XPATHBASE/@steamid" $PLAYERLIST) ]; then
+        if [ -z $($XMLSTARLET sel -t -v "$XPATHBASE/@steamid" $PLAYERSXML) ]; then
                 $XMLSTARLET ed -L \
                         -s "/Players" -t elem -n "Player" -v "" \
@@ -55 +50 @@
                         -i "$XPATHBASE" -t attr -n "online" -v "true" \
                         -i "$XPATHBASE" -t attr -n "entityid" -v "$ENTITYID" \
-                        $PLAYERLIST
+                        $PLAYERSXML
         else
-                LOGINS=$($XMLSTARLET sel -t -v "$XPATHBASE/@logins" $PLAYERLIST)
+                LOGINS=$($XMLSTARLET sel -t -v "$XPATHBASE/@logins" $PLAYERSXML)
                 (( LOGINS++ ))
                 $XMLSTARLET ed -L \
@@ -64 +59 @@
                         -u "$XPATHBASE/@entityid" -v "$ENTITYID" \
                         -u "$XPATHBASE/@logins" -v "$LOGINS" \
-                        $PLAYERLIST
+                        $PLAYERSXML
         fi
 }
@@ -73 +68 @@
 #   2: Entity ID
 logPlayerDisconnect() {
-        PLAYERLOG=$(getInstancePath $1)/players.log
-        PLAYERLIST=$(getInstancePath $1)/players.xml
         ENTITYID="$2"
 
-        createPlayerList "$1"
+        createPlayerList
 
         XPATHBASE="/Players/Player[@entityid='$ENTITYID'][@online='true']"
 
-        if [ -f $PLAYERLIST ]; then
-                if [ ! -z $($XMLSTARLET sel -t -v "$XPATHBASE/@steamid" $PLAYERLIST) ]; then
-                        NICKNAME=$($XMLSTARLET sel -t -v "$XPATHBASE/@nick" $PLAYERLIST)
-                        STEAMID=$($XMLSTARLET sel -t -v "$XPATHBASE/@steamid" $PLAYERLIST)
-                        LOGINTIME=$($XMLSTARLET sel -t -v "$XPATHBASE/@lastlogin" $PLAYERLIST)
-                        PLAYTIME=$($XMLSTARLET sel -t -v "$XPATHBASE/@playtime" $PLAYERLIST)
+        if [ -f $PLAYERSXML ]; then
+                if [ ! -z $($XMLSTARLET sel -t -v "$XPATHBASE/@steamid" $PLAYERSXML) ]; then
+                        NICKNAME=$($XMLSTARLET sel -t -v "$XPATHBASE/@nick" $PLAYERSXML)
+                        STEAMID=$($XMLSTARLET sel -t -v "$XPATHBASE/@steamid" $PLAYERSXML)
+                        LOGINTIME=$($XMLSTARLET sel -t -v "$XPATHBASE/@lastlogin" $PLAYERSXML)
+                        PLAYTIME=$($XMLSTARLET sel -t -v "$XPATHBASE/@playtime" $PLAYERSXML)
                         NOW=$(date '+%s')
                         PLAYTIME=$(( PLAYTIME + NOW - LOGINTIME ))
@@ -92 +85 @@
                                 -u "$XPATHBASE/@playtime" -v "$PLAYTIME" \
                                 -u "$XPATHBASE/@online" -v "false" \
-                                $PLAYERLIST
+                                $PLAYERSXML
                 fi
         fi
 
-        echo "$(timestamp) --- $ENTITYID $NICKNAME $STEAMID" >> $PLAYERLOG
+        echo "$(timestamp) --- $ENTITYID $NICKNAME $STEAMID" >> $PLAYERSLOG
 }