Skip to content

Commit 01a1ec9

Browse files
committed
fix: Formatting with black
1 parent 02dffbb commit 01a1ec9

File tree

18 files changed

+670
-404
lines changed

18 files changed

+670
-404
lines changed

pokedo/cli/app.py

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
app = typer.Typer(
1414
name="pokedo",
1515
help="PokeDo - A Pokemon-themed task manager and wellbeing tracker",
16-
no_args_is_help=False
16+
no_args_is_help=False,
1717
)
1818

1919
# Register sub-commands
@@ -28,8 +28,7 @@
2828
# Direct commands (shortcuts)
2929
@app.command("mood")
3030
def mood_shortcut(
31-
level: int = typer.Argument(..., min=1, max=5),
32-
note: str = typer.Option(None, "--note", "-n")
31+
level: int = typer.Argument(..., min=1, max=5), note: str = typer.Option(None, "--note", "-n")
3332
) -> None:
3433
"""Quick mood log (1-5)."""
3534
wellbeing.log_mood(level, note, None)
@@ -39,7 +38,7 @@ def mood_shortcut(
3938
def exercise_shortcut(
4039
exercise_type: wellbeing.ExerciseType = typer.Argument(...),
4140
duration: int = typer.Option(..., "--duration", "-d"),
42-
intensity: int = typer.Option(3, "--intensity", "-i", min=1, max=5)
41+
intensity: int = typer.Option(3, "--intensity", "-i", min=1, max=5),
4342
) -> None:
4443
"""Quick exercise log."""
4544
wellbeing.log_exercise(exercise_type, duration, intensity, None)
@@ -48,24 +47,20 @@ def exercise_shortcut(
4847
@app.command("sleep")
4948
def sleep_shortcut(
5049
hours: float = typer.Argument(...),
51-
quality: int = typer.Option(3, "--quality", "-q", min=1, max=5)
50+
quality: int = typer.Option(3, "--quality", "-q", min=1, max=5),
5251
) -> None:
5352
"""Quick sleep log."""
5453
wellbeing.log_sleep(hours, quality, None)
5554

5655

5756
@app.command("water")
58-
def water_shortcut(
59-
glasses: int = typer.Option(1, "--glasses", "-g")
60-
) -> None:
57+
def water_shortcut(glasses: int = typer.Option(1, "--glasses", "-g")) -> None:
6158
"""Quick water log."""
6259
wellbeing.log_hydration(glasses, None)
6360

6461

6562
@app.command("meditate")
66-
def meditate_shortcut(
67-
minutes: int = typer.Argument(...)
68-
) -> None:
63+
def meditate_shortcut(minutes: int = typer.Argument(...)) -> None:
6964
"""Quick meditation log."""
7065
wellbeing.log_meditation(minutes, None)
7166

@@ -116,7 +111,7 @@ def show_version() -> None:
116111
def initialize(
117112
name: str = typer.Option("Trainer", "--name", "-n", help="Your trainer name"),
118113
quick: bool = typer.Option(False, "--quick", "-q", help="Quick init (Gen 1 only)"),
119-
gen: int = typer.Option(0, "--gen", "-g", help="Initialize specific generation (1-9, 0=all)")
114+
gen: int = typer.Option(0, "--gen", "-g", help="Initialize specific generation (1-9, 0=all)"),
120115
) -> None:
121116
"""Initialize PokeDo and create trainer profile."""
122117
import asyncio
@@ -191,10 +186,7 @@ def show_dashboard() -> None:
191186

192187
# Header
193188
console.print()
194-
console.print(Panel(
195-
f"[bold]PokeDo[/bold] - {trainer.name}'s Journey",
196-
box=box.DOUBLE
197-
))
189+
console.print(Panel(f"[bold]PokeDo[/bold] - {trainer.name}'s Journey", box=box.DOUBLE))
198190

199191
# Quick stats
200192
today = date.today()
@@ -212,10 +204,9 @@ def show_dashboard() -> None:
212204

213205
# Team preview
214206
if team:
215-
team_str = " | ".join([
216-
f"{p.display_name} Lv.{p.level}" + (" *" if p.is_shiny else "")
217-
for p in team[:3]
218-
])
207+
team_str = " | ".join(
208+
[f"{p.display_name} Lv.{p.level}" + (" *" if p.is_shiny else "") for p in team[:3]]
209+
)
219210
console.print(f"\n[dim]Team:[/dim] {team_str}")
220211

221212
# Today's tasks
@@ -230,7 +221,9 @@ def show_dashboard() -> None:
230221
console.print("\n[green]All tasks completed![/green]")
231222

232223
# Commands hint
233-
console.print("\n[dim]Commands: task add/complete | pokemon team/pokedex | daily | --help[/dim]")
224+
console.print(
225+
"\n[dim]Commands: task add/complete | pokemon team/pokedex | daily | --help[/dim]"
226+
)
234227

235228

236229
if __name__ == "__main__":

pokedo/cli/commands/pokemon.py

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
"""Pokemon management CLI commands."""
22

3-
43
import typer
54
from rich import box
65
from rich.console import Console
@@ -28,7 +27,7 @@ def show_team() -> None:
2827
@app.command("box")
2928
def show_box(
3029
page: int = typer.Option(1, "--page", "-p", help="Page number"),
31-
per_page: int = typer.Option(20, "--limit", "-l", help="Pokemon per page")
30+
per_page: int = typer.Option(20, "--limit", "-l", help="Pokemon per page"),
3231
) -> None:
3332
"""Show all Pokemon in your box."""
3433
all_pokemon = db.get_all_pokemon()
@@ -58,10 +57,7 @@ def pokemon_info(
5857

5958

6059
def render_pokedex(
61-
caught_only: bool = False,
62-
page: int = 1,
63-
gen: int = 0,
64-
auto_focus: bool = False
60+
caught_only: bool = False, page: int = 1, gen: int = 0, auto_focus: bool = False
6561
) -> None:
6662
"""Render the Pokedex view for both CLI commands and shortcuts."""
6763
from pokedo.utils.config import config
@@ -85,7 +81,7 @@ def render_pokedex(
8581
if auto_focus and entries and page == 1:
8682
focus_index = next(
8783
(i for i, entry in enumerate(entries) if entry.is_caught),
88-
next((i for i, entry in enumerate(entries) if entry.is_seen), 0)
84+
next((i for i, entry in enumerate(entries) if entry.is_seen), 0),
8985
)
9086
page = (focus_index // per_page) + 1
9187

@@ -121,25 +117,33 @@ def render_pokedex(
121117
table.add_row(
122118
f"{entry.pokedex_id:04d}",
123119
name,
124-
f"[{type_color}]{entry.type1.capitalize()}[/{type_color}]" if entry.is_seen else "[dim]???[/dim]",
120+
(
121+
f"[{type_color}]{entry.type1.capitalize()}[/{type_color}]"
122+
if entry.is_seen
123+
else "[dim]???[/dim]"
124+
),
125125
caught_str,
126-
shiny_str
126+
shiny_str,
127127
)
128128

129129
console.print(table)
130130

131131
if gen > 0 and gen in config.generation_ranges:
132132
gen_total = config.generation_ranges[gen][1] - config.generation_ranges[gen][0] + 1
133-
console.print(f"\n[dim]Gen {gen}: Seen {total_seen}/{gen_total} | Caught {total_caught}/{gen_total}[/dim]")
133+
console.print(
134+
f"\n[dim]Gen {gen}: Seen {total_seen}/{gen_total} | Caught {total_caught}/{gen_total}[/dim]"
135+
)
134136
else:
135-
console.print(f"\n[dim]Seen: {total_seen}/{total_pokemon} | Caught: {total_caught}/{total_pokemon} ({(total_caught/total_pokemon)*100:.1f}%)[/dim]")
137+
console.print(
138+
f"\n[dim]Seen: {total_seen}/{total_pokemon} | Caught: {total_caught}/{total_pokemon} ({(total_caught/total_pokemon)*100:.1f}%)[/dim]"
139+
)
136140

137141

138142
@app.command("pokedex")
139143
def show_pokedex(
140144
caught_only: bool = typer.Option(False, "--caught", "-c", help="Show only caught Pokemon"),
141145
page: int = typer.Option(1, "--page", "-p", help="Page number"),
142-
gen: int = typer.Option(0, "--gen", "-g", help="Filter by generation (1-9)")
146+
gen: int = typer.Option(0, "--gen", "-g", help="Filter by generation (1-9)"),
143147
) -> None:
144148
"""Show your Pokedex progress."""
145149
render_pokedex(caught_only=caught_only, page=page, gen=gen)
@@ -191,7 +195,7 @@ def remove_active(
191195
@app.command("nickname")
192196
def set_nickname(
193197
pokemon_id: int = typer.Argument(..., help="Pokemon ID"),
194-
nickname: str = typer.Argument(..., help="New nickname")
198+
nickname: str = typer.Argument(..., help="New nickname"),
195199
) -> None:
196200
"""Give a Pokemon a nickname."""
197201
pokemon = db.get_pokemon(pokemon_id)
@@ -206,9 +210,7 @@ def set_nickname(
206210

207211

208212
@app.command("favorite")
209-
def toggle_favorite(
210-
pokemon_id: int = typer.Argument(..., help="Pokemon ID")
211-
) -> None:
213+
def toggle_favorite(pokemon_id: int = typer.Argument(..., help="Pokemon ID")) -> None:
212214
"""Toggle favorite status on a Pokemon."""
213215
pokemon = db.get_pokemon(pokemon_id)
214216
if not pokemon:
@@ -225,7 +227,7 @@ def toggle_favorite(
225227
@app.command("release")
226228
def release_pokemon(
227229
pokemon_id: int = typer.Argument(..., help="Pokemon ID to release"),
228-
force: bool = typer.Option(False, "--force", "-f", help="Skip confirmation")
230+
force: bool = typer.Option(False, "--force", "-f", help="Skip confirmation"),
229231
) -> None:
230232
"""Release a Pokemon back into the wild."""
231233
pokemon = db.get_pokemon(pokemon_id)
@@ -251,9 +253,7 @@ def release_pokemon(
251253

252254

253255
@app.command("evolve")
254-
def evolve_pokemon(
255-
pokemon_id: int = typer.Argument(..., help="Pokemon ID to evolve")
256-
) -> None:
256+
def evolve_pokemon(pokemon_id: int = typer.Argument(..., help="Pokemon ID to evolve")) -> None:
257257
"""Evolve a Pokemon if eligible."""
258258
pokemon = db.get_pokemon(pokemon_id)
259259
if not pokemon:
@@ -263,7 +263,9 @@ def evolve_pokemon(
263263
if not pokemon.can_evolve:
264264
console.print(f"[yellow]{pokemon.display_name} cannot evolve right now.[/yellow]")
265265
if pokemon.evolution_id and pokemon.evolution_level:
266-
console.print(f"[dim]Needs to reach level {pokemon.evolution_level}. Current: {pokemon.level}[/dim]")
266+
console.print(
267+
f"[dim]Needs to reach level {pokemon.evolution_level}. Current: {pokemon.level}[/dim]"
268+
)
267269
raise typer.Exit(0)
268270

269271
if not pokemon.evolution_id:
@@ -272,9 +274,7 @@ def evolve_pokemon(
272274

273275
# Create evolved Pokemon
274276
evolved = create_pokemon_sync(
275-
pokemon.evolution_id,
276-
is_shiny=pokemon.is_shiny,
277-
catch_location=pokemon.catch_location
277+
pokemon.evolution_id, is_shiny=pokemon.is_shiny, catch_location=pokemon.catch_location
278278
)
279279

280280
if not evolved:
@@ -313,5 +313,7 @@ def evolve_pokemon(
313313
trainer.evolutions_triggered += 1
314314
db.save_trainer(trainer)
315315

316-
console.print(f"[bold green]{pokemon.display_name} evolved into {evolved.name.upper()}![/bold green]")
316+
console.print(
317+
f"[bold green]{pokemon.display_name} evolved into {evolved.name.upper()}![/bold green]"
318+
)
317319
display_pokemon(evolved)

pokedo/cli/commands/stats.py

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,7 @@ def show_badges() -> None:
6666
progress = _calculate_badge_progress(badge, trainer)
6767
status = f"[dim]{progress}/{badge.requirement_count}[/dim]"
6868

69-
table.add_row(
70-
badge.name,
71-
badge.description,
72-
status
73-
)
69+
table.add_row(badge.name, badge.description, status)
7470

7571
console.print(table)
7672

@@ -114,16 +110,12 @@ def show_inventory() -> None:
114110
"master_ball": "Guaranteed catch!",
115111
"evolution_stone": "Evolve eligible Pokemon",
116112
"legendary_ticket": "Guaranteed legendary encounter",
117-
"rare_candy": "Increase Pokemon level by 1"
113+
"rare_candy": "Increase Pokemon level by 1",
118114
}
119115

120116
for item, count in trainer.inventory.items():
121117
description = item_descriptions.get(item, "Unknown item")
122-
table.add_row(
123-
item.replace("_", " ").title(),
124-
str(count),
125-
description
126-
)
118+
table.add_row(item.replace("_", " ").title(), str(count), description)
127119

128120
console.print(table)
129121

@@ -156,20 +148,14 @@ def show_history(
156148

157149
bar = "[green]" + "#" * len(completed) + "[/green]" if completed else "[dim]-[/dim]"
158150

159-
table.add_row(
160-
day.isoformat(),
161-
f"{len(completed)} {bar}",
162-
str(xp) if xp else "[dim]0[/dim]"
163-
)
151+
table.add_row(day.isoformat(), f"{len(completed)} {bar}", str(xp) if xp else "[dim]0[/dim]")
164152

165153
console.print(table)
166154
console.print(f"\n[dim]Total: {total_completed} tasks, {total_xp} XP[/dim]")
167155

168156

169157
@app.command("rename")
170-
def rename_trainer(
171-
name: str = typer.Argument(..., help="New trainer name")
172-
) -> None:
158+
def rename_trainer(name: str = typer.Argument(..., help="New trainer name")) -> None:
173159
"""Change your trainer name."""
174160
trainer = db.get_or_create_trainer()
175161
old_name = trainer.name

0 commit comments

Comments
 (0)