diff --git a/conf/configuration.go b/conf/configuration.go index 88e1838fc..cf49606c9 100644 --- a/conf/configuration.go +++ b/conf/configuration.go @@ -57,6 +57,7 @@ type configOptions struct { SearchFullString bool RecentlyAddedByModTime bool PreferSortTags bool + AppendSubtitle bool IgnoredArticles string IndexGroups string FFmpegPath string @@ -433,6 +434,7 @@ func init() { viper.SetDefault("searchfullstring", false) viper.SetDefault("recentlyaddedbymodtime", false) viper.SetDefault("prefersorttags", false) + viper.SetDefault("appendsubtitle", true) viper.SetDefault("ignoredarticles", "The El La Los Las Le Les Os As O A") viper.SetDefault("indexgroups", "A B C D E F G H I J K L M N O P Q R S T U V W X-Z(XYZ) [Unknown]([)") viper.SetDefault("ffmpegpath", "") diff --git a/model/mediafile.go b/model/mediafile.go index d9603f7d3..fda1c784b 100644 --- a/model/mediafile.go +++ b/model/mediafile.go @@ -93,10 +93,10 @@ type MediaFile struct { } func (mf MediaFile) FullTitle() string { - if mf.Tags[TagSubtitle] == nil { - return mf.Title + if conf.Server.AppendSubtitle && mf.Tags[TagSubtitle] != nil { + return fmt.Sprintf("%s (%s)", mf.Title, mf.Tags[TagSubtitle][0]) } - return fmt.Sprintf("%s (%s)", mf.Title, mf.Tags[TagSubtitle][0]) + return mf.Title } func (mf MediaFile) ContentType() string {