From e8a3648c99de9870d3a36d256b70885b35b971e4 Mon Sep 17 00:00:00 2001 From: Simon Ding Date: Sun, 14 Jul 2024 23:36:37 +0800 Subject: [PATCH] fix --- db/db.go | 12 ++++++++++-- server/scheduler.go | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/db/db.go b/db/db.go index 1738860..c0d83e1 100644 --- a/db/db.go +++ b/db/db.go @@ -126,8 +126,16 @@ type SeriesDetails struct { } func (c *Client) GetSeriesDetails(id int) *SeriesDetails { - se := c.ent.Series.Query().Where(series.ID(id)).FirstX(context.TODO()) - ep := se.QueryEpisodes().AllX(context.Background()) + se, err := c.ent.Series.Query().Where(series.ID(id)).First(context.TODO()) + if err != nil { + log.Errorf("get series %d: %v", id, err) + return nil + } + ep, err := se.QueryEpisodes().All(context.Background()) + if err != nil { + log.Errorf("get episodes %d: %v", id, err) + return nil + } return &SeriesDetails{ Series: se, Episodes: ep, diff --git a/server/scheduler.go b/server/scheduler.go index 900212a..bbcc2ae 100644 --- a/server/scheduler.go +++ b/server/scheduler.go @@ -56,6 +56,9 @@ func (s *Server) moveCompletedTask(id int) error { r := s.db.GetHistory(id) series := s.db.GetSeriesDetails(r.SeriesID) + if series == nil { + return nil + } st := s.db.GetStorage(series.StorageID) log.Infof("move task files to target dir: %v", r.TargetDir) if st.Implementation == storage1.ImplementationWebdav {