Merge pull request #584 from Unpackerr/unstable

davidnewhall · web-flow · commit 7e0b6c67c853 · 2026-02-17T23:36:41.000-08:00
fixes
diff --git a/.golangci.yml b/.golangci.yml
@@ -16,6 +16,7 @@ linters:
     - funcorder # also lame.
     - noinlineerr # I like inline errors.
     - wsl_v5 # this one sucks compared to wsl, and lacks configurability.
+    - gomoddirectives # we need to use our own iso9660 package until we fix the issue with the original package.
 
   settings:
     depguard:
diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml
@@ -81,6 +81,7 @@ services:
     - UN_LIDARR_0_DELETE_DELAY=5m
     - UN_LIDARR_0_DELETE_ORIG=false
     - UN_LIDARR_0_SYNCTHING=false
+    - UN_LIDARR_0_SPLIT_FLAC=false
     ## Readarr Settings
     - UN_READARR_0_URL=http://readarr:8787
     - UN_READARR_0_API_KEY=0123456789abcdef0123456789abcdef
@@ -137,4 +138,4 @@ services:
     - UN_CMDHOOK_0_EXCLUDE_1=lidarr
     - UN_CMDHOOK_0_TIMEOUT=10s
 
-## => Content Auto Generated, 14 FEB 2026 03:44 UTC
+## => Content Auto Generated, 18 FEB 2026 06:53 UTC
diff --git a/examples/unpackerr.conf.example b/examples/unpackerr.conf.example
@@ -181,6 +181,9 @@ passwords = []
 # delete_orig = false
 ## If you use Syncthing, setting this to true will make unpackerr wait for syncs to finish.
 # syncthing = false
+## When enabled, FLAC files with embedded CUE sheets are split into
+## individual track files.
+# split_flac = false
 
 #[[readarr]]
 # url = "http://127.0.0.1:8787"
@@ -315,4 +318,4 @@ passwords = []
 ## You can adjust how long to wait for the command to run.
 # timeout = "10s"
 
-## => Content Auto Generated, 16 FEB 2026 17:44 UTC
+## => Content Auto Generated, 18 FEB 2026 06:53 UTC
diff --git a/go.mod b/go.mod
@@ -2,6 +2,9 @@ module github.com/Unpackerr/unpackerr
 
 go 1.26.0
 
+//nolint:gomoddirectives // we need to use our own iso9660 package until we fix the issue with the original package.
+replace github.com/kdomanski/iso9660 => github.com/Unpackerr/iso9660 v0.0.1
+
 require (
 	code.cloudfoundry.org/bytefmt v0.64.0
 	github.com/BurntSushi/toml v1.6.0
@@ -21,7 +24,7 @@ require (
 	golift.io/rotatorr v0.0.0-20260217050959-f6ac6fc7b38e
 	golift.io/starr v1.3.0
 	golift.io/version v0.0.2
-	golift.io/xtractr v0.3.1-0.20260218045420-698696d97b1b
+	golift.io/xtractr v0.3.1-0.20260218060125-b814a941badb
 	gopkg.in/yaml.v3 v3.0.1
 )
 
diff --git a/go.sum b/go.sum
@@ -4,6 +4,8 @@ github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk
 github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
 github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
+github.com/Unpackerr/iso9660 v0.0.1 h1:T1sigj6u9eBuoVeeJyMRdSHi83czj5EDU7vCQUhDv7g=
+github.com/Unpackerr/iso9660 v0.0.1/go.mod h1:OxUSupHsO9ceI8lBLPJKWBTphLemjrCQY8LPXM7qSzU=
 github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
 github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
@@ -83,8 +85,6 @@ github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6 h1:8UsGZ2rr2ksmEru6lTo
 github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6/go.mod h1:xQig96I1VNBDIWGCdTt54nHt6EeI639SmHycLYL7FkA=
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
-github.com/kdomanski/iso9660 v0.4.0 h1:BPKKdcINz3m0MdjIMwS0wx1nofsOjxOq8TOr45WGHFg=
-github.com/kdomanski/iso9660 v0.4.0/go.mod h1:OxUSupHsO9ceI8lBLPJKWBTphLemjrCQY8LPXM7qSzU=
 github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c=
 github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -254,8 +254,8 @@ golift.io/udf v0.0.1 h1:kEcJVzqqR+IEWGMuPjuVPT9DzXRDukEgsizKAKn1LF8=
 golift.io/udf v0.0.1/go.mod h1:ndK7AlWOh+u+nW9tNsQR95dfHsfASG5Y3dMyzVqmPjw=
 golift.io/version v0.0.2 h1:i0gXRuSDHKs4O0sVDUg4+vNIuOxYoXhaxspftu2FRTE=
 golift.io/version v0.0.2/go.mod h1:76aHNz8/Pm7CbuxIsDi97jABL5Zui3f2uZxDm4vB6hU=
-golift.io/xtractr v0.3.1-0.20260218045420-698696d97b1b h1:83TiUL0F/TGz6Tr2I3SGco/mED+j0eKQGSique/yI1w=
-golift.io/xtractr v0.3.1-0.20260218045420-698696d97b1b/go.mod h1:iL6zP/zYuXYfFhuE7cB8e+dtOo9aS0DFHX/feoxuXl4=
+golift.io/xtractr v0.3.1-0.20260218060125-b814a941badb h1:03V2/jDBm5QJTAFB6NxF0esrOJ85u6Vo0DIzQUk069Q=
+golift.io/xtractr v0.3.1-0.20260218060125-b814a941badb/go.mod h1:+eMxkIVQjwJENgn9XCSqmsPGuzWOPvn3Ez5YSRM2Dgw=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
 google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/Knetic/govaluate.v3 v3.0.0/go.mod h1:csKLBORsPbafmSCGTEh3U7Ozmsuq8ZSIlKk1bcqph0E=
diff --git a/init/config/compose.go b/init/config/compose.go
@@ -90,7 +90,7 @@ func (h *Header) makeComposeDefined(prefix string, defs Defs, order []section, b
 	var buf bytes.Buffer
 
 	for _, section := range order {
-		newHeader := createDefinedSection(defs[section], h)
+		newHeader := createDefinedSection(defs[section], h, section)
 		// Make a brand new section and print it.
 		buf.WriteString(newHeader.makeCompose(prefix, bare))
 	}
diff --git a/init/config/config.go b/init/config/config.go
@@ -108,7 +108,7 @@ func (h *Header) makeDefinedSection(defs Defs, order []section, showValue bool)
 	var buf bytes.Buffer
 
 	for _, section := range order {
-		newHeader := createDefinedSection(defs[section], h)
+		newHeader := createDefinedSection(defs[section], h, section)
 		// Make a brand new section and pass it back in.
 		// Only defined sections can comment the header.
 		buf.WriteString(newHeader.makeSection(section, !defs[section].Comment, showValue))
diff --git a/init/config/definitions.yml b/init/config/definitions.yml
@@ -517,6 +517,15 @@ sections:
         recommend: *BOOLEAN
         short: Setting this to true makes unpackerr wait for syncthing to finish.
         desc: If you use Syncthing, setting this to true will make unpackerr wait for syncs to finish.
+      - name: split_flac
+        envvar: SPLIT_FLAC
+        default: false
+        recommend: *BOOLEAN
+        apps: [lidarr]
+        short: Split FLAC cue sheets into separate tracks.
+        desc: |
+          When enabled, FLAC files with embedded CUE sheets are split into
+          individual track files.
 
   # Global folder configuration.
   folders:
diff --git a/init/config/docusaurus.go b/init/config/docusaurus.go
@@ -148,7 +148,7 @@ func (h *Header) makeDefinedDocs(prefix string, defs Defs, order []section) stri
 	var buf bytes.Buffer
 
 	for _, section := range order {
-		buf.WriteString(createDefinedSection(defs[section], h).makeDocs(prefix, section))
+		buf.WriteString(createDefinedSection(defs[section], h, section).makeDocs(prefix, section))
 	}
 
 	return buf.String()
diff --git a/init/config/main.go b/init/config/main.go
@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 	"time"
 
@@ -68,6 +69,7 @@ type Param struct {
 	Desc      string   `yaml:"desc"`
 	Kind      string   `yaml:"kind"` // "", list, conlist
 	Recommend []Option `yaml:"recommend"`
+	Apps      []string `yaml:"apps"` // If set, param only appears for these starr app names (e.g. lidarr).
 }
 
 type Def struct {
@@ -165,12 +167,20 @@ func openFile(fileName string) (io.ReadCloser, error) {
 	return resp.Body, nil
 }
 
-func createDefinedSection(def *Def, section *Header) *Header {
+func createDefinedSection(def *Def, section *Header, sectionName section) *Header {
+	params := make([]*Param, 0, len(section.Params))
+	// Filter params to only those that apply to this app (empty Apps = all apps).
+	for _, p := range section.Params {
+		if len(p.Apps) == 0 || slices.Contains(p.Apps, string(sectionName)) {
+			params = append(params, p)
+		}
+	}
+
 	newSection := &Header{
 		Text:   def.Text,
 		Prefix: def.Prefix,
 		Title:  def.Title,
-		Params: section.Params,
+		Params: params,
 		Kind:   section.Kind,
 	}
 
diff --git a/pkg/unpackerr/folder.go b/pkg/unpackerr/folder.go
@@ -154,7 +154,7 @@ func (u *Unpackerr) PollFolders() {
 			u.Errorf("Folder poller stopped: %v", err)
 		}
 	}()
-	u.Printf("[Folder] Polling @ %v: %s", u.Folder.Interval, strings.Join(flist, ", "))
+	u.Printf("[Folder] Polling @ %s: %s", u.Folder.Interval.String(), strings.Join(flist, ", "))
 }
 
 // checkFolders stats all configured folders and returns only "good" ones.
diff --git a/pkg/unpackerr/lidarr.go b/pkg/unpackerr/lidarr.go
@@ -12,8 +12,8 @@ import (
 type LidarrConfig struct {
 	StarrConfig
 	SplitFlac      bool          `json:"split_flac" toml:"split_flac" xml:"split_flac" yaml:"split_flac"`
-	Queue          *lidarr.Queue `json:"-" toml:"-" xml:"-" yaml:"-"`
-	*lidarr.Lidarr `json:"-" toml:"-" xml:"-" yaml:"-"`
+	Queue          *lidarr.Queue `json:"-"          toml:"-"          xml:"-"          yaml:"-"`
+	*lidarr.Lidarr `json:"-"          toml:"-"          xml:"-"          yaml:"-"`
 }
 
 func (u *Unpackerr) validateLidarr() error {
@@ -40,17 +40,17 @@ func (u *Unpackerr) validateLidarr() error {
 func (u *Unpackerr) logLidarr() {
 	if count := len(u.Lidarr); count == 1 {
 		u.Printf(" => Lidarr Config: 1 server: "+starrLogLine+", split_flac:%v",
-			u.Lidarr[0].URL, u.Lidarr[0].APIKey != "", u.Lidarr[0].Timeout,
+			u.Lidarr[0].URL, u.Lidarr[0].APIKey != "", u.Lidarr[0].Timeout.String(),
 			u.Lidarr[0].ValidSSL, u.Lidarr[0].Protocols, u.Lidarr[0].Syncthing,
-			u.Lidarr[0].DeleteOrig, u.Lidarr[0].DeleteDelay.Duration, u.Lidarr[0].Paths,
+			u.Lidarr[0].DeleteOrig, u.Lidarr[0].DeleteDelay.String(), u.Lidarr[0].Paths,
 			u.Lidarr[0].SplitFlac)
 	} else {
 		u.Printf(" => Lidarr Config: %d servers", count)
 
 		for _, f := range u.Lidarr {
 			u.Printf(starrLogPfx+starrLogLine+", split_flac:%v",
-				f.URL, f.APIKey != "", f.Timeout, f.ValidSSL, f.Protocols,
-				f.Syncthing, f.DeleteOrig, f.DeleteDelay.Duration, f.Paths,
+				f.URL, f.APIKey != "", f.Timeout.String(), f.ValidSSL, f.Protocols,
+				f.Syncthing, f.DeleteOrig, f.DeleteDelay.String(), f.Paths,
 				f.SplitFlac)
 		}
 	}
diff --git a/pkg/unpackerr/logs.go b/pkg/unpackerr/logs.go
@@ -262,12 +262,12 @@ func (u *Unpackerr) logStartupInfo(msg string, externalFiles map[string]string)
 	u.logFolders()
 	u.Printf(" => Parallel: %d", u.Config.Parallel)
 	u.Printf(" => Passwords: %d (rar/7z)", len(u.Config.Passwords))
-	u.Printf(" => Interval / Progress: %v/%v", u.Config.Interval, u.Config.Progress)
-	u.Printf(" => Start/Delete Delay: %v/%v", u.Config.StartDelay, u.Config.DeleteDelay)
+	u.Printf(" => Interval / Progress: %s/%s", u.Config.Interval.String(), u.Config.Progress.String())
+	u.Printf(" => Start/Delete Delay: %s/%s", u.Config.StartDelay.String(), u.Config.DeleteDelay.String())
 	u.Printf(" => Retry Delay: %v, max: %d", u.Config.RetryDelay, u.Config.MaxRetries)
 	u.Printf(" => GUI / StdErr: %v / %v", ui.HasGUI(), u.ErrorStdErr)
 	u.Printf(" => Debug / Quiet: %v / %v", u.Config.Debug, u.Config.Quiet)
-	u.Printf(" => Activity / Queues: %v / %v", u.Config.Activity, u.Config.LogQueues)
+	u.Printf(" => Activity / Queues: %v / %s", u.Config.Activity, u.Config.LogQueues.String())
 
 	if runtime.GOOS != windows {
 		u.Printf(" => Directory & File Modes: %s & %s", u.Config.DirMode, u.Config.FileMode)
diff --git a/pkg/unpackerr/radarr.go b/pkg/unpackerr/radarr.go
@@ -39,16 +39,16 @@ func (u *Unpackerr) validateRadarr() error {
 func (u *Unpackerr) logRadarr() {
 	if count := len(u.Radarr); count == 1 {
 		u.Printf(" => Radarr Config: 1 server: "+starrLogLine,
-			u.Radarr[0].URL, u.Radarr[0].APIKey != "", u.Radarr[0].Timeout,
+			u.Radarr[0].URL, u.Radarr[0].APIKey != "", u.Radarr[0].Timeout.String(),
 			u.Radarr[0].ValidSSL, u.Radarr[0].Protocols, u.Radarr[0].Syncthing,
-			u.Radarr[0].DeleteOrig, u.Radarr[0].DeleteDelay.Duration, u.Radarr[0].Paths)
+			u.Radarr[0].DeleteOrig, u.Radarr[0].DeleteDelay.String(), u.Radarr[0].Paths)
 	} else {
 		u.Printf(" => Radarr Config: %d servers", count)
 
 		for _, f := range u.Radarr {
 			u.Printf(starrLogPfx+starrLogLine,
-				f.URL, f.APIKey != "", f.Timeout, f.ValidSSL, f.Protocols,
-				f.Syncthing, f.DeleteOrig, f.DeleteDelay.Duration, f.Paths)
+				f.URL, f.APIKey != "", f.Timeout.String(), f.ValidSSL, f.Protocols,
+				f.Syncthing, f.DeleteOrig, f.DeleteDelay.String(), f.Paths)
 		}
 	}
 }
diff --git a/pkg/unpackerr/readarr.go b/pkg/unpackerr/readarr.go
@@ -39,16 +39,16 @@ func (u *Unpackerr) validateReadarr() error {
 func (u *Unpackerr) logReadarr() {
 	if count := len(u.Readarr); count == 1 {
 		u.Printf(" => Readarr Config: 1 server: "+starrLogLine,
-			u.Readarr[0].URL, u.Readarr[0].APIKey != "", u.Readarr[0].Timeout,
+			u.Readarr[0].URL, u.Readarr[0].APIKey != "", u.Readarr[0].Timeout.String(),
 			u.Readarr[0].ValidSSL, u.Readarr[0].Protocols, u.Readarr[0].Syncthing,
-			u.Readarr[0].DeleteOrig, u.Readarr[0].DeleteDelay.Duration, u.Readarr[0].Paths)
+			u.Readarr[0].DeleteOrig, u.Readarr[0].DeleteDelay.String(), u.Readarr[0].Paths)
 	} else {
 		u.Printf(" => Readarr Config: %d servers", count)
 
 		for _, f := range u.Readarr {
 			u.Printf(starrLogPfx+starrLogLine,
-				f.URL, f.APIKey != "", f.Timeout, f.ValidSSL, f.Protocols,
-				f.Syncthing, f.DeleteOrig, f.DeleteDelay.Duration, f.Paths)
+				f.URL, f.APIKey != "", f.Timeout.String(), f.ValidSSL, f.Protocols,
+				f.Syncthing, f.DeleteOrig, f.DeleteDelay.String(), f.Paths)
 		}
 	}
 }
diff --git a/pkg/unpackerr/sonarr.go b/pkg/unpackerr/sonarr.go
@@ -39,16 +39,16 @@ func (u *Unpackerr) validateSonarr() error {
 func (u *Unpackerr) logSonarr() {
 	if count := len(u.Sonarr); count == 1 {
 		u.Printf(" => Sonarr Config: 1 server: "+starrLogLine,
-			u.Sonarr[0].URL, u.Sonarr[0].APIKey != "", u.Sonarr[0].Timeout,
+			u.Sonarr[0].URL, u.Sonarr[0].APIKey != "", u.Sonarr[0].Timeout.String(),
 			u.Sonarr[0].ValidSSL, u.Sonarr[0].Protocols, u.Sonarr[0].Syncthing,
-			u.Sonarr[0].DeleteOrig, u.Sonarr[0].DeleteDelay.Duration, u.Sonarr[0].Paths)
+			u.Sonarr[0].DeleteOrig, u.Sonarr[0].DeleteDelay.String(), u.Sonarr[0].Paths)
 	} else {
 		u.Printf(" => Sonarr Config: %d servers", count)
 
 		for _, f := range u.Sonarr {
 			u.Printf(starrLogPfx+starrLogLine,
-				f.URL, f.APIKey != "", f.Timeout, f.ValidSSL, f.Protocols,
-				f.Syncthing, f.DeleteOrig, f.DeleteDelay.Duration, f.Paths)
+				f.URL, f.APIKey != "", f.Timeout.String(), f.ValidSSL, f.Protocols,
+				f.Syncthing, f.DeleteOrig, f.DeleteDelay.String(), f.Paths)
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func (h *Header) makeComposeDefined(prefix string, defs Defs, order []section, b`
`90`	`90`	`var buf bytes.Buffer`
`91`	`91`
`92`	`92`	`for _, section := range order {`
`93`		`- newHeader := createDefinedSection(defs[section], h)`
	`93`	`+ newHeader := createDefinedSection(defs[section], h, section)`
`94`	`94`	`// Make a brand new section and print it.`
`95`	`95`	`buf.WriteString(newHeader.makeCompose(prefix, bare))`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ func (h *Header) makeDefinedDocs(prefix string, defs Defs, order []section) stri`
`148`	`148`	`var buf bytes.Buffer`
`149`	`149`
`150`	`150`	`for _, section := range order {`
`151`		`- buf.WriteString(createDefinedSection(defs[section], h).makeDocs(prefix, section))`
	`151`	`+ buf.WriteString(createDefinedSection(defs[section], h, section).makeDocs(prefix, section))`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`return buf.String()`