some bug fixes

pkg/server/handler.go

@@ -179,11 +179,22 @@ func indexHandler(ctx *Context) {
 	case "GET":
 		earlyErr := make(chan error)
 		go func() {
+			err := ctx.Srv.FS.AddScan(path)
+			if err != nil {
+				select {
+				case earlyErr <- err:
+				default:
+				}
+				return
+			}
+			defer ctx.Srv.FS.RemoveScan(path)
 			file, txt, err := ctx.Srv.Scanner.Scan(path)
 			if err != nil {
 				select {
 				case earlyErr <- err:
+				default:
 				}
+				log.Printf("scanner: %s: %s", path, err)
 				return
 			}
 			id, err := ctx.Srv.DB.Index.Add(txt)
@@ -306,15 +317,17 @@ func moveHandler(ctx *Context) {
 		}
 		name := ctx.Form("name")
 		dest := ctx.Form("destination")
-		newfile, err := ctx.Srv.FS.Move(path, dest, name)
+		moved, newfile, err := ctx.Srv.FS.Move(path, dest, name)
 		if err != nil {
 			ctx.Error(err)
 			return
 		}
-		err = ctx.Srv.DB.MoveFile(path, newfile)
-		if err != nil {
-			ctx.Error(err)
-			return
+		for _, m := range moved {
+			log.Debugf("move: %s to %s", m.Old, m.New)
+			err = ctx.Srv.DB.MoveFile(m.Old, m.New)
+			if err != nil {
+				log.Printf("move: %s: %s", m, err)
+			}
 		}
 		ctx.Redirect(newfile, http.StatusFound)
 	}
@@ -411,6 +424,7 @@ func dirHandler(ctx *Context) {
 				Name: path,
 				Abs:  core.RawPrefix + path,
 				Flag: ctx.Srv.DB.IsIndexed(path),
+				Scan: ctx.Srv.FS.CheckScan(path),
 			}
 			ctx.Data.Paths = fs.Paths(path)
 			ctx.Exec()