mirror of
https://github.com/idanoo/autobrr
synced 2025-07-23 00:39:13 +00:00
feat(indexers): add support for optional baseurl override (#551)
* feat(indexers): optional baseurl override * feat(indexers): update baseUrl parsing * refactor(indexers): BREAKING move parse to IRC struct * Move Parse as part of IRC struct from Indexer * Updated definitions * Build torrentUrl in stages * Use new url.JoinPath to build torrentUrl * Update tests * refactor(indexers): select option obj * refactor(indexers): make backwards compatible
This commit is contained in:
ze0s
GitHub
parent
301180e55b
commit
25a165b764
66 changed files with 1533 additions and 1211 deletions
|
|
@ -6,23 +6,22 @@ import (
|
|||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestIndexerParse_ParseMatch(t *testing.T) {
|
||||
func TestIndexerIRCParse_ParseMatch(t *testing.T) {
|
||||
type fields struct {
|
||||
Type string
|
||||
ForceSizeUnit string
|
||||
Lines []IndexerParseExtract
|
||||
Match IndexerParseMatch
|
||||
Lines []IndexerIRCParseLine
|
||||
Match IndexerIRCParseMatch
|
||||
}
|
||||
type args struct {
|
||||
vars map[string]string
|
||||
extraVars map[string]string
|
||||
release *Release
|
||||
baseURL string
|
||||
vars map[string]string
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
fields fields
|
||||
args args
|
||||
expect *Release
|
||||
want *IndexerIRCParseMatched
|
||||
wantErr bool
|
||||
}{
|
||||
{
|
||||
|
|
@ -30,7 +29,7 @@ func TestIndexerParse_ParseMatch(t *testing.T) {
|
|||
fields: fields{
|
||||
Type: "",
|
||||
ForceSizeUnit: "",
|
||||
Lines: []IndexerParseExtract{
|
||||
Lines: []IndexerIRCParseLine{
|
||||
{
|
||||
Test: nil,
|
||||
Pattern: "New Torrent Announcement:\\s*<([^>]*)>\\s*Name:'(.*)' uploaded by '([^']*)'\\s*(freeleech)*\\s*-\\s*(https?\\:\\/\\/[^\\/]+\\/)torrent\\/(\\d+)",
|
||||
|
|
@ -44,39 +43,25 @@ func TestIndexerParse_ParseMatch(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
Match: IndexerParseMatch{
|
||||
TorrentURL: "{{ .baseUrl }}rss/download/{{ .torrentId }}/{{ .rsskey }}/{{ .torrentName }}.torrent",
|
||||
TorrentName: "",
|
||||
Encode: []string{"torrentName"},
|
||||
Match: IndexerIRCParseMatch{
|
||||
TorrentURL: "rss/download/{{ .torrentId }}/{{ .rsskey }}/{{ .torrentName }}.torrent",
|
||||
Encode: []string{"torrentName"},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
baseURL: "https://mock.local/",
|
||||
vars: map[string]string{
|
||||
"category": "TV :: Episodes HD",
|
||||
"torrentName": "The Show 2019 S03E08 2160p DV WEBRip 6CH x265 HEVC-GROUP",
|
||||
"uploader": "Anonymous",
|
||||
"freeleech": "",
|
||||
"baseUrl": "https://mock.org/",
|
||||
"baseUrl": "https://mock.local/",
|
||||
"torrentId": "240860011",
|
||||
},
|
||||
extraVars: map[string]string{
|
||||
"rsskey": "00000000000000000000",
|
||||
},
|
||||
release: &Release{
|
||||
Indexer: "mock",
|
||||
FilterStatus: ReleaseStatusFilterPending,
|
||||
Rejections: []string{},
|
||||
Protocol: ReleaseProtocolTorrent,
|
||||
Implementation: ReleaseImplementationIRC,
|
||||
"rsskey": "00000000000000000000",
|
||||
},
|
||||
},
|
||||
expect: &Release{
|
||||
Indexer: "mock",
|
||||
FilterStatus: ReleaseStatusFilterPending,
|
||||
Rejections: []string{},
|
||||
Protocol: ReleaseProtocolTorrent,
|
||||
Implementation: ReleaseImplementationIRC,
|
||||
TorrentURL: "https://mock.org/rss/download/240860011/00000000000000000000/The+Show+2019+S03E08+2160p+DV+WEBRip+6CH+x265+HEVC-GROUP.torrent",
|
||||
want: &IndexerIRCParseMatched{
|
||||
TorrentURL: "https://mock.local/rss/download/240860011/00000000000000000000/The+Show+2019+S03E08+2160p+DV+WEBRip+6CH+x265+HEVC-GROUP.torrent",
|
||||
},
|
||||
wantErr: false,
|
||||
},
|
||||
|
|
@ -85,7 +70,7 @@ func TestIndexerParse_ParseMatch(t *testing.T) {
|
|||
fields: fields{
|
||||
Type: "",
|
||||
ForceSizeUnit: "",
|
||||
Lines: []IndexerParseExtract{
|
||||
Lines: []IndexerIRCParseLine{
|
||||
{
|
||||
Test: nil,
|
||||
Pattern: `(.*?)(?: - )?(Visual Novel|Light Novel|TV.*|Movie|Manga|OVA|ONA|DVD Special|BD Special|Oneshot|Anthology|Manhwa|Manhua|Artbook|Game|Live Action.*|)[\s\p{Zs}]{2,}\[(\d+)\] :: (.*?)(?: \/ (?:RAW|Softsubs|Hardsubs|Translated)\s\((.+)\)(?:.*Episode\s(\d+))?(?:.*(Freeleech))?.*)? \|\| (https.*)\/torrents.*\?id=\d+&torrentid=(\d+) \|\| (.+?(?:(?:\|\| Uploaded by|$))?) (?:\|\| Uploaded by: (.*))?$`,
|
||||
|
|
@ -104,13 +89,14 @@ func TestIndexerParse_ParseMatch(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
Match: IndexerParseMatch{
|
||||
TorrentURL: "{{ .baseUrl }}/torrent/{{ .torrentId }}/download/{{ .passkey }}",
|
||||
Match: IndexerIRCParseMatch{
|
||||
TorrentURL: "/torrent/{{ .torrentId }}/download/{{ .passkey }}",
|
||||
TorrentName: `{{ if .releaseGroup }}[{{ .releaseGroup }}] {{ end }}{{ .torrentName }} [{{ .year }}] {{ if .releaseEpisode }}{{ printf "- %02s " .releaseEpisode }}{{ end }}{{ print "[" .releaseTags "]" | replace " / " "][" }}`,
|
||||
Encode: nil,
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
baseURL: "https://mock.local/",
|
||||
vars: map[string]string{
|
||||
"torrentName": "Great BluRay SoftSubbed Anime",
|
||||
"category": "TV Series",
|
||||
|
|
@ -119,45 +105,113 @@ func TestIndexerParse_ParseMatch(t *testing.T) {
|
|||
"releaseGroup": "Softsubs",
|
||||
"releaseEpisode": "",
|
||||
"freeleech": "freeleech",
|
||||
"baseUrl": "https://mock.org",
|
||||
"baseUrl": "https://mock.local",
|
||||
"torrentId": "240860011",
|
||||
"tags": "comedy, drama, school.life, sports",
|
||||
"uploader": "Uploader",
|
||||
},
|
||||
extraVars: map[string]string{
|
||||
"passkey": "00000000000000000000",
|
||||
},
|
||||
release: &Release{
|
||||
Indexer: "mock",
|
||||
FilterStatus: ReleaseStatusFilterPending,
|
||||
Rejections: []string{},
|
||||
Protocol: ReleaseProtocolTorrent,
|
||||
Implementation: ReleaseImplementationIRC,
|
||||
"passkey": "00000000000000000000",
|
||||
},
|
||||
},
|
||||
expect: &Release{
|
||||
Indexer: "mock",
|
||||
FilterStatus: ReleaseStatusFilterPending,
|
||||
Rejections: []string{},
|
||||
Protocol: ReleaseProtocolTorrent,
|
||||
Implementation: ReleaseImplementationIRC,
|
||||
TorrentURL: "https://mock.org/torrent/240860011/download/00000000000000000000",
|
||||
TorrentName: "[Softsubs] Great BluRay SoftSubbed Anime [2020] [Blu-ray][MKV][h264 10-bit][1080p][FLAC 2.0][Dual Audio][Softsubs (Sub Group)][Freeleech]",
|
||||
want: &IndexerIRCParseMatched{
|
||||
TorrentURL: "https://mock.local/torrent/240860011/download/00000000000000000000",
|
||||
TorrentName: "[Softsubs] Great BluRay SoftSubbed Anime [2020] [Blu-ray][MKV][h264 10-bit][1080p][FLAC 2.0][Dual Audio][Softsubs (Sub Group)][Freeleech]",
|
||||
},
|
||||
wantErr: false,
|
||||
},
|
||||
{
|
||||
name: "test_03",
|
||||
fields: fields{
|
||||
Type: "",
|
||||
ForceSizeUnit: "",
|
||||
Lines: []IndexerIRCParseLine{
|
||||
{
|
||||
Test: nil,
|
||||
Pattern: "New Torrent Announcement:\\s*<([^>]*)>\\s*Name:'(.*)' uploaded by '([^']*)'\\s*(freeleech)*\\s*-\\s*(https?\\:\\/\\/[^\\/]+\\/)torrent\\/(\\d+)",
|
||||
Vars: []string{
|
||||
"category",
|
||||
"torrentName",
|
||||
"uploader",
|
||||
"freeleech",
|
||||
"baseUrl",
|
||||
"torrentId",
|
||||
},
|
||||
},
|
||||
},
|
||||
Match: IndexerIRCParseMatch{
|
||||
TorrentURL: "{{ .baseUrl }}rss/download/{{ .torrentId }}/{{ .rsskey }}/{{ .torrentName }}.torrent",
|
||||
Encode: []string{"torrentName"},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
baseURL: "https://mock.local/",
|
||||
vars: map[string]string{
|
||||
"category": "TV :: Episodes HD",
|
||||
"torrentName": "The Show 2019 S03E08 2160p DV WEBRip 6CH x265 HEVC-GROUP",
|
||||
"uploader": "Anonymous",
|
||||
"freeleech": "",
|
||||
"baseUrl": "https://mock.local/",
|
||||
"torrentId": "240860011",
|
||||
"rsskey": "00000000000000000000",
|
||||
},
|
||||
},
|
||||
want: &IndexerIRCParseMatched{
|
||||
TorrentURL: "https://mock.local/rss/download/240860011/00000000000000000000/The+Show+2019+S03E08+2160p+DV+WEBRip+6CH+x265+HEVC-GROUP.torrent",
|
||||
},
|
||||
wantErr: false,
|
||||
},
|
||||
{
|
||||
name: "test_04",
|
||||
fields: fields{
|
||||
Type: "",
|
||||
ForceSizeUnit: "",
|
||||
Lines: []IndexerIRCParseLine{
|
||||
{
|
||||
Test: nil,
|
||||
Pattern: "New Torrent Announcement:\\s*<([^>]*)>\\s*Name:'(.*)' uploaded by '([^']*)'\\s*(freeleech)*\\s*-\\s*(https?\\:\\/\\/[^\\/]+\\/)torrent\\/(\\d+)",
|
||||
Vars: []string{
|
||||
"category",
|
||||
"torrentName",
|
||||
"uploader",
|
||||
"freeleech",
|
||||
"baseUrl",
|
||||
"torrentId",
|
||||
},
|
||||
},
|
||||
},
|
||||
Match: IndexerIRCParseMatch{
|
||||
TorrentURL: "https://mock.local/rss/download/{{ .torrentId }}/{{ .rsskey }}/{{ .torrentName }}.torrent",
|
||||
Encode: []string{"torrentName"},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
baseURL: "https://mock.local/",
|
||||
vars: map[string]string{
|
||||
"category": "TV :: Episodes HD",
|
||||
"torrentName": "The Show 2019 S03E08 2160p DV WEBRip 6CH x265 HEVC-GROUP",
|
||||
"uploader": "Anonymous",
|
||||
"freeleech": "",
|
||||
"baseUrl": "https://mock.local/",
|
||||
"torrentId": "240860011",
|
||||
"rsskey": "00000000000000000000",
|
||||
},
|
||||
},
|
||||
want: &IndexerIRCParseMatched{
|
||||
TorrentURL: "https://mock.local/rss/download/240860011/00000000000000000000/The+Show+2019+S03E08+2160p+DV+WEBRip+6CH+x265+HEVC-GROUP.torrent",
|
||||
},
|
||||
wantErr: false,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
p := &IndexerParse{
|
||||
p := &IndexerIRCParse{
|
||||
Type: tt.fields.Type,
|
||||
ForceSizeUnit: tt.fields.ForceSizeUnit,
|
||||
Lines: tt.fields.Lines,
|
||||
Match: tt.fields.Match,
|
||||
}
|
||||
|
||||
p.ParseMatch(tt.args.vars, tt.args.extraVars, tt.args.release)
|
||||
assert.Equal(t, tt.expect, tt.args.release)
|
||||
got, _ := p.ParseMatch(tt.args.baseURL, tt.args.vars)
|
||||
assert.Equal(t, tt.want, got)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue