fix: tests

Author: sonalys

internal/discovery/run.go

@@ -144,7 +144,7 @@ func getDownloadableEntries(animeListEntry animelist.Entry, entries []nyaa.Entry
 func (c *Controller) NyaaSearch(ctx context.Context, entry animelist.Entry) ([]nyaa.Entry, error) {
 	// Build search query for Nyaa.
 	// For title we filter for english and original titles.
-	strippedTitles := utils.Map(entry.Titles, func(title string) string { return parser.TitleStrip(title, true) })
+	strippedTitles := utils.Map(entry.Titles, func(title string) string { return parser.TitleStrip(title) })
 	titleQuery := nyaa.QueryOr(strippedTitles)
 	sourceQuery := nyaa.QueryOr(c.dep.Config.Sources)
 	qualityQuery := nyaa.QueryOr(c.dep.Config.Qualitites)

internal/discovery/torrent.go

@@ -18,8 +18,7 @@ func (c *Controller) TorrentGetLatestEpisodes(ctx context.Context, entry animeli
 	for i := range entry.Titles {
 		// we should consider both metadata and titleEng, because your anime list has different titles available,
 		// some torrent sources will use one, some will use the other, so to avoid duplication we check for both.
-		metadata := parser.Parse(entry.Titles[i])
-		metadata.Title = parser.TitleStrip(metadata.Title, true)
+		metadata := parser.Parse(entry.Titles[i], parser.RemoveDots())
 		resp, err := c.dep.TorrentClient.List(ctx, &torrentclient.ListTorrentConfig{
 			Tag: utils.Pointer(metadata.TagBuildSeries()),
 		})
@@ -60,8 +59,10 @@ func (c *Controller) buildTorrentName(entry animelist.Entry, parsedNyaa parser.P
 // It will configure all necessary metadata and send it to your torrent client.
 func (c *Controller) TorrentDigestNyaa(ctx context.Context, entry animelist.Entry, parsedNyaa parser.ParsedNyaa) error {
 	savePath := c.TorrentGetDownloadPath(entry.Titles[0])
-	parsedNyaa.Meta.Title = parser.TitleStrip(parsedNyaa.Meta.Title, true)
-	tags := parsedNyaa.Meta.TagsBuildTorrent()
+	meta := parsedNyaa.Meta.Clone()
+	meta.Title = parser.TitleStrip(meta.Title)
+	tags := meta.TagsBuildTorrent()
+
 	req := &torrentclient.AddTorrentConfig{
 		Tags:     tags,
 		URLs:     []string{parsedNyaa.Entry.Link},

internal/parser/metadata.go

@@ -31,3 +31,15 @@ func (m *Metadata) TagIsNextEpisode(latest string) bool {
 	}
 	return true
 }
+
+func (m Metadata) Clone() Metadata {
+	return Metadata{
+		Source:             m.Source,
+		Title:              m.Title,
+		Episode:            m.Episode,
+		Season:             m.Season,
+		Tags:               append([]string{}, m.Tags...),
+		VerticalResolution: m.VerticalResolution,
+		IsMultiEpisode:     m.IsMultiEpisode,
+	}
+}

internal/parser/title.go

@@ -19,18 +19,42 @@ func TitleStripSubtitle(title string) string {
 	return title
 }
 
+type titleCleanOptions struct {
+	removeDots bool
+}
+
+type TitleStripOptions interface {
+	applyTitleStripOptions(*titleCleanOptions)
+}
+
+type optRemoveDots struct{}
+
+func (o optRemoveDots) applyTitleStripOptions(opts *titleCleanOptions) {
+	opts.removeDots = true
+}
+
+func RemoveDots() TitleStripOptions {
+	return optRemoveDots{}
+}
+
 // TitleStrip cleans title from sub-titles, tags and season / episode information.
 // Example: [Source] Show: another story - S03E02 [1080p].mkv -> Show.
-func TitleStrip(title string, cleanSubtitle bool) string {
+func TitleStrip(title string, opts ...TitleStripOptions) string {
+	options := titleCleanOptions{}
+	for _, opt := range opts {
+		opt.applyTitleStripOptions(&options)
+	}
+
 	if index := seasonIndexMatch(title); index != -1 {
 		title = title[:index]
 	}
 	if index := episodeIndexMatch(title); index != -1 {
 		title = title[:index]
 	}
 	title = regexp.MustCompile(`\s{2,}`).ReplaceAllString(title, " ")
-	if cleanSubtitle {
-		title = TitleStripSubtitle(title)
+	title = TitleStripSubtitle(title)
+	if options.removeDots {
+		title = strings.ReplaceAll(title, ".", " ")
 	}
 	title = strings.ReplaceAll(title, "\"", "")
 	title = removeTags(title)
@@ -45,9 +69,9 @@ func removeTags(title string) string {
 }
 
 // Parse will parse a title into a Metadata, extracting stripped title, tags, season and episode information.
-func Parse(title string) Metadata {
+func Parse(title string, opts ...TitleStripOptions) Metadata {
 	resp := Metadata{
-		Title:              TitleStrip(title, false),
+		Title:              TitleStrip(title, opts...),
 		VerticalResolution: qualityMatch(title),
 	}
 	if tags := tagsExpr.FindAllStringSubmatch(title, -1); len(tags) > 0 {

internal/parser/title_test.go

@@ -19,7 +19,7 @@ func TestTitleStrip(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := TitleStrip(tt.title, false); got != tt.want {
+			if got := TitleStrip(tt.title); got != tt.want {
 				t.Errorf("TitleStrip() = %v, want %v", got, tt.want)
 			}
 		})
@@ -30,6 +30,7 @@ func TestTitleParse(t *testing.T) {
 	tests := []struct {
 		name  string
 		title string
+		opts  []TitleStripOptions
 		want  Metadata
 	}{
 		{
@@ -87,6 +88,7 @@ func TestTitleParse(t *testing.T) {
 		{
 			name:  "all dots",
 			title: "MASHLE.MAGIC.AND.MUSCLES.S02E19.Mash.Burnedead.and.the.Magical.Maestro.1080p.CR.WEB-DL.AAC2.0.H.264-VARYG.mkv",
+			opts:  []TitleStripOptions{RemoveDots()},
 			want: Metadata{
 				Title:              "MASHLE MAGIC AND MUSCLES",
 				Episode:            "19",
@@ -98,6 +100,7 @@ func TestTitleParse(t *testing.T) {
 		{
 			name:  "undead unluck",
 			title: "Undead.Unluck.S01E20.Anno.Un.1080p.HULU.WEB-DL.AAC2.0.H.264-VARYG.mkv",
+			opts:  []TitleStripOptions{RemoveDots()},
 			want: Metadata{
 				Title:              "Undead Unluck",
 				Episode:            "20",
@@ -109,7 +112,7 @@ func TestTitleParse(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got := Parse(tt.title)
+			got := Parse(tt.title, tt.opts...)
 			require.Equal(t, tt.want, got)
 		})
 	}