Add word count history tracking and enhance statistics charts UI and storage

Author: HIllya51

src/LunaTranslator/gui/gamemanager/setting.py

@@ -1,6 +1,7 @@
 from qtsymbols import *
 import functools, uuid, os, qtawesome, time
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, date
+from datetime import time as dttime
 from traceback import print_exc
 import gobject, NativeUtils
 import copy
@@ -333,6 +334,7 @@ def selectexe(self, res):
 
     def __init__(self, parent, gameuid, keepindexobject=None) -> None:
         super().__init__(parent)
+        self.__quanju_wc = False
         self.keepindexobject = keepindexobject
         vbox = QVBoxLayout(self)
         self.lauchpath = None
@@ -636,14 +638,27 @@ def __refresh(self):
                 cnt, savehook_new_data[self.gameuid].get("statistic_wordcount", 0)
             )
 
+    def chartwidget_ctxmenu(self, p):
+        menu = QMenu(self)
+        quanju = LAction("this" if self.__quanju_wc else "all", menu)
+        menu.addAction(quanju)
+        action = menu.exec(self.cursor().pos())
+        if action == quanju:
+            self.__quanju_wc = not self.__quanju_wc
+
     def getstatistic(self, formLayout: QVBoxLayout, gameuid):
+
         chart = chartwidget()
         chart.xtext = lambda x: (
             "0" if x == 0 else str(datetime.fromtimestamp(x)).split(" ")[0]
         )
         chart.ytext = lambda y: self.formattime(y, False)
 
-        self.chart = chart
+        chart2 = chartwidget()
+        chart2.xtext = chart.xtext
+        chart2.ytext = str
+        chart2.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
+        chart2.customContextMenuRequested.connect(self.chartwidget_ctxmenu)
         self._timelabel = QLabel()
         self._wordlabel = QLabel()
         self._wordlabel.setSizePolicy(
@@ -652,34 +667,49 @@ def getstatistic(self, formLayout: QVBoxLayout, gameuid):
         self._timelabel.setSizePolicy(
             QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed
         )
+        stack = QStackedWidget()
+        stack.addWidget(chart)
+        stack.addWidget(chart2)
+        wc = LPushButton("文字计数")
+        tm = LPushButton("游戏时间")
+        wc.setCheckable(True)
+        tm.setCheckable(True)
+
+        def clicktm(b):
+            stack.setCurrentIndex(1 - b)
+            globalconfig["statisticvistm"] = b
+            wc.setChecked(not b)
+
+        def clickwc(b):
+            stack.setCurrentIndex(b)
+            globalconfig["statisticvistm"] = not b
+            tm.setChecked(not b)
+
+        tm.toggled.connect(clicktm)
+        wc.toggled.connect(clickwc)
+        if globalconfig.get("statisticvistm", True):
+            tm.setChecked(True)
+        else:
+            wc.setChecked(True)
         formLayout.addLayout(
             getboxlayout(
                 [
-                    "文字计数",
-                    getboxlayout(
-                        [self._wordlabel, getIconButton(self.__refresh, "fa.refresh")]
-                    ),
-                ]
-            )
-        )
-
-        t = QTimer(self)
-        formLayout.addLayout(
-            getboxlayout(
-                [
-                    "游戏时间",
+                    wc,
+                    self._wordlabel,
+                    "",
+                    tm,
                     self._timelabel,
                     getIconButton(
                         icon="fa.edit", callback=functools.partial(timelistediter, self)
                     ),
+                    getIconButton(self.__refresh, "fa.refresh"),
                 ]
             )
         )
-
-        formLayout.addWidget(chart)
+        formLayout.addWidget(stack)
         t = QTimer(self)
         t.setInterval(1000)
-        t.timeout.connect(self.refresh)
+        t.timeout.connect(functools.partial(self.refresh, chart, chart2, gameuid))
         t.timeout.emit()
         t.start()
 
@@ -718,14 +748,30 @@ def split_range_into_days(self, times):
             lists.append((k, everyday[k]))
         return lists
 
-    def refresh(self):
-        __ = gobject.base.somedatabase.querytraceplaytime(self.gameuid)
+    def refresh(self, chart: chartwidget, chart2: chartwidget, gameuid):
+        __ = gobject.base.somedatabase.querytraceplaytime(gameuid)
         _cnt = sum([_[1] - _[0] for _ in __])
         self._timelabel.setText(self.formattime(_cnt))
         self._wordlabel.setText(
-            str(savehook_new_data[self.gameuid].get("statistic_wordcount", 0))
+            str(savehook_new_data[gameuid].get("statistic_wordcount", 0))
         )
-        self.chart.setdata(self.split_range_into_days(__))
+        chart.setdata(self.split_range_into_days(__))
+
+        __ = gobject.base.somedatabase.querywordcount(
+            None if self.__quanju_wc else gameuid
+        )
+        chart2.setdata(self.wordcountbydate(__))
+
+    def wordcountbydate(self, l: tuple[tuple[float, int]]):
+        daily_sum: "dict[date, int]" = {}
+        for timestamp, value in l:
+            date = datetime.fromtimestamp(timestamp).date()
+            daily_sum[date] = daily_sum.get(date, 0) + value
+        lists = []
+        for k in sorted(daily_sum.keys()):
+            lists.append((datetime.combine(k, dttime.min).timestamp(), daily_sum[k]))
+        
+        return lists
 
     def formattime(self, t, usingnotstart=True):
         t = int(t)

src/LunaTranslator/gui/specialwidget.py

@@ -97,22 +97,6 @@ def setdata(self, data):
         data = sorted(data, key=lambda _: _[0])
         self.data = data
 
-    def formattime(self, t):
-        t = int(t)
-        s = t % 60
-        t = t // 60
-        m = t % 60
-        t = t // 60
-        h = t
-        string = ""
-        if h:
-            string += str(h) + _TR("时")
-        if m:
-            string += str(m) + _TR("分")
-        if s:
-            string += str(s) + _TR("秒")
-        return string
-
     def mouseMoveEvent(self, a0):
         self.update()
         return super().mouseMoveEvent(a0)
@@ -134,7 +118,7 @@ def paintatmouse(
         idx = round(idx_f)
         idx = max(0, min(idx, len(self.data) - 1))
         xt = lambda x: ("" if x == 0 else str(datetime.fromtimestamp(x)).split(" ")[0])
-        _ = self.formattime(self.data[idx][1])
+        _ = self.ytext(self.data[idx][1])
         t = xt(self.data[idx][0])
         if _:
             t += "\n" + _

src/LunaTranslator/myutils/config.py

@@ -164,7 +164,6 @@ def getdefaultsavehook(title=None):
         # "onloadautochangemode2": 0,
         # "embedablehook": [],
         # "statistic_wordcount": 0,
-        # "statistic_wordcount_nodump": 0,
         # "hook": [],
         # "inserthooktimeout": 250,
         # "insertpchooks_string": False,

src/LunaTranslator/myutils/somedatabase.py

@@ -2,10 +2,10 @@
 import time
 import os
 from qtsymbols import *
-from myutils.config import findgameuidofpath, globalconfig
-from myutils.hwnd import ListProcess
+from myutils.config import findgameuidofpath
 from myutils.wrapper import threader
 import threading
+from queue import Queue
 import windows
 import gobject
 
@@ -40,6 +40,7 @@ def allwords(self):
         ).fetchall()
 
     def __init__(self):
+        self.wordcountqueue = Queue()
         self.locked = threading.Lock()
         self.sqlsavegameinfo = sqlite3.connect(
             gobject.getconfig("savegame.db"),
@@ -54,41 +55,27 @@ def __init__(self):
             pass
         try:
             self.sqlsavegameinfo.execute(
-                "CREATE TABLE traceplaytime_v4(id INTEGER PRIMARY KEY AUTOINCREMENT,gameinternalid INT,timestart BIGINT,timestop BIGINT);"
+                "CREATE TABLE gameinternalid_v2(gameinternalid INTEGER PRIMARY KEY AUTOINCREMENT,gameuid TEXT);"
             )
         except:
             pass
         try:
             self.sqlsavegameinfo.execute(
-                "CREATE TABLE gameinternalid_v2(gameinternalid INTEGER PRIMARY KEY AUTOINCREMENT,gameuid TEXT);"
+                "CREATE TABLE trace_strict(gameinternalid INT,timestart BIGINT,timestop BIGINT);"
             )
-            self.trycastoldversion()
+            self.sqlsavegameinfo.commit()
         except:
             pass
         try:
             self.sqlsavegameinfo.execute(
-                "CREATE TABLE trace_strict(gameinternalid INT,timestart BIGINT,timestop BIGINT);"
-            )
-            self.sqlsavegameinfo.execute(
-                "INSERT INTO trace_strict SELECT gameinternalid,timestart,timestop FROM traceplaytime_v4"
+                "CREATE TABLE game_word_count(gameinternalid INT,time BIGINT,wordcount BIGINT);"
             )
             self.sqlsavegameinfo.commit()
         except:
             pass
 
         self.checkgameplayingthread()
-
-    def trycastoldversion(self):
-        for _id, gamepath in self.sqlsavegameinfo.execute(
-            "SELECT * from gameinternalid"
-        ).fetchall():
-            gameuid = findgameuidofpath(gamepath)
-            if not gameuid:
-                continue
-            self.sqlsavegameinfo.execute(
-                "INSERT INTO gameinternalid_v2 VALUES(?,?)", (_id, gameuid[0])
-            )
-        self.sqlsavegameinfo.commit()
+        self.wordcountthread()
 
     def lockdata(self):
         self.locked.acquire()
@@ -110,12 +97,26 @@ def settraceplaytime(self, gameuid, lst: "list[tuple[float, float]]"):
         self.sqlsavegameinfo.commit()
 
     def querytraceplaytime(self, gameuid) -> "list[tuple[float, float]]":
-        table = "trace_strict"
         gameinternalid = self.__get_gameinternalid(gameuid)
-        return self.sqlsavegameinfo.execute(
-            "SELECT timestart,timestop FROM {} WHERE gameinternalid = ?".format(table),
+        __ = self.sqlsavegameinfo.execute(
+            "SELECT timestart,timestop FROM trace_strict WHERE gameinternalid = ?",
             (gameinternalid,),
         ).fetchall()
+        __ = tuple(_ for _ in __ if _[1] > _[0])
+        return __
+
+    def querywordcount(self, gameuid: "str|None") -> "list[tuple[float, float]]":
+        if gameuid:
+            gameinternalid = self.__get_gameinternalid(gameuid)
+            __ = self.sqlsavegameinfo.execute(
+                "SELECT time,wordcount FROM game_word_count WHERE gameinternalid = ?",
+                (gameinternalid,),
+            ).fetchall()
+        else:
+            __ = self.sqlsavegameinfo.execute(
+                "SELECT time,wordcount FROM game_word_count"
+            ).fetchall()
+        return __
 
     def __get_gameinternalid(self, gameuid):
         while True:
@@ -188,7 +189,6 @@ def checkgameplayingthread(self):
                     # 虚拟机暂停
                     self.trace_strict.clear()
                     continue
-
                 self.tracex(
                     t,
                     self.finduids(self.stricttraceexe()),
@@ -197,3 +197,18 @@ def checkgameplayingthread(self):
                 )
                 self.sqlsavegameinfo.commit()
             time.sleep(5)
+
+    @threader
+    def wordcountthread(self):
+        lastuid = None
+        while True:
+            t, uid, wc = self.wordcountqueue.get()
+            if not uid:
+                continue
+            if lastuid != uid:
+                gameinternalid = self.__get_gameinternalid(uid)
+                lastuid = uid
+            self.sqlsavegameinfo.execute(
+                "INSERT INTO game_word_count VALUES(?,?,?)",
+                (gameinternalid, t, wc),
+            )

src/LunaTranslator/textio/textsource/textsourcebase.py

@@ -1,5 +1,5 @@
 import gobject, queue
-import json
+import json, time
 from traceback import print_exc
 from myutils.config import globalconfig, savehook_new_data
 from myutils.utils import autosql
@@ -107,6 +107,10 @@ def sqlitethread(self):
                         savehook_new_data[gobject.base.gameuid][
                             "statistic_wordcount"
                         ] += lensrc
+
+                        gobject.base.somedatabase.wordcountqueue.put(
+                            (time.time(), gobject.base.gameuid, lensrc)
+                        )
                     except:
                         pass
                     if ret is None:
@@ -120,19 +124,6 @@ def sqlitethread(self):
                                 "INSERT INTO artificialtrans VALUES(NULL,?,?);",
                                 (src, json.dumps({})),
                             )
-                        try:
-                            if (
-                                "statistic_wordcount_nodump"
-                                not in savehook_new_data[gobject.base.gameuid]
-                            ):
-                                savehook_new_data[gobject.base.gameuid][
-                                    "statistic_wordcount_nodump"
-                                ] = 0
-                            savehook_new_data[gobject.base.gameuid][
-                                "statistic_wordcount_nodump"
-                            ] += lensrc
-                        except:
-                            pass
                 elif len(task) == 3:
                     src, clsname, trans = task
                     ret = self.sqlwrite2.execute(