From f8322486fbcace833872df867629eb1b9146e6a8 Mon Sep 17 00:00:00 2001
From: drojf <drojfjord@gmail.com>
Date: Fri, 20 Nov 2020 20:42:06 +1100
Subject: [PATCH] Use correct Matsuribayashi Linux UI file depending on
 checksum - See https://github.com/07th-mod/matsuribayashi/issues/32

---
 cachedDownloadSizes.json |  3 ++-
 httpGUI.py               |  2 +-
 httpGUI/installer.html   |  6 ++----
 httpGUI/style.css        |  2 +-
 installConfiguration.py  |  4 ++--
 installData.json         | 10 +++++++++-
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/cachedDownloadSizes.json b/cachedDownloadSizes.json
index e2fd25dc..834ce3f8 100644
--- a/cachedDownloadSizes.json
+++ b/cachedDownloadSizes.json
@@ -81,6 +81,7 @@
     "https://07th-mod.com/rikachama/misc/ConsoleArcs-System_win.7z": 5994863,
     "https://07th-mod.com/rikachama/tsumi-system/Tsumihoroboshi-System.7z": 22511057,
     "https://07th-mod.com/rikachama/tsumi-system/this-file-intentionally-left-blank.7z": 32,
+    "https://07th-mod.com/rikachama/ui/Matsuribayashi-UI_2017.2.5_unix_gog_mg.7z": 16788726,
     "https://07th-mod.com/rikachama/video/ConsoleArcs-Movie.7z": 187522730,
     "https://07th-mod.com/rikachama/video/ConsoleArcs-Movie_UNIX.7z": 287760347,
     "https://07th-mod.com/rikachama/video/Himatsubushi-Movie.7z": 35305006,
@@ -146,7 +147,7 @@
     "https://github.com/07th-mod/watanagashi/releases/download/v1.5.1/Watanagashi.Voices.Patch.v1.5.1.7z": 781328,
     "https://github.com/Xorboth/onikakushi-ita/releases/latest/download/onikakushi_ita_07th_mod_installer.7z": 26440282,
     "https://github.com/drojf/higurashi-assembly/releases/download/oni-stock-2020-04-19/Assembly-CSharp.dll": 1268736,
-    "https://github.com/drojf/higurashi-assembly/releases/latest/download/experimental-drojf-dll.7z": 49268383,
+    "https://github.com/drojf/higurashi-assembly/releases/latest/download/experimental-drojf-dll.7z": 49269389,
     "https://github.com/orian34/himatsubushi/releases/download/v1.4.1/Himatsubushi.Patch.FR.refs.tags.v1.4.1.7z": 34133871,
     "https://github.com/orian34/matsuribayashi/releases/download/1.0.0/Matsuribayashi.Patch.FR.v1.0.7z": 129698449,
     "https://github.com/orian34/meakashi/releases/download/v1.1.0/Meakashi.Patch.FR.refs.tags.v1.1.0.7z": 41339859,
diff --git a/httpGUI.py b/httpGUI.py
index 498548d8..c5ab74c8 100644
--- a/httpGUI.py
+++ b/httpGUI.py
@@ -998,7 +998,7 @@ def clearLatestInstallerWarning(_requestData):
 				traceback.print_exc()
 				return _makeJSONResponse('error', {
 					'errorReason':
-"""ERROR: {}
+"""{}
 
 ----- Detailed Exception Information -----
 Exception while handling [{}] request:
diff --git a/httpGUI/installer.html b/httpGUI/installer.html
index 1953ddd5..a9a4bb24 100644
--- a/httpGUI/installer.html
+++ b/httpGUI/installer.html
@@ -19,11 +19,9 @@
 		<div id="app" class="main-container" v-cloak>
 		<div id="modal-container" >
 			<modal v-bind:visible="installErrorDescription" v-on:close="installErrorDescription = ''">
-				<h3>The install can't continue - please read</h3>
-				<p>Please read the below error message, it might tell you how to fix this problem.<br>
-				If you're not sure what to do, please send the error message and install log to the developers at their Discord server</p>
-				<hr>
+				<h3>Please read the below message</h3>
 				<span style="white-space: pre-line; font-family: monospace;">{{installErrorDescription}}</span>
+				<br>
 				<button type="button" class="btn" v-on:click="clearModal()">OK</button></a>
 				<button type="button" class="btn" v-on:click="getLogsZip(selectedSubMod, selectedInstallPath)">Download Install Logs</button>
 				<button type="button" class="btn">Visit 07th-mod Discord server (send install log here!)</button>
diff --git a/httpGUI/style.css b/httpGUI/style.css
index 55fc71e5..c73e0fff 100644
--- a/httpGUI/style.css
+++ b/httpGUI/style.css
@@ -257,7 +257,7 @@ The snackbar - position it at the bottom and in the middle of the screen */
 .modal-content {
   background-color: #fefefe;
   position: absolute;
-  top: 30%;
+  top: 5%;
   left: 10%;
   padding: 20px;
   border: 1px solid #888;
diff --git a/installConfiguration.py b/installConfiguration.py
index f9072470..35063905 100644
--- a/installConfiguration.py
+++ b/installConfiguration.py
@@ -401,11 +401,11 @@ def __str__(self):
 		if not self.candidates:
 			return "Your current OS is not supported by the file {} in this mod".format(self.name)
 		hasUnity = any(x.unity is not None for x in self.candidates)
-		out = "Failed to find a {} file to use, your game has the properties (steam: {}".format(self.name, self.steam)
+		out = "Please check your game is up-to-date. If it is fully up-to-date, please send the game log to the developers on our discord server."
+		out += "\n\nFailed to find a {} file to use, your game has the properties (steam: {}".format(self.name, self.steam)
 		if hasUnity:
 			out += ", unity: {}".format(self.unity)
 		out += ") but the available versions had the requirements " + ", ".join(self.describe(candidate) for candidate in self.candidates)
-		out += "\nPlease check your game is up-to-date. If it is fully up-to-date, please send the game log to the developers on our discord server."
 		return out
 
 
diff --git a/installData.json b/installData.json
index f40354ce..246f2f99 100644
--- a/installData.json
+++ b/installData.json
@@ -618,7 +618,15 @@
 					"fileOverrides": [
 						{"name": "movie", "id": "movie-unix", "os": ["mac", "linux"], "url":"https://07th-mod.com/rikachama/video/Matsuribayashi-Movie_UNIX.7z"},
 						{"name": "ui",    "id": "ui-windows", "os": ["windows"],      "unity": "2017.2.5", "url":"https://07th-mod.com/ui.php?chapter=matsuribayashi&os=win&unity=2017.2.5"},
-						{"name": "ui",    "id": "ui-unix", "os": ["mac", "linux"], "unity": "2017.2.5", "url":"https://07th-mod.com/ui.php?chapter=matsuribayashi&os=unix&unity=2017.2.5"},
+						{"name": "ui",    "id": "ui-macos", "os": ["mac"], "unity": "2017.2.5", "url":"https://07th-mod.com/ui.php?chapter=matsuribayashi&os=unix&unity=2017.2.5"},
+						{"name": "ui",    "id": "ui-linux-steam", "os": ["linux"], "unity": "2017.2.5", "url":"https://07th-mod.com/ui.php?chapter=matsuribayashi&os=unix&unity=2017.2.5", "targetChecksums": [
+							["sharedassets0.assets.backup", "24e34f48f675d8577fdf1e01baa9a40a1c1505d39283def309f4245536c73220"],
+							["sharedassets0.assets", "24e34f48f675d8577fdf1e01baa9a40a1c1505d39283def309f4245536c73220"]
+						]},
+						{"name": "ui",    "id": "ui-linux-gog-mg", "os": ["linux"], "unity": "2017.2.5", "url":"https://07th-mod.com/rikachama/ui/Matsuribayashi-UI_2017.2.5_unix_gog_mg.7z", "targetChecksums": [
+							["sharedassets0.assets.backup", "A200EC2A85349BC03B59C8E2F106B99ED0CBAAA25FC50928BB8BA2E2AA90FCE9"],
+							["sharedassets0.assets", "A200EC2A85349BC03B59C8E2F106B99ED0CBAAA25FC50928BB8BA2E2AA90FCE9"]
+						]},
 						{"name": "ui",    "id": "ui-windows-old", "os": ["windows"],      "unity": "5.6.7f1", "url":"https://07th-mod.com/ui.php?chapter=matsuribayashi&os=win&unity=2017.2.5"},
 						{"name": "ui",    "id": "ui-linux-old", "os": ["linux"], "unity": "5.6.7f1", "url":"https://07th-mod.com/ui.php?chapter=matsuribayashi&os=unix&unity=2017.2.5"},
 						{"name": "system", "id": "system-gog-linux", "os": ["linux"], "unity": "5.6.7f1", "url": "https://07th-mod.com/rikachama/matsuri-system/Matsuribayashi-System_unix.7z"},