fix scan bugs

Author: exppii

.github/workflows/docker.yml

@@ -28,7 +28,7 @@ jobs:
             file: "m4t_server/Dockerfile"
             image: "m4t-server"
             platforms: "linux/amd64,linux/arm64"
-            base: "python:3.10.8-slim" # CPU only
+            base: "nvidia/cuda:12.2.2-base-ubuntu22.04" # CPU only
             image_type: "cpu"
           - context: "."
             file: "Dockerfile"

api/epub/selfhost/scan.go

@@ -59,6 +59,15 @@ func NewScan(ctx context.Context, root, meta string) (*Scanner, error) {
 
 }
 
+func (m *Scanner) status(errs []string, done bool) ScanStatus {
+	return ScanStatus{
+		Running:   done,
+		ScanCount: m.Count,
+		EpubCount: m.Count, // 当前只是扫描了 epub 文件
+		Errs:      errs,
+	}
+}
+
 func (m *Scanner) scanEpub(manager *ScannerManager, books <-chan *schema.Book) {
 
 	errs := []string{}
@@ -73,6 +82,7 @@ func (m *Scanner) scanEpub(manager *ScannerManager, books <-chan *schema.Book) {
 
 			m.wg.Done()
 			// close(errChan)
+
 			close(statusChan)
 			ticker.Stop()
 			log.I(`退出扫描程序`)
@@ -83,14 +93,17 @@ func (m *Scanner) scanEpub(manager *ScannerManager, books <-chan *schema.Book) {
 			select {
 
 			case <-m.ctx.Done():
+				statusChan <- m.status(errs, false)
 				log.W(`接收到退出命令，退出扫描`)
 				return
+			case <-ticker.C: // 定时器触发时发送当前状态
+				statusChan <- m.status(errs, true)
+				errs = []string{}
 			case book, ok := <-books:
-				//debug
-				// time.Sleep(200 * time.Millisecond)
 				if !ok {
 					//books is closed
-					log.I(`书籍为空，退出解析文件。`)
+					statusChan <- m.status(errs, false)
+					log.I(`扫描完成，退出解析文件。`)
 					return
 				}
 				m.Count++
@@ -109,15 +122,6 @@ func (m *Scanner) scanEpub(manager *ScannerManager, books <-chan *schema.Book) {
 
 				}
 
-			case <-ticker.C: // 定时器触发时发送当前状态
-				status := ScanStatus{
-					Running:   true,
-					ScanCount: m.Count,
-					EpubCount: m.Count, // 当前只是扫描了 epub 文件
-					Errs:      errs,
-				}
-				statusChan <- status
-				errs = []string{}
 			}
 		}
 
@@ -131,7 +135,7 @@ func (m *Scanner) scanEpub(manager *ScannerManager, books <-chan *schema.Book) {
 			manager.updateStatus(status)
 		}
 		//关闭扫描器
-		manager.dumpStats(m.cached, true)
+		manager.dumpStats(m.cached)
 
 		m.cached.Close()
 		m.cached = nil

api/epub/selfhost/scan_manager.go

@@ -110,18 +110,12 @@ func (m *ScannerManager) newScan(refresh bool) {
 		return
 	}
 	m.stats.Running = true
+	m.stats.Errs = nil
 	m.Unlock()
 
 	scan.Start(m, refresh)
 }
 
-func (m *ScannerManager) updateStatus(stats ScanStatus) {
-	m.Lock()
-	defer m.Unlock()
-	m.stats = stats
-
-}
-
 func (m *ScannerManager) Stop() {
 	m.Lock()
 	defer m.Unlock()
@@ -135,11 +129,18 @@ func (m *ScannerManager) Stop() {
 
 }
 
-func (m *ScannerManager) dumpStats(cached *nutsdb.DB, done bool) error {
+func (m *ScannerManager) updateStatus(stats ScanStatus) {
+	m.Lock()
+	defer m.Unlock()
+	stats.Errs = append(stats.Errs, m.stats.Errs...)
+	stats.Total = m.stats.Total + int64(m.stats.ScanCount)
+	m.stats = stats
+
+}
+
+func (m *ScannerManager) dumpStats(cached *nutsdb.DB) error {
 
-	stats := m.Status()
-	stats.Running = !done
-	bytes, _ := json.Marshal(stats)
+	bytes, _ := json.Marshal(m.Status())
 
 	return cached.Update(
 		func(tx *nutsdb.Tx) error {

m4t_server/Makefile

@@ -18,5 +18,5 @@ docker_gpu:
 	@docker buildx build --build-arg BUILD_COUNTRY="CN" -t m4t-server:0.0.2 ./
 
 docker_cpu:
-	@docker buildx build --build-arg BUILD_COUNTRY="CN" --build-arg BASE="python:3.10.8-slim" --build-arg DEVICE="cpu" -t m4t-server:0.0.2-cpu ./
+	@docker buildx build --build-arg BUILD_COUNTRY="CN" --build-arg DEVICE="cpu" -t m4t-server:0.0.2-cpu ./