Add score column by calculating freq*length.

Signed-off-by: Slendi <[email protected]>
CharaChorder · Aug 21, 2023 · cf35859 · cf35859
1 parent c71960e
commit cf35859
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 14 deletions.
diff --git a/src/nexus/Freqlog/Definitions.py b/src/nexus/Freqlog/Definitions.py
@@ -43,6 +43,7 @@ def __init__(self, word: str, frequency: int, last_used: datetime, average_speed
         self.frequency = frequency
         self.last_used = last_used
         self.average_speed = average_speed
+        self.score = len(word) * frequency
 
     def __or__(self, other: Any) -> Self:
         """Merge two WordMetadata objects"""
@@ -62,7 +63,7 @@ def __or__(self, other: Any) -> Self:
 
     def __str__(self) -> str:
         return f"Word: {self.word} | Frequency: {self.frequency} | Last used: {self.last_used} | " \
-               f"Average speed: {self.average_speed}"
+               f"Average speed: {self.average_speed} | Score: {self.score}"
 
 
 class WordMetadataAttr(Enum):
@@ -71,6 +72,7 @@ class WordMetadataAttr(Enum):
     frequency = "frequency"
     last_used = "lastused"
     average_speed = "avgspeed"
+    score = "score"
 
 
 class ChordMetadata:

diff --git a/src/nexus/Freqlog/Freqlog.py b/src/nexus/Freqlog/Freqlog.py
@@ -268,7 +268,7 @@ def list_words(self, limit: int = -1, sort_by: WordMetadataAttr = WordMetadataAt
         """
         List words in the store
         :param limit: Maximum number of words to return
-        :param sort_by: Attribute to sort by: word, frequency, last_used, average_speed
+        :param sort_by: Attribute to sort by: word, frequency, last_used, average_speed, score
         :param reverse: Reverse sort order
         :param case: Case sensitivity
         """
@@ -282,7 +282,7 @@ def export_words_to_csv(self, export_path: str, limit: int = -1,
         Export words in the store
         :param export_path: Path to csv file to export to
         :param limit: Maximum number of words to return
-        :param sort_by: Attribute to sort by: word, frequency, last_used, average_speed
+        :param sort_by: Attribute to sort by: word, frequency, last_used, average_speed, score
         :param reverse: Reverse sort order
         :param case: Case sensitivity
         :return: Number of words exported

diff --git a/src/nexus/GUI.py b/src/nexus/GUI.py
@@ -173,6 +173,9 @@ def refresh(self):
                 item = QTableWidgetItem()
                 item.setData(Qt.ItemDataRole.DisplayRole, str(word.average_speed)[2:-3])
                 self.chentry_table.setItem(i, 3, item)
+                item = QTableWidgetItem()
+                item.setData(Qt.ItemDataRole.DisplayRole, word.score)
+                self.chentry_table.setItem(i, 4, item)
 
         self.chentry_table.setRowCount(len(words))
         self.chentry_table.resizeColumnsToContents()

diff --git a/translations/i18n_en.ts b/translations/i18n_en.ts
@@ -83,56 +83,55 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/nexus/GUI.py" line="108"/>
-        <location filename="../src/nexus/GUI.py" line="140"/>
+        <location filename="../src/nexus/GUI.py" line="142"/>
         <source>GUI</source>
         <comment>Start logging</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/nexus/GUI.py" line="110"/>
+        <location filename="../src/nexus/GUI.py" line="111"/>
         <source>GUI</source>
         <comment>Starting...</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/nexus/GUI.py" line="121"/>
+        <location filename="../src/nexus/GUI.py" line="122"/>
         <source>GUI</source>
         <comment>Stop logging</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/nexus/GUI.py" line="125"/>
+        <location filename="../src/nexus/GUI.py" line="127"/>
         <source>GUI</source>
         <comment>Logging started</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/nexus/GUI.py" line="144"/>
+        <location filename="../src/nexus/GUI.py" line="147"/>
         <source>GUI</source>
         <comment>Logging stopped</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/nexus/GUI.py" line="177"/>
+        <location filename="../src/nexus/GUI.py" line="183"/>
         <source>GUI</source>
         <comment>Loaded {} freqlogged words</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/nexus/GUI.py" line="240"/>
+        <location filename="../src/nexus/GUI.py" line="246"/>
         <source>GUI</source>
         <comment>Unban {} words</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/nexus/GUI.py" line="242"/>
+        <location filename="../src/nexus/GUI.py" line="248"/>
         <source>GUI</source>
         <comment>Unban one word</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/nexus/GUI.py" line="259"/>
+        <location filename="../src/nexus/GUI.py" line="265"/>
         <source>GUI</source>
         <comment>Exported {} words to {}</comment>
         <translation type="unfinished"></translation>
@@ -206,5 +205,10 @@
         <source>Avg speed</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../ui/main.ui" line="194"/>
+        <source>Score</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/ui/main.ui b/ui/main.ui
@@ -152,7 +152,7 @@
             <bool>false</bool>
            </property>
            <property name="columnCount">
-            <number>4</number>
+            <number>5</number>
            </property>
            <attribute name="horizontalHeaderVisible">
             <bool>true</bool>
@@ -189,6 +189,11 @@
              <string>Avg speed</string>
             </property>
            </column>
+           <column>
+            <property name="text">
+             <string>Score</string>
+            </property>
+           </column>
           </widget>
          </item>
         </layout>