From 362aa8f9d067467cc5930a8b66e30954dae0d81a Mon Sep 17 00:00:00 2001 From: soup Date: Sat, 14 Jan 2023 16:21:39 +0100 Subject: [PATCH] fix(indexers): funfile single line parsing (#646) * fix(indexers): funfile announce line 2 is optional * Change to single line parse for the time being --- internal/indexer/definitions/funfile.yaml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/internal/indexer/definitions/funfile.yaml b/internal/indexer/definitions/funfile.yaml index 4a5b4cd..8273a64 100644 --- a/internal/indexer/definitions/funfile.yaml +++ b/internal/indexer/definitions/funfile.yaml @@ -48,11 +48,12 @@ irc: help: NickServ password parse: - type: multi + type: single lines: - test: - "[New Shit] Wiseguy.S04E01.720p.WEB.h264-SKYFiRE [TV/Web-HD] @ https://www.funfile.org/details.php?id=1662804 [2 GB] [FL]" - "[New Shit] DC.-.Wonder.Woman.The.Twelve.Labors.2018.Hybrid.Comic.eBook-BitBook [Ebook] @ https://www.funfile.org/details.php?id=1662668 [206 MB]" + - "[New Shit] Sister.Wives.S17.1080p.AMZN.WEB-DL.DDP2.0.H.264-NTb [TV/x264-HD] @ https://www.funfile.org/details.php?id=1663540 [49 GB] [FL]" pattern: '\[New Shit\] (.*) \[(.*)\] @ (https?\:\/\/.*\/).*id=(.*?) \[(.*?)\] ?(?:\[(.*?)\])?' vars: - torrentName @@ -62,15 +63,18 @@ irc: - torrentSize - freeleech - - test: - - "[Scene] Uploaded 1 min and 18 secs after pre" - - "[Scene] Uploaded 1 min and 55 secs after pre" - pattern: '\[(.*)\] Uploaded (.*) after pre' - vars: - - origin - - preTime +# Commented out until we make a better fix for optional multi line +# +# - test: +# - "[Scene] Uploaded 1 min and 18 secs after pre" +# - "[Scene] Uploaded 1 min and 55 secs after pre" +# pattern: '?(?:\[(.*)\] Uploaded (.*) after pre)?' +# vars: +# - origin +# - preTime + match: torrenturl: "/download.php?{{ .torrentId }}/{{ .passkey }}/{{ .torrentName }}.torrent" encode: - - torrentName \ No newline at end of file + - torrentName