From 792a470e694fc1c0665ce3f4fc7afe76a163e116 Mon Sep 17 00:00:00 2001
From: Simon Ding <dingchuan91@gmail.com>
Date: Sun, 14 Jul 2024 20:52:17 +0800
Subject: [PATCH] fix

---
 db/db.go            |  7 +++----
 server/watchlist.go |  2 +-
 ui/lib/search.dart  | 11 ++++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/db/db.go b/db/db.go
index a355656..550133a 100644
--- a/db/db.go
+++ b/db/db.go
@@ -83,21 +83,20 @@ func (c *Client) AddWatchlist(storageId int, nameCn, nameEn string, detail *tmdb
 		res = R1080p
 	}
 	if storageId == 0 {
-		r, err := c.ent.Storage.Query().Where(storage.Default(true)).First(context.TODO())
+		r, err := c.ent.Storage.Query().Where(storage.And(storage.Default(true), storage.Deleted(false))).First(context.TODO())
 		if err == nil {
 			log.Infof("use default storage: %v", r.Name)
 			storageId = r.ID
 		}
 	}
 	st := c.GetStorage(storageId)
-	
+
 	targetDir := fmt.Sprintf("%s %s (%v)", nameCn, nameEn, strings.Split(detail.FirstAirDate, "-")[0])
 	if !utils.IsChineseChar(nameCn) {
 		log.Warnf("name cn is not chinese name: %v", nameCn)
 		targetDir = fmt.Sprintf("%s (%v)", nameEn, strings.Split(detail.FirstAirDate, "-")[0])
 	}
 
-	
 	targetDir = filepath.Join(st.GetPath(), targetDir)
 
 	r, err := c.ent.Series.Create().
@@ -282,7 +281,7 @@ func (c *Client) AddStorage(st *StorageInfo) error {
 			SetImplementation(storage.Implementation(st.Implementation)).
 			SetSettings(string(data)).Exec(context.TODO())
 	}
-	countAll := c.ent.Storage.Query().CountX(context.TODO())
+	countAll := c.ent.Storage.Query().Where(storage.Deleted(false)).CountX(context.TODO())
 	if countAll == 0 {
 		log.Infof("first storage, make it default: %s", st.Name)
 		st.Default = true
diff --git a/server/watchlist.go b/server/watchlist.go
index d94bc1a..04f2c42 100644
--- a/server/watchlist.go
+++ b/server/watchlist.go
@@ -35,7 +35,7 @@ func (s *Server) SearchTvSeries(c *gin.Context) (interface{}, error) {
 
 type addWatchlistIn struct {
 	TmdbID    int `json:"tmdb_id" binding:"required"`
-	StorageID int `json:"storage_id" binding:"required"`
+	StorageID int `json:"storage_id" `
 	Resolution db.ResolutionType `json:"resolution" binding:"required"`
 }
 
diff --git a/ui/lib/search.dart b/ui/lib/search.dart
index 836de74..ad571a1 100644
--- a/ui/lib/search.dart
+++ b/ui/lib/search.dart
@@ -112,7 +112,7 @@ class _SearchPageState extends ConsumerState<SearchPage> {
           return StatefulBuilder(
             builder: (context, setState) {
               String _resSelected = "1080p";
-              Storage? _storageSelected;
+              int _storageSelected = 0;
               var storage = ref.watch(storageSettingProvider);
 
               return AlertDialog(
@@ -140,12 +140,12 @@ class _SearchPageState extends ConsumerState<SearchPage> {
                             label: const Text("存储位置"),
                             initialSelection: _storageSelected,
                             dropdownMenuEntries: v
-                                .map((s) =>
-                                    DropdownMenuEntry(label: s.name!, value: s))
+                                .map((s) => DropdownMenuEntry(
+                                    label: s.name!, value: s.id))
                                 .toList(),
                             onSelected: (value) {
                               setState(() {
-                                _storageSelected = value;
+                                _storageSelected = value!;
                               });
                             },
                           );
@@ -170,10 +170,11 @@ class _SearchPageState extends ConsumerState<SearchPage> {
                     ),
                     child: const Text('确定'),
                     onPressed: () {
+                      print(_storageSelected);
                       ref
                           .read(searchPageDataProvider.notifier)
                           .submit2Watchlist(
-                              item.id!, _storageSelected!.id!, _resSelected);
+                              item.id!, _storageSelected, _resSelected);
                       Navigator.of(context).pop();
                     },
                   ),