twd-m4sc0 3.0.2__py3-none-any.whl → 3.0.4__py3-none-any.whl

twd/cli.py

@@ -24,10 +24,13 @@ def cli(ctx):
 
         path = TWDApp(manager=ctx.obj['manager']).run()
 
+        if not path:
+            print("Exiting...")
+            exit(0)
+
         # write to fd3
         os.write(3, bytes(str(path), "utf-8"))
-
-        pass
+        exit(0)
 
 @cli.command()
 @click.argument('path')

twd/data.py

@@ -6,7 +6,6 @@ from typing import List, Optional
 from datetime import datetime
 
 from .config import Config
-from .utils import search
 
 class Entry(BaseModel):
     """Data class for a signle TWD Entry"""

twd/tui.py

@@ -8,7 +8,7 @@ from textual.color import Color
 
 from twd.config import Config
 from twd.data import TwdManager
-from twd.utils import search, linear_search
+from twd.utils import fuzzy_search, linear_search
 
 class Mode(Enum):
     NORMAL = "normal"
@@ -177,9 +177,13 @@ class TWDApp(App):
 
         # TODO: filter entries and repopulate table
 
-        search_result = linear_search(query, all_entries)
+        if query is None:
+            self._populate_table()
+            return
+
+        search_result = fuzzy_search(query, all_entries)
 
-        filtered = [entry for entry in all_entries if entry.alias in search_result]
+        filtered = [item[0] for item in search_result]
 
         self._populate_table(filtered)
 

twd/tui.tcss

@@ -0,0 +1,58 @@
+Screen {
+  background: transparent;
+}
+
+# DataTable
+
+#data {
+  width: 100%;
+  height: 1fr;
+  background: transparent;
+  border: none;
+  # margin: 4 8;
+  # padding: 1 2;
+  margin: 0;
+  padding: 0;
+}
+
+#data > .datatable--header {
+  background: $surface-lighten-1;
+  color: $text;
+  text-style: bold;
+}
+
+#data > .datatable--cursor {
+  background: $accent;
+  color: $text;
+}
+
+#data > .datatable--odd-row {
+  background: $surface-lighten-1;
+}
+
+#data > .datatable--even-row {
+  background: transparent;
+}
+
+# CWD
+Label.cwd {
+  margin: 1 2;
+  width: 10fr;
+}
+
+# Mode
+Label#mode {
+  padding: 1 2;
+  background: $surface-lighten-1;
+}
+
+Label#mode.search {
+  background: $accent;
+}
+
+# Search input
+Input#search-input {
+  margin: 0 0 1 0;
+  border: round $accent;
+  background: transparent;
+}

twd/utils.py

@@ -1,39 +1,40 @@
 from rapidfuzz import fuzz
 from typing import List
 
-FUZZY_THRESHOLD = 50
-
 def normalize(name) -> str:
     return name.lower().replace('-', ' ').replace('_', ' ')
 
-def search(query, items, threshold = 50) -> List:
+def fuzzy_search(query, items, threshold = 50) -> List:
     """
     query: search input
     items: list of (alias, name)
+    threshold: threshold score over which the entries are selected
 
-    returns: list of (alias, name, score)
+    returns: list of (entry, score)
     """
 
     # return all items if query is empty
     if not query:
-        return [(alias, name, 100) for alias, name in items]
+        return [(e, 100) for e in items]
 
     normalized_query = normalize(query)
     results = []
 
     # filtering
-    for alias, name in items:
-        alias_score = fuzz.WRatio(normalized_query, normalize(alias))
-        name_score = fuzz.WRatio(normalized_query, normalize(name))
+    for entry in items:
+        alias, name = normalize(entry.alias), normalize(entry.name)
+
+        alias_score = fuzz.ratio(normalized_query, alias)
+        name_score = fuzz.ratio(normalized_query, name)
 
         # choose higher score
         best_score = max(alias_score, name_score)
 
         # filter out low scores
-        if best_score >= threshold:
-            results.append((alias, name, best_score))
+        if best_score > threshold:
+            results.append((entry, best_score))
 
-    results.sort(key=lambda x: x[2], reverse=True)
+    results.sort(key=lambda x: x[1], reverse=True)
 
     return results
 

{twd_m4sc0-3.0.2.dist-info → twd_m4sc0-3.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: twd-m4sc0
-Version: 3.0.2
+Version: 3.0.4
 Summary: TWD by m4sc0
 Author: m4sc0
 License: MIT

twd_m4sc0-3.0.4.dist-info/RECORD

@@ -0,0 +1,12 @@
+twd/__init__.py,sha256=76brvw44gXGskDSsajfwk5rvxoRjk4PT99d4qGUs_64,162
+twd/cli.py,sha256=e7weY8SSf6Qp3Z7sigQVnsdO5c-iEyGwzdqap_0jMJg,2626
+twd/config.py,sha256=pGAaurguz1Bv6NxjwKbLBbvJ9tuAVJx_l7tcvd0B84I,1996
+twd/data.py,sha256=bz3uqd8aefaom1Awo40nSFuAlGa3bllVqWLSsG1bWks,4105
+twd/tui.py,sha256=8RTbp4QhbFSIoqnUMuTl5J_qFsZU5KE_bZpHTxpVSSo,6119
+twd/tui.tcss,sha256=GVEtk-fUcAaaGP3I-VjTFUzZocPAEcASDCBNGVoUBWw,778
+twd/utils.py,sha256=xsMa69vAotpNMd3Vp5_F7ELwZCwT-sd45taN7PRI9pE,1201
+twd_m4sc0-3.0.4.dist-info/METADATA,sha256=qK_h_Jvrowt7G5JndPl5BdckqnWmZ7_ftsWZfLzGjME,437
+twd_m4sc0-3.0.4.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+twd_m4sc0-3.0.4.dist-info/entry_points.txt,sha256=KeIDpaQx0GSqgJFYql14wmT3yj_JHTwq7rRsm-mKckc,36
+twd_m4sc0-3.0.4.dist-info/top_level.txt,sha256=B93Li7fIZ4uWoKq8rKVuGPU_MtzyjxxDb0NF96oGZ0o,4
+twd_m4sc0-3.0.4.dist-info/RECORD,,

{twd_m4sc0-3.0.2.dist-info → twd_m4sc0-3.0.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

twd_m4sc0-3.0.2.dist-info/RECORD

@@ -1,11 +0,0 @@
-twd/__init__.py,sha256=76brvw44gXGskDSsajfwk5rvxoRjk4PT99d4qGUs_64,162
-twd/cli.py,sha256=Shm8ZeHrPKPr-lbo6Mvb_mjWEH8mYBVlpvZ3OcWb2sw,2550
-twd/config.py,sha256=pGAaurguz1Bv6NxjwKbLBbvJ9tuAVJx_l7tcvd0B84I,1996
-twd/data.py,sha256=YPVU2NhZuDOps-pkquRG9y4GW5RHf46eXIm23rgY_Lo,4131
-twd/tui.py,sha256=2SGGQ5EhjZSun6NrOiU9aC6AQWfjWEZzFZjKlcIQ9vU,6062
-twd/utils.py,sha256=F42JxIlqUMLsklQ7_zXoIOPmh872E2pHdu1jGLt6-vw,1144
-twd_m4sc0-3.0.2.dist-info/METADATA,sha256=5bra7nBnthJ13mBy5ARJal4Y77iEJP_v1EGjR-aIfNw,437
-twd_m4sc0-3.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-twd_m4sc0-3.0.2.dist-info/entry_points.txt,sha256=KeIDpaQx0GSqgJFYql14wmT3yj_JHTwq7rRsm-mKckc,36
-twd_m4sc0-3.0.2.dist-info/top_level.txt,sha256=B93Li7fIZ4uWoKq8rKVuGPU_MtzyjxxDb0NF96oGZ0o,4
-twd_m4sc0-3.0.2.dist-info/RECORD,,