From 3369e4dcccbd57bb45d02eebc56e4d47e91ed8d3 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Sat, 24 Oct 2020 09:01:19 +1300 Subject: [PATCH] assorted p* yml: code tidy --- src/Jackett.Common/Definitions/p2pbg.yml | 12 +++++----- src/Jackett.Common/Definitions/p2pelite.yml | 16 ++++++------- src/Jackett.Common/Definitions/parnuxi.yml | 18 +++++++------- src/Jackett.Common/Definitions/peersfm.yml | 16 ++++++------- src/Jackett.Common/Definitions/pier720.yml | 16 ++++++------- .../Definitions/piratadigital.yml | 16 ++++++------- src/Jackett.Common/Definitions/piratbit.yml | 14 +++++------ src/Jackett.Common/Definitions/piratbitl.yml | 14 +++++------ src/Jackett.Common/Definitions/pirateiro.yml | 24 +++++++++---------- src/Jackett.Common/Definitions/pixelcove.yml | 14 +++++------ .../Definitions/pleasuredome.yml | 16 ++++++------- .../Definitions/polishsource.yml | 16 ++++++------- src/Jackett.Common/Definitions/pornbay.yml | 2 -- src/Jackett.Common/Definitions/pornbits.yml | 16 ++++++------- src/Jackett.Common/Definitions/pornforall.yml | 2 -- src/Jackett.Common/Definitions/pornleech.yml | 18 +++++++------- src/Jackett.Common/Definitions/pornolive.yml | 18 +++++++------- src/Jackett.Common/Definitions/pornorip.yml | 18 +++++++------- src/Jackett.Common/Definitions/pornotor.yml | 18 +++++++------- .../Definitions/proaudiotorrents.yml | 16 ++++++------- src/Jackett.Common/Definitions/proporno.yml | 2 -- src/Jackett.Common/Definitions/prostylex.yml | 16 ++++++------- src/Jackett.Common/Definitions/pterclub.yml | 16 ++++++------- src/Jackett.Common/Definitions/ptfiles.yml | 16 ++++++------- src/Jackett.Common/Definitions/ptmsg.yml | 16 ++++++------- src/Jackett.Common/Definitions/ptsbao.yml | 16 ++++++------- .../Definitions/puntotorrent.yml | 16 ++++++------- src/Jackett.Common/Definitions/purovicio.yml | 16 ++++++------- .../Definitions/pussytorrents.yml | 18 +++++++------- src/Jackett.Common/Definitions/pwtorrents.yml | 16 ++++++------- 30 files changed, 215 insertions(+), 233 deletions(-) diff --git a/src/Jackett.Common/Definitions/p2pbg.yml b/src/Jackett.Common/Definitions/p2pbg.yml index 509a6f9f6..2bbed7eca 100644 --- a/src/Jackett.Common/Definitions/p2pbg.yml +++ b/src/Jackett.Common/Definitions/p2pbg.yml @@ -77,17 +77,17 @@ settings: - name: sort type: select label: Sort requested from site - default: "data" + default: data options: - "data": "created" - "size": "size" + data: created + size: size - name: type type: select label: Order requested from site - default: "DESC" + default: DESC options: - "DESC": "desc" - "ASC": "asc" + DESC: desc + ASC: asc login: path: index.php?page=login diff --git a/src/Jackett.Common/Definitions/p2pelite.yml b/src/Jackett.Common/Definitions/p2pelite.yml index 4fc119ea4..f51748521 100644 --- a/src/Jackett.Common/Definitions/p2pelite.yml +++ b/src/Jackett.Common/Definitions/p2pelite.yml @@ -68,19 +68,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "4" + default: 4 options: - "4": "created" - "7": "seeders" - "5": "size" - "1": "title" + 4: created + 7: seeders + 5: size + 1: title - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc login: path: login.php diff --git a/src/Jackett.Common/Definitions/parnuxi.yml b/src/Jackett.Common/Definitions/parnuxi.yml index 893fdec2b..32e087eaa 100644 --- a/src/Jackett.Common/Definitions/parnuxi.yml +++ b/src/Jackett.Common/Definitions/parnuxi.yml @@ -154,26 +154,24 @@ caps: modes: search: [q] - tv-search: [q] - movie-search: [q] settings: - name: sort type: select label: Sort requested from site - default: "t" + default: t options: - "t": "created" - "ts": "seeders" - "sz": "size" - "i": "title" + t: created + ts: seeders + sz: size + i: title - name: type type: select label: Order requested from site - default: "d" + default: d options: - "d": "desc" - "a": "asc" + d: desc + a: asc search: paths: diff --git a/src/Jackett.Common/Definitions/peersfm.yml b/src/Jackett.Common/Definitions/peersfm.yml index 7b16ef072..202be1b00 100644 --- a/src/Jackett.Common/Definitions/peersfm.yml +++ b/src/Jackett.Common/Definitions/peersfm.yml @@ -52,19 +52,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "4" + default: 4 options: - "4": "created" - "7": "seeders" - "5": "size" - "1": "title" + 4: created + 7: seeders + 5: size + 1: title - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc login: path: takelogin.php diff --git a/src/Jackett.Common/Definitions/pier720.yml b/src/Jackett.Common/Definitions/pier720.yml index 83b13b7f6..4d2c49a82 100644 --- a/src/Jackett.Common/Definitions/pier720.yml +++ b/src/Jackett.Common/Definitions/pier720.yml @@ -82,19 +82,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "t" + default: t options: - "t": "created" - "ts": "seeders" - "sz": "size" - "i": "title" + t: created + ts: seeders + sz: size + i: title - name: type type: select label: Order requested from site - default: "d" + default: d options: - "d": "desc" - "a": "asc" + d: desc + a: asc login: path: ucp.php?mode=login diff --git a/src/Jackett.Common/Definitions/piratadigital.yml b/src/Jackett.Common/Definitions/piratadigital.yml index f8264d18c..3389850a4 100644 --- a/src/Jackett.Common/Definitions/piratadigital.yml +++ b/src/Jackett.Common/Definitions/piratadigital.yml @@ -35,19 +35,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "created_at" + default: created_at options: - "created_at": "created" - "seeders": "seeders" - "size": "size" - "name": "title" + created_at: created + seeders: seeders + size: size + name: title - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc login: path: login diff --git a/src/Jackett.Common/Definitions/piratbit.yml b/src/Jackett.Common/Definitions/piratbit.yml index b12c8f6f6..d668f0bee 100644 --- a/src/Jackett.Common/Definitions/piratbit.yml +++ b/src/Jackett.Common/Definitions/piratbit.yml @@ -624,18 +624,18 @@ settings: - name: sort type: select label: Sort requested from site - default: "1" + default: 1 options: - "1": "created" - "10": "seeders" - "7": "size" + 1: created + 10: seeders + 7: size - name: type type: select label: Order requested from site - default: "2" + default: 2 options: - "2": "desc" - "1": "asc" + 2: desc + 1: asc - name: striprussian type: checkbox label: Strip Russian Letters diff --git a/src/Jackett.Common/Definitions/piratbitl.yml b/src/Jackett.Common/Definitions/piratbitl.yml index 5c4e707f6..6f3df663f 100644 --- a/src/Jackett.Common/Definitions/piratbitl.yml +++ b/src/Jackett.Common/Definitions/piratbitl.yml @@ -630,18 +630,18 @@ settings: - name: sort type: select label: Sort requested from site - default: "1" + default: 1 options: - "1": "created" - "10": "seeders" - "7": "size" + 1: created + 10: seeders + 7: size - name: type type: select label: Order requested from site - default: "2" + default: 2 options: - "2": "desc" - "1": "asc" + 2: desc + 1: asc login: path: login.php diff --git a/src/Jackett.Common/Definitions/pirateiro.yml b/src/Jackett.Common/Definitions/pirateiro.yml index dd64d952b..c5bc5b8be 100644 --- a/src/Jackett.Common/Definitions/pirateiro.yml +++ b/src/Jackett.Common/Definitions/pirateiro.yml @@ -22,14 +22,14 @@ legacylinks: caps: categories: - "cat100": TV/Anime - "cat200": PC - "cat300": Movies - "cat400": Console - "cat500": Audio - "cat600": Other - "cat700": TV - "cat800": XXX + cat100: TV/Anime + cat200: PC + cat300: Movies + cat400: Console + cat500: Audio + cat600: Other + cat700: TV + cat800: XXX modes: search: [q] @@ -41,11 +41,11 @@ settings: - name: sort type: select label: Sort requested from site - default: "enviado" + default: enviado options: - "enviado": "created" - "seeders": "seeders" - "tamanho": "size" + enviado: created + seeders: seeders + tamanho: size search: paths: diff --git a/src/Jackett.Common/Definitions/pixelcove.yml b/src/Jackett.Common/Definitions/pixelcove.yml index 887944313..2458466df 100644 --- a/src/Jackett.Common/Definitions/pixelcove.yml +++ b/src/Jackett.Common/Definitions/pixelcove.yml @@ -74,18 +74,18 @@ settings: - name: sort type: select label: Sort requested from site - default: "time" + default: time options: - "time": "created" - "seeders": "seeders" - "size": "size" + time: created + seeders: seeders + size: size - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc login: path: login diff --git a/src/Jackett.Common/Definitions/pleasuredome.yml b/src/Jackett.Common/Definitions/pleasuredome.yml index a47e2cf49..9e32e4704 100644 --- a/src/Jackett.Common/Definitions/pleasuredome.yml +++ b/src/Jackett.Common/Definitions/pleasuredome.yml @@ -83,19 +83,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "data" + default: data options: - "data": "created" - "s.seeds": "seeders" - "n.size": "size" - "n.filename": "title" + data: created + s.seeds: seeders + n.size: size + n.filename: title - name: type type: select label: Order requested from site - default: "DESC" + default: DESC options: - "DESC": "desc" - "ASC": "asc" + DESC: desc + ASC: asc login: path: index.php diff --git a/src/Jackett.Common/Definitions/polishsource.yml b/src/Jackett.Common/Definitions/polishsource.yml index 60a99be08..7d44fb1df 100644 --- a/src/Jackett.Common/Definitions/polishsource.yml +++ b/src/Jackett.Common/Definitions/polishsource.yml @@ -39,19 +39,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "4" + default: 4 options: - "4": "created" - "7": "seeders" - "5": "size" - "1": "title" + 4: created + 7: seeders + 5: size + 1: title - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc login: path: login.php diff --git a/src/Jackett.Common/Definitions/pornbay.yml b/src/Jackett.Common/Definitions/pornbay.yml index 2c1bb4379..e816b2c7e 100644 --- a/src/Jackett.Common/Definitions/pornbay.yml +++ b/src/Jackett.Common/Definitions/pornbay.yml @@ -51,8 +51,6 @@ caps: modes: search: [q] - tv-search: [q] - movie-search: [q] settings: - name: username diff --git a/src/Jackett.Common/Definitions/pornbits.yml b/src/Jackett.Common/Definitions/pornbits.yml index 5edc83079..1776c2dc7 100644 --- a/src/Jackett.Common/Definitions/pornbits.yml +++ b/src/Jackett.Common/Definitions/pornbits.yml @@ -12,7 +12,7 @@ legacylinks: caps: categories: - "xxx": XXX + xxx: XXX modes: search: [q] @@ -33,14 +33,14 @@ settings: - name: sort type: select label: Sort requested from site - default: "date_desc" + default: date_desc options: - "date_desc": "created desc" - "date_asc": "created asc" - "seeds_desc": "seeders desc" - "seeds_asc": "seeders asc" - "size_desc": "size desc" - "size_asc": "size asc" + date_desc: created desc + date_asc: created asc + seeds_desc: seeders desc + seeds_asc: seeders asc + size_desc: size desc + size_asc: size asc login: path: login diff --git a/src/Jackett.Common/Definitions/pornforall.yml b/src/Jackett.Common/Definitions/pornforall.yml index 4a70d3652..97e3f903d 100644 --- a/src/Jackett.Common/Definitions/pornforall.yml +++ b/src/Jackett.Common/Definitions/pornforall.yml @@ -13,8 +13,6 @@ caps: modes: search: [q] - tv-search: [q] - movie-search: [q] settings: [] diff --git a/src/Jackett.Common/Definitions/pornleech.yml b/src/Jackett.Common/Definitions/pornleech.yml index de3be65a8..a7bb9f02f 100644 --- a/src/Jackett.Common/Definitions/pornleech.yml +++ b/src/Jackett.Common/Definitions/pornleech.yml @@ -25,26 +25,24 @@ caps: modes: search: [q] - tv-search: [q] - movie-search: [q] settings: - name: sort type: select label: Sort requested from site - default: "3" + default: 3 options: - "3": "created" - "5": "seeders" - "4": "size" - "2": "title" + 3: created + 5: seeders + 4: size + 2: title - name: type type: select label: Order requested from site - default: "2" + default: 2 options: - "2": "desc" - "1": "asc" + 2: desc + 1: asc search: path: index.php diff --git a/src/Jackett.Common/Definitions/pornolive.yml b/src/Jackett.Common/Definitions/pornolive.yml index bed9d2e10..f1cbec7ee 100644 --- a/src/Jackett.Common/Definitions/pornolive.yml +++ b/src/Jackett.Common/Definitions/pornolive.yml @@ -16,26 +16,24 @@ caps: modes: search: [q] - tv-search: [q] - movie-search: [q] settings: - name: sort type: select label: Sort requested from site - default: "4" + default: 4 options: - "4": "created" - "7": "seeders" - "5": "size" - "1": "title" + 4: created + 7: seeders + 5: size + 1: title - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc search: paths: diff --git a/src/Jackett.Common/Definitions/pornorip.yml b/src/Jackett.Common/Definitions/pornorip.yml index b214447bb..faaa924d2 100644 --- a/src/Jackett.Common/Definitions/pornorip.yml +++ b/src/Jackett.Common/Definitions/pornorip.yml @@ -71,26 +71,24 @@ caps: modes: search: [q] - tv-search: [q] - movie-search: [q] settings: - name: sort type: select label: Sort requested from site - default: "t" + default: t options: - "t": "created" - "ts": "seeders" - "sz": "size" - "i": "title" + t: created + ts: seeders + sz: size + i: title - name: type type: select label: Order requested from site - default: "d" + default: d options: - "d": "desc" - "a": "asc" + d: desc + a: asc search: paths: diff --git a/src/Jackett.Common/Definitions/pornotor.yml b/src/Jackett.Common/Definitions/pornotor.yml index 376fe3062..57d81469a 100644 --- a/src/Jackett.Common/Definitions/pornotor.yml +++ b/src/Jackett.Common/Definitions/pornotor.yml @@ -14,26 +14,24 @@ caps: modes: search: [q] - tv-search: [q] - movie-search: [q] settings: - name: sort type: select label: Sort requested from site - default: "4" + default: 4 options: - "4": "created" - "7": "seeders" - "5": "size" - "1": "title" + 4: created + 7: seeders + 5: size + 1: title - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc search: paths: diff --git a/src/Jackett.Common/Definitions/proaudiotorrents.yml b/src/Jackett.Common/Definitions/proaudiotorrents.yml index d33def9c2..a5ce660ee 100644 --- a/src/Jackett.Common/Definitions/proaudiotorrents.yml +++ b/src/Jackett.Common/Definitions/proaudiotorrents.yml @@ -49,19 +49,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "added" + default: added options: - "added": "created" - "seeders": "seeders" - "size": "size" - "name": "title" + added: created + seeders: seeders + size: size + name: title - name: type type: select label: Order requested from site - default: "down" + default: down options: - "down": "desc" - "up": "asc" + down: desc + up: asc login: path: login.php diff --git a/src/Jackett.Common/Definitions/proporno.yml b/src/Jackett.Common/Definitions/proporno.yml index 64c326ae0..34c2ce5ad 100644 --- a/src/Jackett.Common/Definitions/proporno.yml +++ b/src/Jackett.Common/Definitions/proporno.yml @@ -27,8 +27,6 @@ caps: modes: search: [q] - tv-search: [q] - movie-search: [q] settings: [] diff --git a/src/Jackett.Common/Definitions/prostylex.yml b/src/Jackett.Common/Definitions/prostylex.yml index 6d249e29f..4ccf2716c 100644 --- a/src/Jackett.Common/Definitions/prostylex.yml +++ b/src/Jackett.Common/Definitions/prostylex.yml @@ -92,19 +92,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "id" + default: id options: - "id": "created" - "seeders": "seeders" - "size": "size" - "name": "title" + id: created + seeders: seeders + size: size + name: title - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc login: path: account-login.php diff --git a/src/Jackett.Common/Definitions/pterclub.yml b/src/Jackett.Common/Definitions/pterclub.yml index 6becc82d2..8fc378225 100644 --- a/src/Jackett.Common/Definitions/pterclub.yml +++ b/src/Jackett.Common/Definitions/pterclub.yml @@ -52,19 +52,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "4" + default: 4 options: - "4": "created" - "7": "seeders" - "5": "size" - "1": "title" + 4: created + 7: seeders + 5: size + 1: title - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc - name: info_tpp type: info label: Results Per Page diff --git a/src/Jackett.Common/Definitions/ptfiles.yml b/src/Jackett.Common/Definitions/ptfiles.yml index 69742c2c9..654f92d11 100644 --- a/src/Jackett.Common/Definitions/ptfiles.yml +++ b/src/Jackett.Common/Definitions/ptfiles.yml @@ -55,19 +55,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "4" + default: 4 options: - "4": "created" - "7": "seeders" - "5": "size" - "1": "title" + 4: created + 7: seeders + 5: size + 1: title - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc login: path: loginproc/ diff --git a/src/Jackett.Common/Definitions/ptmsg.yml b/src/Jackett.Common/Definitions/ptmsg.yml index 4c9b64b0e..d96fb20d6 100644 --- a/src/Jackett.Common/Definitions/ptmsg.yml +++ b/src/Jackett.Common/Definitions/ptmsg.yml @@ -47,19 +47,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "4" + default: 4 options: - "4": "created" - "7": "seeders" - "5": "size" - "1": "title" + 4: created + 7: seeders + 5: size + 1: title - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc - name: info_tpp type: info label: Results Per Page diff --git a/src/Jackett.Common/Definitions/ptsbao.yml b/src/Jackett.Common/Definitions/ptsbao.yml index 11d691842..beb9be0c5 100644 --- a/src/Jackett.Common/Definitions/ptsbao.yml +++ b/src/Jackett.Common/Definitions/ptsbao.yml @@ -46,19 +46,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "4" + default: 4 options: - "4": "created" - "7": "seeders" - "5": "size" - "1": "title" + 4: created + 7: seeders + 5: size + 1: title - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc - name: info_tpp type: info label: Results Per Page diff --git a/src/Jackett.Common/Definitions/puntotorrent.yml b/src/Jackett.Common/Definitions/puntotorrent.yml index c4b53470c..1ae3eda74 100644 --- a/src/Jackett.Common/Definitions/puntotorrent.yml +++ b/src/Jackett.Common/Definitions/puntotorrent.yml @@ -114,19 +114,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "3" + default: 3 options: - "3": "created" - "5": "seeders" - "4": "size" - "2": "title" + 3: created + 5: seeders + 4: size + 2: title - name: type type: select label: Order requested from site - default: "2" + default: 2 options: - "2": "desc" - "1": "asc" + 2: desc + 1: asc - name: info type: info label: Results Per Page diff --git a/src/Jackett.Common/Definitions/purovicio.yml b/src/Jackett.Common/Definitions/purovicio.yml index b2faf23f0..f9ed5c7f1 100644 --- a/src/Jackett.Common/Definitions/purovicio.yml +++ b/src/Jackett.Common/Definitions/purovicio.yml @@ -46,19 +46,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "created_at" + default: created_at options: - "created_at": "created" - "seeders": "seeders" - "size": "size" - "name": "title" + created_at: created + seeders: seeders + size: size + name: title - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc login: method: cookie diff --git a/src/Jackett.Common/Definitions/pussytorrents.yml b/src/Jackett.Common/Definitions/pussytorrents.yml index 331840189..4280a85b5 100644 --- a/src/Jackett.Common/Definitions/pussytorrents.yml +++ b/src/Jackett.Common/Definitions/pussytorrents.yml @@ -14,8 +14,6 @@ caps: modes: search: [q] - tv-search: [q] - movie-search: [q] settings: - name: username @@ -27,19 +25,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "added" + default: added options: - "added": "created" - "seeders": "seeders" - "size": "size" - "nameSort": "title" + added: created + seeders: seeders + size: size + nameSort: title - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc login: path: user/account/login/ diff --git a/src/Jackett.Common/Definitions/pwtorrents.yml b/src/Jackett.Common/Definitions/pwtorrents.yml index f148a6714..6a62846cb 100644 --- a/src/Jackett.Common/Definitions/pwtorrents.yml +++ b/src/Jackett.Common/Definitions/pwtorrents.yml @@ -53,19 +53,19 @@ settings: - name: sort type: select label: Sort requested from site - default: "4" + default: 4 options: - "4": "created" - "7": "seeders" - "5": "size" - "1": "title" + 4: created + 7: seeders + 5: size + 1: title - name: type type: select label: Order requested from site - default: "desc" + default: desc options: - "desc": "desc" - "asc": "asc" + desc: desc + asc: asc login: path: takelogin.php