fix: tv date not exists and folder name suggestion

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

View File

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

View File

@@ -425,7 +425,9 @@ func (c *Client) SuggestedSeriesFolderName(tmdbId int) (string, error) {
if err != nil {
log.Errorf("get en tv detail error: %v", err)
} 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]

View File

@@ -34,7 +34,7 @@ func (s *Server) SetSetting(c *gin.Context) (interface{}, error) {
return nil, errors.Wrap(err, "bind json")
}
utils.TrimFields(&in)
log.Infof("set setting input: %+v", in)
if in.TmdbApiKey != "" {
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 _, 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")
}
s.db.SetSetting(db.SettingTvNamingFormat, in.TvNamingFormat)
} else {
s.db.SetSetting(db.SettingTvNamingFormat, "")
}
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")
}
s.db.SetSetting(db.SettingMovieNamingFormat, in.MovieNamingFormat)
} else {
s.db.SetSetting(db.SettingMovieNamingFormat, "")
}
plexmatchEnabled := s.db.GetSetting(db.SettingPlexMatchEnabled)

View File

@@ -72,7 +72,7 @@ class _DetailCardState extends ConsumerState<DetailCard> {
children: [
//const 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(
fontSize: 24,
fontWeight: FontWeight.bold,