fix: validating inputs

Author: KDesp73

docs/index.html

@@ -46,7 +46,7 @@
             <div class="flex items-center justify-between">
                 <div>
                     <h1 class="text-2xl font-bold text-indigo-600 dark:text-indigo-400">tinydocs</h1>
-                    <p class="text-xs text-gray-500 dark:text-gray-400 uppercase tracking-widest">Generated on 2026-03-02 22:32:46</p>
+                    <p class="text-xs text-gray-500 dark:text-gray-400 uppercase tracking-widest">Generated on 2026-03-02 22:41:54</p>
                 </div>
                 <button @click="toggleTheme()" class="md:hidden p-2 rounded-lg bg-gray-100 dark:bg-gray-700">
                     <span x-show="!darkMode">🌙</span><span x-show="darkMode">☀️</span>

docs/tiny.docs.json

@@ -1,6 +1,6 @@
 {
     "name": "tinydocs",
-    "timestamp": "2026-03-02 22:32:46",
+    "timestamp": "2026-03-02 22:41:54",
     "docs": [
         {
             "file": "tinydocs/generator.py",

tinydocs/cli.py

@@ -2,78 +2,129 @@
 
 import json
 import argparse
+import sys
+import logging
 from pathlib import Path
+from datetime import datetime
+
 from .ignore import IgnoreChecker
 from .parser import Parser
 from .markers import Marker
 from .generator import SiteGenerator
-from datetime import datetime
 
+logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s")
+logger = logging.getLogger("tinydocs")
 
 def parse_arguments():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("-F", "--files", type=str, help="Provide files (comma separated)")
-    parser.add_argument("-D", "--dirs", type=str, help="Provide directories (comma separated)")
-    parser.add_argument("-I", "--ignore", type=str, help="Paths to ignore files (comma seperated)")
-    parser.add_argument("--list-files", action="store_true", help="List the files included in the documentation generation")
-    parser.add_argument("--comment-style", type=str, default="#", help="Specify the comment style (#, //, etc)")
-    parser.add_argument("--markers", type=str, default="tiny.markers.json", help="Provide the marker definition json file")
-    parser.add_argument("-o", "--output", type=str, default="docs", help="Specify the output directory")
-    parser.add_argument("--generate", action="store_true", help="Generate a static documentation site")
-    parser.add_argument("--name", type=str, help="Specify the name of the project")
+    parser = argparse.ArgumentParser(description="TinyDocs: Minimalist documentation generator.")
+    parser.add_argument("-F", "--files", type=str, help="Comma separated files")
+    parser.add_argument("-D", "--dirs", type=str, help="Comma separated directories")
+    parser.add_argument("-I", "--ignore", type=str, help="Comma separated ignore files")
+    parser.add_argument("--list-files", action="store_true", help="List included files and exit")
+    parser.add_argument("--comment-style", type=str, default="#", help="Comment style (default: #)")
+    parser.add_argument("--markers", type=str, default="tiny.markers.json", help="Markers definition JSON")
+    parser.add_argument("-o", "--output", type=str, default="docs", help="Output directory")
+    parser.add_argument("--generate", action="store_true", help="Generate static HTML site")
+    parser.add_argument("--name", type=str, help="Project name")
 
     return parser.parse_args()
 
-
 def main():
     args = parse_arguments()
-
+    
+    # 1. Initialize Ignore Checker
     ignore_files = args.ignore.split(",") if args.ignore else []
+    ignore_checker = IgnoreChecker([".git/", "__pycache__/", ".venv/", "node_modules/"])
+    try:
+        ignore_checker.load_ignore_files(ignore_files)
+    except Exception as e:
+        logger.warning(f"Could not load some ignore files: {e}")
+
+    # 2. Collect and Validate Files
+    files = []
+    if args.dirs:
+        dir_paths = [d.strip() for d in args.dirs.split(",") if d.strip()]
+        files.extend(ignore_checker.filter(dir_paths))
+    
+    if args.files:
+        extra_files = [f.strip() for f in args.files.split(",") if f.strip()]
+        files.extend(extra_files)
 
-    ignore_checker = IgnoreChecker([".git/"])
-    ignore_checker.load_ignore_files(ignore_files)
+    # Remove duplicates and filter non-existent files
+    files = list(dict.fromkeys(files)) 
+    files = [f for f in files if Path(f).exists()]
 
-    files = ignore_checker.filter(args.dirs.split(","))
-    if args.files:
-        files.extend(args.files.split(","))
+    if not files:
+        logger.error("No valid files found to document. Check your --dirs or --files arguments.")
+        sys.exit(1)
 
     if args.list_files:
         for f in files:
             print(f)
         return
 
-    with open(args.markers, "r") as file:
-        markers = Marker.parse(file.read())
-
-    docs = []
-    for i, file in enumerate(files, start=1):
-        print(f"[{i}/{len(files)}] Parsing {file}...")
-        parser = Parser(Path(file), prefix="@", comment="#")
-        docs.extend([
-            {
-                "file": file,
-                "docs": doc
-            } 
-            for doc in parser.parse(markers)
-        ])
-
-
-    output = {
-        "name": args.name or "TinyDocs", 
-        "timestamp": str(datetime.now()).split(".")[0],
-        "docs": docs
+    # 3. Load Markers
+    marker_path = Path(args.markers)
+    if not marker_path.exists():
+        logger.error(f"Marker file not found: {args.markers}")
+        sys.exit(1)
+
+    try:
+        with open(marker_path, "r", encoding="utf-8") as f:
+            markers = Marker.parse(f.read())
+    except json.JSONDecodeError:
+        logger.error(f"Malformed JSON in marker file: {args.markers}")
+        sys.exit(1)
+    except Exception as e:
+        logger.error(f"Failed to parse markers: {e}")
+        sys.exit(1)
+
+    # 4. Parse Documentation
+    docs_entries = []
+    for i, file_path in enumerate(files, start=1):
+        try:
+            logger.info(f"[{i}/{len(files)}] Parsing {file_path}...")
+            parser = Parser(Path(file_path), prefix="@", comment=args.comment_style)
+            parsed_data = parser.parse(markers)
+            
+            for doc in parsed_data:
+                docs_entries.append({
+                    "file": str(file_path),
+                    "docs": doc
+                })
+        except Exception as e:
+            logger.error(f"Failed to parse {file_path}: {e}")
+
+    # 5. Prepare Output
+    output_payload = {
+        "name": args.name or Path.cwd().name, 
+        "timestamp": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+        "docs": docs_entries
     }
 
-    json_output = json.dumps(output, indent=4, ensure_ascii=False)
-
-    output_file = f"{args.output}/tiny.docs.json"
-    with open(output_file, "w") as file:
-        file.write(json_output)
-
+    # 6. Write JSON Output
+    out_dir = Path(args.output)
+    try:
+        out_dir.mkdir(parents=True, exist_ok=True)
+        json_path = out_dir / "tiny.docs.json"
+        
+        with open(json_path, "w", encoding="utf-8") as f:
+            json.dump(output_payload, f, indent=4, ensure_ascii=False)
+        
+        logger.info(f"Documentation data saved to {json_path}")
+    except Exception as e:
+        logger.error(f"Failed to write output JSON: {e}")
+        sys.exit(1)
+
+    # 7. Site Generation
     if args.generate:
-        gen = SiteGenerator(json_path=output_file, output_dir=args.output)
-        gen.generate()
-
+        try:
+            gen = SiteGenerator(json_path=str(json_path), output_dir=str(out_dir))
+            gen.generate()
+            logger.info(f"Static site generated in {out_dir}/")
+        except Exception as e:
+            logger.error(f"Site generation failed: {e}")
+            sys.exit(1)
 
 if __name__ == "__main__":
     main()