idanoo/autobrr
1
0
Fork 0
mirror of https://github.com/idanoo/autobrr synced 2025-07-23 16:59:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(indexers): only load definitions with .yaml ext (#188)

Browse source
This commit is contained in:
Ludvig Lundgren 2022-03-20 16:37:29 +01:00 • committed by GitHub
parent fdf69e6403
commit a966291b38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

84
internal/indexer/service.go
View file

@ -318,27 +318,30 @@ func (s *service) LoadIndexerDefinitions() error {
} }
for _, f := range entries { for _, f := range entries {
filePath := "definitions/" + f.Name() fileExtension := filepath.Ext(f.Name())
if fileExtension != ".yaml" {
if strings.Contains(f.Name(), ".yaml") { continue
log.Trace().Msgf("parsing: %v", filePath)
var d domain.IndexerDefinition
data, err := fs.ReadFile(Definitions, filePath)
if err != nil {
log.Error().Stack().Err(err).Msgf("failed reading file: %v", filePath)
return err
}
err = yaml.Unmarshal(data, &d)
if err != nil {
log.Error().Stack().Err(err).Msgf("failed unmarshal file: %v", filePath)
return err
}
s.indexerDefinitions[d.Identifier] = d
} }
file := "definitions/" + f.Name()
log.Trace().Msgf("parsing: %v", file)
var d domain.IndexerDefinition
data, err := fs.ReadFile(Definitions, file)
if err != nil {
log.Error().Stack().Err(err).Msgf("failed reading file: %v", file)
return err
}
err = yaml.Unmarshal(data, &d)
if err != nil {
log.Error().Stack().Err(err).Msgf("failed unmarshal file: %v", file)
return err
}
s.indexerDefinitions[d.Identifier] = d
} }
log.Debug().Msgf("Loaded %d indexer definitions", len(s.indexerDefinitions)) log.Debug().Msgf("Loaded %d indexer definitions", len(s.indexerDefinitions))
@ -368,30 +371,33 @@ func (s *service) LoadCustomIndexerDefinitions() error {
customCount := 0 customCount := 0
for _, f := range entries { for _, f := range entries {
fileExtension := filepath.Ext(f.Name())
if fileExtension != ".yaml" {
continue
}
file := filepath.Join(s.config.CustomDefinitions, f.Name()) file := filepath.Join(s.config.CustomDefinitions, f.Name())
if strings.Contains(f.Name(), ".yaml") { log.Trace().Msgf("parsing custom: %v", file)
log.Trace().Msgf("parsing custom: %v", file)
var d domain.IndexerDefinition var d domain.IndexerDefinition
//data, err := fs.ReadFile(Definitions, filePath) //data, err := fs.ReadFile(Definitions, filePath)
data, err := os.ReadFile(file) data, err := os.ReadFile(file)
if err != nil { if err != nil {
log.Error().Stack().Err(err).Msgf("failed reading file: %v", file) log.Error().Stack().Err(err).Msgf("failed reading file: %v", file)
return err return err
}
err = yaml.Unmarshal(data, &d)
if err != nil {
log.Error().Stack().Err(err).Msgf("failed unmarshal file: %v", file)
return err
}
s.indexerDefinitions[d.Identifier] = d
customCount++
} }
err = yaml.Unmarshal(data, &d)
if err != nil {
log.Error().Stack().Err(err).Msgf("failed unmarshal file: %v", file)
return err
}
s.indexerDefinitions[d.Identifier] = d
customCount++
} }
log.Debug().Msgf("Loaded %d custom indexer definitions", customCount) log.Debug().Msgf("Loaded %d custom indexer definitions", customCount)