Changeset 62 for scripts/usr

Timestamp:

Jul 5, 2014, 7:06:58 PM (10 years ago)

Author:

alloc

Message:

V21: Fixes #19, #20

Location:

scripts/usr/local/lib/7dtd

Files:

• VERSION (modified) (1 diff)
• monitor-log.sh (modified) (6 diffs)

scripts/usr/local/lib/7dtd/VERSION

@@ -1 @@
-Version: 20
-Release: 2014-06-20
+Version: 21
+Release: 2014-07-05

scripts/usr/local/lib/7dtd/monitor-log.sh

@@ -11 +11 @@
 INSTANCE=$1
 LOG=$(getInstancePath $INSTANCE)/output.log
+CHATLOG=$(getInstancePath $INSTANCE)/chat.log
 
 timestamp() {
@@ -19 +20 @@
         tel=$(telnetCommand $INSTANCE lp)
         playerline=$(echo "$tel" | tr -d '\r' | grep "id=$2,")
-        nickname=$(echo "$playerline" | sed -r 's/^.* id=[0-9]*, ([^,]*), pos=.*$/\1/')
+        #nickname=$(echo "$playerline" | sed -r 's/^.* id=[0-9]*, ([^,]*), pos=.*$/\1/')
         steamid=$(echo "$playerline" | sed -r 's/^.*, health=[0-9]*, ([0-9]*)$/\1/')
         
@@ -26 +27 @@
         fi
 
-        logPlayerConnect $INSTANCE $2 $steamid $nickname
+        logPlayerConnect $INSTANCE $2 $steamid $3
 
         for H in $(getHooksFor playerConnect); do
-                $H $INSTANCE $1 $2 $nickname $steamid
+                $H $INSTANCE $1 $2 $3 $steamid
         done
 }
@@ -38 +39 @@
         for H in $(getHooksFor playerDisconnect); do
                 $H $INSTANCE $1 $2 $NICKNAME $STEAMID
+        done
+}
+
+handleChat() {
+        echo "$(timestamp): $1" >> $CHATLOG
+        
+        for H in $(getHooksFor chat); do
+                $H $INSTANCE $1
         done
 }
@@ -65 +74 @@
                         handleConnect "$playerId" "$entityId" "$playerName"
                         unset entityId playerId playerName unknown
-                fi
+                else
                 if [ -n "$(echo "$line" | grep '^Removing player with id ')" ]; then
                         playerId=$(expr "$line" : 'Removing player with id clientId=\([0-9]*\), entityId=[0-9]*$')
@@ -71 +80 @@
                         handleDisconnect "$playerId" "$entityId"
                         unset playerId entityId
+                else
+                if [ -n "$(echo "$line" | grep -E '^GMSG: .+')" ]; then
+                        msg=$(expr "$line" : 'GMSG: \(.*\)$')
+                        handleChat "$msg"
+                        unset msg
+                fi
+                fi
                 fi
         fi