fixed correct proton drive upload with vertical slices

2026-08-08 13:45:04 +01:00
parent b60588c4a0
commit a483371dc5
3 changed files with 124 additions and 55 deletions
@@ -17,33 +17,35 @@ var (
 	rootCmd = &cobra.Command{
 		Use:   "dirmd [flags] <directory>",
 		Short: "Generate markdown documentation from directory structure",
-		Long: `dirmd walks a directory and generates a markdown file with:
+		Long: `dirmd walks a directory and generates markdown files with:

 - Directory tree structure
 - All readable text files with their contents

+Output is always written to a directory specified by -o.
+
 Examples:

-  # Create new documentation
-  dirmd -o output.md ~/repos/myproject
+  # Create new documentation (writes index.md inside ./docs/)
+  dirmd -o ./docs ~/repos/myproject
+
+  # Overwrite existing output directory
+  dirmd -o ./docs ~/repos/myproject -f

  # Append a single file
-  dirmd -a -i README.md -o existing.md
+  dirmd -a -i README.md -o ./docs

-  # Append another directory
-  dirmd -a -o existing.md ~/repos/anotherproject
+  # Vertical slices (root index.md + one markdown per top-level dir)
+  dirmd -o ./docs ~/repos/myproject --vertical-slices

-  # Overwrite existing local file
-  dirmd -o output.md ~/repos/myproject -f
-
-  # Generate with vertical slices (root + one file per top-level dir)
-  dirmd -o output.md ~/repos/myproject --vertical-slices
+  # Skip frontend files
+  dirmd -o ./docs ~/repos/myproject --skip-frontend

  # Generate and upload to Proton Drive
-  dirmd -o output.md ~/repos/myproject --proton-drive
+  dirmd -o ./docs ~/repos/myproject --proton-drive

  # Generate and upload to a specific remote path
-  dirmd -o output.md ~/repos/myproject --proton-drive --drive-path /my-files/docs/api.md`,
+  dirmd -o ./docs ~/repos/myproject --proton-drive --drive-path /my-files/docs/api`,
 		RunE: run,
 	}

@@ -68,17 +70,17 @@ func Execute() {
 }

 func init() {
-	rootCmd.PersistentFlags().StringVarP(&outputPath, "output", "o", "", "output markdown file path (required)")
-	rootCmd.Flags().BoolVarP(&appendMode, "append", "a", false, "append to existing output file")
-	rootCmd.Flags().BoolVarP(&force, "force", "f", false, "overwrite existing output file (non-append mode)")
+	rootCmd.PersistentFlags().StringVarP(&outputPath, "output", "o", "", "output directory (required)")
+	rootCmd.Flags().BoolVarP(&appendMode, "append", "a", false, "append to existing index.md")
+	rootCmd.Flags().BoolVarP(&force, "force", "f", false, "overwrite existing output directory")
 	rootCmd.Flags().StringVarP(&singleFile, "input-file", "i", "", "single file input (append mode only)")
 	rootCmd.Flags().Int64Var(&maxSize, "max-size", config.DefaultMaxSize, "max file size in bytes")
 	rootCmd.Flags().IntVar(&maxDepth, "max-depth", config.DefaultMaxDepth, "max directory recursion depth")
 	rootCmd.Flags().StringArrayVar(&ignorePatterns, "ignore", nil, "additional ignore patterns (glob)")
 	rootCmd.Flags().StringArrayVar(&extensions, "extensions", nil, "additional file extensions to skip (repeatable)")
-	rootCmd.Flags().BoolVar(&protonDrive, "proton-drive", false, "upload output to Proton Drive after writing locally")
-	rootCmd.Flags().StringVar(&drivePath, "drive-path", "", "full remote path on Proton Drive (e.g. /my-files/md/report.md). Requires --proton-drive")
-	rootCmd.Flags().BoolVar(&verticalSlices, "vertical-slices", false, "split output into root file + one markdown per top-level directory")
+	rootCmd.Flags().BoolVar(&protonDrive, "proton-drive", false, "upload output directory to Proton Drive after writing locally")
+	rootCmd.Flags().StringVar(&drivePath, "drive-path", "", "full remote directory on Proton Drive (e.g. /my-files/docs/api). Requires --proton-drive")
+	rootCmd.Flags().BoolVar(&verticalSlices, "vertical-slices", false, "split output into root index.md + one markdown per top-level directory")
 	rootCmd.Flags().BoolVar(&skipFrontend, "skip-frontend", false, "omit frontend file types (.html, .css, .js, .ts, .vue, .svelte, etc.)")

 	rootCmd.MarkPersistentFlagRequired("output")
@@ -135,12 +137,25 @@ func run(cmd *cobra.Command, args []string) error {
 	}
 	cfg.AbsRoot = abs

+	absOutput, err := filepath.Abs(outputPath)
+	if err != nil {
+		return fmt.Errorf("failed to resolve output path: %w", err)
+	}
+
+	absOutput = filepath.Join(filepath.Dir(absOutput), filepath.Base(absOutput)+"_dirmd")
+
 	if !appendMode {
-		if _, err := os.Stat(outputPath); err == nil && !force {
-			return fmt.Errorf("output file %s already exists (use -f to overwrite or -a to append)", outputPath)
+		if _, err := os.Stat(absOutput); err == nil && !force {
+			return fmt.Errorf("output directory %s already exists (use -f to overwrite)", absOutput)
 		}
 	}

+	if err := os.MkdirAll(absOutput, 0755); err != nil {
+		return fmt.Errorf("cannot create output directory: %w", err)
+	}
+
+	fmt.Printf("%s\n", absOutput)
+
 	result, err := walker.Run(cfg)
 	if err != nil {
 		return err
@@ -151,42 +166,49 @@ func run(cmd *cobra.Command, args []string) error {
 	}

 	if verticalSlices {
-		generated, err := renderer.WriteSlices(result, outputPath)
+		generated, err := renderer.WriteSlices(result, absOutput)
 		if err != nil {
 			return err
 		}

-		fmt.Fprintf(os.Stderr, "generated %d files\n", len(generated))
+		fmt.Fprintf(os.Stderr, "generated %d files in %s\n", len(generated), absOutput)

 		if protonDrive {
+			remoteDir := drivePath
+			if remoteDir == "" {
+				remoteDir = "/my-files/md/" + filepath.Base(absOutput)
+			}
+
 			if err := drive.CheckAuth(); err != nil {
 				fmt.Fprintf(os.Stderr, "error: %v\n", err)
 				fmt.Fprintln(os.Stderr, "local files were written successfully, but upload was skipped")
 				return err
 			}

-			for _, path := range generated {
-				if err := drive.Upload(path, "/my-files/md/"+filepath.Base(path)); err != nil {
-					fmt.Fprintf(os.Stderr, "error uploading %s: %v\n", path, err)
-				} else {
-					fmt.Fprintf(os.Stderr, "uploaded %s to Proton Drive\n", path)
-				}
+			if err := drive.UploadDir(absOutput, remoteDir); err != nil {
+				fmt.Fprintf(os.Stderr, "error: %v\n", err)
+				fmt.Fprintln(os.Stderr, "local files were written successfully, but upload failed")
+				return err
 			}
+
+			fmt.Fprintf(os.Stderr, "uploaded %s to %s on Proton Drive\n", absOutput, remoteDir)
 		}

 		return nil
 	}

-	if err := renderer.Write(result, outputPath, appendMode, cfg.SingleFile); err != nil {
+	indexPath := filepath.Join(absOutput, "index.md")
+
+	if err := renderer.Write(result, indexPath, appendMode, cfg.SingleFile); err != nil {
 		return err
 	}

-	fmt.Fprintf(os.Stderr, "wrote %d entries to %s\n", len(result.Entries), outputPath)
+	fmt.Fprintf(os.Stderr, "wrote %d entries to %s\n", len(result.Entries), indexPath)

 	if protonDrive {
-		remotePath := drivePath
-		if remotePath == "" {
-			remotePath = "/my-files/md/" + filepath.Base(outputPath)
+		remoteDir := drivePath
+		if remoteDir == "" {
+			remoteDir = "/my-files/md/" + filepath.Base(absOutput)
 		}

 		if err := drive.CheckAuth(); err != nil {
@@ -195,13 +217,13 @@ func run(cmd *cobra.Command, args []string) error {
 			return err
 		}

-		if err := drive.Upload(outputPath, remotePath); err != nil {
+		if err := drive.UploadDir(absOutput, remoteDir); err != nil {
 			fmt.Fprintf(os.Stderr, "error: %v\n", err)
 			fmt.Fprintln(os.Stderr, "local file was written successfully, but upload failed")
 			return err
 		}

-		fmt.Fprintf(os.Stderr, "uploaded %s to %s on Proton Drive\n", outputPath, remotePath)
+		fmt.Fprintf(os.Stderr, "uploaded %s to %s on Proton Drive\n", absOutput, remoteDir)
 	}

 	return nil