neoris/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Validate input and output address with all available diskfs

Browse Source
This commit is contained in:
Ingo Oppermann 2022-08-24 17:07:36 +03:00
parent 6751346566
commit 4f292ec0c5
No known key found for this signature in database
GPG Key ID: 2AB32426E9DD229E
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
restream/restream.go
View File

@ -91,7 +91,7 @@ type restream struct {
nProc int64 nProc int64
fs struct { fs struct {
list []rfs.Filesystem list []rfs.Filesystem
diskfs rfs.Filesystem diskfs []rfs.Filesystem
stopObserver context.CancelFunc stopObserver context.CancelFunc
} }
replace replace.Replacer replace replace.Replacer
@ -132,9 +132,9 @@ func New(config Config) (Restreamer, error) {
r.fs.list = append(r.fs.list, fs) r.fs.list = append(r.fs.list, fs)
// TODO: This is just to make the input and output address validator happy for now. This needs to be replaced with a more general approach. // Add the diskfs filesystems also to a separate array. We need it later for input and output validation
if fs.Type() == "diskfs" { if fs.Type() == "diskfs" {
r.fs.diskfs = fs r.fs.diskfs = append(r.fs.diskfs, fs)
} }
} }
@ -595,8 +595,15 @@ func (r *restream) validateConfig(config *app.Config) (bool, error) {
return false, fmt.Errorf("the address for input '#%s:%s' must not be empty", config.ID, io.ID) return false, fmt.Errorf("the address for input '#%s:%s' must not be empty", config.ID, io.ID)
} }
io.Address, err = r.validateInputAddress(io.Address, r.fs.diskfs.Base()) maxFails := 0
if err != nil { for _, fs := range r.fs.diskfs {
io.Address, err = r.validateInputAddress(io.Address, fs.Base())
if err != nil {
maxFails++
}
}
if maxFails == len(r.fs.diskfs) {
return false, fmt.Errorf("the address for input '#%s:%s' (%s) is invalid: %w", config.ID, io.ID, io.Address, err) return false, fmt.Errorf("the address for input '#%s:%s' (%s) is invalid: %w", config.ID, io.ID, io.Address, err)
} }
} }
@ -627,15 +634,21 @@ func (r *restream) validateConfig(config *app.Config) (bool, error) {
return false, fmt.Errorf("the address for output '#%s:%s' must not be empty", config.ID, io.ID) return false, fmt.Errorf("the address for output '#%s:%s' must not be empty", config.ID, io.ID)
} }
isFile := false maxFails := 0
for _, fs := range r.fs.diskfs {
isFile := false
io.Address, isFile, err = r.validateOutputAddress(io.Address, fs.Base())
if err != nil {
maxFails++
}
io.Address, isFile, err = r.validateOutputAddress(io.Address, r.fs.diskfs.Base()) if isFile {
if err != nil { hasFiles = true
return false, fmt.Errorf("the address for output '#%s:%s' is invalid: %w", config.ID, io.ID, err) }
} }
if isFile { if maxFails == len(r.fs.diskfs) {
hasFiles = true return false, fmt.Errorf("the address for output '#%s:%s' is invalid: %w", config.ID, io.ID, err)
} }
} }