feat: add ability to change folder naming convention

server/core/importlist.go

@@ -1,7 +1,9 @@
 package core
 
 import (
+	"bytes"
 	"fmt"
+	"html/template"
 	"io"
 	"net/http"
 	"os"
@@ -366,27 +368,35 @@ func (c *Client) SuggestedMovieFolderName(tmdbId int) (string, error) {
 			return javid, nil
 		}
 	}
-
-	//if name is already in english, no need to query again
-	if !utils.IsASCII(name) && c.language == db.LanguageCN {
+	info := db.NamingInfo{TmdbID: tmdbId}
+	if utils.IsASCII(name) {
+		info.NameEN = stripExtraCharacters(name)
+	} else {
+		info.NameCN = stripExtraCharacters(name)
 		en, err := c.MustTMDB().GetMovieDetails(tmdbId, db.LanguageEN)
 		if err != nil {
-			log.Errorf("get en movie detail error: %v", err)
+			log.Errorf("get en tv detail error: %v", err)
 		} else {
-			name = fmt.Sprintf("%s %s", name, en.Title)
+			info.NameEN = stripExtraCharacters(en.Title)
 		}
 	}
-	//remove extra characters
-	re := regexp.MustCompile(`[^\p{L}\w\s]`)
-	name = re.ReplaceAllString(name, " ")
-	name = strings.Join(strings.Fields(name), " ")
 	year := strings.Split(d1.ReleaseDate, "-")[0]
-	if year != "" {
-		name = fmt.Sprintf("%s (%s)", name, year)
-	}
+	info.Year = year
+	movieNamingFormat := c.db.GetMovingNamingFormat()
 
-	log.Infof("tv series of tmdb id %v suggestting name is %v", tmdbId, name)
-	return name, nil
+	tmpl, err := template.New("test").Parse(movieNamingFormat)
+	if err != nil {
+		return "", errors.Wrap(err, "naming format")
+	}
+	buff := &bytes.Buffer{}
+	err = tmpl.Execute(buff, info)
+	if err != nil {
+		return "", errors.Wrap(err, "tmpl exec")
+	}
+	res := strings.TrimSpace(buff.String())
+
+	log.Infof("tv series of tmdb id %v suggestting name is %v", tmdbId, res)
+	return res, nil
 }
 
 func (c *Client) SuggestedSeriesFolderName(tmdbId int) (string, error) {
@@ -398,24 +408,40 @@ func (c *Client) SuggestedSeriesFolderName(tmdbId int) (string, error) {
 
 	name := d.Name
 
-	//if name is already in english, no need to query again
-	if !utils.IsASCII(name) && c.language == db.LanguageCN {
+	info := db.NamingInfo{TmdbID: tmdbId}
+	if utils.IsASCII(name) {
+		info.NameEN = stripExtraCharacters(name)
+	} else {
+		info.NameCN = stripExtraCharacters(name)
 		en, err := c.MustTMDB().GetTvDetails(tmdbId, db.LanguageEN)
 		if err != nil {
 			log.Errorf("get en tv detail error: %v", err)
 		} else {
-			name = fmt.Sprintf("%s %s", name, en.Name)
+			info.NameEN = stripExtraCharacters(en.Name)
 		}
 	}
-	//remove extra characters
-	re := regexp.MustCompile(`[^\p{L}\w\s]`)
-	name = re.ReplaceAllString(name, " ")
-	name = strings.Join(strings.Fields(name), " ")
 	year := strings.Split(d.FirstAirDate, "-")[0]
-	if year != "" {
-		name = fmt.Sprintf("%s (%s)", name, year)
-	}
+	info.Year = year
 
-	log.Infof("tv series of tmdb id %v suggestting name is %v", tmdbId, name)
-	return name, nil
+	tvNamingFormat := c.db.GetTvNamingFormat()
+
+	tmpl, err := template.New("test").Parse(tvNamingFormat)
+	if err != nil {
+		return "", errors.Wrap(err, "naming format")
+	}
+	buff := &bytes.Buffer{}
+	err = tmpl.Execute(buff, info)
+	if err != nil {
+		return "", errors.Wrap(err, "tmpl exec")
+	}
+	res := strings.TrimSpace(buff.String())
+
+	log.Infof("tv series of tmdb id %v suggestting name is %v", tmdbId, res)
+	return res, nil
+}
+
+func stripExtraCharacters(s string) string {
+	re := regexp.MustCompile(`[^\p{L}\w\s]`)
+	s = re.ReplaceAllString(s, " ")
+	return strings.Join(strings.Fields(s), " ")
 }

server/setting.go

@@ -22,6 +22,8 @@ type GeneralSettings struct {
 	EnableNfo          bool   `json:"enable_nfo"`
 	AllowQiangban      bool   `json:"allow_qiangban"`
 	EnableAdultContent bool   `json:"enable_adult_content"`
+	TvNamingFormat     string   `json:"tv_naming_format"`
+	MovieNamingFormat  string   `json:"movie_naming_format"`
 }
 
 func (s *Server) SetSetting(c *gin.Context) (interface{}, error) {
@@ -46,7 +48,12 @@ func (s *Server) SetSetting(c *gin.Context) (interface{}, error) {
 		if err := s.db.SetSetting(db.SettingLogLevel, in.LogLevel); err != nil {
 			return nil, errors.Wrap(err, "save log level")
 		}
-
+	}
+	if in.TvNamingFormat != "" {
+		s.db.SetSetting(db.SettingTvNamingFormat, in.TvNamingFormat)
+	}
+	if in.MovieNamingFormat != "" {
+		s.db.SetSetting(db.SettingMovieNamingFormat, in.MovieNamingFormat)
 	}
 
 	plexmatchEnabled := s.db.GetSetting(db.SettingPlexMatchEnabled)
@@ -74,7 +81,6 @@ func (s *Server) SetSetting(c *gin.Context) (interface{}, error) {
 	} else {
 		s.db.SetSetting(db.SettingEnableTmdbAdultContent, "false")
 	}
-
 	return nil, nil
 }
 
@@ -86,15 +92,19 @@ func (s *Server) GetSetting(c *gin.Context) (interface{}, error) {
 	allowQiangban := s.db.GetSetting(db.SettingAllowQiangban)
 	enableNfo := s.db.GetSetting(db.SettingNfoSupportEnabled)
 	enableAdult := s.db.GetSetting(db.SettingEnableTmdbAdultContent)
+	tvFormat := s.db.GetTvNamingFormat()
+	movieFormat := s.db.GetMovingNamingFormat()
 	return &GeneralSettings{
-		TmdbApiKey:      tmdb,
-		DownloadDir:     downloadDir,
-		LogLevel:        logLevel,
-		Proxy:           s.db.GetSetting(db.SettingProxy),
-		EnablePlexmatch: plexmatchEnabled == "true",
-		AllowQiangban:   allowQiangban == "true",
-		EnableNfo:       enableNfo == "true",
-		EnableAdultContent: enableAdult == "true",
+		TmdbApiKey:           tmdb,
+		DownloadDir:          downloadDir,
+		LogLevel:             logLevel,
+		Proxy:                s.db.GetSetting(db.SettingProxy),
+		EnablePlexmatch:      plexmatchEnabled == "true",
+		AllowQiangban:        allowQiangban == "true",
+		EnableNfo:            enableNfo == "true",
+		EnableAdultContent:   enableAdult == "true",
+		TvNamingFormat: tvFormat,
+		MovieNamingFormat: movieFormat,
 	}, nil
 }
 
@@ -262,4 +272,4 @@ func (s *Server) TriggerCronJob(c *gin.Context) (interface{}, error) {
 		return nil, err
 	}
 	return "success", nil
-}
+}