Fix Equivalent to --show-path in config file #62

ShowPath field can be added in config.json file. When given, Destinaton field is ignored.
simulot · Feb 10, 2021 · 7e5f07e · 7e5f07e
1 parent e9165d3
commit 7e5f07e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/cmd/aspiratv/config.go b/cmd/aspiratv/config.go
@@ -22,7 +22,7 @@ func (a *app) Initialize(cmd string) {
 			a.logger.Fatal().Printf("[Initialize] %s", err)
 		}
 		// Check and normalize configuration file
-		a.Config.Check()
+		a.Check(&a.Config)
 	}
 
 	// Check ffmpeg presence
@@ -113,7 +113,7 @@ func (a *app) ReadConfig(configFile string) error {
 }
 
 // Check the configuration or die
-func (c *config) Check() {
+func (a *app) Check(c *config) {
 
 	// Expand paths
 	for d, p := range c.Destinations {
@@ -126,7 +126,9 @@ func (c *config) Check() {
 		m.Title = strings.ToLower(m.Title)
 		if len(m.ShowRootPath) == 0 {
 			if s, ok := c.Destinations[m.Destination]; !ok {
-				log.Fatalf("Destination %q for show %q is not defined into section Destination of %q", m.Destination, m.Show, c.ConfigFile)
+				if m.ShowRootPath == "" {
+					a.logger.Fatal().Printf("Destination %q for show %q is not defined into section Destination of %q", m.Destination, m.Show, c.ConfigFile)
+				}
 			} else {
 				m.ShowRootPath = filepath.Join(s, providers.PathNameCleaner(m.Show))
 			}

diff --git a/cmd/aspiratv/config.json b/cmd/aspiratv/config.json
@@ -11,17 +11,17 @@
       "enabled": true
     },
     "gulli": {
-      "enabled": true
+      "enabled": false
     },
     "artetv": {
-      "enabled": true
+      "enabled": false
     }
   },
   "WatchList": [
     {
-      "Show": "La maison France 5",
+      "Show": "Les Lapins Crétins - Invasion",
       "Provider": "francetv",
-      "Destination": "Séries"
+      "ShowPath": "${HOME}/Videos/DL/TEST/LAPINS"
     }
   ]
 }
diff --git a/cmd/aspiratv/main.go b/cmd/aspiratv/main.go
@@ -403,7 +403,7 @@ showLoop:
 		if m.Match.ShowRootPath == "" {
 			m.ShowPath = path.Join(a.Config.Destinations[m.Match.Destination], nfo.FileNameCleaner(m.Metadata.GetMediaInfo().Showtitle))
 		} else {
-			m.ShowPath = m.Match.ShowRootPath
+			m.ShowPath = os.ExpandEnv(m.Match.ShowRootPath)
 		}
 
 		mediaBaseName := filepath.Base(m.Metadata.GetMediaPath(m.ShowPath))

diff --git a/providers/matcher/matcher.go b/providers/matcher/matcher.go
@@ -18,7 +18,7 @@ type MatchRequest struct {
 	MaxAgedDays int // Retrive media younger than MaxAgedDays when not zero
 
 	Destination   string // Destination name when found
-	ShowRootPath  string // Show/Movie path. For expisodes, actual season will append to the path
+	ShowRootPath  string `json:"ShowPath"` // Show/Movie path. For expisodes, actual season will append to the path
 	RetentionDays int    // Media retention time, when not zero the system will delete old files
 	TitleFilter   Filter // ShowTitle or Episode title must match this regexp to be downloaded
 	TitleExclude  Filter // ShowTitle and Episode title must not match this regexp to be downloaded