From 84c7a4484e71e45e746f1333be9643774e6eb83b Mon Sep 17 00:00:00 2001 From: ze0s <43699394+zze0s@users.noreply.github.com> Date: Sun, 1 Jan 2023 16:35:55 +0100 Subject: [PATCH] feat(releases): improve log score parsing (#604) * feat(releases): improve logscore parsing * feat(releases): test case naming --- internal/domain/releasetags.go | 2 +- internal/domain/releasetags_test.go | 1 + internal/indexer/definitions/orpheus.yaml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/domain/releasetags.go b/internal/domain/releasetags.go index fce17d5..9b8d78f 100644 --- a/internal/domain/releasetags.go +++ b/internal/domain/releasetags.go @@ -43,7 +43,7 @@ func init() { {tag: "FLAC", title: "Free Lossless Audio Codec", regexp: "", re: nil}, {tag: "LiNE", title: "Line", regexp: "(?-i:L[iI]NE)", re: nil}, {tag: "Lossless", title: "", regexp: "(?i:Lossless)", re: nil}, - {tag: "Log100", title: "", regexp: "(log 100%)", re: nil}, + {tag: "Log100", title: "", regexp: "(log 100%|log \\(100%\\))", re: nil}, {tag: "Log", title: "", regexp: "(?:log)", re: nil}, {tag: "LPCM", title: "Linear Pulse-Code Modulation", regexp: "", re: nil}, {tag: "MP3", title: "", regexp: "", re: nil}, diff --git a/internal/domain/releasetags_test.go b/internal/domain/releasetags_test.go index 0f08946..6bdc359 100644 --- a/internal/domain/releasetags_test.go +++ b/internal/domain/releasetags_test.go @@ -39,6 +39,7 @@ func TestParseReleaseTagString(t *testing.T) { {name: "music_3", args: args{tags: "FLAC Lossless Log 100% Cue CD"}, want: ReleaseTags{Audio: []string{"Cue", "FLAC", "Lossless", "Log100", "Log"}, Source: "CD"}}, {name: "music_4", args: args{tags: "FLAC 24bit Lossless Log 100% Cue CD"}, want: ReleaseTags{Audio: []string{"24BIT Lossless", "Cue", "FLAC", "Lossless", "Log100", "Log"}, Source: "CD"}}, {name: "music_5", args: args{tags: "MP3 320 WEB"}, want: ReleaseTags{Audio: []string{"320", "MP3"}, Source: "WEB"}}, + {name: "music_6", args: args{tags: "FLAC Lossless Log (100%) Cue CD"}, want: ReleaseTags{Audio: []string{"Cue", "FLAC", "Lossless", "Log100", "Log"}, Source: "CD"}}, {name: "movies_1", args: args{tags: "x264 Blu-ray MKV 1080p"}, want: ReleaseTags{Codec: "x264", Source: "BluRay", Resolution: "1080p", Container: "mkv"}}, {name: "movies_2", args: args{tags: "HEVC HDR Blu-ray mp4 2160p"}, want: ReleaseTags{Codec: "HEVC", Source: "BluRay", Resolution: "2160p", Container: "mp4", HDR: []string{"HDR"}}}, {name: "movies_3", args: args{tags: "HEVC HDR DV Blu-ray mp4 2160p"}, want: ReleaseTags{Codec: "HEVC", Source: "BluRay", Resolution: "2160p", Container: "mp4", HDR: []string{"HDR", "DV"}}}, diff --git a/internal/indexer/definitions/orpheus.yaml b/internal/indexer/definitions/orpheus.yaml index 0d50c75..f02e559 100644 --- a/internal/indexer/definitions/orpheus.yaml +++ b/internal/indexer/definitions/orpheus.yaml @@ -60,6 +60,7 @@ irc: - test: - "TORRENT: That Artist - Albuum [2002] [Single] - FLAC / Lossless / WEB - 2000s,house,uk.garage,garage.house - https://orpheus.network/torrents.php?id=000000 / https://orpheus.network/torrents.php?action=download&id=0000000" - "TORRENT: Something [2021] [Album] - FLAC / Lossless / CD - - https://orpheus.network/torrents.php?id=000000 / https://orpheus.network/torrents.php?action=download&id=0000000" + - "TORRENT: Artist 1 & Artist 2 - Best album (subtitle) [2004] [Album] - FLAC / Lossless / Log (100%) / Cue / CD - experimental,ambient,downtempo - https://orpheus.network/torrents.php?id=000000 / https://orpheus.network/torrents.php?action=download&id=0000000" pattern: 'TORRENT: (.*) \[(.+?)\] \[(.+?)\] - (.*) - \s*(.*) - https?:\/\/.* \/ (https?:\/\/.+\/).+id=(\d+)' vars: - torrentName