feat(macros): add IndexerName (#1511)

* feat(macros): add IndexerName * fix: tests * fix: tests
autobrr · Apr 16, 2024 · 3c3b47f · 3c3b47f
1 parent c43e2c7
commit 3c3b47f
Show file tree

Hide file tree

Showing 37 changed files with 310 additions and 235 deletions.
diff --git a/internal/action/exec.go b/internal/action/exec.go
@@ -48,7 +48,7 @@ func (s *service) execCmd(ctx context.Context, action *domain.Action, release do
 
 	duration := time.Since(start)
 
-	s.log.Info().Msgf("executed command: '%s', args: '%s' %s,%s, total time %v", cmd, args, release.TorrentName, release.Indexer, duration)
+	s.log.Info().Msgf("executed command: '%s', args: '%s' %s,%s, total time %v", cmd, args, release.TorrentName, release.Indexer.Name, duration)
 
 	return nil
 }
diff --git a/internal/action/exec_test.go b/internal/action/exec_test.go
@@ -81,7 +81,11 @@ func Test_service_execCmd(t *testing.T) {
 				release: domain.Release{
 					TorrentName:    "This is a test",
 					TorrentTmpFile: "tmp-10000",
-					Indexer:        "mock",
+					Indexer: domain.IndexerMinimal{
+						ID:         0,
+						Name:       "Mock Indexer",
+						Identifier: "mock",
+					},
 				},
 				action: &domain.Action{
 					Name:     "echo",

diff --git a/internal/action/lidarr.go b/internal/action/lidarr.go
@@ -59,7 +59,7 @@ func (s *service) lidarr(ctx context.Context, action *domain.Action, release dom
 		DownloadUrl:      release.DownloadURL,
 		MagnetUrl:        release.MagnetURI,
 		Size:             int64(release.Size),
-		Indexer:          release.Indexer,
+		Indexer:          release.Indexer.Identifier,
 		DownloadClientId: externalClientId,
 		DownloadClient:   externalClient,
 		DownloadProtocol: string(release.Protocol),

diff --git a/internal/action/radarr.go b/internal/action/radarr.go
@@ -58,7 +58,7 @@ func (s *service) radarr(ctx context.Context, action *domain.Action, release dom
 		DownloadUrl:      release.DownloadURL,
 		MagnetUrl:        release.MagnetURI,
 		Size:             int64(release.Size),
-		Indexer:          release.Indexer,
+		Indexer:          release.Indexer.Identifier,
 		DownloadClientId: externalClientId,
 		DownloadClient:   externalClient,
 		DownloadProtocol: string(release.Protocol),

diff --git a/internal/action/readarr.go b/internal/action/readarr.go
@@ -58,7 +58,7 @@ func (s *service) readarr(ctx context.Context, action *domain.Action, release do
 		DownloadUrl:      release.DownloadURL,
 		MagnetUrl:        release.MagnetURI,
 		Size:             int64(release.Size),
-		Indexer:          release.Indexer,
+		Indexer:          release.Indexer.Identifier,
 		DownloadClientId: externalClientId,
 		DownloadClient:   externalClient,
 		DownloadProtocol: string(release.Protocol),

diff --git a/internal/action/run.go b/internal/action/run.go
@@ -98,7 +98,7 @@ func (s *service) RunAction(ctx context.Context, action *domain.Action, release
 		Event:          domain.NotificationEventPushApproved,
 		ReleaseName:    release.TorrentName,
 		Filter:         release.FilterName,
-		Indexer:        release.Indexer,
+		Indexer:        release.Indexer.Name,
 		InfoHash:       release.TorrentHash,
 		Size:           release.Size,
 		Status:         domain.ReleasePushStatusApproved,

diff --git a/internal/action/sonarr.go b/internal/action/sonarr.go
@@ -58,7 +58,7 @@ func (s *service) sonarr(ctx context.Context, action *domain.Action, release dom
 		DownloadUrl:      release.DownloadURL,
 		MagnetUrl:        release.MagnetURI,
 		Size:             int64(release.Size),
-		Indexer:          release.Indexer,
+		Indexer:          release.Indexer.Identifier,
 		DownloadClientId: externalClientId,
 		DownloadClient:   externalClient,
 		DownloadProtocol: string(release.Protocol),

diff --git a/internal/action/whisparr.go b/internal/action/whisparr.go
@@ -58,7 +58,7 @@ func (s *service) whisparr(ctx context.Context, action *domain.Action, release d
 		DownloadUrl:      release.DownloadURL,
 		MagnetUrl:        release.MagnetURI,
 		Size:             int64(release.Size),
-		Indexer:          release.Indexer,
+		Indexer:          release.Indexer.Identifier,
 		DownloadClientId: externalClientId,
 		DownloadClient:   externalClient,
 		DownloadProtocol: string(release.Protocol),

diff --git a/internal/announce/announce.go b/internal/announce/announce.go
@@ -103,7 +103,7 @@ func (a *announceProcessor) processQueue(queue chan string) {
 			continue
 		}
 
-		rls := domain.NewRelease(a.indexer.Identifier)
+		rls := domain.NewRelease(domain.IndexerMinimal{ID: a.indexer.ID, Name: a.indexer.Name, Identifier: a.indexer.Identifier})
 		rls.Protocol = domain.ReleaseProtocol(a.indexer.Protocol)
 
 		// on lines matched

diff --git a/internal/database/feed.go b/internal/database/feed.go
@@ -32,7 +32,9 @@ func (r *FeedRepo) FindByID(ctx context.Context, id int) (*domain.Feed, error) {
 	queryBuilder := r.db.squirrel.
 		Select(
 			"f.id",
+			"i.id",
 			"i.identifier",
+			"i.name",
 			"f.name",
 			"f.type",
 			"f.enabled",
@@ -64,7 +66,7 @@ func (r *FeedRepo) FindByID(ctx context.Context, id int) (*domain.Feed, error) {
 
 	var apiKey, cookie, settings sql.NullString
 
-	if err := row.Scan(&f.ID, &f.Indexer, &f.Name, &f.Type, &f.Enabled, &f.URL, &f.Interval, &f.Timeout, &f.MaxAge, &apiKey, &cookie, &settings, &f.CreatedAt, &f.UpdatedAt); err != nil {
+	if err := row.Scan(&f.ID, &f.Indexer.ID, &f.Indexer.Identifier, &f.Indexer.Name, &f.Name, &f.Type, &f.Enabled, &f.URL, &f.Interval, &f.Timeout, &f.MaxAge, &apiKey, &cookie, &settings, &f.CreatedAt, &f.UpdatedAt); err != nil {
 		return nil, errors.Wrap(err, "error scanning row")
 	}
 
@@ -87,7 +89,9 @@ func (r *FeedRepo) FindByIndexerIdentifier(ctx context.Context, indexer string)
 	queryBuilder := r.db.squirrel.
 		Select(
 			"f.id",
+			"i.id",
 			"i.identifier",
+			"i.name",
 			"f.name",
 			"f.type",
 			"f.enabled",
@@ -119,7 +123,7 @@ func (r *FeedRepo) FindByIndexerIdentifier(ctx context.Context, indexer string)
 
 	var apiKey, cookie, settings sql.NullString
 
-	if err := row.Scan(&f.ID, &f.Indexer, &f.Name, &f.Type, &f.Enabled, &f.URL, &f.Interval, &f.Timeout, &f.MaxAge, &apiKey, &cookie, &settings, &f.CreatedAt, &f.UpdatedAt); err != nil {
+	if err := row.Scan(&f.ID, &f.Indexer.ID, &f.Indexer.Identifier, &f.Indexer.Name, &f.Name, &f.Type, &f.Enabled, &f.URL, &f.Interval, &f.Timeout, &f.MaxAge, &apiKey, &cookie, &settings, &f.CreatedAt, &f.UpdatedAt); err != nil {
 		return nil, errors.Wrap(err, "error scanning row")
 	}
 
@@ -140,7 +144,9 @@ func (r *FeedRepo) Find(ctx context.Context) ([]domain.Feed, error) {
 	queryBuilder := r.db.squirrel.
 		Select(
 			"f.id",
+			"i.id",
 			"i.identifier",
+			"i.name",
 			"f.name",
 			"f.type",
 			"f.enabled",
@@ -179,7 +185,7 @@ func (r *FeedRepo) Find(ctx context.Context) ([]domain.Feed, error) {
 		var apiKey, cookie, lastRunData, settings sql.NullString
 		var lastRun sql.NullTime
 
-		if err := rows.Scan(&f.ID, &f.Indexer, &f.Name, &f.Type, &f.Enabled, &f.URL, &f.Interval, &f.Timeout, &f.MaxAge, &apiKey, &cookie, &lastRun, &lastRunData, &settings, &f.CreatedAt, &f.UpdatedAt); err != nil {
+		if err := rows.Scan(&f.ID, &f.Indexer.ID, &f.Indexer.Identifier, &f.Indexer.Name, &f.Name, &f.Type, &f.Enabled, &f.URL, &f.Interval, &f.Timeout, &f.MaxAge, &apiKey, &cookie, &lastRun, &lastRunData, &settings, &f.CreatedAt, &f.UpdatedAt); err != nil {
 			return nil, errors.Wrap(err, "error scanning row")
 		}
 

diff --git a/internal/database/indexer.go b/internal/database/indexer.go
@@ -153,7 +153,6 @@ func (r *IndexerRepo) FindByID(ctx context.Context, id int) (*domain.Indexer, er
 	i.Settings = settingsMap
 
 	return &i, nil
-
 }
 
 func (r *IndexerRepo) FindByFilterID(ctx context.Context, id int) ([]domain.Indexer, error) {

diff --git a/internal/database/release.go b/internal/database/release.go
@@ -39,7 +39,7 @@ func (repo *ReleaseRepo) Store(ctx context.Context, r *domain.Release) error {
 	queryBuilder := repo.db.squirrel.
 		Insert("release").
 		Columns("filter_status", "rejections", "indexer", "filter", "protocol", "implementation", "timestamp", "group_id", "torrent_id", "info_url", "download_url", "torrent_name", "size", "title", "category", "season", "episode", "year", "resolution", "source", "codec", "container", "hdr", "release_group", "proper", "repack", "website", "type", "origin", "tags", "uploader", "pre_time", "filter_id").
-		Values(r.FilterStatus, pq.Array(r.Rejections), r.Indexer, r.FilterName, r.Protocol, r.Implementation, r.Timestamp.Format(time.RFC3339), r.GroupID, r.TorrentID, r.InfoURL, r.DownloadURL, r.TorrentName, r.Size, r.Title, r.Category, r.Season, r.Episode, r.Year, r.Resolution, r.Source, codecStr, r.Container, hdrStr, r.Group, r.Proper, r.Repack, r.Website, r.Type, r.Origin, pq.Array(r.Tags), r.Uploader, r.PreTime, r.FilterID).
+		Values(r.FilterStatus, pq.Array(r.Rejections), r.Indexer.Identifier, r.FilterName, r.Protocol, r.Implementation, r.Timestamp.Format(time.RFC3339), r.GroupID, r.TorrentID, r.InfoURL, r.DownloadURL, r.TorrentName, r.Size, r.Title, r.Category, r.Season, r.Episode, r.Year, r.Resolution, r.Source, codecStr, r.Container, hdrStr, r.Group, r.Proper, r.Repack, r.Website, r.Type, r.Origin, pq.Array(r.Tags), r.Uploader, r.PreTime, r.FilterID).
 		Suffix("RETURNING id").RunWith(repo.db.handler)
 
 	// return values
@@ -291,7 +291,7 @@ func (repo *ReleaseRepo) findReleases(ctx context.Context, tx *Tx, params domain
 			continue
 		}
 
-		rls.Indexer = rlsindexer.String
+		rls.Indexer.Identifier = rlsindexer.String
 		rls.FilterName = rlsfilter.String
 		rls.ActionStatus = make([]domain.ReleaseActionStatus, 0)
 		rls.InfoURL = infoUrl.String
@@ -443,7 +443,7 @@ func (repo *ReleaseRepo) Get(ctx context.Context, req *domain.GetReleaseRequest)
 		return nil, errors.Wrap(err, "error scanning row")
 	}
 
-	rls.Indexer = indexerName.String
+	rls.Indexer.Identifier = indexerName.String
 	rls.FilterName = filterName.String
 	rls.FilterID = int(filterId.Int64)
 	rls.ActionStatus = make([]domain.ReleaseActionStatus, 0)

diff --git a/internal/database/release_test.go b/internal/database/release_test.go
@@ -18,9 +18,13 @@ import (
 
 func getMockRelease() *domain.Release {
 	return &domain.Release{
-		FilterStatus:   domain.ReleaseStatusFilterApproved,
-		Rejections:     []string{"test", "not-a-match"},
-		Indexer:        "BTN",
+		FilterStatus: domain.ReleaseStatusFilterApproved,
+		Rejections:   []string{"test", "not-a-match"},
+		Indexer: domain.IndexerMinimal{
+			ID:         0,
+			Name:       "BTN",
+			Identifier: "btn",
+		},
 		FilterName:     "ExampleFilter",
 		Protocol:       domain.ReleaseProtocolTorrent,
 		Implementation: domain.ReleaseImplementationIRC,

diff --git a/internal/domain/feed.go b/internal/domain/feed.go
@@ -36,7 +36,7 @@ type FeedRepo interface {
 type Feed struct {
 	ID           int               `json:"id"`
 	Name         string            `json:"name"`
-	Indexer      string            `json:"indexer"`
+	Indexer      IndexerMinimal    `json:"indexer"`
 	Type         string            `json:"type"`
 	Enabled      bool              `json:"enabled"`
 	URL          string            `json:"url"`
@@ -50,7 +50,6 @@ type Feed struct {
 	CreatedAt    time.Time         `json:"created_at"`
 	UpdatedAt    time.Time         `json:"updated_at"`
 	IndexerID    int               `json:"indexer_id,omitempty"`
-	Indexerr     FeedIndexer       `json:"-"`
 	LastRun      time.Time         `json:"last_run"`
 	LastRunData  string            `json:"last_run_data"`
 	NextRun      time.Time         `json:"next_run"`

diff --git a/internal/domain/indexer.go b/internal/domain/indexer.go
@@ -35,6 +35,12 @@ type Indexer struct {
 	Settings       map[string]string `json:"settings,omitempty"`
 }
 
+type IndexerMinimal struct {
+	ID         int    `json:"id"`
+	Name       string `json:"name"`
+	Identifier string `json:"identifier"`
+}
+
 type IndexerDefinition struct {
 	ID             int               `json:"id,omitempty"`
 	Name           string            `json:"name"`

diff --git a/internal/domain/indexer_test.go b/internal/domain/indexer_test.go
@@ -254,7 +254,7 @@ func TestIRCParserGazelleGames_Parse(t *testing.T) {
 		{
 			name: "",
 			args: args{
-				rls: NewRelease("ggn"),
+				rls: NewRelease(IndexerMinimal{0, "GazelleGames", "ggn"}),
 				vars: map[string]string{
 					"torrentName": "Trouble.in.Paradise-GROUP in Trouble in Paradise",
 				},
@@ -267,7 +267,7 @@ func TestIRCParserGazelleGames_Parse(t *testing.T) {
 		{
 			name: "",
 			args: args{
-				rls: NewRelease("ggn"),
+				rls: NewRelease(IndexerMinimal{0, "GazelleGames", "ggn"}),
 				vars: map[string]string{
 					"torrentName": "F.I.L.F. Game Walkthrough v.0.18 in F.I.L.F.",
 				},
@@ -280,7 +280,7 @@ func TestIRCParserGazelleGames_Parse(t *testing.T) {
 		{
 			name: "",
 			args: args{
-				rls: NewRelease("ggn"),
+				rls: NewRelease(IndexerMinimal{0, "GazelleGames", "ggn"}),
 				vars: map[string]string{
 					"torrentName": "Ni no Kuni: Dominion of the Dark Djinn in Ni no Kuni: Dominion of the Dark Djinn",
 				},
@@ -293,7 +293,7 @@ func TestIRCParserGazelleGames_Parse(t *testing.T) {
 		{
 			name: "",
 			args: args{
-				rls: NewRelease("ggn"),
+				rls: NewRelease(IndexerMinimal{0, "GazelleGames", "ggn"}),
 				vars: map[string]string{
 					"torrentName": "Year 2 Remastered by Insaneintherainmusic",
 					"category":    "OST",
@@ -332,7 +332,7 @@ func TestIRCParserOrpheus_Parse(t *testing.T) {
 		{
 			name: "",
 			args: args{
-				rls: NewRelease("ops"),
+				rls: NewRelease(IndexerMinimal{0, "Orpheus", "ops"}),
 				vars: map[string]string{
 					"torrentName": "Busta Rhymes – BEACH BALL (feat. BIA) – [2023] [Single] WEB/FLAC/24bit Lossless",
 					"title":       "Busta Rhymes – BEACH BALL (feat. BIA)",
@@ -348,7 +348,7 @@ func TestIRCParserOrpheus_Parse(t *testing.T) {
 		{
 			name: "",
 			args: args{
-				rls: NewRelease("ops"),
+				rls: NewRelease(IndexerMinimal{0, "Orpheus", "ops"}),
 				vars: map[string]string{
 					"torrentName": "Busta Rhymes – BEACH BALL (feat. BIA) – [2023] [Single] CD/FLAC/Lossless",
 					"title":       "Busta Rhymes – BEACH BALL (feat. BIA)",

diff --git a/internal/domain/macros.go b/internal/domain/macros.go
@@ -28,6 +28,8 @@ type Macro struct {
 	DownloadUrl         string
 	InfoUrl             string
 	Indexer             string
+	IndexerName         string
+	IndexerIdentifier   string
 	Title               string
 	Type                string
 	Category            string
@@ -67,7 +69,9 @@ func NewMacro(release Release) Macro {
 		GroupID:             release.GroupID,
 		InfoUrl:             release.InfoURL,
 		DownloadUrl:         release.DownloadURL,
-		Indexer:             release.Indexer,
+		Indexer:             release.Indexer.Identifier,
+		IndexerName:         release.Indexer.Name,
+		IndexerIdentifier:   release.Indexer.Identifier,
 		Title:               release.Title,
 		Type:                release.Type,
 		Category:            release.Category,