show scan status in ui

scanner/scanner.go

@@ -22,9 +22,22 @@ import (
 	"github.com/sentriz/gonic/scanner/tags"
 )
 
-// IsScanning acts as an atomic boolean semaphore. we don't
+// isScanning acts as an atomic boolean semaphore. we don't
 // want to have more than one scan going on at a time
-var IsScanning int32
+var isScanning int32
+
+func IsScanning() bool {
+	return atomic.LoadInt32(&isScanning) == 1
+}
+
+func SetScanning(status bool) {
+	switch {
+	case status:
+		atomic.StoreInt32(&isScanning, 1)
+	default:
+		atomic.StoreInt32(&isScanning, 0)
+	}
+}
 
 var coverFilenames = map[string]struct{}{
 	"cover.png":   {},
@@ -91,11 +104,11 @@ func New(db *db.DB, musicPath string) *Scanner {
 }
 
 func (s *Scanner) Start() error {
-	if atomic.LoadInt32(&IsScanning) == 1 {
+	if IsScanning() {
 		return errors.New("already scanning")
 	}
-	atomic.StoreInt32(&IsScanning, 1)
+	SetScanning(true)
-	defer atomic.StoreInt32(&IsScanning, 0)
+	defer SetScanning(false)
 	//
 	// being walking
 	start := time.Now()

server/assets/pages/home.tmpl

@@ -80,13 +80,12 @@
             </tr>
         {{ end }}
         </table>
+        {{- if not .IsScanning -}}
             <a href="/admin/start_scan_do">start scan</a>
-        {{ if not .LastScanTime.IsZero }}
+            {{- if not .LastScanTime.IsZero -}}
                 <br>
-            <span class="light">
+                <span class="light">scanned {{ .LastScanTime | humanDate }}</span>
-                last completed:
+            {{ end }}
-                <a title="{{ .LastScanTime }}">{{ .LastScanTime | humanDate }}</a>
-            </span>
         {{ end }}
     </div>
 </div>

server/handler/handler_admin.go

@@ -73,10 +73,8 @@ func (c *Controller) ServeHome(w http.ResponseWriter, r *http.Request) {
 	)
 	data.RequestRoot = fmt.Sprintf("%s://%s", scheme, host)
 	data.CurrentLastFMAPIKey = c.DB.GetSetting("lastfm_api_key")
-	if tStr := c.DB.GetSetting("last_scan_time"); tStr != "" {
+	//
-		i, _ := strconv.ParseInt(tStr, 10, 64)
+	// users box
-		data.LastScanTime = time.Unix(i, 0)
-	}
 	c.DB.Find(&data.AllUsers)
 	//
 	// recent folders box
@@ -85,6 +83,11 @@ func (c *Controller) ServeHome(w http.ResponseWriter, r *http.Request) {
 		Order("updated_at DESC").
 		Limit(8).
 		Find(&data.RecentFolders)
+	data.IsScanning = scanner.IsScanning()
+	if tStr := c.DB.GetSetting("last_scan_time"); tStr != "" {
+		i, _ := strconv.ParseInt(tStr, 10, 64)
+		data.LastScanTime = time.Unix(i, 0)
+	}
 	//
 	renderTemplate(w, r, c.Templates["home.tmpl"], data)
 }

server/handler/handler_sub_common.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 	"os"
 	"path"
-	"sync/atomic"
 	"time"
 	"unicode"
 
@@ -175,7 +174,7 @@ func (c *Controller) GetScanStatus(w http.ResponseWriter, r *http.Request) {
 		Count(&trackCount)
 	sub := subsonic.NewResponse()
 	sub.ScanStatus = &subsonic.ScanStatus{
-		Scanning: atomic.LoadInt32(&scanner.IsScanning) == 1,
+		Scanning: scanner.IsScanning(),
 		Count:    trackCount,
 	}
 	respond(w, r, sub)

server/handler/respond_admin.go

@@ -23,6 +23,7 @@ type templateData struct {
 	RecentFolders []*model.Album
 	AllUsers      []*model.User
 	LastScanTime  time.Time
+	IsScanning    bool
 	//
 	CurrentLastFMAPIKey    string
 	CurrentLastFMAPISecret string