twd-m4sc0 3.0.3__py3-none-any.whl → 3.1.0__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')
@@ -100,5 +103,62 @@ def list_twds(ctx):
         click.echo("No TWDs saved yet. Use 'twd save <path> <alias>' to add one.")
         return
     
+    invalid_found = False
     for entry in entries:
+        if not invalid_found and not os.path.exists(entry.path):
+            invalid_found = True
         click.echo(f"{entry.alias:20} {entry.name:30} {entry.path}")
+
+    if invalid_found:
+        click.echo(f"\nInvalid TWD paths found. Run <twd clean> to remove them.")
+
+
+@cli.command('clean')
+@click.option('--yes', '-y', is_flag=True, help="Remove all invalid entries without asking")
+@click.pass_context
+def clean(ctx, yes):
+    """
+    clean twds from invalid paths
+    """
+    manager = ctx.obj['manager']
+
+    # all entries, valid and invalid
+    entries = manager.list_all()
+
+    # only invalids
+    invalids = []
+    for entry in entries:
+        if os.path.exists(entry.path):
+            continue
+
+        invalids.append(entry)
+
+    if len(invalids) == 0:
+        click.echo("No invalid TWDs found.")
+        return
+
+    click.echo(f"Found {len(invalids)} invalid TWDs\n")
+
+    # only valid
+    valid_entries = []
+    for entry in entries:
+        if entry not in invalids:
+            valid_entries.append(entry)
+
+    # remove all
+    if yes:
+        click.echo("Removing all invalid entries...")
+        manager._write_all(valid_entries)
+        click.echo(f"Done. {len(valid_entries)} TWDs left.")
+        return
+
+    to_keep = []
+    for inv in invalids:
+        if not click.confirm(f"Do you want to remove '{inv.alias}'?", default=True):
+            # user wants to keep invalid TWD (weird but i'll allow it)
+            to_keep.append(inv)
+
+    # write a unison list of valid entries and the ones to keep
+    final_entries = valid_entries + to_keep
+    manager._write_all(final_entries)
+    click.echo(f"Done. {len(final_entries)} TWDs left.")

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"""
@@ -27,10 +26,6 @@ class Entry(BaseModel):
     def validate_path(cls, v):
         path = Path(v).expanduser().resolve()
 
-        if not path.exists():
-            raise ValueError(f"Path does not exist: {path}")
-        if not path.is_dir():
-            raise ValueError(f"Path is not a directory: {path}")
         return path
 
     def to_csv(self) -> List[str]:
@@ -56,6 +51,7 @@ class TwdManager:
     """twd entry manager stored in csv"""
 
     CSV_HEADERS = ["alias", "path", "name", "created_at"]
+    CSV_HEADERS_FANCY = ["Alias", "Path", "Description", "Created at"]
 
     def __init__(self, csv_path: Path):
         self.csv_path = csv_path
@@ -81,10 +77,7 @@ class TwdManager:
             next(reader) # skip headers
 
             for row in reader:
-                try:
-                    entries.append(Entry.from_csv(row))
-                except Exception as e:
-                    print(f"Warning: skipping invalid row: {e}")
+                entries.append(Entry.from_csv(row))
 
         return entries
 

twd/modals.py

@@ -0,0 +1,92 @@
+from textual import on
+from textual.app import ComposeResult
+from textual.screen import ModalScreen
+from textual.containers import Container, Horizontal
+from textual.widgets import Button, Label
+from typing import Union
+
+from twd.data import Entry
+
+class ConfirmModal(ModalScreen[bool]):
+    """A confirm modal"""
+
+    DEFAULT_CSS = """
+        ConfirmModal {
+            align: center middle;
+        }
+
+        ConfirmModal > Container {
+            width: auto;
+            height: auto;
+            border: thick $background 80%;
+            background: $surface;
+        }
+
+        ConfirmModal > Container > Label {
+            width: 100%;
+            content-align-horizontal: center;
+            margin-top: 1;
+        }
+
+        ConfirmModal > Container > Horizontal {
+            width: auto;
+            height: auto;
+        }
+
+        ConfirmModal > Container > Horizontal > Button {
+            margin: 2 4;
+        }
+    """
+
+    def __init__(
+            self, 
+            message: Union[str, None] = None,
+            confirm_text: str = "Yes",
+            cancel_text: str = "No"
+    ):
+        """
+        message: The message to display when popping the modal
+        confirm_text: Text to show for confirmation
+        cancel_text: Text to show for cancellation
+        """
+        self.message = message
+        self.confirm_text = confirm_text
+        self.cancel_text = cancel_text
+
+        super().__init__()
+
+    def compose_content(self) -> ComposeResult:
+        """
+        Abstract method for presenting custom shenanigans
+        """
+        if self.message:
+            yield Label(self.message, id="content")
+        else:
+            yield Label("Are you sure?", id="content")
+
+    def compose(self) -> ComposeResult:
+        with Container():
+            yield from self.compose_content()
+            with Horizontal():
+                yield Button(self.cancel_text, id="no", variant="error")
+                yield Button(self.confirm_text, id="yes", variant="success")
+
+    @on(Button.Pressed, "#no")
+    def no_decision(self) -> None:
+        """decision no"""
+        self.dismiss(False)
+
+    @on(Button.Pressed, "#yes")
+    def yes_decision(self) -> None:
+        """decision yes"""
+        self.dismiss(True)
+
+class EntryDeleteModal(ConfirmModal):
+    """Confirmation modal with detailed entry information"""
+
+    def __init__(self, entry):
+        self.entry = entry
+        super().__init__(confirm_text="Delete", cancel_text="Cancel")
+
+    def compose_content(self) -> ComposeResult:
+        yield Label(f"Delete entry '{self.entry.name}'?", id="content")

twd/tui.py

@@ -1,4 +1,5 @@
 from enum import Enum
+from datetime import datetime
 from textual import on
 from textual.app import App, ComposeResult, Binding
 from textual.containers import HorizontalGroup, VerticalScroll
@@ -8,7 +9,8 @@ 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
+from twd.modals import ConfirmModal, EntryDeleteModal
 
 class Mode(Enum):
     NORMAL = "normal"
@@ -28,6 +30,7 @@ class TWDApp(App):
 
             # modify
             Binding("/", "enter_search_mode", "Search"),
+            Binding("d", "delete_entry", "Delete"),
             Binding("escape", "enter_normal_mode", "Normal", show=False),
             # TODO: edit
             # TODO: rename
@@ -77,7 +80,7 @@ class TWDApp(App):
 
         # add headers
         table = self.query_one(DataTable)
-        table.add_columns(*self.manager.CSV_HEADERS)
+        table.add_columns(*self.manager.CSV_HEADERS_FANCY)
         
         self._populate_table()
 
@@ -93,7 +96,7 @@ class TWDApp(App):
         
         # fill data
         for entry in entries:
-            table.add_row(entry.alias, str(entry.path), entry.name, entry.created_at)
+            table.add_row(entry.alias, str(entry.path), entry.name, entry.created_at.strftime("%Y-%m-%d %H:%M:%S"))
 
     def watch_mode(self, old_mode: Mode, new_mode: Mode) -> None:
         """
@@ -128,8 +131,11 @@ class TWDApp(App):
         """
         table = self.query_one(DataTable)
 
-        current_row = table.cursor_coordinate.row
-        next_row = (current_row + 1) % table.row_count
+        try:
+            current_row = table.cursor_coordinate.row
+            next_row = (current_row + 1) % table.row_count
+        except ZeroDivisionError as e:
+            return
 
         table.move_cursor(row=next_row)
 
@@ -139,8 +145,11 @@ class TWDApp(App):
         """
         table = self.query_one(DataTable)
         
-        current_row = table.cursor_coordinate.row
-        prev_row = (current_row - 1) % table.row_count
+        try:
+            current_row = table.cursor_coordinate.row
+            prev_row = (current_row - 1) % table.row_count
+        except ZeroDivisionError as e:
+            return
 
         table.move_cursor(row=prev_row)
 
@@ -160,6 +169,39 @@ class TWDApp(App):
             return
         self.mode = Mode.NORMAL
 
+    def action_delete_entry(self) -> None:
+        """
+        open confirm modal and delete entry if yes
+        """
+        if not self.mode == Mode.NORMAL:
+            return
+
+        table = self.query_one(DataTable)
+
+        # get row
+        row_key = table.coordinate_to_cell_key(table.cursor_coordinate).row_key
+        row_data = table.get_row(row_key)
+        alias = row_data[0]
+
+        # get entry
+        entry = self.manager.get(alias)
+
+        def check_delete(decision: bool | None) -> None:
+            """
+            open modal and return the decision
+            """
+            if not decision:
+                return
+
+            self.manager.remove(alias)
+
+            self._populate_table()
+
+            self.notify(f"Removed entry \"{entry.name}\"")
+
+        # self.push_screen(ConfirmModal(message=f"Are you sure want to delete '{entry.alias}'?"), check_delete)
+        self.push_screen(EntryDeleteModal(entry), check_delete)
+
     def action_exit(self) -> None:
         self.exit()
 
@@ -177,9 +219,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/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.3.dist-info → twd_m4sc0-3.1.0.dist-info}/METADATA

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

twd_m4sc0-3.1.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+twd/__init__.py,sha256=76brvw44gXGskDSsajfwk5rvxoRjk4PT99d4qGUs_64,162
+twd/cli.py,sha256=m1Buh3_pDg4Yej-3v2cRlB2m-1jz55cLnPx63TJgb4s,4247
+twd/config.py,sha256=pGAaurguz1Bv6NxjwKbLBbvJ9tuAVJx_l7tcvd0B84I,1996
+twd/data.py,sha256=8GmBk5VOfmvJJa16H2jywi06_0wRNYjjkseqgM17Hdk,3861
+twd/modals.py,sha256=NWeOu87DlVxYERUqKfulxRXlb1Bs1BYxs_Q8tih-WZM,2601
+twd/tui.py,sha256=XksMYTDgOL5sZg4Cn0LjnNVYvOkgKHsUlve1KZZNmyo,7403
+twd/tui.tcss,sha256=GVEtk-fUcAaaGP3I-VjTFUzZocPAEcASDCBNGVoUBWw,778
+twd/utils.py,sha256=xsMa69vAotpNMd3Vp5_F7ELwZCwT-sd45taN7PRI9pE,1201
+twd_m4sc0-3.1.0.dist-info/METADATA,sha256=ZzuIkcbhHTraVKyx3u_aNymjTYxQv8Fl577mjuiozpE,437
+twd_m4sc0-3.1.0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+twd_m4sc0-3.1.0.dist-info/entry_points.txt,sha256=KeIDpaQx0GSqgJFYql14wmT3yj_JHTwq7rRsm-mKckc,36
+twd_m4sc0-3.1.0.dist-info/top_level.txt,sha256=B93Li7fIZ4uWoKq8rKVuGPU_MtzyjxxDb0NF96oGZ0o,4
+twd_m4sc0-3.1.0.dist-info/RECORD,,

{twd_m4sc0-3.0.3.dist-info → twd_m4sc0-3.1.0.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.3.dist-info/RECORD

@@ -1,12 +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/tui.tcss,sha256=GVEtk-fUcAaaGP3I-VjTFUzZocPAEcASDCBNGVoUBWw,778
-twd/utils.py,sha256=F42JxIlqUMLsklQ7_zXoIOPmh872E2pHdu1jGLt6-vw,1144
-twd_m4sc0-3.0.3.dist-info/METADATA,sha256=IB8U5YkNDs3MldgdSy6ffadSt84fFpgT15yz3QIjktg,437
-twd_m4sc0-3.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-twd_m4sc0-3.0.3.dist-info/entry_points.txt,sha256=KeIDpaQx0GSqgJFYql14wmT3yj_JHTwq7rRsm-mKckc,36
-twd_m4sc0-3.0.3.dist-info/top_level.txt,sha256=B93Li7fIZ4uWoKq8rKVuGPU_MtzyjxxDb0NF96oGZ0o,4
-twd_m4sc0-3.0.3.dist-info/RECORD,,