mirror of
https://github.com/simon-ding/polaris.git
synced 2026-05-29 05:57:46 +08:00
feat: change name suggestting
This commit is contained in:
@@ -7,7 +7,6 @@ import (
|
|||||||
storage1 "polaris/ent/storage"
|
storage1 "polaris/ent/storage"
|
||||||
"polaris/log"
|
"polaris/log"
|
||||||
"polaris/pkg/storage"
|
"polaris/pkg/storage"
|
||||||
"polaris/pkg/utils"
|
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@@ -66,19 +65,22 @@ func (s *Server) SuggestedSeriesFolderName(c *gin.Context) (interface{}, error)
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrap(err, "get tv details")
|
return nil, errors.Wrap(err, "get tv details")
|
||||||
}
|
}
|
||||||
|
|
||||||
name := d.Name
|
name := d.Name
|
||||||
originalName := d.OriginalName
|
|
||||||
year := strings.Split(d.FirstAirDate, "-")[0]
|
|
||||||
|
|
||||||
|
if s.language == db.LanguageCN {
|
||||||
if utils.ContainsChineseChar(originalName) || name == originalName {
|
en, err := s.MustTMDB().GetTvDetails(id, db.LanguageEN)
|
||||||
name = originalName
|
if err != nil {
|
||||||
|
log.Errorf("get en tv detail error: %v", err)
|
||||||
} else {
|
} else {
|
||||||
name = fmt.Sprintf("%s %s", name, originalName)
|
name = fmt.Sprintf("%s %s", d.Name, en.Name)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
year := strings.Split(d.FirstAirDate, "-")[0]
|
||||||
if year != "" {
|
if year != "" {
|
||||||
name = fmt.Sprintf("%s (%s)", name, year)
|
name = fmt.Sprintf("%s (%s)", name, year)
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Infof("tv series of tmdb id %v suggestting name is %v", id, name)
|
log.Infof("tv series of tmdb id %v suggestting name is %v", id, name)
|
||||||
return gin.H{"name": name}, nil
|
return gin.H{"name": name}, nil
|
||||||
}
|
}
|
||||||
@@ -94,14 +96,17 @@ func (s *Server) SuggestedMovieFolderName(c *gin.Context) (interface{}, error) {
|
|||||||
return nil, errors.Wrap(err, "get movie details")
|
return nil, errors.Wrap(err, "get movie details")
|
||||||
}
|
}
|
||||||
name := d1.Title
|
name := d1.Title
|
||||||
originalName := d1.OriginalTitle
|
|
||||||
year := strings.Split(d1.ReleaseDate, "-")[0]
|
|
||||||
|
|
||||||
if utils.ContainsChineseChar(originalName) || name == originalName {
|
if s.language == db.LanguageCN {
|
||||||
name = originalName
|
en, err := s.MustTMDB().GetMovieDetails(id, db.LanguageEN)
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("get en movie detail error: %v", err)
|
||||||
} else {
|
} else {
|
||||||
name = fmt.Sprintf("%s %s", name, originalName)
|
name = fmt.Sprintf("%s %s", d1.Title, en.Title)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
year := strings.Split(d1.ReleaseDate, "-")[0]
|
||||||
if year != "" {
|
if year != "" {
|
||||||
name = fmt.Sprintf("%s (%s)", name, year)
|
name = fmt.Sprintf("%s (%s)", name, year)
|
||||||
}
|
}
|
||||||
@@ -109,7 +114,6 @@ func (s *Server) SuggestedMovieFolderName(c *gin.Context) (interface{}, error) {
|
|||||||
return gin.H{"name": name}, nil
|
return gin.H{"name": name}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
func (s *Server) getStorage(storageId int, mediaType media.MediaType) (storage.Storage, error) {
|
func (s *Server) getStorage(storageId int, mediaType media.MediaType) (storage.Storage, error) {
|
||||||
st := s.db.GetStorage(storageId)
|
st := s.db.GetStorage(storageId)
|
||||||
targetPath := st.TvPath
|
targetPath := st.TvPath
|
||||||
|
|||||||
@@ -124,6 +124,7 @@ func (s *Server) AddTv2Watchlist(c *gin.Context) (interface{}, error) {
|
|||||||
StorageID: in.StorageID,
|
StorageID: in.StorageID,
|
||||||
TargetDir: in.Folder,
|
TargetDir: in.Folder,
|
||||||
DownloadHistoryEpisodes: in.DownloadHistoryEpisodes,
|
DownloadHistoryEpisodes: in.DownloadHistoryEpisodes,
|
||||||
|
ImdbID: detail.IMDbID,
|
||||||
}, epIds)
|
}, epIds)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrap(err, "add to list")
|
return nil, errors.Wrap(err, "add to list")
|
||||||
@@ -189,6 +190,7 @@ func (s *Server) AddMovie2Watchlist(c *gin.Context) (interface{}, error) {
|
|||||||
Resolution: media.Resolution(in.Resolution),
|
Resolution: media.Resolution(in.Resolution),
|
||||||
StorageID: in.StorageID,
|
StorageID: in.StorageID,
|
||||||
TargetDir: in.Folder,
|
TargetDir: in.Folder,
|
||||||
|
ImdbID: detail.IMDbID,
|
||||||
}, []int{epid})
|
}, []int{epid})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrap(err, "add to list")
|
return nil, errors.Wrap(err, "add to list")
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ class _DetailCardState extends ConsumerState<DetailCard> {
|
|||||||
widget.details.mediaType == 'tv'
|
widget.details.mediaType == 'tv'
|
||||||
? (widget.details.downloadHistoryEpisodes ==
|
? (widget.details.downloadHistoryEpisodes ==
|
||||||
true
|
true
|
||||||
? const Text("下载往期剧集")
|
? const Text("下载所有剧集")
|
||||||
: const Text("只下载更新剧集"))
|
: const Text("只下载更新剧集"))
|
||||||
: const Text("")
|
: const Text("")
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in New Issue
Block a user