From 0afd9c638afd3bd8ca15dda8b1d8fa5d2f5a80b4 Mon Sep 17 00:00:00 2001 From: Mike Date: Sat, 3 Jun 2017 15:08:01 +0200 Subject: [PATCH] Fixed nyaa-pantsu again.. Smaal nyaasi naming changes. (#1427) --- src/Jackett/Definitions/nyaa-pantsu.yml | 62 ++++++++++++++++++------- src/Jackett/Definitions/nyaasi.yml | 34 +++++++------- 2 files changed, 61 insertions(+), 35 deletions(-) diff --git a/src/Jackett/Definitions/nyaa-pantsu.yml b/src/Jackett/Definitions/nyaa-pantsu.yml index e09402e3f..40955ebde 100644 --- a/src/Jackett/Definitions/nyaa-pantsu.yml +++ b/src/Jackett/Definitions/nyaa-pantsu.yml @@ -14,27 +14,55 @@ settings: - name: cat-id - type: text - label: Category Id + type: select + label: Category + default: "_" + options: + _: "All categories" + 3_: "Anime" + 3_12: "Anime - Anime Music Video" + 3_5: "Anime - English-translated" + 3_13: "Anime - Non-English-translated" + 3_6: "Anime - Raw" + 2_: "Audio" + 2_3: "Audio - Lossless" + 2_4: "Audio - Lossy" + 4_: "Literature" + 4_7: "Literature - English-translated" + 4_14: "Literature - Non-English-translated" + 4_14: "Literature - Raw" + 1_: "Software" + 1_1: "Software - Applications" + 1_2: "Software - Games" + - name: filter-id + type: select + label: Filter + default: "0" + options: + 0: "Show all" + 1: "Filter Remakes" + 2: "Trusted" + 3: "A+" caps: categorymappings: # Anime -# - {id: 3_, cat: TV/Anime, desc: "Anime"} + - {id: 3_, cat: TV/Anime, desc: "Anime"} - {id: 3_12, cat: TV/Anime, desc: "Anime music videos"} - {id: 3_5, cat: TV/Anime, desc: "English subtitled animes"} - {id: 3_13, cat: TV/Anime, desc: "Non-english subtitled animes"} - {id: 3_6, cat: TV/Anime, desc: "Raw animes"} # Audio -# - {id: 2_, cat: Audio, desc: "Audio"} + - {id: 2_, cat: Audio, desc: "Audio"} - {id: 2_3, cat: Audio, desc: "Lossless audio"} - {id: 2_4, cat: Audio, desc: "Lossy audio"} # Literature -# - {id: 4_, cat: Books, desc: "Literature"} + - {id: 4_, cat: Books, desc: "Literature"} - {id: 4_7, cat: Books, desc: "Literature english translated"} - - {id: 4_14, cat: Books, desc: "Literature non-english translated"} - - {id: 4_8, cat: Books, desc: "Raw literature"} + - {id: 4_14, cat: Books, desc: "Literature non-english translated"} + - {id: 4_8, cat: Books, desc: "Raw literature"} # Software + - {id: 1_, cat: PC, desc: "Software"} - {id: 1_1, cat: PC/ISO, desc: "Applications"} - {id: 1_2, cat: PC/Games, desc: "Games"} modes: @@ -46,11 +74,12 @@ inputs: q: "{{ .Query.Keywords }}" c: "{{ .Config.cat-id }}" + s: "{{ .Config.filter-id }}" rows: selector: tr.torrent-info fields: title: - selector: td.name a + selector: td.tr-name a category: selector: td:nth-child(1) a attribute: href @@ -58,30 +87,27 @@ - name: split args: [ "=", -1 ] details: - selector: td.name a + selector: td.tr-name a attribute: href download: - selector: a[title="Magnet link"] + selector: a[title="Magnet Link"] attribute: href seeders: - selector: td:nth-child(3) b.text-success + selector: td.tr-se optional: true leechers: - selector: td:nth-child(3) b.text-danger + selector: td.tr-le optional: true grabs: - selector: td:nth-child(3) + selector: td.tr-dl optional: true - filters: - - name: split - args: [ "/", -1 ] date: selector: td.date-short filters: - name: dateparse args: "2006-01-02T15:04:05Z" size: - selector: td:nth-child(5) + selector: td.tr-size filters: - name: replace - args: ["Unknown", "0"] + args: ["Unknown", "0"] \ No newline at end of file diff --git a/src/Jackett/Definitions/nyaasi.yml b/src/Jackett/Definitions/nyaasi.yml index 49502dcf7..02e3ec540 100644 --- a/src/Jackett/Definitions/nyaasi.yml +++ b/src/Jackett/Definitions/nyaasi.yml @@ -23,38 +23,38 @@ options: 0_0: "All categories" 1_0: "Anime" - 1_1: "- Anime Music Video" - 1_2: "- English-translated" - 1_3: "- Non-English-translated" - 1_4: "- Raw" + 1_1: "Anime - Anime Music Video" + 1_2: "Anime - English-translated" + 1_3: "Anime - Non-English-translated" + 1_4: "Anime - Raw" 2_0: "Audio" - 2_1: "- Lossless" - 2_2: "- Lossy" + 2_1: "Audio - Lossless" + 2_2: "Audio - Lossy" 3_0: "Literature" - 3_1: "- English-translated" - 3_2: "- Non-English-translated" - 3_3: "- Lossy" + 3_1: "Literature - English-translated" + 3_2: "Literature - Non-English-translated" + 3_3: "Literature - Lossy" 6_0: "Software" - 6_1: "- Applications" - 6_2: "- Games" + 6_1: "Software - Applications" + 6_2: "Software - Games" caps: categorymappings: # Anime - - {id: 1_0, cat: TV/Anime, desc: "Anime"} - - {id: 1_1, cat: TV/Anime, desc: "Anime music videos"} + - {id: 1_0, cat: TV/Anime, desc: "Anime"} + - {id: 1_1, cat: TV/Anime, desc: "Anime music videos"} - {id: 1_2, cat: TV/Anime, desc: "English subtitled animes"} - - {id: 1_3, cat: TV/Anime, desc: "Non-english subtitled animes"} + - {id: 1_3, cat: TV/Anime, desc: "Non-english subtitled animes"} - {id: 1_4, cat: TV/Anime, desc: "Raw animes"} # Audio - - {id: 2_0, cat: Audio, desc: "Audio"} + - {id: 2_0, cat: Audio, desc: "Audio"} - {id: 2_1, cat: Audio, desc: "Lossless audio"} - {id: 2_2, cat: Audio, desc: "Lossy audio"} # Literature - - {id: 3_0, cat: Books, desc: "Literature"} + - {id: 3_0, cat: Books, desc: "Literature"} - {id: 3_1, cat: Books, desc: "Literature english translated"} - {id: 3_2, cat: Books, desc: "Literature non-english translated"} - - {id: 3_3, cat: Books, desc: "Raw literature"} + - {id: 3_3, cat: Books, desc: "Raw literature"} # Software - {id: 6_0, cat: PC, desc: "Software"} - {id: 6_1, cat: PC/ISO, desc: "Applications"}