Merge pull request #99 from ahzmr/main

fix: 解决macos环境中下载出错与闪退的问题

Author: yann0917

backend/app/download.go

@@ -122,7 +122,9 @@ func (d *CourseDownload) Download() error {
 			progress.Total = total
 			curr++
 			progress.Current = curr
-			progress.Pct = curr * 100 / progress.Total
+			if total > 0 {
+				progress.Pct = curr * 100 / progress.Total
+			}
 			progress.Value = datum.Title
 			runtime.EventsEmit(d.Ctx, "courseDownload", progress)
 			emitProgress(d.ProgressCB, progress)
@@ -192,7 +194,9 @@ func (d *OdobDownload) Download() error {
 			progress.Total = total
 			curr++
 			progress.Current = curr
-			progress.Pct = curr * 100 / progress.Total
+			if total > 0 {
+				progress.Pct = curr * 100 / progress.Total
+			}
 			progress.Value = datum.Title + ".mp3"
 			runtime.EventsEmit(d.Ctx, "odobDownload", progress)
 			emitProgress(d.ProgressCB, progress)
@@ -629,7 +633,9 @@ func DownloadPdfCourse(list []downloader.Datum, path string, ctx context.Context
 		progress.Total = total
 		curr++
 		progress.Current = curr
-		progress.Pct = curr * 100 / progress.Total
+		if total > 0 {
+			progress.Pct = curr * 100 / progress.Total
+		}
 		progress.Value = v.Title
 		runtime.EventsEmit(ctx, "courseDownload", progress)
 		emitProgress(cb, progress)
@@ -678,7 +684,9 @@ func DownloadMarkdown(list *services.ArticleList, aid int, path string, ctx cont
 		progress.Total = total
 		curr++
 		progress.Current = curr
-		progress.Pct = curr * 100 / progress.Total
+		if total > 0 {
+			progress.Pct = curr * 100 / progress.Total
+		}
 		progress.Value = v.Title
 		runtime.EventsEmit(ctx, "courseDownload", progress)
 		emitProgress(cb, progress)

backend/app/ebook.go

@@ -63,6 +63,9 @@ func EbookPage(ctx context.Context, enID string, cb ProgressCallback) (info *ser
 	wgp := utils.NewWaitGroupPool(5)
 	total, curr := len(info.BookInfo.Orders), 0
 	var chapterMap sync.Map
+	var mu sync.Mutex
+	var firstErr error
+	var svgList []*utils.SvgContent
 	for _, ebookToc := range info.BookInfo.Toc {
 		key := ebookToc.Href
 		href := strings.Split(ebookToc.Href, "#")
@@ -76,7 +79,9 @@ func EbookPage(ctx context.Context, enID string, cb ProgressCallback) (info *ser
 		progress.Total = total
 		curr++
 		progress.Current = curr
-		progress.Pct = curr * 100 / progress.Total
+		if total > 0 {
+			progress.Pct = curr * 100 / progress.Total
+		}
 		value, ok := chapterMap.Load(order.ChapterID)
 		if ok {
 			progress.Value = value.(utils.EbookToc).Text
@@ -87,24 +92,42 @@ func EbookPage(ctx context.Context, enID string, cb ProgressCallback) (info *ser
 		wgp.Add()
 		go func(i int, order services.EbookOrders) {
 			defer func() {
+				if r := recover(); r != nil {
+					mu.Lock()
+					if firstErr == nil {
+						firstErr = fmt.Errorf("goroutine panic: %v", r)
+					}
+					mu.Unlock()
+				}
 				wgp.Done()
 			}()
 			index, count, offset := 0, 20, 0
-			svgList, err1 := generateEbookPages(enID, order.ChapterID, token.Token, index, count, offset)
+			pages, err1 := generateEbookPages(enID, order.ChapterID, token.Token, index, count, offset)
 			if err1 != nil {
-				err = err1
+				mu.Lock()
+				if firstErr == nil {
+					firstErr = err1
+				}
+				mu.Unlock()
 				return
 			}
 
-			svgContent = append(svgContent, &utils.SvgContent{
-				Contents:   svgList,
+			mu.Lock()
+			svgList = append(svgList, &utils.SvgContent{
+				Contents:   pages,
 				ChapterID:  order.ChapterID,
 				PathInEpub: order.PathInEpub,
 				OrderIndex: i,
 			})
+			mu.Unlock()
 		}(i, order)
 	}
 	wgp.Wait()
+	if firstErr != nil {
+		err = firstErr
+		return
+	}
+	svgContent = svgList
 	return
 }
 
@@ -154,7 +177,13 @@ func generateEbookPages(enid, chapterID, token string, index, count, offset int)
 // PKCS7Unpad 实现PKCS7去填充
 func PKCS7Unpad(data []byte) []byte {
 	length := len(data)
+	if length == 0 {
+		return data
+	}
 	unpadding := int(data[length-1])
+	if unpadding == 0 || unpadding > length {
+		return data
+	}
 	return data[:(length - unpadding)]
 }
 
@@ -175,6 +204,10 @@ func DecryptAES(contents string) string {
 	}
 
 	blockSize := block.BlockSize()
+	// CryptBlocks 要求密文长度必须是 block 大小的整数倍，否则会 panic
+	if len(ciphertext) == 0 || len(ciphertext)%blockSize != 0 {
+		return ""
+	}
 	mode := cipher.NewCBCDecrypter(block, iv[:blockSize])
 	plaintext := make([]byte, len(ciphertext))
 	mode.CryptBlocks(plaintext, ciphertext)

backend/config/config.go

@@ -129,7 +129,7 @@ func (c *ConfigsData) Save() error {
 	data, err := jsoniter.MarshalIndent(conf, "", " ")
 
 	if err != nil {
-		panic(err)
+		return err
 	}
 
 	// 减掉多余的部分

backend/downloader/downloader.go

@@ -22,6 +22,9 @@ func Download(v Datum, stream, path string) error {
 		title = fmt.Sprintf("%03d.%s", v.OrderNum, title)
 	}
 	if stream == "" {
+		if len(v.sortedStreams) == 0 {
+			return fmt.Errorf("没有可用的下载流：%s", v.Title)
+		}
 		stream = v.sortedStreams[0].name
 	}
 	data, ok := v.Streams[stream]

backend/downloadmgr/repository.go

@@ -288,11 +288,11 @@ func (r *Repository) ClearTasks(clearAll bool) error {
 }
 
 func defaultDBPath() (string, error) {
-	wd, err := os.Getwd()
+	configDir, err := os.UserConfigDir()
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("获取用户配置目录失败: %w", err)
 	}
-	dir := filepath.Join(wd, ".cache", "download")
+	dir := filepath.Join(configDir, "dedao", "download")
 	if err = os.MkdirAll(dir, 0755); err != nil {
 		return "", fmt.Errorf("创建下载数据库目录失败: %w", err)
 	}

backend/utils/badger.go

@@ -3,7 +3,6 @@ package utils
 import (
 	"encoding/json"
 	"fmt"
-	"log"
 	"os"
 	"path/filepath"
 	"strings"
@@ -36,13 +35,13 @@ func ensureDir(dirPath string) error {
 
 // GetBadgerDB 获取全局 BadgerDB 实例
 func GetBadgerDB(dbPath string) (*BadgerDB, error) {
+	var initErr error
 	once.Do(func() {
-		var err error
-		badgerInstance, err = NewBadgerDB(dbPath)
-		if err != nil {
-			log.Fatalf("初始化 BadgerDB 失败: %v", err)
-		}
+		badgerInstance, initErr = NewBadgerDB(dbPath)
 	})
+	if badgerInstance == nil {
+		return nil, fmt.Errorf("初始化 BadgerDB 失败: %w", initErr)
+	}
 	return badgerInstance, nil
 }
 
@@ -270,9 +269,10 @@ func FormatKey(category string, id int) string {
 
 // GetDefaultBadgerDBPath 获取默认的 BadgerDB 路径
 func GetDefaultBadgerDBPath() string {
-	configDir, err := os.Getwd()
+	// 使用 UserConfigDir 而非 os.Getwd()，避免 macOS .app 包中返回 "/" 的问题
+	configDir, err := os.UserConfigDir()
 	if err != nil {
 		configDir = os.TempDir()
 	}
-	return filepath.Join(configDir, ".cache", "db")
+	return filepath.Join(configDir, "dedao", ".cache", "db")
 }

backend/utils/svg2html.go

@@ -696,7 +696,7 @@ func GenLineContentByElement(chapterID string, element *svgparser.Element) (line
 			// footnote image with text in one line
 			yInt, _ := strconv.ParseFloat(ele.Y, 64)
 			w, _ := strconv.ParseFloat(ele.Width, 64)
-			if children.Name == "image" && w < footNoteImgW {
+			if children.Name == "image" && w < footNoteImgW && k > 0 {
 				attrPre := element.Children[k-1].Attributes
 				yInt, _ = strconv.ParseFloat(attrPre["y"], 64)
 				ele.Y = attrPre["y"]

frontend/wailsjs/runtime/runtime.d.ts

@@ -246,85 +246,4 @@ export function OnFileDropOff() :void
 export function CanResolveFilePaths(): boolean;
 
 // Resolves file paths for an array of files
-export function ResolveFilePaths(files: File[]): void
-
-// Notification types
-export interface NotificationOptions {
-    id: string;
-    title: string;
-    subtitle?: string; // macOS and Linux only
-    body?: string;
-    categoryId?: string;
-    data?: { [key: string]: any };
-}
-
-export interface NotificationAction {
-    id?: string;
-    title?: string;
-    destructive?: boolean; // macOS-specific
-}
-
-export interface NotificationCategory {
-    id?: string;
-    actions?: NotificationAction[];
-    hasReplyField?: boolean;
-    replyPlaceholder?: string;
-    replyButtonTitle?: string;
-}
-
-// [InitializeNotifications](https://wails.io/docs/reference/runtime/notification#initializenotifications)
-// Initializes the notification service for the application.
-// This must be called before sending any notifications.
-export function InitializeNotifications(): Promise<void>;
-
-// [CleanupNotifications](https://wails.io/docs/reference/runtime/notification#cleanupnotifications)
-// Cleans up notification resources and releases any held connections.
-export function CleanupNotifications(): Promise<void>;
-
-// [IsNotificationAvailable](https://wails.io/docs/reference/runtime/notification#isnotificationavailable)
-// Checks if notifications are available on the current platform.
-export function IsNotificationAvailable(): Promise<boolean>;
-
-// [RequestNotificationAuthorization](https://wails.io/docs/reference/runtime/notification#requestnotificationauthorization)
-// Requests notification authorization from the user (macOS only).
-export function RequestNotificationAuthorization(): Promise<boolean>;
-
-// [CheckNotificationAuthorization](https://wails.io/docs/reference/runtime/notification#checknotificationauthorization)
-// Checks the current notification authorization status (macOS only).
-export function CheckNotificationAuthorization(): Promise<boolean>;
-
-// [SendNotification](https://wails.io/docs/reference/runtime/notification#sendnotification)
-// Sends a basic notification with the given options.
-export function SendNotification(options: NotificationOptions): Promise<void>;
-
-// [SendNotificationWithActions](https://wails.io/docs/reference/runtime/notification#sendnotificationwithactions)
-// Sends a notification with action buttons. Requires a registered category.
-export function SendNotificationWithActions(options: NotificationOptions): Promise<void>;
-
-// [RegisterNotificationCategory](https://wails.io/docs/reference/runtime/notification#registernotificationcategory)
-// Registers a notification category that can be used with SendNotificationWithActions.
-export function RegisterNotificationCategory(category: NotificationCategory): Promise<void>;
-
-// [RemoveNotificationCategory](https://wails.io/docs/reference/runtime/notification#removenotificationcategory)
-// Removes a previously registered notification category.
-export function RemoveNotificationCategory(categoryId: string): Promise<void>;
-
-// [RemoveAllPendingNotifications](https://wails.io/docs/reference/runtime/notification#removeallpendingnotifications)
-// Removes all pending notifications from the notification center.
-export function RemoveAllPendingNotifications(): Promise<void>;
-
-// [RemovePendingNotification](https://wails.io/docs/reference/runtime/notification#removependingnotification)
-// Removes a specific pending notification by its identifier.
-export function RemovePendingNotification(identifier: string): Promise<void>;
-
-// [RemoveAllDeliveredNotifications](https://wails.io/docs/reference/runtime/notification#removealldeliverednotifications)
-// Removes all delivered notifications from the notification center.
-export function RemoveAllDeliveredNotifications(): Promise<void>;
-
-// [RemoveDeliveredNotification](https://wails.io/docs/reference/runtime/notification#removedeliverednotification)
-// Removes a specific delivered notification by its identifier.
-export function RemoveDeliveredNotification(identifier: string): Promise<void>;
-
-// [RemoveNotification](https://wails.io/docs/reference/runtime/notification#removenotification)
-// Removes a notification by its identifier (cross-platform convenience function).
-export function RemoveNotification(identifier: string): Promise<void>;
+export function ResolveFilePaths(files: File[]): void

frontend/wailsjs/runtime/runtime.js

@@ -239,60 +239,4 @@ export function CanResolveFilePaths() {
 
 export function ResolveFilePaths(files) {
     return window.runtime.ResolveFilePaths(files);
-}
-
-export function InitializeNotifications() {
-    return window.runtime.InitializeNotifications();
-}
-
-export function CleanupNotifications() {
-    return window.runtime.CleanupNotifications();
-}
-
-export function IsNotificationAvailable() {
-    return window.runtime.IsNotificationAvailable();
-}
-
-export function RequestNotificationAuthorization() {
-    return window.runtime.RequestNotificationAuthorization();
-}
-
-export function CheckNotificationAuthorization() {
-    return window.runtime.CheckNotificationAuthorization();
-}
-
-export function SendNotification(options) {
-    return window.runtime.SendNotification(options);
-}
-
-export function SendNotificationWithActions(options) {
-    return window.runtime.SendNotificationWithActions(options);
-}
-
-export function RegisterNotificationCategory(category) {
-    return window.runtime.RegisterNotificationCategory(category);
-}
-
-export function RemoveNotificationCategory(categoryId) {
-    return window.runtime.RemoveNotificationCategory(categoryId);
-}
-
-export function RemoveAllPendingNotifications() {
-    return window.runtime.RemoveAllPendingNotifications();
-}
-
-export function RemovePendingNotification(identifier) {
-    return window.runtime.RemovePendingNotification(identifier);
-}
-
-export function RemoveAllDeliveredNotifications() {
-    return window.runtime.RemoveAllDeliveredNotifications();
-}
-
-export function RemoveDeliveredNotification(identifier) {
-    return window.runtime.RemoveDeliveredNotification(identifier);
-}
-
-export function RemoveNotification(identifier) {
-    return window.runtime.RemoveNotification(identifier);
 }

go.mod

@@ -17,14 +17,13 @@ require (
 	github.com/json-iterator/go v1.1.12
 	github.com/mattn/go-colorable v0.1.14
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
-	github.com/wailsapp/wails/v2 v2.12.0
+	github.com/wailsapp/wails/v2 v2.11.0
 	golang.org/x/sync v0.12.0
 	gorm.io/driver/sqlite v1.6.0
 	gorm.io/gorm v1.31.1
 )
 
 require (
-	git.sr.ht/~jackmordaunt/go-toast/v2 v2.0.3 // indirect
 	github.com/andybalholm/cascadia v1.3.2 // indirect
 	github.com/bep/debounce v1.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect