From 2caa4eea2ba7900c0c46c76a9f2c34c28334d927 Mon Sep 17 00:00:00 2001
From: jtuu <joona.tuukkanen@gmail.com>
Date: Thu, 17 Oct 2019 23:36:25 +0300
Subject: [PATCH] Fixed a bug in QST header parsing. Headers were parsed
 incorrectly if the basename of the file chunk was less than 5 characters.

---
 src/core/data_formats/parsing/quest/qst.ts |  3 ++-
 src/core/util.ts                           | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/core/data_formats/parsing/quest/qst.ts b/src/core/data_formats/parsing/quest/qst.ts
index 1ae63fa0..3c468149 100644
--- a/src/core/data_formats/parsing/quest/qst.ts
+++ b/src/core/data_formats/parsing/quest/qst.ts
@@ -5,6 +5,7 @@ import { Cursor } from "../../cursor/Cursor";
 import { ResizableBufferCursor } from "../../cursor/ResizableBufferCursor";
 import { WritableCursor } from "../../cursor/WritableCursor";
 import { ResizableBuffer } from "../../ResizableBuffer";
+import { basename } from "../../../util";
 
 const logger = Logger.get("core/data_formats/parsing/quest/qst");
 
@@ -128,7 +129,7 @@ function parse_headers(cursor: Cursor): QstHeader[] {
         if (
             prev_quest_id != undefined &&
             prev_file_name != undefined &&
-            (quest_id !== prev_quest_id || file_name.slice(0, 5) !== prev_file_name.slice(0, 5))
+            (quest_id !== prev_quest_id || basename(file_name) !== basename(prev_file_name))
         ) {
             cursor.seek(-88);
             break;
diff --git a/src/core/util.ts b/src/core/util.ts
index f9b3dbbd..5a2fa171 100644
--- a/src/core/util.ts
+++ b/src/core/util.ts
@@ -26,3 +26,18 @@ export function array_buffers_equal(a: ArrayBuffer, b: ArrayBuffer): boolean {
 
     return true;
 }
+
+/**
+ * Returns the given filename without the file extension.
+ */
+export function basename(filename: string): string {
+    const dot_idx = filename.lastIndexOf(".");
+
+    // < 0 means filenames doesn't contain any "."
+    // also skip index 0 because that would mean the basename is empty
+    if (dot_idx > 1) {
+        return filename.slice(0, dot_idx);
+    }
+
+    return filename;
+}