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

fix: tv date not exists and folder name suggestion

Browse Source
This commit is contained in:
Simon Ding
2024-09-26 09:45:36 +08:00
parent 89104785d7
commit ecfe31ea45
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/const.go
View File

@@ -37,7 +37,7 @@ const (
LanguageCN = "zh-CN" LanguageCN = "zh-CN"
) )
const DefaultNamingFormat = "{{.NameCN}} {{.NameEN}} ({{.Year}})" const DefaultNamingFormat = "{{.NameCN}} {{.NameEN}} {{if .Year}} ({{.Year}}) {{end}}"
type NamingInfo struct { type NamingInfo struct {
NameCN string NameCN string

4
server/core/importlist.go
View File

@@ -425,7 +425,9 @@ func (c *Client) SuggestedSeriesFolderName(tmdbId int) (string, error) {
if err != nil { if err != nil {
log.Errorf("get en tv detail error: %v", err) log.Errorf("get en tv detail error: %v", err)
} else { } else {
info.NameEN = stripExtraCharacters(en.Name) if en.Name != name { //sometimes en name is in chinese
info.NameEN = stripExtraCharacters(en.Name)
}
} }
} }
year := strings.Split(d.FirstAirDate, "-")[0] year := strings.Split(d.FirstAirDate, "-")[0]

11
server/setting.go
View File

@@ -34,7 +34,7 @@ func (s *Server) SetSetting(c *gin.Context) (interface{}, error) {
return nil, errors.Wrap(err, "bind json") return nil, errors.Wrap(err, "bind json")
} }
utils.TrimFields(&in) utils.TrimFields(&in)
log.Infof("set setting input: %+v", in) log.Infof("set setting input: %+v", in)
if in.TmdbApiKey != "" { if in.TmdbApiKey != "" {
if err := s.db.SetSetting(db.SettingTmdbApiKey, in.TmdbApiKey); err != nil { if err := s.db.SetSetting(db.SettingTmdbApiKey, in.TmdbApiKey); err != nil {
@@ -54,18 +54,23 @@ func (s *Server) SetSetting(c *gin.Context) (interface{}, error) {
} }
} }
if in.TvNamingFormat != "" { if in.TvNamingFormat != "" {
if _, err := template.New("test").Parse(in.TvNamingFormat);err != nil { if _, err := template.New("test").Parse(in.TvNamingFormat); err != nil {
return nil, errors.Wrap(err, "tv format") return nil, errors.Wrap(err, "tv format")
} }
s.db.SetSetting(db.SettingTvNamingFormat, in.TvNamingFormat) s.db.SetSetting(db.SettingTvNamingFormat, in.TvNamingFormat)
} else {
s.db.SetSetting(db.SettingTvNamingFormat, "")
} }
if in.MovieNamingFormat != "" { if in.MovieNamingFormat != "" {
if _, err := template.New("test").Parse(in.MovieNamingFormat);err != nil { if _, err := template.New("test").Parse(in.MovieNamingFormat); err != nil {
return nil, errors.Wrap(err, "movie format") return nil, errors.Wrap(err, "movie format")
} }
s.db.SetSetting(db.SettingMovieNamingFormat, in.MovieNamingFormat) s.db.SetSetting(db.SettingMovieNamingFormat, in.MovieNamingFormat)
} else {
s.db.SetSetting(db.SettingMovieNamingFormat, "")
} }
plexmatchEnabled := s.db.GetSetting(db.SettingPlexMatchEnabled) plexmatchEnabled := s.db.GetSetting(db.SettingPlexMatchEnabled)

2
ui/lib/widgets/detail_card.dart
View File

@@ -72,7 +72,7 @@ class _DetailCardState extends ConsumerState<DetailCard> {
children: [ children: [
//const Text(""), //const Text(""),
Text( Text(
"${widget.details.name} ${widget.details.name != widget.details.originalName ? widget.details.originalName : ''} (${widget.details.airDate!.split("-")[0]})", "${widget.details.name} ${widget.details.name != widget.details.originalName ? widget.details.originalName : ''} ${widget.details.airDate == null? "": (widget.details.airDate!.split("-")[0])}",
style: const TextStyle( style: const TextStyle(
fontSize: 24, fontSize: 24,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,