dev: refactor cli

Author: virtualguard101

src/mkdocs_note/cli.py

@@ -8,8 +8,15 @@
 
 import sys
 import click
+from pathlib import Path
 from importlib import metadata
 
+from mkdocs_note.config import MkdocsNoteConfig
+from mkdocs_note.utils.cli.new import NoteCreator
+from mkdocs_note.utils.cli.remove import NoteRemover
+from mkdocs_note.utils.cli.move import NoteMover
+from mkdocs_note.utils.cli.clean import NoteCleaner
+
 
 def get_version():
 	"""Get the version of mkdocs-note package.
@@ -99,27 +106,65 @@ def cli(ctx):
 
 
 @cli.command("new")
-@click.argument("file_path", required=False)
+@click.argument("file_path", required=True)
+@click.option(
+	"--template",
+	"-t",
+	type=click.Path(exists=True, path_type=Path),
+	help="Custom template file to use",
+)
 @click.pass_context
-def new_command(ctx, file_path):
+def new_command(ctx, file_path, template):
 	"""Create a new note file with proper asset structure.
 
 	\b
 	Examples:
 	    mkdocs-note new docs/notes/my-note.md
 	    mkdocs-note new docs/notes/python/intro.md
+	    mkdocs-note new docs/notes/custom.md --template templates/custom.md
 
 	FILE_PATH: Path where the new note file should be created
 	"""
-	click.echo("⚠️  'new' command is not yet implemented")
-	click.echo("💡 This feature is being refactored")
-	sys.exit(1)
+	try:
+		# Load configuration
+		config = MkdocsNoteConfig()
+		creator = NoteCreator(config)
+
+		# Convert to Path
+		note_path = Path(file_path)
+
+		# Create the note
+		result = creator.create_new_note(note_path, template_path=template)
+
+		if result.success:
+			click.echo(f"✅ {result.message}")
+			click.echo(f"📝 Note: {result.data['note_path']}")
+			click.echo(f"📁 Assets: {result.data['asset_dir']}")
+			sys.exit(0)
+		else:
+			click.echo(f"❌ Error: {result.message}", err=True)
+			sys.exit(1)
+
+	except Exception as e:
+		click.echo(f"❌ Unexpected error: {e}", err=True)
+		sys.exit(1)
 
 
 @cli.command("remove")
-@click.argument("file_path", required=False)
+@click.argument("file_path", required=True)
+@click.option(
+	"--keep-assets",
+	is_flag=True,
+	help="Keep the asset directory when removing the note",
+)
+@click.option(
+	"--yes",
+	"-y",
+	is_flag=True,
+	help="Skip confirmation prompt",
+)
 @click.pass_context
-def remove_command(ctx, file_path):
+def remove_command(ctx, file_path, keep_assets, yes):
 	"""Remove a note file and its corresponding asset directory.
 
 	\b
@@ -129,27 +174,74 @@ def remove_command(ctx, file_path):
 	Examples:
 	    mkdocs-note remove docs/notes/test.md
 	    mkdocs-note rm docs/notes/test.md --yes
+	    mkdocs-note remove docs/notes/test.md --keep-assets
 
 	FILE_PATH: Path to the note file to remove
 	"""
-	click.echo("⚠️  'remove' command is not yet implemented")
-	click.echo("💡 This feature is being refactored")
-	sys.exit(1)
+	try:
+		note_path = Path(file_path)
+
+		# Check if file exists
+		if not note_path.exists():
+			click.echo(f"❌ Error: File does not exist: {note_path}", err=True)
+			sys.exit(1)
+
+		# Confirmation prompt (unless --yes)
+		if not yes:
+			asset_msg = "and its assets" if not keep_assets else "(keeping assets)"
+			if not click.confirm(f"Remove {note_path} {asset_msg}?"):
+				click.echo("⚠️  Cancelled")
+				sys.exit(0)
+
+		# Load configuration
+		config = MkdocsNoteConfig()
+		remover = NoteRemover(config)
+
+		# Remove the note
+		result = remover.remove_note(note_path, remove_assets=not keep_assets)
+
+		if result.success:
+			click.echo(f"✅ {result.message}")
+			if result.data["removed_assets"]:
+				click.echo(f"📁 Removed assets: {result.data['asset_dir']}")
+			else:
+				click.echo(f"📁 Kept assets: {result.data['asset_dir']}")
+			sys.exit(0)
+		else:
+			click.echo(f"❌ Error: {result.message}", err=True)
+			sys.exit(1)
+
+	except Exception as e:
+		click.echo(f"❌ Unexpected error: {e}", err=True)
+		sys.exit(1)
 
 
 @cli.command("rm")
-@click.argument("file_path", required=False)
+@click.argument("file_path", required=True)
+@click.option("--keep-assets", is_flag=True, help="Keep the asset directory")
+@click.option("--yes", "-y", is_flag=True, help="Skip confirmation")
 @click.pass_context
-def rm_command(ctx, file_path):
+def rm_command(ctx, file_path, keep_assets, yes):
 	"""Alias for 'remove' command - Remove a note file and its asset directory."""
-	ctx.invoke(remove_command, file_path=file_path)
+	ctx.invoke(remove_command, file_path=file_path, keep_assets=keep_assets, yes=yes)
 
 
 @cli.command("move")
-@click.argument("source", required=False)
-@click.argument("destination", required=False)
+@click.argument("source", required=True)
+@click.argument("destination", required=True)
+@click.option(
+	"--keep-source-assets",
+	is_flag=True,
+	help="Keep the source asset directory (don't move it)",
+)
+@click.option(
+	"--yes",
+	"-y",
+	is_flag=True,
+	help="Skip confirmation prompt",
+)
 @click.pass_context
-def move_command(ctx, source, destination):
+def move_command(ctx, source, destination, keep_source_assets, yes):
 	"""Move or rename a note file/directory and its asset directory.
 
 	\b
@@ -159,58 +251,146 @@ def move_command(ctx, source, destination):
 	Examples:
 	    mkdocs-note move docs/notes/old.md docs/notes/new.md
 	    mkdocs-note mv docs/notes/test.md docs/notes/archive
+	    mkdocs-note move docs/notes/drafts docs/notes/published --yes
 
 	\b
 	Arguments:
 	    SOURCE: Current path of the note file or directory
 	    DESTINATION: Destination path (or parent directory if exists)
 	"""
-	click.echo("⚠️  'move' command is not yet implemented")
-	click.echo("💡 This feature is being refactored")
-	sys.exit(1)
+	try:
+		source_path = Path(source)
+		dest_path = Path(destination)
+
+		# Check if source exists
+		if not source_path.exists():
+			click.echo(f"❌ Error: Source does not exist: {source_path}", err=True)
+			sys.exit(1)
+
+		# Confirmation prompt (unless --yes)
+		if not yes:
+			asset_msg = "with assets" if not keep_source_assets else "(keeping assets)"
+			if not click.confirm(f"Move {source_path} → {dest_path} {asset_msg}?"):
+				click.echo("⚠️  Cancelled")
+				sys.exit(0)
+
+		# Load configuration
+		config = MkdocsNoteConfig()
+		mover = NoteMover(config)
+
+		# Move the note or directory
+		result = mover.move_note_or_directory(
+			source_path, dest_path, move_assets=not keep_source_assets
+		)
+
+		if result.success:
+			click.echo(f"✅ {result.message}")
+			if "source" in result.data and "destination" in result.data:
+				click.echo(f"📝 From: {result.data['source']}")
+				click.echo(f"📝 To: {result.data['destination']}")
+				if "asset_moved" in result.data:
+					if result.data["asset_moved"]:
+						click.echo("📁 Assets moved")
+					else:
+						click.echo("📁 Assets kept at source")
+			sys.exit(0)
+		else:
+			click.echo(f"❌ Error: {result.message}", err=True)
+			sys.exit(1)
+
+	except Exception as e:
+		click.echo(f"❌ Unexpected error: {e}", err=True)
+		sys.exit(1)
 
 
 @cli.command("mv")
-@click.argument("source", required=False)
-@click.argument("destination", required=False)
+@click.argument("source", required=True)
+@click.argument("destination", required=True)
+@click.option("--keep-source-assets", is_flag=True, help="Keep source assets")
+@click.option("--yes", "-y", is_flag=True, help="Skip confirmation")
 @click.pass_context
-def mv_command(ctx, source, destination):
+def mv_command(ctx, source, destination, keep_source_assets, yes):
 	"""Alias for 'move' command - Move or rename a note file/directory and its assets."""
-	ctx.invoke(move_command, source=source, destination=destination)
+	ctx.invoke(
+		move_command,
+		source=source,
+		destination=destination,
+		keep_source_assets=keep_source_assets,
+		yes=yes,
+	)
 
 
 @cli.command("clean")
+@click.option(
+	"--dry-run",
+	is_flag=True,
+	help="Show what would be removed without actually removing",
+)
+@click.option(
+	"--yes",
+	"-y",
+	is_flag=True,
+	help="Skip confirmation prompt",
+)
 @click.pass_context
-def clean_command(ctx):
+def clean_command(ctx, dry_run, yes):
 	"""Clean up orphaned asset directories without corresponding notes.
 
 	\b
 	Examples:
 	    mkdocs-note clean --dry-run
 	    mkdocs-note clean --yes
+	    mkdocs-note clean
 	"""
-	click.echo("⚠️  'clean' command is not yet implemented")
-	click.echo("💡 This feature is being refactored")
-	sys.exit(1)
-
-
-@cli.command("template")
-@click.pass_context
-def template_command(ctx):
-	"""Manage the note template file.
-
-	This command helps you check and create the template file
-	configured in your mkdocs.yml.
-
-	\b
-	Examples:
-	    mkdocs-note template
-	    mkdocs-note template --check
-	    mkdocs-note template --create
-	"""
-	click.echo("⚠️  'template' command is not yet implemented")
-	click.echo("💡 This feature is being refactored")
-	sys.exit(1)
+	try:
+		# Load configuration
+		config = MkdocsNoteConfig()
+		cleaner = NoteCleaner(config)
+
+		# Find orphaned assets
+		if dry_run:
+			click.echo("🔍 Scanning for orphaned assets (dry run mode)...")
+		else:
+			click.echo("🔍 Scanning for orphaned assets...")
+
+		result = cleaner.clean_orphaned_assets(dry_run=True)
+
+		if result.data["removed_count"] == 0:
+			click.echo("✅ No orphaned asset directories found")
+			sys.exit(0)
+
+		# Show what will be removed
+		click.echo(
+			f"\n{'Would remove' if dry_run else 'Found'} {result.data['removed_count']} orphaned asset director{'y' if result.data['removed_count'] == 1 else 'ies'}:"
+		)
+		for orphaned_dir in result.data["orphaned_dirs"]:
+			click.echo(f"  📁 {orphaned_dir}")
+
+		# If dry run, exit here
+		if dry_run:
+			click.echo("\n💡 Run without --dry-run to actually remove these directories")
+			sys.exit(0)
+
+		# Confirmation prompt (unless --yes)
+		if not yes:
+			if not click.confirm(f"\nRemove these {result.data['removed_count']} directories?"):
+				click.echo("⚠️  Cancelled")
+				sys.exit(0)
+
+		# Actually clean
+		click.echo("\n🗑️  Removing orphaned assets...")
+		result = cleaner.clean_orphaned_assets(dry_run=False)
+
+		if result.success:
+			click.echo(f"✅ {result.message}")
+			sys.exit(0)
+		else:
+			click.echo(f"❌ Error: {result.message}", err=True)
+			sys.exit(1)
+
+	except Exception as e:
+		click.echo(f"❌ Unexpected error: {e}", err=True)
+		sys.exit(1)
 
 
 if __name__ == "__main__":

src/mkdocs_note/config.py

@@ -57,3 +57,24 @@ class MkdocsNoteConfig(Config):
     This prevents broken image links when assets haven't been moved to the 
     co-located asset directory structure yet.
     """
+
+	# CLI-specific configuration
+	supported_extensions = config_opt.Type(list, default=[".md"])
+	"""List of supported note file extensions.
+    Used by CLI commands to validate note file types.
+    """
+
+	exclude_patterns = config_opt.Type(list, default=["index.md", "README.md"])
+	"""List of filename patterns to exclude from note management.
+    Files matching these patterns will not be created, moved, or managed by CLI commands.
+    """
+
+	timestamp_zone = config_opt.Type(str, default="UTC+0")
+	"""Timezone for timestamp generation in format 'UTC+X' or 'UTC-X'.
+    Used when creating new notes to generate date/time in frontmatter.
+    """
+
+	output_date_format = config_opt.Type(str, default="%Y-%m-%d %H:%M:%S")
+	"""Date format string for timestamp output.
+    Uses Python strftime format codes.
+    """