refactor epasswd stuff

.editorconfig

@@ -15,6 +15,7 @@ indent_size = 4
 
 [*.{xml,json}]
 charset = utf-8
+indent_size = 2
 
 # Tab indentation (no size specified)
 [Makefile]

README.md

@@ -1,23 +1,31 @@
 # What is this?
 
-This repository contains the source code for the Play-by-Mail strategy game [Eressea](http://www.eressea.de/).
+This repository contains the source code for the Play-by-Mail 
+strategy game [Eressea](http://www.eressea.de/).
 
 # Prerequisites
 
-Eressea depends on a number of external libraries. On a recent Debian-based Linux system, this is the apt-get command to install all of them:
+Eressea depends on a number of external libraries. On a recent
+Debian-based Linux system, this is the apt-get command to
+install all of them:
 
-    sudo apt-get install git cmake gcc make libxml2-dev liblua5.2-dev libtolua-dev libncurses5-dev libsqlite3-dev luarocks
+    sudo apt-get install git cmake gcc make luarocks libxml2-dev \
+        liblua5.2-dev libtolua-dev libncurses5-dev libsqlite3-dev
 
 # How to check out and build the Eressea server
 
-This repository relies heavily on the use of submodules, and it pulls in most of the code from those. The build system being used is cmake, which can create Makefiles on Unix, or Visual Studio project files on Windows. Here's how you clone and build the source on Ubuntu:
+This repository relies heavily on the use of submodules, and it pulls in
+most of the code from those. The build system being used is cmake, which
+can create Makefiles on Unix, or Visual Studio project files on Windows.
+Here's how you clone and build the source on Linux or macOS:
 
-    git clone --recursive git://github.com/eressea/server.git
-    cd server
-    ./configure
-    ./s/build
+    git clone --recursive git://github.com/eressea/server.git source
+    cd source
+    git submodule update --init
+    s/build
 
-If you got this far and all went well, you have built a server (it is linked from the `game` subdirectory), and it will have passed some basic functionality tests.
+If you got this far and all went well, you have built the server, and
+it will have passed some basic functionality tests.
 
 * [![Static Analysis](https://scan.coverity.com/projects/6742/badge.svg?flat=1)](https://scan.coverity.com/projects/6742/)
 * [![Build Status](https://api.travis-ci.org/eressea/server.svg?branch=develop)](https://travis-ci.org/eressea/server)

conf/e2/locales.json

@@ -1,11 +1,34 @@
 {
-    "include": [
-      "config://res/translations/strings.de.po",
-      "config://res/translations/strings-e2.de.po",
-      "config://res/translations/strings.en.po",
-      "config://res/translations/strings-e2.en.po",
-      "config://res/translations/messages.de.po",
-      "config://res/translations/messages.en.po",
-      "config://res/core/messages.xml"
-    ]
+  "include": [
+    "config://res/translations/strings.de.po",
+    "config://res/translations/strings-e2.de.po",
+    "config://res/translations/strings.en.po",
+    "config://res/translations/strings-e2.en.po",
+    "config://res/translations/messages.de.po",
+    "config://res/translations/messages.en.po",
+    "config://res/core/messages.xml"
+  ],
+  "aliases": {
+    "de": {
+      "spell::earthquake": [
+        "Beschwöre einen Erdelementar",
+        "Beschwörung eines Erdelementares"
+      ],
+      "spell::goodwinds": [
+        "Beschwörung eines Wasserelementares",
+        "Beschwöre einen Wasserelementar"
+      ],
+      "spell::stormwinds": [
+        "Beschwöre einen Sturmelementar",
+        "Beschwörung eines Sturmelementares"
+      ],
+      "spell::summonfireelemental": [
+        "Beschwöre einen Hitzeelementar",
+        "Beschwörung eines Hitzeelementares"
+      ]
+    },
+    "en": {
+      "spell::migration": "Rit of Acceptance"
+    }
+  }
 }

conf/e2/terrains.json

@@ -211,8 +211,6 @@
             }
         },
         "firewall": {
-            "size": 100,
-            "road": 250,
             "flags": [ "forbidden" ]
         },
         "fog": {

conf/e3/locales.json

@@ -1,11 +1,11 @@
 {
-    "include": [
-      "config://res/translations/strings.de.po",
-      "config://res/translations/strings-e3.de.po",
-      "config://res/translations/messages.de.po",
-      "config://res/translations/strings.en.po",
-      "config://res/translations/strings-e3.en.po",
-      "config://res/translations/messages.en.po",
-      "config://res/core/messages.xml"
-    ]
+  "include": [
+    "config://res/translations/strings.de.po",
+    "config://res/translations/strings-e3.de.po",
+    "config://res/translations/messages.de.po",
+    "config://res/translations/strings.en.po",
+    "config://res/translations/strings-e3.en.po",
+    "config://res/translations/messages.en.po",
+    "config://res/core/messages.xml"
+  ]
 }

conf/keywords.json

@@ -4,6 +4,7 @@
             "plant": "PLANT",
 	    "grow": [ "GROW", "BREED" ],
             "promote": ["PROMOTE", "PROMOTION" ],
+            "locale": ["LANGUAGE", "LOCALE"],
             "combat": [ "COMBAT", "FIGHT" ]
         },
         "de": {
@@ -65,6 +66,7 @@
             "alliance": "ALLIANZ",
             "claim": ["BEANSPRUCHE", "BEANSPRUCHEN"],
             "promote": ["BEFÖRDERE", "BEFÖRDERUNG"],
+            "locale": ["SPRACHE", "LOCALE"],
             "pay": ["BEZAHLE", "BEZAHLEN"]
         }
     }

process/checkpasswd.py

@@ -18,20 +18,14 @@ def log(str):
 if mypasswd[0] == '"':
     mypasswd = mypasswd.strip('"')
 
-pw_data = EPasswd()
-try:
-    pw_data.load_database(filename)
-    log("loaded from db " + filename)
-except:
-    pw_data.load_file(filename)
-    log("loaded from file " + filename)
+pw_data = EPasswd.load_any(filename, log=log)
+faction = pw_data.get_faction(myfaction)
 
-if pw_data.fac_exists(myfaction):
-    if pw_data.check(myfaction, mypasswd):
-        log("password match: " + myfaction)
-        sys.exit(0)
+if not faction:
+    log("faction missing: " + myfaction)
+elif not faction.check_passwd(mypasswd):
     log("password mismatch: " + myfaction)
 else:
-    log("faction missing: " + myfaction)
-
+    log("password match: " + myfaction)
+    sys.exit(0)
 sys.exit(-1)

process/compress.py

@@ -15,7 +15,7 @@
 
 addr=%(email)s
 [ $# -ge 1 ] && addr=$1
-[ -z $addr ] || send-%(compression)s-report $addr '%(gamename)s Report #%(turn)s' %(files)s
+[ -z $addr ] || $ERESSEA/server/bin/send-%(compression)s-report $addr '%(gamename)s Report #%(turn)s' %(files)s
 """
 
 turn = argv[1]

process/compress.sh

@@ -5,8 +5,10 @@ if [ -z "$ERESSEA" ]; then
   exit 2
 fi
 
+BINDIR="$ERESSEA/server/bin"
+
 GAME="$ERESSEA/game-$1"
-GAME_NAME=$(grep -w name "$GAME/eressea.ini" | sed 's/.*=\s*//')
+GAME_NAME=$("$BINDIR/inifile" "$GAME/eressea.ini" get game:name)
 
 TURN=$2
 if [ -z "$TURN" ]
@@ -20,6 +22,6 @@ if [ ! -d "$GAME/reports" ]; then
 fi
 
 cd "$GAME/reports" || exit
-"$ERESSEA/server/bin/compress.py" "$TURN" "$GAME_NAME"
+"$BINDIR/compress.py" "$TURN" "$GAME_NAME"
 cd - || exit
 

process/cron/orders.cron

@@ -5,11 +5,19 @@
 # this here script to make a non-blocking syntax check and reject or
 # accept the order file.
 
-if [ "yes" != "$CONFIRM" ] ; then
+if [ "no" == "$CONFIRM" ] ; then
   exit
 fi
 
-for GAME in $*
+if [ -z "$ERESSEA" ] ; then
+  ERESSEA="$HOME/eressea"
+  echo "The ERESSEA environment variable is not set. Assuming $ERESSEA."
+fi
+
+cd "$ERESSEA" || exit
+
+for GAME in "$@"
 do
-  $HOME/eressea/orders-php/check-orders.sh $GAME
+  orders-php/check-orders.sh "$GAME"
 done
+

process/cron/preview.cron

@@ -3,7 +3,7 @@
 [ "$PREVIEW" != "yes" ] && exit
 [ -z "${ERESSEA}" ] && ERESSEA="$HOME/eressea"
 
-eval $(luarocks path)
+eval "$(luarocks path)"
 branch="develop"
 if [ -e "${ERESSEA}/build/.preview" ]; then
     branch=$(cat "${ERESSEA}/build/.preview")

process/cron/run-eressea.cron

@@ -1,55 +1,55 @@
 #!/bin/bash
 
-eval $(luarocks path)
+eval "$(luarocks path)"
 GAME=$1
 (
-[ "$ENABLED" != "yes" ] && exit
-[ -z ${ERESSEA} ] && ERESSEA=$HOME/eressea
+[ "$ENABLED" == "no" ] && exit
+[ -z "$ERESSEA" ] && ERESSEA="$HOME/eressea"
 
 export ERESSEA
-BIN=$ERESSEA/server/bin
-TURN=$(cat $ERESSEA/game-$GAME/turn)
-if [ ! -e $ERESSEA/game-$GAME/data/$TURN.dat ]; then
+BIN="$ERESSEA/server/bin"
+TURN=$(cat "$ERESSEA/game-$GAME/turn")
+if [ ! -e "$ERESSEA/game-$GAME/data/$TURN.dat" ]; then
   echo "data file $TURN is missing, cannot run turn for game $GAME"
   exit 1
 fi
-REPORTS=$ERESSEA/game-$GAME/reports
-if [ -d $REPORTS ]; then
-  rm -rf $REPORTS
+REPORTS="$ERESSEA/game-$GAME/reports"
+if [ -d "$REPORTS" ]; then
+  rm -rf "$REPORTS"
 fi
-mkdir $REPORTS
+mkdir "$REPORTS"
 
-cd $ERESSEA/game-$GAME
+cd "$ERESSEA/game-$GAME" || exit
 
 if [ -d test ]; then
   touch test/execute.lock
 fi
 
-$BIN/create-orders $GAME $TURN
-if [ ! -s $ERESSEA/game-$GAME/orders.$TURN ]; then
+"$BIN/create-orders" "$GAME" "$TURN"
+if [ ! -s "$ERESSEA/game-$GAME/orders.$TURN" ]; then
   echo "server did not create orders for turn $TURN in game $GAME"
   exit 2
 fi
 
-$BIN/backup-eressea $GAME $TURN
+"$BIN/backup-eressea" "$GAME" "$TURN"
 rm -f execute.lock
-$BIN/run-turn $GAME $TURN
+"$BIN/run-turn" "$GAME" "$TURN"
 touch execute.lock
 
-if [ ! -s $REPORTS/reports.txt ]; then
+if [ ! -s "$REPORTS/reports.txt" ]; then
   echo "server did not create reports.txt in game $GAME"
   exit 4
 fi
-$BIN/backup-eressea $GAME $TURN
+"$BIN/backup-eressea" "$GAME" "$TURN"
 let TURN=$TURN+1
-if [ ! -s $ERESSEA/game-$GAME/data/$TURN.dat ]; then
+if [ ! -s "$ERESSEA/game-$GAME/data/$TURN.dat" ]; then
   echo "server did not create data for turn $TURN in game $GAME"
   exit 3
 fi
 echo "sending reports for game $GAME, turn $TURN"
-$BIN/compress.sh $GAME $TURN
-$BIN/sendreports.sh $GAME
-$BIN/backup-eressea $GAME $TURN
+"$BIN/compress.sh" "$GAME" "$TURN"
+"$BIN/sendreports.sh" "$GAME"
+"$BIN/backup-eressea" "$GAME" "$TURN"
 rm -f test/execute.lock
-) | tee -a $HOME/log/eressea.cron.log
+) | tee -a "$HOME/log/eressea.cron.log"