@@ -15,17 +15,18 @@ var (
1515 version = "dev"
1616 helpMsg = `Rem - Get some rem sleep knowing your files are safe
1717Rem is a CLI Trash
18- Usage: rem [-h/--help | -v/--version | -d/--directory | -l/--list | --t/--set-trash | `
18+ Usage: rem [<option>]
19+ rem fileToTrash
20+ rem -u/--undo fileToRestore
21+ Options:
22+ -h/--help | -v/--version | -d/--directory | -l/--list | --t/--set-trash`
1923 home , _ = os .UserHomeDir ()
2024 trashDir = home + "/.remTrash"
2125 logFileName = ".trash.log"
2226 logSeparator = " ==> "
2327)
2428
2529func main () {
26- //for key, value := range parseLogFile() {
27- // fmt.Println("Key:", key, "Value:", value)
28- //}
2930 if len (os .Args ) == 1 {
3031 handleErrStr ("too few arguments" )
3132 fmt .Println (helpMsg )
@@ -59,7 +60,7 @@ func main() {
5960 }
6061 if hasOption , _ := argsHaveOptionLong ("empty-trash" ); hasOption {
6162 color .Red ("Warning, permanently deleting these files in trash: " )
62- fmt . Println (listFilesInTrash ())
63+ printFormattedList (listFilesInTrash ())
6364 if promptBool ("Confirm delete?" ) {
6465 emptyTrash ()
6566 }
@@ -98,24 +99,6 @@ func main() {
9899}
99100
100101func listFilesInTrash () []string {
101- //file, err := os.Open(trashDir)
102- //if err != nil {
103- // handleErrStr("Could not open " + trashDir)
104- // handleErr(err)
105- // return nil
106- //}
107- //defer func() {
108- // err = file.Close()
109- // if err != nil {
110- // handleErr(err)
111- // }
112- //}()
113- //list, err := file.Readdirnames(0) // >=0 to read all files and folders
114- //if err != nil {
115- // handleErrStr("An error occurred while trying to list files in " + trashDir)
116- // handleErr(err)
117- //}
118- //return list
119102 m := parseLogFile ()
120103 s := make ([]string , 0 , 10 )
121104 for key , _ := range m {
@@ -129,13 +112,13 @@ func emptyTrash() {
129112}
130113
131114func parseLogFile () map [string ]string {
115+ ensureTrashDir ()
132116 file , err := os .OpenFile (trashDir + "/" + logFileName , os .O_CREATE | os .O_RDONLY , 0644 )
133117 if err != nil {
134118 handleErr (err )
135119 return nil
136120 }
137121 defer file .Close ()
138- //var lines map[string]string
139122 lines := make (map [string ]string )
140123 scanner := bufio .NewScanner (file )
141124 for scanner .Scan () {
@@ -149,12 +132,9 @@ func parseLogFile() map[string]string {
149132}
150133
151134func setLogFile (m map [string ]string ) {
152- //err := os.Truncate(trashDir+"/"+logFileName, 0)
153- //if err != nil {
154- // handleErr(err)
155- // return
156- //}
157- f , err := os .OpenFile (trashDir + "/" + logFileName , os .O_TRUNC | os .O_CREATE | os .O_WRONLY , 0644 ) // truncate to empty, create if not exist, write only
135+ //f, err := os.OpenFile(trashDir+"/"+logFileName, os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0644) // truncate to empty, create if not exist, write only
136+ ensureTrashDir ()
137+ f , err := os .Create (trashDir + "/" + logFileName )
158138 if err != nil {
159139 handleErr (err )
160140 return
@@ -205,12 +185,10 @@ func trashFile(path string) {
205185 return
206186 }
207187 if _ , err = os .Stat (path ); os .IsNotExist (err ) {
208- // file specified does not exist
209188 handleErrStr (color .YellowString (path ) + " does not exist" )
210189 return
211190 }
212191 if i , err := os .Stat (toMoveTo ); ! (os .IsNotExist (err )) {
213- // file of same name in trash
214192 handleErrStr ("file with name " + color .YellowString (i .Name ()) + " already in ~/.remTrash at " + color .YellowString (toMoveTo )) // as helpful as possible
215193 return
216194 }
@@ -219,20 +197,10 @@ func trashFile(path string) {
219197 handleErr (err )
220198 return
221199 }
222- //f, err := os.OpenFile(trashDir+"/"+logFileName, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
223- //if err != nil {
224- // handleErr(err)
225- // return
226- //}
227- //defer f.Close()
228- //if _, err = f.WriteString(path + logSeparator + toMoveTo + "\n"); err != nil {
229- // handleErr(err)
230- // return
231- //}
232200 m := parseLogFile ()
233201 m [path ] = toMoveTo // logfile format is path where it came from ==> path in trash
234202 setLogFile (m )
235- fmt .Println ("Trashed " + color .YellowString (path ) + " to " + color . YellowString ( toMoveTo ) + " \n Undo using "+ color .YellowString ("rem --undo " + path ))
203+ fmt .Println ("Trashed " + color .YellowString (path ) + "\n Undo using " + color .YellowString ("rem --undo " + path ))
236204}
237205
238206func ensureTrashDir () {
@@ -244,6 +212,15 @@ func ensureTrashDir() {
244212 }
245213}
246214
215+ func ensureLogFile () {
216+ if _ , err := os .Stat (trashDir + "/" + logFileName ); os .IsNotExist (err ) {
217+ _ , err = os .Create (trashDir + "/" + logFileName )
218+ if err != nil {
219+ handleErr (err )
220+ }
221+ }
222+ }
223+
247224func permanentlyDeleteFile (fileName string ) {
248225 err := os .RemoveAll (fileName )
249226 if err != nil {
0 commit comments