Merge pull request #55 from vdye/cli-bugs

Make `init` more proactive in reporting errors

Author: vdye

cmd/git-bundle-server/init.go

@@ -53,13 +53,28 @@ func (i *initCmd) Run(ctx context.Context, args []string) error {
 	bundleProvider := utils.GetDependency[bundles.BundleProvider](ctx, i.container)
 	gitHelper := utils.GetDependency[git.GitHelper](ctx, i.container)
 
+	// First, check whether route already exists (enabled or not). If it does,
+	// exit with an error.
+	allRepos, err := repoProvider.ReadRepositoryStorage(ctx)
+	if err != nil {
+		return i.logger.Errorf(ctx, "could not load existing routes: %w", err)
+	} else if _, ok := allRepos[*route]; ok {
+		return i.logger.Errorf(ctx, "route '%s' already exists; if you want to "+
+			"overwrite the route, delete it with 'git-bundle-server delete' "+
+			"then re-run this command", *route)
+	}
+
+	// Create the new route
 	repo, err := repoProvider.CreateRepository(ctx, *route)
 	if err != nil {
 		return i.logger.Error(ctx, err)
 	}
 
 	fmt.Printf("Cloning repository from %s\n", *url)
-	gitHelper.CloneBareRepo(ctx, *url, repo.RepoDir)
+	err = gitHelper.CloneBareRepo(ctx, *url, repo.RepoDir)
+	if err != nil {
+		return i.logger.Errorf(ctx, "failed to clone repository: %w", err)
+	}
 
 	bundle := bundleProvider.CreateInitialBundle(ctx, repo)
 	fmt.Printf("Constructing base bundle file at %s\n", bundle.Filename)

internal/common/filesystem.go

@@ -215,7 +215,13 @@ func (f *fileSystem) ReadDirRecursive(path string, depth int, strictDepth bool)
 
 	dirEntries, err := os.ReadDir(path)
 	if err != nil {
-		return nil, err
+		if errors.Is(err, os.ErrNotExist) {
+			// We tried to read the directory, but it doesn't exist - return
+			// empty result.
+			return []ReadDirEntry{}, nil
+		} else {
+			return nil, err
+		}
 	}
 
 	entries := utils.Map(dirEntries, mapDirEntry(path))