mirror of
https://github.com/idanoo/autobrr
synced 2025-07-23 08:49:13 +00:00
feat(indexers): GGn improve release name parsing (#1366)
* feat(indexers): GGn improve IRC parsing * chore: organize imports
This commit is contained in:
parent
dea0b32b89
commit
fffd5bbf56
5 changed files with 435 additions and 403 deletions
|
@ -232,11 +232,52 @@ type IndexerIRCParseMatched struct {
|
|||
TorrentName string
|
||||
}
|
||||
|
||||
func (p *IndexerIRCParse) ParseMatch(baseURL string, vars map[string]string) (*IndexerIRCParseMatched, error) {
|
||||
matched := &IndexerIRCParseMatched{}
|
||||
func parseTemplateURL(baseURL, sourceURL string, vars map[string]string, basename string) (*url.URL, error) {
|
||||
// setup text template to inject variables into
|
||||
tmpl, err := template.New(basename).Funcs(sprig.TxtFuncMap()).Parse(sourceURL)
|
||||
if err != nil {
|
||||
return nil, errors.New("could not create %s url template", basename)
|
||||
}
|
||||
|
||||
var urlBytes bytes.Buffer
|
||||
if err := tmpl.Execute(&urlBytes, &vars); err != nil {
|
||||
return nil, errors.New("could not write %s url template output", basename)
|
||||
}
|
||||
|
||||
templateUrl := urlBytes.String()
|
||||
parsedUrl, err := url.Parse(templateUrl)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "could not parse template url: %q", templateUrl)
|
||||
}
|
||||
|
||||
// for backwards compatibility remove Host and Scheme to rebuild url
|
||||
if parsedUrl.Host != "" {
|
||||
parsedUrl.Host = ""
|
||||
}
|
||||
if parsedUrl.Scheme != "" {
|
||||
parsedUrl.Scheme = ""
|
||||
}
|
||||
|
||||
// join baseURL with query
|
||||
baseUrlPath, err := url.JoinPath(baseURL, parsedUrl.Path)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "could not join %s url", basename)
|
||||
}
|
||||
|
||||
// reconstruct url
|
||||
infoUrl, err := url.Parse(baseUrlPath)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "could not parse %s url", basename)
|
||||
}
|
||||
|
||||
infoUrl.RawQuery = parsedUrl.RawQuery
|
||||
|
||||
return infoUrl, nil
|
||||
}
|
||||
|
||||
func (p *IndexerIRCParseMatch) ParseURLs(baseURL string, vars map[string]string, rls *Release) error {
|
||||
// handle url encode of values
|
||||
for _, e := range p.Match.Encode {
|
||||
for _, e := range p.Encode {
|
||||
if v, ok := vars[e]; ok {
|
||||
// url encode value
|
||||
t := url.QueryEscape(v)
|
||||
|
@ -244,100 +285,86 @@ func (p *IndexerIRCParse) ParseMatch(baseURL string, vars map[string]string) (*I
|
|||
}
|
||||
}
|
||||
|
||||
if p.Match.InfoURL != "" {
|
||||
// setup text template to inject variables into
|
||||
tmpl, err := template.New("infourl").Funcs(sprig.TxtFuncMap()).Parse(p.Match.InfoURL)
|
||||
if p.InfoURL != "" {
|
||||
infoURL, err := parseTemplateURL(baseURL, p.InfoURL, vars, "infourl")
|
||||
if err != nil {
|
||||
return nil, errors.New("could not create info url template")
|
||||
return err
|
||||
}
|
||||
|
||||
var urlBytes bytes.Buffer
|
||||
if err := tmpl.Execute(&urlBytes, &vars); err != nil {
|
||||
return nil, errors.New("could not write info url template output")
|
||||
}
|
||||
|
||||
templateUrl := urlBytes.String()
|
||||
parsedUrl, err := url.Parse(templateUrl)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// for backwards compatibility remove Host and Scheme to rebuild url
|
||||
if parsedUrl.Host != "" {
|
||||
parsedUrl.Host = ""
|
||||
}
|
||||
if parsedUrl.Scheme != "" {
|
||||
parsedUrl.Scheme = ""
|
||||
}
|
||||
|
||||
// join baseURL with query
|
||||
baseUrlPath, err := url.JoinPath(baseURL, parsedUrl.Path)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "could not join info url")
|
||||
}
|
||||
|
||||
// reconstruct url
|
||||
infoUrl, _ := url.Parse(baseUrlPath)
|
||||
infoUrl.RawQuery = parsedUrl.RawQuery
|
||||
|
||||
matched.InfoURL = infoUrl.String()
|
||||
rls.InfoURL = infoURL.String()
|
||||
}
|
||||
|
||||
if p.Match.TorrentURL != "" {
|
||||
// setup text template to inject variables into
|
||||
tmpl, err := template.New("torrenturl").Funcs(sprig.TxtFuncMap()).Parse(p.Match.TorrentURL)
|
||||
if p.TorrentURL != "" {
|
||||
downloadURL, err := parseTemplateURL(baseURL, p.TorrentURL, vars, "torrenturl")
|
||||
if err != nil {
|
||||
return nil, errors.New("could not create torrent url template")
|
||||
return err
|
||||
}
|
||||
|
||||
var urlBytes bytes.Buffer
|
||||
if err := tmpl.Execute(&urlBytes, &vars); err != nil {
|
||||
return nil, errors.New("could not write torrent url template output")
|
||||
}
|
||||
|
||||
templateUrl := urlBytes.String()
|
||||
parsedUrl, err := url.Parse(templateUrl)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// for backwards compatibility remove Host and Scheme to rebuild url
|
||||
if parsedUrl.Host != "" {
|
||||
parsedUrl.Host = ""
|
||||
}
|
||||
if parsedUrl.Scheme != "" {
|
||||
parsedUrl.Scheme = ""
|
||||
}
|
||||
|
||||
// join baseURL with query
|
||||
baseUrlPath, err := url.JoinPath(baseURL, parsedUrl.Path)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "could not join torrent url")
|
||||
}
|
||||
|
||||
// reconstruct url
|
||||
torrentUrl, _ := url.Parse(baseUrlPath)
|
||||
torrentUrl.RawQuery = parsedUrl.RawQuery
|
||||
|
||||
matched.TorrentURL = torrentUrl.String()
|
||||
rls.DownloadURL = downloadURL.String()
|
||||
}
|
||||
|
||||
if p.Match.TorrentName != "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *IndexerIRCParseMatch) ParseTorrentName(vars map[string]string, rls *Release) error {
|
||||
if p.TorrentName != "" {
|
||||
// setup text template to inject variables into
|
||||
tmplName, err := template.New("torrentname").Funcs(sprig.TxtFuncMap()).Parse(p.Match.TorrentName)
|
||||
tmplName, err := template.New("torrentname").Funcs(sprig.TxtFuncMap()).Parse(p.TorrentName)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return err
|
||||
}
|
||||
|
||||
var nameBytes bytes.Buffer
|
||||
if err := tmplName.Execute(&nameBytes, &vars); err != nil {
|
||||
return nil, errors.New("could not write torrent name template output")
|
||||
return errors.New("could not write torrent name template output")
|
||||
}
|
||||
|
||||
matched.TorrentName = nameBytes.String()
|
||||
rls.TorrentName = nameBytes.String()
|
||||
}
|
||||
|
||||
return matched, nil
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *IndexerIRCParse) Parse(def *IndexerDefinition, vars map[string]string, rls *Release) error {
|
||||
if err := rls.MapVars(def, vars); err != nil {
|
||||
return errors.Wrap(err, "could not map variables for release")
|
||||
}
|
||||
|
||||
baseUrl := def.URLS[0]
|
||||
|
||||
// merge vars from regex captures on announce and vars from settings
|
||||
mergedVars := mergeVars(vars, def.SettingsMap)
|
||||
|
||||
// parse urls
|
||||
if err := def.IRC.Parse.Match.ParseURLs(baseUrl, mergedVars, rls); err != nil {
|
||||
return errors.Wrap(err, "could not parse urls for release")
|
||||
}
|
||||
|
||||
// parse torrent var
|
||||
if err := def.IRC.Parse.Match.ParseTorrentName(mergedVars, rls); err != nil {
|
||||
return errors.Wrap(err, "could not parse release name")
|
||||
}
|
||||
|
||||
var parser IRCParser
|
||||
|
||||
switch def.Identifier {
|
||||
case "ggn":
|
||||
parser = IRCParserGazelleGames{}
|
||||
case "ops":
|
||||
parser = IRCParserOrpheus{}
|
||||
default:
|
||||
parser = IRCParserDefault{}
|
||||
}
|
||||
|
||||
if err := parser.Parse(rls, vars); err != nil {
|
||||
return errors.Wrap(err, "could not parse release")
|
||||
}
|
||||
|
||||
if v, ok := def.SettingsMap["cookie"]; ok {
|
||||
rls.RawCookie = v
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
type TorrentBasic struct {
|
||||
|
|
|
@ -9,46 +9,29 @@ import (
|
|||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestIndexerIRCParse_ParseMatch(t *testing.T) {
|
||||
func TestIndexerIRCParseMatch_ParseUrls(t *testing.T) {
|
||||
type fields struct {
|
||||
Type string
|
||||
ForceSizeUnit string
|
||||
Lines []IndexerIRCParseLine
|
||||
Match IndexerIRCParseMatch
|
||||
TorrentURL string
|
||||
TorrentName string
|
||||
InfoURL string
|
||||
Encode []string
|
||||
}
|
||||
type args struct {
|
||||
baseURL string
|
||||
vars map[string]string
|
||||
rls *Release
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
fields fields
|
||||
args args
|
||||
want *IndexerIRCParseMatched
|
||||
wantErr bool
|
||||
name string
|
||||
fields fields
|
||||
args args
|
||||
want *Release
|
||||
}{
|
||||
{
|
||||
name: "test_01",
|
||||
name: "",
|
||||
fields: fields{
|
||||
Type: "",
|
||||
ForceSizeUnit: "",
|
||||
Lines: []IndexerIRCParseLine{
|
||||
{
|
||||
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: "rss/download/{{ .torrentId }}/{{ .rsskey }}/{{ .torrentName }}.torrent",
|
||||
Encode: []string{"torrentName"},
|
||||
},
|
||||
TorrentURL: "rss/download/{{ .torrentId }}/{{ .rsskey }}/{{ .torrentName }}.torrent",
|
||||
Encode: []string{"torrentName"},
|
||||
},
|
||||
args: args{
|
||||
baseURL: "https://mock.local/",
|
||||
|
@ -61,40 +44,17 @@ func TestIndexerIRCParse_ParseMatch(t *testing.T) {
|
|||
"torrentId": "240860011",
|
||||
"rsskey": "00000000000000000000",
|
||||
},
|
||||
rls: &Release{},
|
||||
},
|
||||
want: &IndexerIRCParseMatched{
|
||||
TorrentURL: "https://mock.local/rss/download/240860011/00000000000000000000/The+Show+2019+S03E08+2160p+DV+WEBRip+6CH+x265+HEVC-GROUP.torrent",
|
||||
want: &Release{
|
||||
DownloadURL: "https://mock.local/rss/download/240860011/00000000000000000000/The+Show+2019+S03E08+2160p+DV+WEBRip+6CH+x265+HEVC-GROUP.torrent",
|
||||
},
|
||||
wantErr: false,
|
||||
},
|
||||
{
|
||||
name: "test_02",
|
||||
name: "",
|
||||
fields: fields{
|
||||
Type: "",
|
||||
ForceSizeUnit: "",
|
||||
Lines: []IndexerIRCParseLine{
|
||||
{
|
||||
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: (.*))?$`,
|
||||
Vars: []string{
|
||||
"torrentName",
|
||||
"category",
|
||||
"year",
|
||||
"releaseTags",
|
||||
"releaseGroup",
|
||||
"releaseEpisode",
|
||||
"freeleech",
|
||||
"baseUrl",
|
||||
"torrentId",
|
||||
"tags",
|
||||
"uploader",
|
||||
},
|
||||
},
|
||||
},
|
||||
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,
|
||||
},
|
||||
TorrentURL: "/torrent/{{ .torrentId }}/download/{{ .passkey }}",
|
||||
Encode: nil,
|
||||
},
|
||||
args: args{
|
||||
baseURL: "https://mock.local/",
|
||||
|
@ -112,35 +72,17 @@ func TestIndexerIRCParse_ParseMatch(t *testing.T) {
|
|||
"uploader": "Uploader",
|
||||
"passkey": "00000000000000000000",
|
||||
},
|
||||
rls: &Release{},
|
||||
},
|
||||
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]",
|
||||
want: &Release{
|
||||
DownloadURL: "https://mock.local/torrent/240860011/download/00000000000000000000",
|
||||
},
|
||||
wantErr: false,
|
||||
},
|
||||
{
|
||||
name: "test_03",
|
||||
name: "",
|
||||
fields: fields{
|
||||
Type: "",
|
||||
ForceSizeUnit: "",
|
||||
Lines: []IndexerIRCParseLine{
|
||||
{
|
||||
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"},
|
||||
},
|
||||
TorrentURL: "{{ .baseUrl }}rss/download/{{ .torrentId }}/{{ .rsskey }}/{{ .torrentName }}.torrent",
|
||||
Encode: []string{"torrentName"},
|
||||
},
|
||||
args: args{
|
||||
baseURL: "https://mock.local/",
|
||||
|
@ -153,34 +95,17 @@ func TestIndexerIRCParse_ParseMatch(t *testing.T) {
|
|||
"torrentId": "240860011",
|
||||
"rsskey": "00000000000000000000",
|
||||
},
|
||||
rls: &Release{},
|
||||
},
|
||||
want: &IndexerIRCParseMatched{
|
||||
TorrentURL: "https://mock.local/rss/download/240860011/00000000000000000000/The+Show+2019+S03E08+2160p+DV+WEBRip+6CH+x265+HEVC-GROUP.torrent",
|
||||
want: &Release{
|
||||
DownloadURL: "https://mock.local/rss/download/240860011/00000000000000000000/The+Show+2019+S03E08+2160p+DV+WEBRip+6CH+x265+HEVC-GROUP.torrent",
|
||||
},
|
||||
wantErr: false,
|
||||
},
|
||||
{
|
||||
name: "test_04",
|
||||
name: "",
|
||||
fields: fields{
|
||||
Type: "",
|
||||
ForceSizeUnit: "",
|
||||
Lines: []IndexerIRCParseLine{
|
||||
{
|
||||
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"},
|
||||
},
|
||||
TorrentURL: "https://mock.local/rss/download/{{ .torrentId }}/{{ .rsskey }}/{{ .torrentName }}.torrent",
|
||||
Encode: []string{"torrentName"},
|
||||
},
|
||||
args: args{
|
||||
baseURL: "https://mock.local/",
|
||||
|
@ -193,34 +118,17 @@ func TestIndexerIRCParse_ParseMatch(t *testing.T) {
|
|||
"torrentId": "240860011",
|
||||
"rsskey": "00000000000000000000",
|
||||
},
|
||||
rls: &Release{},
|
||||
},
|
||||
want: &IndexerIRCParseMatched{
|
||||
TorrentURL: "https://mock.local/rss/download/240860011/00000000000000000000/The+Show+2019+S03E08+2160p+DV+WEBRip+6CH+x265+HEVC-GROUP.torrent",
|
||||
want: &Release{
|
||||
DownloadURL: "https://mock.local/rss/download/240860011/00000000000000000000/The+Show+2019+S03E08+2160p+DV+WEBRip+6CH+x265+HEVC-GROUP.torrent",
|
||||
},
|
||||
wantErr: false,
|
||||
},
|
||||
{
|
||||
name: "test_04",
|
||||
name: "",
|
||||
fields: fields{
|
||||
Type: "",
|
||||
ForceSizeUnit: "",
|
||||
Lines: []IndexerIRCParseLine{
|
||||
{
|
||||
Pattern: "New Torrent in category \\[([^\\]]*)\\] (.*) \\(([^\\)]*)\\) uploaded! Download\\: (https?\\:\\/\\/[^\\/]+\\/).+id=(.+)",
|
||||
Vars: []string{
|
||||
"category",
|
||||
"torrentName",
|
||||
"uploader",
|
||||
"freeleech",
|
||||
"baseUrl",
|
||||
"torrentId",
|
||||
},
|
||||
},
|
||||
},
|
||||
Match: IndexerIRCParseMatch{
|
||||
TorrentURL: "/rss/?action=download&key={{ .key }}&token={{ .token }}&hash={{ .torrentId }}&title={{ .torrentName }}",
|
||||
Encode: []string{"torrentName"},
|
||||
},
|
||||
TorrentURL: "/rss/?action=download&key={{ .key }}&token={{ .token }}&hash={{ .torrentId }}&title={{ .torrentName }}",
|
||||
Encode: []string{"torrentName"},
|
||||
},
|
||||
args: args{
|
||||
baseURL: "https://mock.local/",
|
||||
|
@ -235,24 +143,225 @@ func TestIndexerIRCParse_ParseMatch(t *testing.T) {
|
|||
"token": "TOKEN",
|
||||
"rsskey": "00000000000000000000",
|
||||
},
|
||||
rls: &Release{},
|
||||
},
|
||||
want: &IndexerIRCParseMatched{
|
||||
TorrentURL: "https://mock.local/rss/?action=download&key=KEY&token=TOKEN&hash=240860011&title=The+Show+2019+S03E08+2160p+DV+WEBRip+6CH+x265+HEVC-GROUP",
|
||||
want: &Release{
|
||||
DownloadURL: "https://mock.local/rss/?action=download&key=KEY&token=TOKEN&hash=240860011&title=The+Show+2019+S03E08+2160p+DV+WEBRip+6CH+x265+HEVC-GROUP",
|
||||
},
|
||||
wantErr: false,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
p := &IndexerIRCParse{
|
||||
Type: tt.fields.Type,
|
||||
ForceSizeUnit: tt.fields.ForceSizeUnit,
|
||||
Lines: tt.fields.Lines,
|
||||
Match: tt.fields.Match,
|
||||
p := &IndexerIRCParseMatch{
|
||||
TorrentURL: tt.fields.TorrentURL,
|
||||
TorrentName: tt.fields.TorrentName,
|
||||
InfoURL: tt.fields.InfoURL,
|
||||
Encode: tt.fields.Encode,
|
||||
}
|
||||
|
||||
got, _ := p.ParseMatch(tt.args.baseURL, tt.args.vars)
|
||||
assert.Equal(t, tt.want, got)
|
||||
p.ParseURLs(tt.args.baseURL, tt.args.vars, tt.args.rls)
|
||||
assert.Equal(t, tt.want, tt.args.rls)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestIndexerIRCParseMatch_ParseTorrentName(t *testing.T) {
|
||||
type fields struct {
|
||||
TorrentURL string
|
||||
TorrentName string
|
||||
InfoURL string
|
||||
Encode []string
|
||||
}
|
||||
type args struct {
|
||||
vars map[string]string
|
||||
rls *Release
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
fields fields
|
||||
args args
|
||||
want *Release
|
||||
}{
|
||||
{
|
||||
name: "",
|
||||
fields: fields{
|
||||
TorrentName: "",
|
||||
},
|
||||
args: args{
|
||||
vars: map[string]string{
|
||||
"torrentName": "The Show 2019 S03E08 2160p DV WEBRip 6CH x265 HEVC-GROUP",
|
||||
},
|
||||
rls: &Release{},
|
||||
},
|
||||
want: &Release{
|
||||
TorrentName: "",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "",
|
||||
fields: fields{
|
||||
TorrentName: `{{ if .releaseGroup }}[{{ .releaseGroup }}] {{ end }}{{ .torrentName }} [{{ .year }}] {{ if .releaseEpisode }}{{ printf "- %02s " .releaseEpisode }}{{ end }}{{ print "[" .releaseTags "]" | replace " / " "][" }}`,
|
||||
},
|
||||
args: args{
|
||||
vars: map[string]string{
|
||||
"torrentName": "Great BluRay SoftSubbed Anime",
|
||||
"category": "TV Series",
|
||||
"year": "2020",
|
||||
"releaseTags": "Blu-ray / MKV / h264 10-bit / 1080p / FLAC 2.0 / Dual Audio / Softsubs (Sub Group) / Freeleech",
|
||||
"releaseGroup": "Softsubs",
|
||||
"releaseEpisode": "",
|
||||
"freeleech": "freeleech",
|
||||
"baseUrl": "https://mock.local",
|
||||
"torrentId": "240860011",
|
||||
"tags": "comedy, drama, school.life, sports",
|
||||
"uploader": "Uploader",
|
||||
"passkey": "00000000000000000000",
|
||||
},
|
||||
rls: &Release{},
|
||||
},
|
||||
want: &Release{
|
||||
TorrentName: "[Softsubs] Great BluRay SoftSubbed Anime [2020] [Blu-ray][MKV][h264 10-bit][1080p][FLAC 2.0][Dual Audio][Softsubs (Sub Group)][Freeleech]",
|
||||
},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
p := &IndexerIRCParseMatch{
|
||||
TorrentURL: tt.fields.TorrentURL,
|
||||
TorrentName: tt.fields.TorrentName,
|
||||
InfoURL: tt.fields.InfoURL,
|
||||
Encode: tt.fields.Encode,
|
||||
}
|
||||
p.ParseTorrentName(tt.args.vars, tt.args.rls)
|
||||
assert.Equal(t, tt.want, tt.args.rls)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestIRCParserGazelleGames_Parse(t *testing.T) {
|
||||
type args struct {
|
||||
rls *Release
|
||||
vars map[string]string
|
||||
}
|
||||
type want struct {
|
||||
title string
|
||||
release string
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
want want
|
||||
}{
|
||||
{
|
||||
name: "",
|
||||
args: args{
|
||||
rls: NewRelease("ggn"),
|
||||
vars: map[string]string{
|
||||
"torrentName": "Trouble.in.Paradise-GROUP in Trouble in Paradise",
|
||||
},
|
||||
},
|
||||
want: want{
|
||||
title: "Trouble in Paradise",
|
||||
release: "Trouble.in.Paradise-GROUP",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "",
|
||||
args: args{
|
||||
rls: NewRelease("ggn"),
|
||||
vars: map[string]string{
|
||||
"torrentName": "F.I.L.F. Game Walkthrough v.0.18 in F.I.L.F.",
|
||||
},
|
||||
},
|
||||
want: want{
|
||||
title: "F.I.L.F.",
|
||||
release: "F.I.L.F. Game Walkthrough v.0.18",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "",
|
||||
args: args{
|
||||
rls: NewRelease("ggn"),
|
||||
vars: map[string]string{
|
||||
"torrentName": "Ni no Kuni: Dominion of the Dark Djinn in Ni no Kuni: Dominion of the Dark Djinn",
|
||||
},
|
||||
},
|
||||
want: want{
|
||||
title: "Ni no Kuni: Dominion of the Dark Djinn",
|
||||
release: "Ni no Kuni: Dominion of the Dark Djinn",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "",
|
||||
args: args{
|
||||
rls: NewRelease("ggn"),
|
||||
vars: map[string]string{
|
||||
"torrentName": "Year 2 Remastered by Insaneintherainmusic",
|
||||
"category": "OST",
|
||||
},
|
||||
},
|
||||
want: want{
|
||||
title: "Year 2 Remastered by Insaneintherainmusic",
|
||||
release: "Year 2 Remastered by Insaneintherainmusic",
|
||||
},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
p := IRCParserGazelleGames{}
|
||||
p.Parse(tt.args.rls, tt.args.vars)
|
||||
assert.Equal(t, tt.want.release, tt.args.rls.TorrentName)
|
||||
assert.Equal(t, tt.want.title, tt.args.rls.Title)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestIRCParserOrpheus_Parse(t *testing.T) {
|
||||
type args struct {
|
||||
rls *Release
|
||||
vars map[string]string
|
||||
}
|
||||
type want struct {
|
||||
title string
|
||||
release string
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
want want
|
||||
}{
|
||||
{
|
||||
name: "",
|
||||
args: args{
|
||||
rls: NewRelease("ops"),
|
||||
vars: map[string]string{
|
||||
"torrentName": "Busta Rhymes – BEACH BALL (feat. BIA) – [2023] [Single] WEB/FLAC/24bit Lossless",
|
||||
},
|
||||
},
|
||||
want: want{
|
||||
title: "BEACH BALL",
|
||||
release: "Busta Rhymes - BEACH BALL (feat. BIA) - [2023] [Single] WEB/FLAC/24bit Lossless",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "",
|
||||
args: args{
|
||||
rls: NewRelease("ops"),
|
||||
vars: map[string]string{
|
||||
"torrentName": "Busta Rhymes – BEACH BALL (feat. BIA) – [2023] [Single] CD/FLAC/Lossless",
|
||||
},
|
||||
},
|
||||
want: want{
|
||||
title: "BEACH BALL",
|
||||
release: "Busta Rhymes - BEACH BALL (feat. BIA) - [2023] [Single] CD/FLAC/Lossless",
|
||||
},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
p := IRCParserOrpheus{}
|
||||
p.Parse(tt.args.rls, tt.args.vars)
|
||||
assert.Equal(t, tt.want.release, tt.args.rls.TorrentName)
|
||||
assert.Equal(t, tt.want.title, tt.args.rls.Title)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@ package domain
|
|||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
|
@ -137,3 +138,82 @@ type IrcRepo interface {
|
|||
GetNetworkByID(ctx context.Context, id int64) (*IrcNetwork, error)
|
||||
DeleteNetwork(ctx context.Context, id int64) error
|
||||
}
|
||||
|
||||
type IRCParser interface {
|
||||
Parse(rls *Release, vars map[string]string) error
|
||||
}
|
||||
|
||||
type IRCParserDefault struct{}
|
||||
|
||||
func (p IRCParserDefault) Parse(rls *Release, _ map[string]string) error {
|
||||
// parse fields
|
||||
// run before ParseMatch to not potentially use a reconstructed TorrentName
|
||||
rls.ParseString(rls.TorrentName)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
type IRCParserGazelleGames struct{}
|
||||
|
||||
func (p IRCParserGazelleGames) Parse(rls *Release, vars map[string]string) error {
|
||||
torrentName := vars["torrentName"]
|
||||
category := vars["category"]
|
||||
|
||||
releaseName := ""
|
||||
title := ""
|
||||
|
||||
switch category {
|
||||
case "OST":
|
||||
// OST does not have the Title in Group naming convention
|
||||
releaseName = torrentName
|
||||
default:
|
||||
releaseName, title = splitInMiddle(torrentName, " in ")
|
||||
|
||||
if releaseName == "" && title != "" {
|
||||
releaseName = torrentName
|
||||
}
|
||||
}
|
||||
|
||||
rls.ParseString(releaseName)
|
||||
|
||||
if title != "" {
|
||||
rls.Title = title
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
type IRCParserOrpheus struct{}
|
||||
|
||||
func (p IRCParserOrpheus) Parse(rls *Release, vars map[string]string) error {
|
||||
// OPS uses en-dashes as separators, which causes moistari/rls to not parse the torrentName properly,
|
||||
// we replace the en-dashes with hyphens here
|
||||
torrentName := vars["torrentName"]
|
||||
rls.TorrentName = strings.ReplaceAll(torrentName, "–", "-")
|
||||
|
||||
rls.ParseString(rls.TorrentName)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// mergeVars merge maps
|
||||
func mergeVars(data ...map[string]string) map[string]string {
|
||||
tmpVars := map[string]string{}
|
||||
|
||||
for _, vars := range data {
|
||||
// copy vars to new tmp map
|
||||
for k, v := range vars {
|
||||
tmpVars[k] = v
|
||||
}
|
||||
}
|
||||
return tmpVars
|
||||
}
|
||||
|
||||
// splitInMiddle utility for GGn that tries to split the announced release name
|
||||
// torrent name consists of "This.Game-GRP in This Game Group" but titles can include "in"
|
||||
// this function tries to split in the correct place
|
||||
func splitInMiddle(s, sep string) (string, string) {
|
||||
parts := strings.Split(s, sep)
|
||||
l := len(parts)
|
||||
return strings.Join(parts[:l/2], sep), strings.Join(parts[l/2:], sep)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue