cli-todo-jd 0.1.1__py3-none-any.whl → 0.2.1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- cli_todo_jd/cli_entry.py +115 -51
- cli_todo_jd/main.py +328 -63
- cli_todo_jd/storage/__init__.py +6 -0
- cli_todo_jd/storage/migrate.py +111 -0
- cli_todo_jd/storage/schema.py +58 -0
- {cli_todo_jd-0.1.1.dist-info → cli_todo_jd-0.2.1.dist-info}/METADATA +5 -4
- cli_todo_jd-0.2.1.dist-info/RECORD +11 -0
- {cli_todo_jd-0.1.1.dist-info → cli_todo_jd-0.2.1.dist-info}/WHEEL +1 -1
- cli_todo_jd-0.2.1.dist-info/entry_points.txt +3 -0
- cli_todo_jd-0.1.1.dist-info/RECORD +0 -8
- cli_todo_jd-0.1.1.dist-info/entry_points.txt +0 -6
- {cli_todo_jd-0.1.1.dist-info → cli_todo_jd-0.2.1.dist-info}/top_level.txt +0 -0
cli_todo_jd/cli_entry.py
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
from __future__ import annotations
|
|
2
|
+
|
|
1
3
|
from argparse import ArgumentParser
|
|
2
4
|
from cli_todo_jd.main import (
|
|
3
5
|
add_item_to_list,
|
|
@@ -5,75 +7,133 @@ from cli_todo_jd.main import (
|
|
|
5
7
|
list_items_on_list,
|
|
6
8
|
clear_list_of_items,
|
|
7
9
|
cli_menu,
|
|
10
|
+
mark_item_as_done,
|
|
11
|
+
mark_item_as_not_done,
|
|
8
12
|
)
|
|
13
|
+
from pathlib import Path
|
|
14
|
+
import typer
|
|
9
15
|
|
|
16
|
+
app = typer.Typer(help="A tiny todo CLI built with Typer.")
|
|
10
17
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
18
|
+
|
|
19
|
+
@app.command()
|
|
20
|
+
def add(
|
|
21
|
+
text: list[str] = typer.Argument(..., help="Todo item text (no quotes needed)."),
|
|
22
|
+
filepath: Path = typer.Option(
|
|
23
|
+
Path(".todo_list.db"),
|
|
14
24
|
"--filepath",
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
)
|
|
25
|
+
"-f",
|
|
26
|
+
help="Path to the JSON file used for storage.",
|
|
27
|
+
),
|
|
28
|
+
) -> None:
|
|
29
|
+
full_text = " ".join(text).strip()
|
|
30
|
+
if not full_text:
|
|
31
|
+
raise typer.BadParameter("Todo item text cannot be empty.")
|
|
32
|
+
|
|
33
|
+
add_item_to_list(full_text, filepath)
|
|
34
|
+
typer.echo(f"Added: {full_text}")
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
@app.command(name="list")
|
|
38
|
+
def list_(
|
|
39
|
+
filepath: Path = typer.Option(Path(".todo_list.db"), "--filepath", "-f"),
|
|
40
|
+
show_all: bool = typer.Option(
|
|
41
|
+
False, "--all", "-a", help="Show all todos (open + done)."
|
|
42
|
+
),
|
|
43
|
+
show_done: bool = typer.Option(
|
|
44
|
+
False, "--done", "-d", help="Show only completed todos."
|
|
45
|
+
),
|
|
46
|
+
show_open: bool = typer.Option(
|
|
47
|
+
False, "--open", "-o", help="Show only open todos (default)."
|
|
48
|
+
),
|
|
49
|
+
) -> None:
|
|
50
|
+
"""List todos.
|
|
51
|
+
|
|
52
|
+
Examples
|
|
53
|
+
--------
|
|
54
|
+
- todo list
|
|
55
|
+
- todo list --done
|
|
56
|
+
- todo list --all
|
|
57
|
+
- todo list -a
|
|
58
|
+
"""
|
|
59
|
+
|
|
60
|
+
# Choose filter. If nothing specified, default to open.
|
|
61
|
+
# If the user specifies multiple flags, error out.
|
|
62
|
+
flags = [show_all, show_done, show_open]
|
|
63
|
+
if sum(1 for f in flags if f) > 1:
|
|
64
|
+
raise typer.BadParameter(
|
|
65
|
+
"Use only one of: --all / -a, --done / -d, --open / -o"
|
|
66
|
+
)
|
|
18
67
|
|
|
68
|
+
if show_all:
|
|
69
|
+
show = "all"
|
|
70
|
+
elif show_done:
|
|
71
|
+
show = "done"
|
|
72
|
+
else:
|
|
73
|
+
# default is open (or explicit --open)
|
|
74
|
+
show = "open"
|
|
19
75
|
|
|
20
|
-
|
|
21
|
-
parser = ArgumentParser(description="Add a todo item")
|
|
22
|
-
parser.add_argument(
|
|
23
|
-
"item",
|
|
24
|
-
nargs="+",
|
|
25
|
-
help="The todo item to add (use quotes or multiple words)",
|
|
26
|
-
)
|
|
27
|
-
parser_optional_args(parser)
|
|
76
|
+
list_items_on_list(filepath, show=show)
|
|
28
77
|
|
|
29
|
-
args = parser.parse_args()
|
|
30
|
-
args.item = " ".join(args.item)
|
|
31
|
-
add_item_to_list(args.item, args.filepath)
|
|
32
78
|
|
|
79
|
+
@app.command()
|
|
80
|
+
def remove(
|
|
81
|
+
index: int = typer.Argument(..., help="1-based index of item to remove."),
|
|
82
|
+
filepath: Path = typer.Option(Path(".todo_list.db"), "--filepath", "-f"),
|
|
83
|
+
) -> None:
|
|
84
|
+
remove_item_from_list(index, filepath)
|
|
33
85
|
|
|
34
|
-
def remove_item():
|
|
35
|
-
parser = ArgumentParser(description="Remove a todo item by index")
|
|
36
|
-
parser.add_argument(
|
|
37
|
-
"index",
|
|
38
|
-
type=int,
|
|
39
|
-
help="The index of the todo item to remove (1-based)",
|
|
40
|
-
)
|
|
41
|
-
parser_optional_args(parser)
|
|
42
86
|
|
|
43
|
-
|
|
44
|
-
|
|
87
|
+
@app.command()
|
|
88
|
+
def clear(
|
|
89
|
+
yes: bool = typer.Option(False, "--yes", "-y", help="Skip confirmation prompt."),
|
|
90
|
+
filepath: Path = typer.Option(Path(".todo_list.db"), "--filepath", "-f"),
|
|
91
|
+
) -> None:
|
|
92
|
+
if not yes and not typer.confirm(f"Clear all todos in {filepath}?"):
|
|
93
|
+
typer.echo("Cancelled.")
|
|
94
|
+
raise typer.Exit(code=1)
|
|
45
95
|
|
|
96
|
+
clear_list_of_items(filepath)
|
|
46
97
|
|
|
47
|
-
def list_items():
|
|
48
|
-
parser = ArgumentParser(description="List all todo items")
|
|
49
|
-
parser_optional_args(parser)
|
|
50
98
|
|
|
51
|
-
|
|
52
|
-
|
|
99
|
+
@app.command(name="menu")
|
|
100
|
+
def menu_(
|
|
101
|
+
filepath: Path = typer.Option(
|
|
102
|
+
Path(".todo_list.db"),
|
|
103
|
+
"--filepath",
|
|
104
|
+
"-f",
|
|
105
|
+
help="Path to the JSON file used for storage.",
|
|
106
|
+
),
|
|
107
|
+
) -> None:
|
|
108
|
+
cli_menu(filepath)
|
|
109
|
+
typer.echo("Exited menu.")
|
|
53
110
|
|
|
54
111
|
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
)
|
|
63
|
-
parser_optional_args(parser)
|
|
112
|
+
@app.command()
|
|
113
|
+
def done(
|
|
114
|
+
index: int = typer.Argument(..., help="1-based index of item to mark as done."),
|
|
115
|
+
filepath: Path = typer.Option(Path(".todo_list.db"), "--filepath", "-f"),
|
|
116
|
+
) -> None:
|
|
117
|
+
mark_item_as_done(index, filepath)
|
|
118
|
+
list_items_on_list(filepath=filepath, show="all")
|
|
64
119
|
|
|
65
|
-
args = parser.parse_args()
|
|
66
|
-
list_items_on_list(args.filepath)
|
|
67
120
|
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
121
|
+
@app.command()
|
|
122
|
+
def not_done(
|
|
123
|
+
index: int = typer.Argument(..., help="1-based index of item to mark as done."),
|
|
124
|
+
filepath: Path = typer.Option(Path(".todo_list.db"), "--filepath", "-f"),
|
|
125
|
+
) -> None:
|
|
126
|
+
mark_item_as_not_done(index, filepath)
|
|
127
|
+
list_items_on_list(filepath=filepath, show="all")
|
|
74
128
|
|
|
75
|
-
|
|
76
|
-
|
|
129
|
+
|
|
130
|
+
def parser_optional_args(parser: ArgumentParser):
|
|
131
|
+
parser.add_argument(
|
|
132
|
+
"-f",
|
|
133
|
+
"--filepath",
|
|
134
|
+
help="Path to the file to process",
|
|
135
|
+
default="./.todo_list.db",
|
|
136
|
+
)
|
|
77
137
|
|
|
78
138
|
|
|
79
139
|
def todo_menu():
|
|
@@ -82,3 +142,7 @@ def todo_menu():
|
|
|
82
142
|
args = parser.parse_args()
|
|
83
143
|
|
|
84
144
|
cli_menu(filepath=args.filepath)
|
|
145
|
+
|
|
146
|
+
|
|
147
|
+
if __name__ == "__main__":
|
|
148
|
+
app()
|
cli_todo_jd/main.py
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
import json
|
|
2
1
|
from pathlib import Path
|
|
3
2
|
import questionary
|
|
4
3
|
from rich.console import Console
|
|
5
4
|
from rich.table import Table
|
|
6
5
|
from rich.padding import Padding
|
|
6
|
+
import sqlite3
|
|
7
|
+
|
|
8
|
+
from cli_todo_jd.storage.schema import ensure_schema
|
|
9
|
+
from cli_todo_jd.storage.migrate import migrate_from_json
|
|
7
10
|
|
|
8
11
|
|
|
9
12
|
def main():
|
|
@@ -15,43 +18,147 @@ class TodoApp:
|
|
|
15
18
|
A simple command-line todo application.
|
|
16
19
|
"""
|
|
17
20
|
|
|
18
|
-
def __init__(self,
|
|
21
|
+
def __init__(self, file_path_to_db="./.todo_list.db"):
|
|
19
22
|
self.todos = []
|
|
20
|
-
self.
|
|
21
|
-
self.
|
|
23
|
+
self.status = []
|
|
24
|
+
self.file_path_to_db = Path(file_path_to_db)
|
|
25
|
+
self._check_and_load_todos(self.file_path_to_db)
|
|
22
26
|
self._console = Console()
|
|
23
27
|
|
|
24
|
-
def add_todo(self, item):
|
|
25
|
-
|
|
28
|
+
def add_todo(self, item: str) -> None:
|
|
29
|
+
item = (item or "").strip()
|
|
30
|
+
if not item:
|
|
31
|
+
print("Error: Todo item cannot be empty.")
|
|
32
|
+
return
|
|
33
|
+
|
|
34
|
+
try:
|
|
35
|
+
with sqlite3.connect(self.file_path_to_db) as conn:
|
|
36
|
+
ensure_schema(conn)
|
|
37
|
+
with conn:
|
|
38
|
+
conn.execute(
|
|
39
|
+
"INSERT INTO todos(item, done) VALUES (?, 0);", (item,)
|
|
40
|
+
)
|
|
41
|
+
except sqlite3.Error as e:
|
|
42
|
+
print(f"Error: Failed to add todo. ({e})")
|
|
43
|
+
return
|
|
44
|
+
|
|
26
45
|
print(f'Added todo: "{item}"')
|
|
46
|
+
self._check_and_load_todos(self.file_path_to_db)
|
|
47
|
+
|
|
48
|
+
def list_todos(self, *, show: str = "open") -> None:
|
|
49
|
+
"""List todos.
|
|
50
|
+
|
|
51
|
+
Parameters
|
|
52
|
+
----------
|
|
53
|
+
show:
|
|
54
|
+
"open" (default), "done", or "all".
|
|
55
|
+
"""
|
|
56
|
+
show = (show or "open").lower()
|
|
57
|
+
if show not in {"open", "done", "all"}:
|
|
58
|
+
print("Error: show must be one of: open, done, all")
|
|
59
|
+
return
|
|
27
60
|
|
|
28
|
-
|
|
61
|
+
# Always read fresh so output reflects the DB
|
|
62
|
+
self._check_and_load_todos(self.file_path_to_db)
|
|
29
63
|
if not self.todos:
|
|
30
64
|
print("No todos found.")
|
|
31
65
|
return
|
|
32
|
-
self._table_print()
|
|
33
66
|
|
|
34
|
-
|
|
67
|
+
if show == "all":
|
|
68
|
+
self._table_print(title="Todos")
|
|
69
|
+
return
|
|
70
|
+
|
|
71
|
+
# Filter in-memory to keep this change minimal. (You can later filter in SQL.)
|
|
72
|
+
filtered_todos: list[str] = []
|
|
73
|
+
filtered_status: list[int] = []
|
|
74
|
+
for todo, done in zip(self.todos, self.status, strict=False):
|
|
75
|
+
if show == "open" and not done:
|
|
76
|
+
filtered_todos.append(todo)
|
|
77
|
+
filtered_status.append(done)
|
|
78
|
+
elif show == "done" and done:
|
|
79
|
+
filtered_todos.append(todo)
|
|
80
|
+
filtered_status.append(done)
|
|
81
|
+
|
|
82
|
+
if not filtered_todos:
|
|
83
|
+
print("No todos found.")
|
|
84
|
+
return
|
|
85
|
+
|
|
86
|
+
original_todos, original_status = self.todos, self.status
|
|
35
87
|
try:
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
88
|
+
self.todos, self.status = filtered_todos, filtered_status
|
|
89
|
+
title = "Open todos" if show == "open" else "Completed todos"
|
|
90
|
+
self._table_print(title=title)
|
|
91
|
+
finally:
|
|
92
|
+
self.todos, self.status = original_todos, original_status
|
|
93
|
+
|
|
94
|
+
def remove_todo(self, index: int) -> None:
|
|
95
|
+
# Maintain current UX: index refers to the displayed (1-based) ordering.
|
|
96
|
+
self._check_and_load_todos(self.file_path_to_db)
|
|
97
|
+
|
|
98
|
+
if index < 1 or index > len(self.todos):
|
|
39
99
|
print("Error: Invalid todo index.")
|
|
100
|
+
return
|
|
101
|
+
|
|
102
|
+
try:
|
|
103
|
+
with sqlite3.connect(self.file_path_to_db) as conn:
|
|
104
|
+
ensure_schema(conn)
|
|
105
|
+
|
|
106
|
+
row = conn.execute(
|
|
107
|
+
"SELECT id, item FROM todos ORDER BY id LIMIT 1 OFFSET ?;",
|
|
108
|
+
(index - 1,),
|
|
109
|
+
).fetchone()
|
|
110
|
+
if row is None:
|
|
111
|
+
print("Error: Invalid todo index.")
|
|
112
|
+
return
|
|
113
|
+
|
|
114
|
+
todo_id, removed_item = row
|
|
115
|
+
with conn:
|
|
116
|
+
conn.execute("DELETE FROM todos WHERE id = ?;", (todo_id,))
|
|
117
|
+
except sqlite3.Error as e:
|
|
118
|
+
print(f"Error: Failed to remove todo. ({e})")
|
|
119
|
+
return
|
|
120
|
+
|
|
121
|
+
print(f'Removed todo: "{removed_item}"')
|
|
122
|
+
self._check_and_load_todos(self.file_path_to_db)
|
|
123
|
+
|
|
124
|
+
def clear_all(self) -> None:
|
|
125
|
+
try:
|
|
126
|
+
with sqlite3.connect(self.file_path_to_db) as conn:
|
|
127
|
+
ensure_schema(conn)
|
|
128
|
+
with conn:
|
|
129
|
+
conn.execute("DELETE FROM todos;")
|
|
130
|
+
except sqlite3.Error as e:
|
|
131
|
+
print(f"Error: Failed to clear todos. ({e})")
|
|
132
|
+
return
|
|
133
|
+
|
|
134
|
+
self.todos = []
|
|
135
|
+
print("Cleared all todos.")
|
|
136
|
+
|
|
137
|
+
def _check_and_load_todos(self, file_path: Path) -> None:
|
|
138
|
+
# Create parent directory if needed
|
|
139
|
+
file_path.parent.mkdir(parents=True, exist_ok=True)
|
|
40
140
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
except (json.JSONDecodeError, OSError):
|
|
47
|
-
print("Warning: Failed to load existing todos. Starting fresh.")
|
|
141
|
+
# Optional one-time migration: if the user still has a legacy JSON file and
|
|
142
|
+
# the DB is empty/new, import the items. This keeps upgrades smooth.
|
|
143
|
+
json_path = file_path.with_suffix(".json")
|
|
144
|
+
if json_path.exists() and file_path.suffix == ".db":
|
|
145
|
+
migrate_from_json(json_path=json_path, db_path=file_path, backup=True)
|
|
48
146
|
|
|
49
|
-
def write_todos(self):
|
|
50
147
|
try:
|
|
51
|
-
with
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
148
|
+
with sqlite3.connect(file_path) as conn:
|
|
149
|
+
ensure_schema(conn)
|
|
150
|
+
rows = conn.execute(
|
|
151
|
+
"SELECT id, item, done, created_at, done_at FROM todos ORDER BY id"
|
|
152
|
+
).fetchall()
|
|
153
|
+
|
|
154
|
+
# In-memory list is used by the interactive menu for selection.
|
|
155
|
+
# Keep it as a simple list[str] for now.
|
|
156
|
+
self.todos = [row[1] for row in rows]
|
|
157
|
+
self.status = [row[2] for row in rows]
|
|
158
|
+
except sqlite3.Error as e:
|
|
159
|
+
print(f"Warning: Failed to load existing todos. Starting fresh. ({e})")
|
|
160
|
+
self.todos = []
|
|
161
|
+
self.status = []
|
|
55
162
|
|
|
56
163
|
def _table_print(
|
|
57
164
|
self,
|
|
@@ -61,29 +168,166 @@ class TodoApp:
|
|
|
61
168
|
table = Table(
|
|
62
169
|
title=title, header_style=style, border_style=style, show_lines=True
|
|
63
170
|
)
|
|
64
|
-
columns = ["ID", "Todo Item"]
|
|
171
|
+
columns = ["ID", "Todo Item", "Done"]
|
|
65
172
|
for col in columns:
|
|
66
173
|
table.add_column(str(col))
|
|
174
|
+
|
|
67
175
|
for idx, todo in enumerate(self.todos, start=1):
|
|
68
|
-
table.add_row(
|
|
176
|
+
table.add_row(
|
|
177
|
+
f"{idx}.",
|
|
178
|
+
str(todo),
|
|
179
|
+
"[green]✔[/green]" if self.status[idx - 1] else "[red]✖[/red]",
|
|
180
|
+
)
|
|
181
|
+
|
|
69
182
|
self._console.print(Padding(table, (2, 2)))
|
|
70
183
|
|
|
184
|
+
def mark_as_not_done(self, index: int) -> None:
|
|
185
|
+
self._check_and_load_todos(self.file_path_to_db)
|
|
186
|
+
|
|
187
|
+
if index < 1 or index > len(self.todos):
|
|
188
|
+
print("Error: Invalid todo index.")
|
|
189
|
+
return
|
|
190
|
+
|
|
191
|
+
try:
|
|
192
|
+
with sqlite3.connect(self.file_path_to_db) as conn:
|
|
193
|
+
ensure_schema(conn)
|
|
194
|
+
|
|
195
|
+
row = conn.execute(
|
|
196
|
+
"SELECT id, item FROM todos ORDER BY id LIMIT 1 OFFSET ?;",
|
|
197
|
+
(index - 1,),
|
|
198
|
+
).fetchone()
|
|
199
|
+
if row is None:
|
|
200
|
+
print("Error: Invalid todo index.")
|
|
201
|
+
return
|
|
202
|
+
|
|
203
|
+
todo_id, item = row
|
|
204
|
+
with conn:
|
|
205
|
+
conn.execute(
|
|
206
|
+
"UPDATE todos SET done = 0, done_at = NULL WHERE id = ?;",
|
|
207
|
+
(todo_id,),
|
|
208
|
+
)
|
|
209
|
+
except sqlite3.Error as e:
|
|
210
|
+
print(f"Error: Failed to mark todo as not done. ({e})")
|
|
211
|
+
return
|
|
212
|
+
|
|
213
|
+
print(f'Marked todo as not done: "{item}"')
|
|
214
|
+
self._check_and_load_todos(self.file_path_to_db)
|
|
215
|
+
|
|
216
|
+
def mark_as_done(self, index: int) -> None:
|
|
217
|
+
self._check_and_load_todos(self.file_path_to_db)
|
|
218
|
+
|
|
219
|
+
if index < 1 or index > len(self.todos):
|
|
220
|
+
print("Error: Invalid todo index.")
|
|
221
|
+
return
|
|
222
|
+
|
|
223
|
+
try:
|
|
224
|
+
with sqlite3.connect(self.file_path_to_db) as conn:
|
|
225
|
+
ensure_schema(conn)
|
|
226
|
+
|
|
227
|
+
row = conn.execute(
|
|
228
|
+
"SELECT id, item FROM todos ORDER BY id LIMIT 1 OFFSET ?;",
|
|
229
|
+
(index - 1,),
|
|
230
|
+
).fetchone()
|
|
231
|
+
if row is None:
|
|
232
|
+
print("Error: Invalid todo index.")
|
|
233
|
+
return
|
|
234
|
+
|
|
235
|
+
todo_id, item = row
|
|
236
|
+
with conn:
|
|
237
|
+
conn.execute(
|
|
238
|
+
"UPDATE todos SET done = ?, done_at = datetime('now') WHERE id = ?;",
|
|
239
|
+
(1, todo_id),
|
|
240
|
+
)
|
|
241
|
+
except sqlite3.Error as e:
|
|
242
|
+
print(f"Error: Failed to mark todo as done. ({e})")
|
|
243
|
+
return
|
|
244
|
+
|
|
245
|
+
print(f'Marked todo as done: "{item}"')
|
|
246
|
+
self._check_and_load_todos(self.file_path_to_db)
|
|
247
|
+
|
|
248
|
+
def update_done_data(self, index, done_value, done_at_value, todo_id):
|
|
249
|
+
text_done_value = "done" if done_value == 1 else "not done"
|
|
250
|
+
try:
|
|
251
|
+
with sqlite3.connect(self.file_path_to_db) as conn:
|
|
252
|
+
ensure_schema(conn)
|
|
253
|
+
|
|
254
|
+
row = conn.execute(
|
|
255
|
+
"SELECT id, item FROM todos ORDER BY id LIMIT 1 OFFSET ?;",
|
|
256
|
+
(index - 1,),
|
|
257
|
+
).fetchone()
|
|
258
|
+
if row is None:
|
|
259
|
+
print("Error: Invalid todo index.")
|
|
260
|
+
return
|
|
261
|
+
|
|
262
|
+
todo_id, item = row
|
|
263
|
+
with conn:
|
|
264
|
+
if done_value:
|
|
265
|
+
conn.execute(
|
|
266
|
+
"UPDATE todos SET done = ?, done_at = datetime('now') WHERE id = ?;",
|
|
267
|
+
(1, todo_id),
|
|
268
|
+
)
|
|
269
|
+
else:
|
|
270
|
+
conn.execute(
|
|
271
|
+
"UPDATE todos SET done = ?, done_at = NULL WHERE id = ?;",
|
|
272
|
+
(0, todo_id),
|
|
273
|
+
)
|
|
274
|
+
except sqlite3.Error as e:
|
|
275
|
+
print(f"Error: Failed to mark todo as {text_done_value}. ({e})")
|
|
276
|
+
return
|
|
277
|
+
|
|
278
|
+
def edit_entry(self, index: int, new_text: str) -> None:
|
|
279
|
+
self._check_and_load_todos(self.file_path_to_db)
|
|
280
|
+
|
|
281
|
+
if index < 1 or index > len(self.todos):
|
|
282
|
+
print("Error: Invalid todo index.")
|
|
283
|
+
return
|
|
284
|
+
|
|
285
|
+
new_text = (new_text or "").strip()
|
|
286
|
+
if not new_text:
|
|
287
|
+
print("Error: Todo item cannot be empty.")
|
|
288
|
+
return
|
|
289
|
+
|
|
290
|
+
try:
|
|
291
|
+
with sqlite3.connect(self.file_path_to_db) as conn:
|
|
292
|
+
ensure_schema(conn)
|
|
293
|
+
|
|
294
|
+
row = conn.execute(
|
|
295
|
+
"SELECT id, item FROM todos ORDER BY id LIMIT 1 OFFSET ?;",
|
|
296
|
+
(index - 1,),
|
|
297
|
+
).fetchone()
|
|
298
|
+
if row is None:
|
|
299
|
+
print("Error: Invalid todo index.")
|
|
300
|
+
return
|
|
301
|
+
|
|
302
|
+
todo_id, old_item = row
|
|
303
|
+
with conn:
|
|
304
|
+
conn.execute(
|
|
305
|
+
"UPDATE todos SET item = ? WHERE id = ?;",
|
|
306
|
+
(new_text, todo_id),
|
|
307
|
+
)
|
|
308
|
+
except sqlite3.Error as e:
|
|
309
|
+
print(f"Error: Failed to edit todo. ({e})")
|
|
310
|
+
return
|
|
311
|
+
|
|
312
|
+
print(f'Edited todo: "{old_item}" to "{new_text}"')
|
|
313
|
+
self._check_and_load_todos(self.file_path_to_db)
|
|
71
314
|
|
|
72
|
-
|
|
315
|
+
|
|
316
|
+
def create_list(file_path_to_db: str = "./.todo_list.db"):
|
|
73
317
|
"""
|
|
74
318
|
Create a new todo list.
|
|
75
319
|
|
|
76
320
|
Parameters
|
|
77
321
|
----------
|
|
78
|
-
|
|
79
|
-
The file path to the JSON file for storing todos, by default "./.todo_list.
|
|
322
|
+
file_path_to_db : str, optional
|
|
323
|
+
The file path to the JSON file for storing todos, by default "./.todo_list.db"
|
|
80
324
|
|
|
81
325
|
Returns
|
|
82
326
|
-------
|
|
83
327
|
TodoApp
|
|
84
328
|
An instance of the TodoApp class.
|
|
85
329
|
"""
|
|
86
|
-
app = TodoApp(
|
|
330
|
+
app = TodoApp(file_path_to_db=file_path_to_db)
|
|
87
331
|
return app
|
|
88
332
|
|
|
89
333
|
|
|
@@ -98,23 +342,23 @@ def add_item_to_list(item: str, filepath: str):
|
|
|
98
342
|
filepath : str
|
|
99
343
|
The file path to the JSON file for storing todos.
|
|
100
344
|
"""
|
|
101
|
-
app = create_list(
|
|
345
|
+
app = create_list(file_path_to_db=filepath)
|
|
102
346
|
app.add_todo(item)
|
|
103
347
|
app.list_todos()
|
|
104
|
-
app.write_todos()
|
|
105
348
|
|
|
106
349
|
|
|
107
|
-
def list_items_on_list(filepath: str):
|
|
108
|
-
"""
|
|
109
|
-
List all items in the todo list.
|
|
350
|
+
def list_items_on_list(filepath: str, show: str = "open"):
|
|
351
|
+
"""List items in the todo list.
|
|
110
352
|
|
|
111
353
|
Parameters
|
|
112
354
|
----------
|
|
113
|
-
filepath
|
|
114
|
-
The
|
|
355
|
+
filepath:
|
|
356
|
+
The SQLite database path.
|
|
357
|
+
show:
|
|
358
|
+
"open" (default), "done", or "all".
|
|
115
359
|
"""
|
|
116
|
-
app = create_list(
|
|
117
|
-
app.list_todos()
|
|
360
|
+
app = create_list(file_path_to_db=filepath)
|
|
361
|
+
app.list_todos(show=show)
|
|
118
362
|
|
|
119
363
|
|
|
120
364
|
def remove_item_from_list(index: int, filepath: str):
|
|
@@ -128,10 +372,9 @@ def remove_item_from_list(index: int, filepath: str):
|
|
|
128
372
|
filepath : str
|
|
129
373
|
The file path to the JSON file for storing todos.
|
|
130
374
|
"""
|
|
131
|
-
app = create_list(
|
|
375
|
+
app = create_list(file_path_to_db=filepath)
|
|
132
376
|
app.remove_todo(index)
|
|
133
377
|
app.list_todos()
|
|
134
|
-
app.write_todos()
|
|
135
378
|
|
|
136
379
|
|
|
137
380
|
def clear_list_of_items(filepath: str):
|
|
@@ -143,28 +386,37 @@ def clear_list_of_items(filepath: str):
|
|
|
143
386
|
filepath : str
|
|
144
387
|
The file path to the JSON file for storing todos.
|
|
145
388
|
"""
|
|
146
|
-
app = create_list(
|
|
147
|
-
app.
|
|
148
|
-
print("Cleared all todos.")
|
|
149
|
-
app.write_todos()
|
|
389
|
+
app = create_list(file_path_to_db=filepath)
|
|
390
|
+
app.clear_all()
|
|
150
391
|
|
|
151
392
|
|
|
152
|
-
def
|
|
393
|
+
def mark_item_as_done(index: int, filepath: str):
|
|
394
|
+
app = create_list(file_path_to_db=filepath)
|
|
395
|
+
app.mark_as_done(index)
|
|
396
|
+
|
|
397
|
+
|
|
398
|
+
def mark_item_as_not_done(index: int, filepath: str):
|
|
399
|
+
app = create_list(file_path_to_db=filepath)
|
|
400
|
+
app.mark_as_not_done(index)
|
|
401
|
+
|
|
402
|
+
|
|
403
|
+
def cli_menu(filepath="./.todo_list.db"):
|
|
153
404
|
"""
|
|
154
405
|
Display the command-line interface menu for the todo list.
|
|
155
406
|
|
|
156
407
|
Parameters
|
|
157
408
|
----------
|
|
158
409
|
filepath : str, optional
|
|
159
|
-
The file path to the JSON file for storing todos, by default "./.todo_list.
|
|
410
|
+
The file path to the JSON file for storing todos, by default "./.todo_list.db"
|
|
160
411
|
"""
|
|
161
|
-
app = create_list(
|
|
412
|
+
app = create_list(file_path_to_db=filepath)
|
|
162
413
|
while True:
|
|
163
414
|
action = questionary.select(
|
|
164
415
|
"What would you like to do?",
|
|
165
416
|
choices=[
|
|
166
417
|
"Add todo",
|
|
167
418
|
"List todos",
|
|
419
|
+
"Update todo status",
|
|
168
420
|
"Remove todo",
|
|
169
421
|
"Clear all todos",
|
|
170
422
|
"Exit",
|
|
@@ -174,9 +426,33 @@ def cli_menu(filepath="./.todo_list.json"):
|
|
|
174
426
|
if action == "Add todo":
|
|
175
427
|
item = questionary.text("Enter the todo item:").ask()
|
|
176
428
|
app.add_todo(item)
|
|
177
|
-
app.write_todos()
|
|
178
429
|
elif action == "List todos":
|
|
179
|
-
app.list_todos()
|
|
430
|
+
app.list_todos(show="all")
|
|
431
|
+
elif action == "Update todo status":
|
|
432
|
+
if not app.todos:
|
|
433
|
+
print("No todos to update.")
|
|
434
|
+
continue
|
|
435
|
+
todo_choice = questionary.select(
|
|
436
|
+
"Select the todo to update:",
|
|
437
|
+
choices=["<Back>"] + app.todos,
|
|
438
|
+
).ask()
|
|
439
|
+
|
|
440
|
+
if todo_choice == "<Back>" or todo_choice is None:
|
|
441
|
+
continue
|
|
442
|
+
|
|
443
|
+
todo_index = app.todos.index(todo_choice) + 1
|
|
444
|
+
status_choice = questionary.select(
|
|
445
|
+
"Mark as:",
|
|
446
|
+
choices=["Done", "Not Done", "<Back>"],
|
|
447
|
+
).ask()
|
|
448
|
+
|
|
449
|
+
if status_choice == "<Back>" or status_choice is None:
|
|
450
|
+
continue
|
|
451
|
+
elif status_choice == "Done":
|
|
452
|
+
app.mark_as_done(todo_index)
|
|
453
|
+
elif status_choice == "Not Done":
|
|
454
|
+
app.mark_as_not_done(todo_index)
|
|
455
|
+
app.list_todos(show="all")
|
|
180
456
|
elif action == "Remove todo":
|
|
181
457
|
if not app.todos:
|
|
182
458
|
print("No todos to remove.")
|
|
@@ -186,29 +462,18 @@ def cli_menu(filepath="./.todo_list.json"):
|
|
|
186
462
|
choices=["<Back>"] + app.todos,
|
|
187
463
|
).ask()
|
|
188
464
|
|
|
189
|
-
if todo_choice == "<Back>":
|
|
465
|
+
if todo_choice == "<Back>" or todo_choice is None:
|
|
190
466
|
continue
|
|
191
467
|
|
|
192
468
|
todo_to_remove = app.todos.index(todo_choice) + 1
|
|
193
469
|
app.remove_todo(todo_to_remove)
|
|
194
|
-
app.write_todos()
|
|
195
470
|
|
|
196
471
|
elif action == "Clear all todos":
|
|
197
472
|
confirm = questionary.confirm(
|
|
198
473
|
"Are you sure you want to clear all todos?"
|
|
199
474
|
).ask()
|
|
200
475
|
if confirm:
|
|
201
|
-
app.
|
|
202
|
-
print("Cleared all todos.")
|
|
203
|
-
app.write_todos()
|
|
204
|
-
elif action == "Clear all todos":
|
|
205
|
-
confirm = questionary.confirm(
|
|
206
|
-
"Are you sure you want to clear all todos?"
|
|
207
|
-
).ask()
|
|
208
|
-
if confirm:
|
|
209
|
-
app.todos = []
|
|
210
|
-
print("Cleared all todos.")
|
|
211
|
-
app.write_todos()
|
|
476
|
+
app.clear_all()
|
|
212
477
|
elif action == "Exit":
|
|
213
478
|
break
|
|
214
479
|
else:
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
from __future__ import annotations
|
|
2
|
+
|
|
3
|
+
import json
|
|
4
|
+
import sqlite3
|
|
5
|
+
from pathlib import Path
|
|
6
|
+
from typing import Iterable
|
|
7
|
+
|
|
8
|
+
from .schema import ensure_schema
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
def _iter_json_items(data: object) -> Iterable[str]:
|
|
12
|
+
"""Yield todo item strings from supported legacy JSON formats.
|
|
13
|
+
|
|
14
|
+
Supported:
|
|
15
|
+
- ["item1", "item2", ...]
|
|
16
|
+
- [{"item": "..."}, {"text": "..."}, ...]
|
|
17
|
+
"""
|
|
18
|
+
if isinstance(data, list):
|
|
19
|
+
for entry in data:
|
|
20
|
+
if isinstance(entry, str):
|
|
21
|
+
text = entry
|
|
22
|
+
elif isinstance(entry, dict):
|
|
23
|
+
text = entry.get("item") or entry.get("text")
|
|
24
|
+
if not isinstance(text, str):
|
|
25
|
+
continue
|
|
26
|
+
else:
|
|
27
|
+
continue
|
|
28
|
+
|
|
29
|
+
text = text.strip()
|
|
30
|
+
if text:
|
|
31
|
+
yield text
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
def migrate_from_json(
|
|
35
|
+
*,
|
|
36
|
+
json_path: Path,
|
|
37
|
+
db_path: Path,
|
|
38
|
+
backup: bool = True,
|
|
39
|
+
) -> int:
|
|
40
|
+
"""Migrate todos from a legacy JSON file into a SQLite database.
|
|
41
|
+
|
|
42
|
+
Parameters
|
|
43
|
+
----------
|
|
44
|
+
json_path:
|
|
45
|
+
Path to legacy JSON file (e.g. `.todo_list.json`).
|
|
46
|
+
db_path:
|
|
47
|
+
Path to SQLite file (e.g. `.todo_list.db`).
|
|
48
|
+
backup:
|
|
49
|
+
If True, rename the JSON file to `.bak` after successful import.
|
|
50
|
+
|
|
51
|
+
Returns
|
|
52
|
+
-------
|
|
53
|
+
int
|
|
54
|
+
Number of rows inserted.
|
|
55
|
+
|
|
56
|
+
Behavior
|
|
57
|
+
--------
|
|
58
|
+
- If the JSON file doesn't exist, returns 0.
|
|
59
|
+
- If the database already has todos, does not import (returns 0).
|
|
60
|
+
(This avoids duplicate imports when multiple commands run.)
|
|
61
|
+
"""
|
|
62
|
+
|
|
63
|
+
if not json_path.exists():
|
|
64
|
+
return 0
|
|
65
|
+
|
|
66
|
+
db_path.parent.mkdir(parents=True, exist_ok=True)
|
|
67
|
+
|
|
68
|
+
try:
|
|
69
|
+
raw = json_path.read_text(encoding="utf-8")
|
|
70
|
+
data = json.loads(raw) if raw.strip() else []
|
|
71
|
+
except (OSError, json.JSONDecodeError):
|
|
72
|
+
# Fail safe: don't destroy/rename the user's file.
|
|
73
|
+
return 0
|
|
74
|
+
|
|
75
|
+
items = list(_iter_json_items(data))
|
|
76
|
+
if not items:
|
|
77
|
+
return 0
|
|
78
|
+
|
|
79
|
+
inserted = 0
|
|
80
|
+
with sqlite3.connect(db_path) as conn:
|
|
81
|
+
ensure_schema(conn)
|
|
82
|
+
|
|
83
|
+
# Guard against double-import
|
|
84
|
+
existing = conn.execute("SELECT 1 FROM todos LIMIT 1;").fetchone()
|
|
85
|
+
if existing is not None:
|
|
86
|
+
return 0
|
|
87
|
+
|
|
88
|
+
with conn:
|
|
89
|
+
conn.executemany(
|
|
90
|
+
"INSERT INTO todos(item, done) VALUES (?, 0);", [(t,) for t in items]
|
|
91
|
+
)
|
|
92
|
+
inserted = conn.execute("SELECT changes();").fetchone()[0]
|
|
93
|
+
|
|
94
|
+
if backup:
|
|
95
|
+
try:
|
|
96
|
+
bak_path = json_path.with_suffix(json_path.suffix + ".bak")
|
|
97
|
+
if bak_path.exists():
|
|
98
|
+
# Avoid overwrite; add a numeric suffix
|
|
99
|
+
i = 1
|
|
100
|
+
while True:
|
|
101
|
+
candidate = json_path.with_suffix(json_path.suffix + f".bak{i}")
|
|
102
|
+
if not candidate.exists():
|
|
103
|
+
bak_path = candidate
|
|
104
|
+
break
|
|
105
|
+
i += 1
|
|
106
|
+
json_path.rename(bak_path)
|
|
107
|
+
except OSError:
|
|
108
|
+
# Backup failure shouldn't invalidate a successful migration
|
|
109
|
+
pass
|
|
110
|
+
|
|
111
|
+
return inserted
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
from __future__ import annotations
|
|
2
|
+
|
|
3
|
+
import sqlite3
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
SCHEMA_VERSION = 1
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
def ensure_schema(conn: sqlite3.Connection) -> None:
|
|
10
|
+
"""Ensure required SQLite schema exists and is migrated.
|
|
11
|
+
|
|
12
|
+
Uses `PRAGMA user_version` for lightweight, in-app migrations.
|
|
13
|
+
|
|
14
|
+
Parameters
|
|
15
|
+
----------
|
|
16
|
+
conn:
|
|
17
|
+
An open sqlite3 connection.
|
|
18
|
+
|
|
19
|
+
Notes
|
|
20
|
+
-----
|
|
21
|
+
- Call this once per process/command, right after connecting.
|
|
22
|
+
- Keep migrations idempotent and wrapped in a transaction.
|
|
23
|
+
"""
|
|
24
|
+
|
|
25
|
+
# Improve concurrent CLI usage (separate processes) and durability.
|
|
26
|
+
# WAL is persistent for the database file once set.
|
|
27
|
+
conn.execute("PRAGMA journal_mode = WAL;")
|
|
28
|
+
conn.execute("PRAGMA foreign_keys = ON;")
|
|
29
|
+
|
|
30
|
+
current_version = conn.execute("PRAGMA user_version;").fetchone()[0]
|
|
31
|
+
|
|
32
|
+
# Fresh database
|
|
33
|
+
if current_version == 0:
|
|
34
|
+
with conn:
|
|
35
|
+
conn.execute(
|
|
36
|
+
"""
|
|
37
|
+
CREATE TABLE IF NOT EXISTS todos (
|
|
38
|
+
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
39
|
+
item TEXT NOT NULL,
|
|
40
|
+
done INTEGER NOT NULL DEFAULT 0,
|
|
41
|
+
created_at TEXT NOT NULL DEFAULT (datetime('now')),
|
|
42
|
+
done_at TEXT
|
|
43
|
+
);
|
|
44
|
+
"""
|
|
45
|
+
)
|
|
46
|
+
conn.execute("CREATE INDEX IF NOT EXISTS idx_todos_done ON todos(done);")
|
|
47
|
+
conn.execute(f"PRAGMA user_version = {int(SCHEMA_VERSION)};")
|
|
48
|
+
return
|
|
49
|
+
|
|
50
|
+
# Incremental migrations
|
|
51
|
+
if current_version < 1:
|
|
52
|
+
# Example placeholder for future migrations.
|
|
53
|
+
# Keep each migration block small and bump user_version accordingly.
|
|
54
|
+
with conn:
|
|
55
|
+
conn.execute("PRAGMA user_version = 1;")
|
|
56
|
+
current_version = 1
|
|
57
|
+
|
|
58
|
+
# If you bump SCHEMA_VERSION, add `if current_version < N:` blocks above.
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: cli-todo-jd
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.2.1
|
|
4
4
|
Summary: Add your description here
|
|
5
5
|
Requires-Python: >=3.10
|
|
6
6
|
Description-Content-Type: text/markdown
|
|
7
7
|
Requires-Dist: questionary>=2.1.1
|
|
8
8
|
Requires-Dist: rich>=14.2.0
|
|
9
|
+
Requires-Dist: typer>=0.21.1
|
|
9
10
|
Provides-Extra: dev
|
|
10
11
|
Requires-Dist: pre-commit; extra == "dev"
|
|
11
12
|
Requires-Dist: pytest; extra == "dev"
|
|
@@ -20,16 +21,16 @@ A command line to do list with interactive menu
|
|
|
20
21
|
This is a command line interface todo list. Once installed, there are two ways to interact
|
|
21
22
|
with the list.
|
|
22
23
|
|
|
23
|
-
### `
|
|
24
|
+
### `todo_menu`
|
|
24
25
|
|
|
25
|
-
Once installed
|
|
26
|
+
Once installed use `todo_menu` to launch into the interactive menu. From here you can add,
|
|
26
27
|
remove, list, or clear your todo list. Items in your list are stored (by default) as
|
|
27
28
|
`.todo_list.json`. The menu does also support optional filepaths using `-f` or `--filepath`.
|
|
28
29
|
|
|
29
30
|
|
|
30
31
|
### interacting with todo list without menu
|
|
31
32
|
|
|
32
|
-
|
|
33
|
+
Alternately you can interact directly using the following commands (`--filepath can be substituted for -f`)
|
|
33
34
|
|
|
34
35
|
- `todo_add text --filepath optional_path_to_json` used to add an item to your list
|
|
35
36
|
- `todo_remove index --filepath optional_path_to_json` used to remove item number `index`
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
cli_todo_jd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
2
|
+
cli_todo_jd/cli_entry.py,sha256=PiwgYwT5OTvY0ZyPIxEjBrvdNgEQzx5awgqcKXh1AUE,3875
|
|
3
|
+
cli_todo_jd/main.py,sha256=cqjwHSg4l0aH4aLHyVxOHW8WlRiXp0dB4s8PjhIRxao,15437
|
|
4
|
+
cli_todo_jd/storage/__init__.py,sha256=u0jMfDuUIEy9mor1dVeIiAE0Cap6FL77tW9GlsyskYU,210
|
|
5
|
+
cli_todo_jd/storage/migrate.py,sha256=Ij_0OwTvibow79KVilf2O2nfMuohj0raarVV7OcjwbY,3063
|
|
6
|
+
cli_todo_jd/storage/schema.py,sha256=r5BTtcRn8J72_b8NJlryYnd_aiuy0y00eX01QavKE98,1824
|
|
7
|
+
cli_todo_jd-0.2.1.dist-info/METADATA,sha256=YGHa7H0kv4b8aoNPBj_lgKcF6TMyoiDUGhWEhjbKCkY,2982
|
|
8
|
+
cli_todo_jd-0.2.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
|
|
9
|
+
cli_todo_jd-0.2.1.dist-info/entry_points.txt,sha256=BIfrMKcC340A79aXHg34nnhiDsXh7c9hPck1k-Rb28c,95
|
|
10
|
+
cli_todo_jd-0.2.1.dist-info/top_level.txt,sha256=hOnYr7w1JdQs6MlD1Uzjt24Ca8nvriOWNNq6NaqgHqM,12
|
|
11
|
+
cli_todo_jd-0.2.1.dist-info/RECORD,,
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
cli_todo_jd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
2
|
-
cli_todo_jd/cli_entry.py,sha256=WFigVsmponzukNW-T_35ChdMWS3AVerdfKp2MePZzVo,2109
|
|
3
|
-
cli_todo_jd/main.py,sha256=PfzsSz6whW8BMQ79PoCRvJO5oBN7qhpDFut_HtgjJns,5877
|
|
4
|
-
cli_todo_jd-0.1.1.dist-info/METADATA,sha256=PhFUYCFtAyTd5u_CQ-b5Pn1K6Q_5nvYlxNcqigRLoWs,2951
|
|
5
|
-
cli_todo_jd-0.1.1.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
|
|
6
|
-
cli_todo_jd-0.1.1.dist-info/entry_points.txt,sha256=UtqZ1yqzeQNOOVC232_iqRQCcKu9hL9k5Q-BtyMZSGg,243
|
|
7
|
-
cli_todo_jd-0.1.1.dist-info/top_level.txt,sha256=hOnYr7w1JdQs6MlD1Uzjt24Ca8nvriOWNNq6NaqgHqM,12
|
|
8
|
-
cli_todo_jd-0.1.1.dist-info/RECORD,,
|
|
File without changes
|