From 7fdb8052c44d4ff2b49d5162969651500d9d016d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lilian=20J=C3=B3nsd=C3=B3ttir?=
 <lilian.jonsdottir@gmail.com>
Date: Thu, 20 Jun 2024 22:43:21 -0700
Subject: [PATCH] generate random names until one fits

---
 internal/trash/trash.go | 52 ++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/internal/trash/trash.go b/internal/trash/trash.go
index 04d148f..da804a2 100644
--- a/internal/trash/trash.go
+++ b/internal/trash/trash.go
@@ -12,6 +12,7 @@ import (
 
 	"git.burning.moe/celediel/gt/internal/filter"
 	"github.com/charmbracelet/log"
+	"github.com/dustin/go-humanize"
 	"gitlab.com/tymonx/go-formatter/formatter"
 	"gopkg.in/ini.v1"
 )
@@ -144,28 +145,7 @@ func Remove(files []Info) (removed int, err error) {
 }
 
 func TrashFile(trashDir, name string) error {
-	var (
-		outdir   = filepath.Join(trashDir, "files")
-		trashout = filepath.Join(trashDir, "info")
-		filename = filepath.Base(name)
-		rando    = random_filename(random_str_length)
-	)
-
-	trashinfo_filename := filepath.Join(trashout, filename+trash_info_ext)
-	out_path := filepath.Join(outdir, filename)
-
-	// check for file collision
-	// TODO: make sure randomly generated name doesn't exist
-	if _, e := os.Stat(trashinfo_filename); e == nil {
-		new_name := filepath.Join(trashout, filename+rando+trash_info_ext)
-		log.Warnf("trashinfo %s exists, using randomized %s", trashinfo_filename, new_name)
-		trashinfo_filename = new_name
-	}
-	if _, e := os.Stat(out_path); e == nil {
-		new_name := filepath.Join(outdir, filename+rando)
-		log.Warnf("trashed file %s exists, using randomized %s", out_path, new_name)
-		out_path = new_name
-	}
+	trashinfo_filename, out_path := ensureUniqueName(filepath.Base(name), trashDir)
 
 	// TODO: write across filesystems
 	if err := os.Rename(name, out_path); err != nil {
@@ -248,3 +228,31 @@ func randomChar() byte {
 	const chars string = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
 	return chars[rand.Intn(len(chars))]
 }
+
+func ensureUniqueName(filename, trashDir string) (string, string) {
+	var (
+		filedir = filepath.Join(trashDir, "files")
+		infodir = filepath.Join(trashDir, "info")
+	)
+
+	info := filepath.Join(infodir, filename+trash_info_ext)
+	if _, err := os.Stat(info); os.IsNotExist(err) {
+		// doesn't exist, so use it
+		path := filepath.Join(filedir, filename)
+		return info, path
+	} else {
+		// otherwise, try random suffixes until one works
+		log.Debugf("%s exists in trash, generating random name", filename)
+		var tries int
+		for {
+			tries++
+			rando := random_filename(random_str_length)
+			new_name := filepath.Join(infodir, filename+rando+trash_info_ext)
+			if _, err := os.Stat(new_name); os.IsNotExist(err) {
+				path := filepath.Join(filedir, filename+rando)
+				log.Debugf("settled on random name %s%s on the %s try", filename, rando, humanize.Ordinal(tries))
+				return new_name, path
+			}
+		}
+	}
+}