From 41ef4d1f555cc5f6307287dae2ad37e2e98c62ac Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Tue, 5 Oct 2021 15:51:25 +1300 Subject: [PATCH] acidlounge: refresh to current standards update cats fix cat serach add freeleech search config add site sort config description can be missing so make it optional to prevent error add MR and MST --- README.md | 16 +-- src/Jackett.Common/Definitions/acidlounge.yml | 97 +++++++++++++------ 2 files changed, 77 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 04f00da2a..66f5de2f7 100644 --- a/README.md +++ b/README.md @@ -238,7 +238,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * 720pier * Abnormal * ABtorrents (ABT + RNS) - * Acid Lounge (A-L) [![(invite needed)][inviteneeded]](#) + * Acid Lounge (A-L) * AcrossTheTasman [![(invite needed)][inviteneeded]](#) * Aftershock * Aidoru!Online @@ -276,7 +276,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * BJ-Share (BJ) * BlueBird [![(invite needed)][inviteneeded]](#) * Blutopia (BLU) - * Borgzelle + * Borgzelle [![(invite needed)][inviteneeded]](#) * Boxing Torrents * Brasil Tracker * BroadcasTheNet (BTN) @@ -332,7 +332,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * Falkon Vision Team * FANO.IN * Fantastic Heaven - * Fantastiko + * Fantastiko [![(invite needed)][inviteneeded]](#) * Femdomcult * FileList (FL) * Film-Paleis @@ -344,7 +344,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * Gay-Torrents.org [![(invite needed)][inviteneeded]](#) * GAYtorrent.ru * GazelleGames (GGn) [![(invite needed)][inviteneeded]](#) - * Generation-Free + * Generation-Free [![(invite needed)][inviteneeded]](#) * GFXPeers * GigaTorrents * GimmePeers (formerly ILT) @@ -406,7 +406,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * M-Team TP (MTTP) * MaDs Revolution [![(invite needed)][inviteneeded]](#) * magic-heaven - * Magico (Trellas) + * Magico (Trellas) [![(invite needed)][inviteneeded]](#) * Majomparádé (TurkDepo) * MeseVilág (Fairytale World) * MicroBit (µBit) @@ -511,7 +511,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * The Occult [![(invite needed)][inviteneeded]](#) * The Place [![(invite needed)][inviteneeded]](#) * The Shinning (TsH) - * The Show [![(invite needed)][inviteneeded]](#) + * The Show * The Vault [![(invite needed)][inviteneeded]](#) * TheAudioScene * TheEmpire (TE) @@ -558,8 +558,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * Vizuk * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents) * wOOt [![(invite needed)][inviteneeded]](#) - * World-In-HD [![(invite needed)][inviteneeded]](#) - * x-ite.me (XM) [![(invite needed)][inviteneeded]](#) + * World-In-HD + * x-ite.me (XM) * xBytesV2 * XSpeeds (XS) * XWT-Classics diff --git a/src/Jackett.Common/Definitions/acidlounge.yml b/src/Jackett.Common/Definitions/acidlounge.yml index 3c7e1265e..cd495547c 100644 --- a/src/Jackett.Common/Definitions/acidlounge.yml +++ b/src/Jackett.Common/Definitions/acidlounge.yml @@ -18,9 +18,9 @@ caps: - {id: 32, cat: PC, desc: "Appz/PC"} - {id: 48, cat: Audio/Audiobook, desc: "Audio/Books"} - {id: 84, cat: Other, desc: "Damaged Torrent"} - - {id: 14, cat: Books, desc: "eBooks"} - - {id: 82, cat: Books, desc: "eBooks/Comics"} - - {id: 81, cat: Books, desc: "eBooks/Mags"} + - {id: 14, cat: Books/EBook, desc: "eBooks"} + - {id: 82, cat: Books/Comics, desc: "eBooks/Comics"} + - {id: 81, cat: Books/Mags, desc: "eBooks/Mags"} - {id: 60, cat: PC/Mac, desc: "Games/Mac"} - {id: 54, cat: Console/NDS, desc: "Games/NDS"} - {id: 4, cat: PC/Games, desc: "Games/PC"} @@ -52,7 +52,9 @@ caps: - {id: 75, cat: TV/HD, desc: "TV/Boxsets HD"} - {id: 76, cat: TV/SD, desc: "TV/Boxsets SD"} - {id: 37, cat: XXX, desc: "XXX"} + - {id: 68, cat: XXX, desc: "XXX/0-Day"} - {id: 78, cat: XXX, desc: "XXX/3D"} + - {id: 67, cat: XXX/ImageSet, desc: "XXX/Imagesets"} modes: search: [q] @@ -61,6 +63,33 @@ caps: music-search: [q] book-search: [q] +settings: + - name: username + type: text + label: Username + - name: password + type: password + label: Password + - name: freeleech + type: checkbox + label: Search freeleech only + default: false + - name: sort + type: select + label: Sort requested from site + default: dateAdded + options: + dateAdded: created + seeders: seeders + size: size + name: title + - name: type + type: select + label: Order requested from site + default: desc + options: + desc: desc + asc: asc login: path: Main/?act=Login method: form @@ -81,50 +110,39 @@ search: paths: - path: browse.php inputs: - $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}" + $raw: "{{ range .Categories }}cat[]={{.}}&{{end}}" search: "{{ .Keywords }}" + # alive, aliveanddead, nobot, dead, free, nuked + status: "{{ if .Config.freeleech }}free{{ else }}aliveanddead{{ end }}" + # title, desc, both search_type: title + sort: "{{ .Config.sort }}" + order: "{{ .Config.type }}" rows: selector: table#browse_torrents_table > tbody > tr[id^="torrent_row_"] fields: - title: - selector: a.torrent_name - attribute: title - description: - selector: span.torrent_small_desc category: - selector: td.torrent_table_type > a + selector: a[href^="browse.php?cat[]="] attribute: href filters: - name: querystring args: cat[] + title: + selector: a.torrent_name + attribute: title details: selector: a.torrent_name attribute: href download: selector: a[href^="download.php?"] attribute: href - size: - selector: td.torrent_table_size + description: + optional: true + selector: span.torrent_small_desc files: selector: td.torrent_table_files - seeders: - selector: td.torrent_table_seeders - leechers: - selector: td.torrent_table_leechers - grabs: - selector: td.torrent_table_snatched - filters: - - name: regexp - args: ([\d\.]+) - downloadvolumefactor: - case: - ":root div#notice_ratioBoostingMadness": 0 - "*": 1 - uploadvolumefactor: - text: 1 date: selector: td.torrent_table_dateAdded filters: @@ -132,4 +150,27 @@ search: args: " +01:00" # CET - name: dateparse args: "2006-01-02 15:04:05 -07:00" -# engine tbd + size: + selector: td.torrent_table_size + grabs: + selector: td.torrent_table_snatched + filters: + - name: regexp + args: (\d+) + seeders: + selector: td.torrent_table_seeders + leechers: + selector: td.torrent_table_leechers + downloadvolumefactor: + case: + ":root div#notice_ratioBoostingMadness": 0 + img[src$="images/freedownload.gif"]: 0 + "*": 1 + uploadvolumefactor: + text: 1 + minimumratio: + text: 1.0 + minimumseedtime: + # 5 day (as seconds = 5 x 24 x 60 x 60) + text: 432000 # 3 days for torrents under 20GB +# engine n/a