Show error if impossible to move album while syncing.

barsanuphe · Jan 26, 2016 · 4727776 · 4727776
1 parent 2f9ce0c
commit 4727776
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/music/album_test.go b/music/album_test.go
@@ -101,7 +101,6 @@ func createTestFiles(c config.Config) {
 		panic(err)
 	}
 
-	// TODO what happens if we want to move an album to an already existing path???
 	// create folders
 	a0 := filepath.Join(c.Paths.Root, "arthi (2000) jqojdoijd")
 	a1 := filepath.Join(c.Paths.Root, "arthi東京?-4. (2000) jqojdoijd(??)--+")

diff --git a/music/walks.go b/music/walks.go
@@ -53,13 +53,16 @@ func SortAlbums(c config.Config, doNothing bool) (err error) {
 				if !hasGenre {
 					uncategorized++
 				}
+
+				originalRelative, _ := filepath.Rel(a.Root, a.Path)
+				destRelative, _ := filepath.Rel(a.Root, a.NewPath)
+
 				hasMoved, err := a.MoveToNewPath(doNothing)
 				if err != nil {
-					panic(err)
+					fmt.Println(chalk.Bold.TextStyle(chalk.Red.Color("!!! ERROR MOVING " + a.String())))
+					fmt.Println(chalk.Bold.TextStyle(chalk.Red.Color("!!!\t    " + originalRelative + "\n!!!\t -> " + destRelative)))
 				}
 				if hasMoved {
-					originalRelative, _ := filepath.Rel(a.Root, a.Path)
-					destRelative, _ := filepath.Rel(a.Root, a.NewPath)
 					fmt.Println(chalk.Yellow.Color("+ " + a.String()))
 					fmt.Println("\t    " + originalRelative + "\n\t -> " + destRelative)
 					movedAlbums++