jiazhizhong/polaris
1
0
Fork 0
mirror of https://github.com/simon-ding/polaris.git synced 2026-06-10 03:57:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Simon Ding
2024-07-14 20:52:17 +08:00
parent 6f91157d40
commit 792a470e69
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
db/db.go
View File

@@ -83,21 +83,20 @@ func (c *Client) AddWatchlist(storageId int, nameCn, nameEn string, detail *tmdb
res = R1080p res = R1080p
} }
if storageId == 0 { 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 { if err == nil {
log.Infof("use default storage: %v", r.Name) log.Infof("use default storage: %v", r.Name)
storageId = r.ID storageId = r.ID
} }
} }
st := c.GetStorage(storageId) st := c.GetStorage(storageId)
targetDir := fmt.Sprintf("%s %s (%v)", nameCn, nameEn, strings.Split(detail.FirstAirDate, "-")[0]) targetDir := fmt.Sprintf("%s %s (%v)", nameCn, nameEn, strings.Split(detail.FirstAirDate, "-")[0])
if !utils.IsChineseChar(nameCn) { if !utils.IsChineseChar(nameCn) {
log.Warnf("name cn is not chinese name: %v", nameCn) log.Warnf("name cn is not chinese name: %v", nameCn)
targetDir = fmt.Sprintf("%s (%v)", nameEn, strings.Split(detail.FirstAirDate, "-")[0]) targetDir = fmt.Sprintf("%s (%v)", nameEn, strings.Split(detail.FirstAirDate, "-")[0])
} }
targetDir = filepath.Join(st.GetPath(), targetDir) targetDir = filepath.Join(st.GetPath(), targetDir)
r, err := c.ent.Series.Create(). r, err := c.ent.Series.Create().
@@ -282,7 +281,7 @@ func (c *Client) AddStorage(st *StorageInfo) error {
SetImplementation(storage.Implementation(st.Implementation)). SetImplementation(storage.Implementation(st.Implementation)).
SetSettings(string(data)).Exec(context.TODO()) 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 { if countAll == 0 {
log.Infof("first storage, make it default: %s", st.Name) log.Infof("first storage, make it default: %s", st.Name)
st.Default = true st.Default = true

2
server/watchlist.go
View File

@@ -35,7 +35,7 @@ func (s *Server) SearchTvSeries(c *gin.Context) (interface{}, error) {
type addWatchlistIn struct { type addWatchlistIn struct {
TmdbID int `json:"tmdb_id" binding:"required"` 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"` Resolution db.ResolutionType `json:"resolution" binding:"required"`
} }

11
ui/lib/search.dart
View File

@@ -112,7 +112,7 @@ class _SearchPageState extends ConsumerState<SearchPage> {
return StatefulBuilder( return StatefulBuilder(
builder: (context, setState) { builder: (context, setState) {
String _resSelected = "1080p"; String _resSelected = "1080p";
Storage? _storageSelected; int _storageSelected = 0;
var storage = ref.watch(storageSettingProvider); var storage = ref.watch(storageSettingProvider);
return AlertDialog( return AlertDialog(
@@ -140,12 +140,12 @@ class _SearchPageState extends ConsumerState<SearchPage> {
label: const Text("存储位置"), label: const Text("存储位置"),
initialSelection: _storageSelected, initialSelection: _storageSelected,
dropdownMenuEntries: v dropdownMenuEntries: v
.map((s) => .map((s) => DropdownMenuEntry(
DropdownMenuEntry(label: s.name!, value: s)) label: s.name!, value: s.id))
.toList(), .toList(),
onSelected: (value) { onSelected: (value) {
setState(() { setState(() {
_storageSelected = value; _storageSelected = value!;
}); });
}, },
); );
@@ -170,10 +170,11 @@ class _SearchPageState extends ConsumerState<SearchPage> {
), ),
child: const Text('确定'), child: const Text('确定'),
onPressed: () { onPressed: () {
print(_storageSelected);
ref ref
.read(searchPageDataProvider.notifier) .read(searchPageDataProvider.notifier)
.submit2Watchlist( .submit2Watchlist(
item.id!, _storageSelected!.id!, _resSelected); item.id!, _storageSelected, _resSelected);
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
), ),