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(feeds): indexer identifier issues (#538)

Browse source 
* fix(torznab/rss): keep original name

* fix(feeds): get identifier via indexer join

* fix(feeds/web): remove identifier slugify
This commit is contained in:
Kyle Sanderson 2022-11-17 09:50:40 -08:00 • committed by GitHub
parent dc42ca0042
commit a93b54bbbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 61 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

101
internal/database/feed.go
View file

@ -27,22 +27,23 @@ type FeedRepo struct {
func (r *FeedRepo) FindByID(ctx context.Context, id int) (*domain.Feed, error) {
queryBuilder := r.db.squirrel.
Select(
"id",
"indexer",
"name",
"type",
"enabled",
"url",
"interval",
"timeout",
"max_age",
"api_key",
"cookie",
"created_at",
"updated_at",
"f.id",
"i.identifier",
"f.name",
"f.type",
"f.enabled",
"f.url",
"f.interval",
"f.timeout",
"f.max_age",
"f.api_key",
"f.cookie",
"f.created_at",
"f.updated_at",
).
From("feed").
Where("id = ?", id)
From("feed f").
Join("indexer i ON f.indexer_id = i.id").
Where("f.id = ?", id)
query, args, err := queryBuilder.ToSql()
if err != nil {
@ -72,22 +73,23 @@ func (r *FeedRepo) FindByID(ctx context.Context, id int) (*domain.Feed, error) {
func (r *FeedRepo) FindByIndexerIdentifier(ctx context.Context, indexer string) (*domain.Feed, error) {
queryBuilder := r.db.squirrel.
Select(
"id",
"indexer",
"name",
"type",
"enabled",
"url",
"interval",
"timeout",
"max_age",
"api_key",
"cookie",
"created_at",
"updated_at",
"f.id",
"i.identifier",
"f.name",
"f.type",
"f.enabled",
"f.url",
"f.interval",
"f.timeout",
"f.max_age",
"f.api_key",
"f.cookie",
"f.created_at",
"f.updated_at",
).
From("feed").
Where("indexer = ?", indexer)
From("feed f").
Join("indexer i ON f.indexer_id = i.id").
Where("i.name = ?", indexer)
query, args, err := queryBuilder.ToSql()
if err != nil {
@ -105,7 +107,6 @@ func (r *FeedRepo) FindByIndexerIdentifier(ctx context.Context, indexer string)
if err := row.Scan(&f.ID, &f.Indexer, &f.Name, &f.Type, &f.Enabled, &f.URL, &f.Interval, &f.Timeout, &f.MaxAge, &apiKey, &cookie, &f.CreatedAt, &f.UpdatedAt); err != nil {
return nil, errors.Wrap(err, "error scanning row")
}
f.ApiKey = apiKey.String
@ -117,24 +118,25 @@ func (r *FeedRepo) FindByIndexerIdentifier(ctx context.Context, indexer string)
func (r *FeedRepo) Find(ctx context.Context) ([]domain.Feed, error) {
queryBuilder := r.db.squirrel.
Select(
"id",
"indexer",
"name",
"type",
"enabled",
"url",
"interval",
"timeout",
"max_age",
"api_key",
"cookie",
"last_run",
"last_run_data",
"created_at",
"updated_at",
"f.id",
"i.identifier",
"f.name",
"f.type",
"f.enabled",
"f.url",
"f.interval",
"f.timeout",
"f.max_age",
"f.api_key",
"f.cookie",
"f.last_run",
"f.last_run_data",
"f.created_at",
"f.updated_at",
).
From("feed").
OrderBy("name ASC")
From("feed f").
Join("indexer i ON f.indexer_id = i.id").
OrderBy("f.name ASC")
query, args, err := queryBuilder.ToSql()
if err != nil {
@ -175,7 +177,6 @@ func (r *FeedRepo) Store(ctx context.Context, feed *domain.Feed) error {
Insert("feed").
Columns(
"name",
"indexer",
"type",
"enabled",
"url",
@ -186,7 +187,6 @@ func (r *FeedRepo) Store(ctx context.Context, feed *domain.Feed) error {
).
Values(
feed.Name,
feed.Indexer,
feed.Type,
feed.Enabled,
feed.URL,
@ -212,7 +212,6 @@ func (r *FeedRepo) Update(ctx context.Context, feed *domain.Feed) error {
queryBuilder := r.db.squirrel.
Update("feed").
Set("name", feed.Name).
Set("indexer", feed.Indexer).
Set("type", feed.Type).
Set("enabled", feed.Enabled).
Set("url", feed.URL).

20
internal/indexer/service.go
View file

@ -69,22 +69,17 @@ func NewService(log logger.Logger, config *domain.Config, repo domain.IndexerRep
}
func (s *service) Store(ctx context.Context, indexer domain.Indexer) (*domain.Indexer, error) {
identifier := indexer.Identifier
// if indexer is rss or torznab do additional cleanup for identifier
switch indexer.Implementation {
case "torznab":
// if the name already contains torznab remove it
cleanName := strings.ReplaceAll(strings.ToLower(indexer.Name), "torznab", "")
identifier = slug.Make(fmt.Sprintf("%v-%v", indexer.Implementation, cleanName)) // torznab-name
case "torznab", "rss":
// make lowercase
cleanName := strings.ToLower(indexer.Name)
case "rss":
// if the name already contains rss remove it
cleanName := strings.ReplaceAll(strings.ToLower(indexer.Name), "rss", "")
identifier = slug.Make(fmt.Sprintf("%v-%v", indexer.Implementation, cleanName)) // rss-name
// torznab-name OR rss-name
indexer.Identifier = slug.Make(fmt.Sprintf("%v-%v", indexer.Implementation, cleanName))
}
indexer.Identifier = identifier
i, err := s.repo.Store(ctx, indexer)
if err != nil {
s.log.Error().Stack().Err(err).Msgf("failed to store indexer: %v", indexer.Name)
@ -92,8 +87,7 @@ func (s *service) Store(ctx context.Context, indexer domain.Indexer) (*domain.In
}
// add to indexerInstances
err = s.addIndexer(*i)
if err != nil {
if err = s.addIndexer(*i); err != nil {
s.log.Error().Stack().Err(err).Msgf("failed to add indexer: %v", indexer.Name)
return nil, err
}