add "-full-scan" scan option to gonic scan

closes #20

cmd/gonicscan/main.go

@@ -15,12 +15,9 @@ import (
 
 func main() {
 	set := flag.NewFlagSet(version.NAME_SCAN, flag.ExitOnError)
-	musicPath := set.String(
+	musicPath := set.String("music-path", "", "path to music")
-		"music-path", "",
+	dbPath := set.String("db-path", "gonic.db", "path to database (optional)")
-		"path to music")
+	fullScan := set.Bool("full-scan", false, "ignore file modtimes while scanning (optional)")
-	dbPath := set.String(
-		"db-path", "gonic.db",
-		"path to database (optional)")
 	if err := ff.Parse(set, os.Args[1:],
 		ff.WithEnvVarPrefix(version.NAME_UPPER),
 	); err != nil {
@@ -34,11 +31,15 @@ func main() {
 		log.Fatalf("error opening database: %v\n", err)
 	}
 	defer db.Close()
-	s := scanner.New(
+	s := scanner.New(*musicPath, db)
-		*musicPath,
+	var scan func() error
-		db,
+	switch {
-	)
+	case *fullScan:
-	if err := s.Start(); err != nil {
+		scan = s.StartFull
-		log.Fatalf("error starting scanner: %v\n", err)
+	default:
+		scan = s.StartInc
+	}
+	if err := scan(); err != nil {
+		log.Fatalf("error during scan: %v\n", err)
 	}
 }

scanner/scanner.go

@@ -39,6 +39,7 @@ func SetScanning() func() {
 type Scanner struct {
 	db        *db.DB
 	musicPath string
+	isFull    bool
 	// these two are for the transaction we do for every folder.
 	// the boolean is there so we dont begin or commit multiple
 	// times in the handle folder or post children callback
@@ -67,7 +68,7 @@ func New(musicPath string, db *db.DB) *Scanner {
 	}
 }
 
-func (s *Scanner) Start() error {
+func (s *Scanner) Start(isFull bool) error {
 	if IsScanning() {
 		return errors.New("already scanning")
 	}
@@ -82,6 +83,7 @@ func (s *Scanner) Start() error {
 		s.seenTracksErr = 0
 	}()
 	// ** begin being walking
+	s.isFull = isFull
 	start := time.Now()
 	err := godirwalk.Walk(s.musicPath, &godirwalk.Options{
 		Callback:             s.callbackItem,
@@ -146,6 +148,14 @@ func (s *Scanner) Start() error {
 	return nil
 }
 
+func (s *Scanner) StartInc() error {
+	return s.Start(false)
+}
+
+func (s *Scanner) StartFull() error {
+	return s.Start(true)
+}
+
 // items are passed to the handle*() functions
 type item struct {
 	fullPath  string
@@ -274,8 +284,8 @@ func (s *Scanner) handleFolder(it *item) error {
 		}).
 		First(folder).
 		Error
-	if !gorm.IsRecordNotFoundError(err) &&
+	if !s.isFull && (!gorm.IsRecordNotFoundError(err) &&
-		it.stat.ModTime().Before(folder.UpdatedAt) {
+		it.stat.ModTime().Before(folder.UpdatedAt)) {
 		// we found the record but it hasn't changed
 		return nil
 	}
@@ -303,7 +313,7 @@ func (s *Scanner) handleTrack(it *item) error {
 		}).
 		First(track).
 		Error
-	if !gorm.IsRecordNotFoundError(err) &&
+	if !s.isFull && !gorm.IsRecordNotFoundError(err) &&
 		it.stat.ModTime().Before(track.UpdatedAt) {
 		// we found the record but it hasn't changed
 		s.seenTracks[track.ID] = struct{}{}

scanner/scanner_test.go

@@ -40,17 +40,17 @@ func resetTablesPause(db *db.DB, b *testing.B) {
 func BenchmarkScanFresh(b *testing.B) {
 	for n := 0; n < b.N; n++ {
 		resetTablesPause(testScanner.db, b)
-		testScanner.Start()
+		testScanner.StartInc()
 	}
 }
 
 func BenchmarkScanIncremental(b *testing.B) {
 	// do a full scan and reset
-	testScanner.Start()
+	testScanner.StartInc()
 	b.ResetTimer()
 	// do the inc scans
 	for n := 0; n < b.N; n++ {
-		testScanner.Start()
+		testScanner.StartInc()
 	}
 }
 

server/ctrladmin/handlers.go

@@ -272,7 +272,7 @@ func (c *Controller) ServeUpdateLastFMAPIKeyDo(r *http.Request) *Response {
 func (c *Controller) ServeStartScanDo(r *http.Request) *Response {
 	defer func() {
 		go func() {
-			if err := c.Scanner.Start(); err != nil {
+			if err := c.Scanner.StartInc(); err != nil {
 				log.Printf("error while scanning: %v\n", err)
 			}
 		}()

server/ctrlsubsonic/handlers_common.go

@@ -86,7 +86,7 @@ func (c *Controller) ServeGetMusicFolders(r *http.Request) *spec.Response {
 
 func (c *Controller) ServeStartScan(r *http.Request) *spec.Response {
 	go func() {
-		if err := c.Scanner.Start(); err != nil {
+		if err := c.Scanner.StartInc(); err != nil {
 			log.Printf("error while scanning: %v\n", err)
 		}
 	}()

server/server.go

@@ -208,7 +208,7 @@ func (s *Server) StartScanTicker(dur time.Duration) (funcExecute, funcInterrupt)
 			case <-done:
 				return nil
 			case <-ticker.C:
-				if err := s.scanner.Start(); err != nil {
+				if err := s.scanner.StartInc(); err != nil {
 					log.Printf("error scanning: %v", err)
 				}
 			}