From 12051045cc921fd73a12ec18e07fd4f99a5c8b7d Mon Sep 17 00:00:00 2001
From: argoneus <argoneus@poweris.moe>
Date: Wed, 21 Oct 2020 23:40:00 +0200
Subject: [PATCH] added scene images to scene json

---
 db/quest.py        |  6 +++++-
 diva/quest.py      | 33 +++++++++++++++++----------------
 utage/translate.py |  2 +-
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/db/quest.py b/db/quest.py
index 7054e94..bedc636 100644
--- a/db/quest.py
+++ b/db/quest.py
@@ -52,12 +52,14 @@ class QuestDB(BaseDB):
                 questSceneMstId,
                 name,
                 summaryText,
+                img,
                 group_concat(partIds) as parts
             FROM (
                     SELECT
                         qs.questSceneMstId,
                         qs.name,
                         qs.summaryText,
+                        qs.img,
                         CASE
                             WHEN qp.afterTalkName == '' AND qp.beforeTalkName == '' THEN NULL
                             WHEN qp.afterTalkName == '' AND qp.beforeTalkName != '' THEN qp.beforeTalkName
@@ -74,9 +76,11 @@ class QuestDB(BaseDB):
         )
         res = self.cursor.fetchall()
         scenes = {}
-        for scene_id, name, summary, parts in res:
+        for scene_id, name, summary, img, parts in res:
             scenes[str(scene_id)] = {}
             scenes[str(scene_id)]["Name"] = name
             scenes[str(scene_id)]["SummaryText"] = summary
+            if img:
+                scenes[str(scene_id)]["Image"] = img
             scenes[str(scene_id)]["Parts"] = parts.split(",")
         return scenes
diff --git a/diva/quest.py b/diva/quest.py
index 7af5214..2b0cb41 100644
--- a/diva/quest.py
+++ b/diva/quest.py
@@ -51,22 +51,23 @@ def scene_mst(qdb, old_path, languages, utage_in, is_global):
 
     for lang in languages:
         out_dict = {}
-        if lang == "jpn" or is_global:
-            for key, value in scenes.items():
-                out_dict[key] = {
-                    "Name": value["Name"],
-                    "SummaryText": value["SummaryText"],
-                    "Credits": "POKELABO",
-                    "Enabled": False,
-                }
-        else:
-            for key in scenes.keys():
-                out_dict[key] = {
-                    "Name": "",
-                    "SummaryText": "",
-                    "Credits": "",
-                    "Enabled": False,
-                }
+        for key, value in scenes.items():
+            name = ""
+            summary = ""
+            credit = ""
+            enabled = False
+
+            if lang == "jpn" or is_global:
+                name = value["Name"]
+                summary = value["SummaryText"]
+                credit = "POKELABO"
+
+            out_dict[key] = {
+                "Name": name,
+                "SummaryText": summary,
+                "Credits": credit,
+                "Enabled": enabled,
+            }
 
         langfile = os.path.join(old_path, f"XduSceneNames_{lang}.json")
         if os.path.isfile(langfile):
diff --git a/utage/translate.py b/utage/translate.py
index 93ae072..cd3b875 100644
--- a/utage/translate.py
+++ b/utage/translate.py
@@ -15,7 +15,7 @@ def translate_dir(dir_in, tsv_out_dir, json_out_dir, is_global):
     files = [
         f
         for f in glob(os.path.join(dir_in, "**/Scenario/*.tsv"), recursive=True)
-        if "{os.path.sep}Diva{os.path.sep}" not in f
+        if f"{os.path.sep}Diva{os.path.sep}" not in f
     ]
 
     if len(files) == 0: