Fix loading world from compressed tar archives (#1304)

Dockerfile

@@ -20,6 +20,7 @@ RUN apt-get update \
   rsync \
   nano \
   unzip \
+  zstd \
   knockd \
   ttf-dejavu \
   && apt-get clean

scripts/start-utils

@@ -195,12 +195,16 @@ function extract() {
   destDir=${2?}
 
   type=$(file -b --mime-type "${src}")
-  if [[ $type == application/zip ]]; then
+  case "${type}" in
-    unzip -q -d "${destDir}" "${src}"
+    application/zip)
-  elif [[ $type == application/x-tar ]]; then
+      unzip -q -d "${destDir}" "${src}"
-    tar -C "${destDir}" -xf "${src}"
+      ;;
-  else
+    application/x-tar|application/gzip|application/x-bzip2|application/zstd)
-    log "ERROR: unsupported archive type: $type"
+      tar -C "${destDir}" -xf "${src}"
-    return 1
+      ;;
-  fi
+    *)
-}
+      log "ERROR: unsupported archive type: $type"
+      return 1
+      ;;
+  esac
+}

tests/setuponlytests/world_from_tar/docker-compose.yml

@@ -8,7 +8,7 @@ services:
       EULA: "TRUE"
       SETUP_ONLY: "TRUE"
       VERSION: ${MINECRAFT_VERSION:-LATEST}
-      WORLD: /worlds/world-for-testing.tgz
+      WORLD: /worlds/world-for-testing.tar
     volumes:
       - ./worlds:/worlds:ro
       - ./data:/data

tests/setuponlytests/world_from_tarbz2/docker-compose.yml

@@ -0,0 +1,14 @@
+version: "3"
+
+services:
+  mc:
+    restart: "no"
+    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
+    environment:
+      EULA: "TRUE"
+      SETUP_ONLY: "TRUE"
+      VERSION: ${MINECRAFT_VERSION:-LATEST}
+      WORLD: /worlds/world-for-testing.tar.bz2
+    volumes:
+      - ./worlds:/worlds:ro
+      - ./data:/data

tests/setuponlytests/world_from_tarbz2/verify.sh

@@ -0,0 +1 @@
+mc-image-helper assert fileExists world/level.dat

tests/setuponlytests/world_from_targz/docker-compose.yml

@@ -0,0 +1,14 @@
+version: "3"
+
+services:
+  mc:
+    restart: "no"
+    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
+    environment:
+      EULA: "TRUE"
+      SETUP_ONLY: "TRUE"
+      VERSION: ${MINECRAFT_VERSION:-LATEST}
+      WORLD: /worlds/world-for-testing.tar.gz
+    volumes:
+      - ./worlds:/worlds:ro
+      - ./data:/data

tests/setuponlytests/world_from_targz/verify.sh

@@ -0,0 +1 @@
+mc-image-helper assert fileExists world/level.dat

tests/setuponlytests/world_from_tarzst/docker-compose.yml

@@ -0,0 +1,14 @@
+version: "3"
+
+services:
+  mc:
+    restart: "no"
+    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
+    environment:
+      EULA: "TRUE"
+      SETUP_ONLY: "TRUE"
+      VERSION: ${MINECRAFT_VERSION:-LATEST}
+      WORLD: /worlds/world-for-testing.tar.zst
+    volumes:
+      - ./worlds:/worlds:ro
+      - ./data:/data

tests/setuponlytests/world_from_tarzst/verify.sh

@@ -0,0 +1 @@
+mc-image-helper assert fileExists world/level.dat