diff --git a/src/Jackett.Common/Definitions/1ptbar.yml b/src/Jackett.Common/Definitions/1ptbar.yml index 4a1245a82..e1ca53415 100644 --- a/src/Jackett.Common/Definitions/1ptbar.yml +++ b/src/Jackett.Common/Definitions/1ptbar.yml @@ -99,12 +99,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/2xfree.yml b/src/Jackett.Common/Definitions/2xfree.yml index d3b4dbdd1..d4d67c74c 100644 --- a/src/Jackett.Common/Definitions/2xfree.yml +++ b/src/Jackett.Common/Definitions/2xfree.yml @@ -141,12 +141,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/3changtrai.yml b/src/Jackett.Common/Definitions/3changtrai.yml index de705686a..0aace49be 100644 --- a/src/Jackett.Common/Definitions/3changtrai.yml +++ b/src/Jackett.Common/Definitions/3changtrai.yml @@ -114,12 +114,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/52pt.yml b/src/Jackett.Common/Definitions/52pt.yml index 88c0d059b..41a33ff6a 100644 --- a/src/Jackett.Common/Definitions/52pt.yml +++ b/src/Jackett.Common/Definitions/52pt.yml @@ -98,12 +98,11 @@ search: fields: title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" category: selector: a[href^="?cat="] attribute: href diff --git a/src/Jackett.Common/Definitions/beitai.yml b/src/Jackett.Common/Definitions/beitai.yml index f51d60f3e..f1fd926d9 100644 --- a/src/Jackett.Common/Definitions/beitai.yml +++ b/src/Jackett.Common/Definitions/beitai.yml @@ -98,12 +98,11 @@ search: fields: title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" category: selector: a[href^="?cat="] attribute: href diff --git a/src/Jackett.Common/Definitions/byrbt.yml b/src/Jackett.Common/Definitions/byrbt.yml index d7262a0e8..24998178c 100644 --- a/src/Jackett.Common/Definitions/byrbt.yml +++ b/src/Jackett.Common/Definitions/byrbt.yml @@ -112,12 +112,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/carpt.yml b/src/Jackett.Common/Definitions/carpt.yml index 1ab59307a..68140a28a 100644 --- a/src/Jackett.Common/Definitions/carpt.yml +++ b/src/Jackett.Common/Definitions/carpt.yml @@ -116,12 +116,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/ceskeforum.yml b/src/Jackett.Common/Definitions/ceskeforum.yml index 5c674aa15..5dcb56497 100644 --- a/src/Jackett.Common/Definitions/ceskeforum.yml +++ b/src/Jackett.Common/Definitions/ceskeforum.yml @@ -111,12 +111,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/chdbits.yml b/src/Jackett.Common/Definitions/chdbits.yml index 6449510fa..9e799d18c 100644 --- a/src/Jackett.Common/Definitions/chdbits.yml +++ b/src/Jackett.Common/Definitions/chdbits.yml @@ -109,12 +109,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/discfan.yml b/src/Jackett.Common/Definitions/discfan.yml index b4da55f71..8926ebf3a 100644 --- a/src/Jackett.Common/Definitions/discfan.yml +++ b/src/Jackett.Common/Definitions/discfan.yml @@ -116,12 +116,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/haitang.yml b/src/Jackett.Common/Definitions/haitang.yml index 8ea2d00e3..9ee21a680 100644 --- a/src/Jackett.Common/Definitions/haitang.yml +++ b/src/Jackett.Common/Definitions/haitang.yml @@ -108,12 +108,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/hd4fans.yml b/src/Jackett.Common/Definitions/hd4fans.yml index 8862b5abc..da033540c 100644 --- a/src/Jackett.Common/Definitions/hd4fans.yml +++ b/src/Jackett.Common/Definitions/hd4fans.yml @@ -83,12 +83,11 @@ search: fields: title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" category: selector: a[href^="?cat="] attribute: href diff --git a/src/Jackett.Common/Definitions/hdarea.yml b/src/Jackett.Common/Definitions/hdarea.yml index 95f262de9..511c34a9e 100644 --- a/src/Jackett.Common/Definitions/hdarea.yml +++ b/src/Jackett.Common/Definitions/hdarea.yml @@ -109,12 +109,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/hdatmos.yml b/src/Jackett.Common/Definitions/hdatmos.yml index e6aa45762..a27882d26 100644 --- a/src/Jackett.Common/Definitions/hdatmos.yml +++ b/src/Jackett.Common/Definitions/hdatmos.yml @@ -119,12 +119,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/hddolby.yml b/src/Jackett.Common/Definitions/hddolby.yml index a7534df2a..536141bbc 100644 --- a/src/Jackett.Common/Definitions/hddolby.yml +++ b/src/Jackett.Common/Definitions/hddolby.yml @@ -102,12 +102,11 @@ search: fields: title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" category: selector: a[href^="?cat="] attribute: href diff --git a/src/Jackett.Common/Definitions/hdfans.yml b/src/Jackett.Common/Definitions/hdfans.yml index 5611ea7e7..fa25552a3 100644 --- a/src/Jackett.Common/Definitions/hdfans.yml +++ b/src/Jackett.Common/Definitions/hdfans.yml @@ -128,12 +128,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/hdmayi.yml b/src/Jackett.Common/Definitions/hdmayi.yml index d22b17eba..1c769fd40 100644 --- a/src/Jackett.Common/Definitions/hdmayi.yml +++ b/src/Jackett.Common/Definitions/hdmayi.yml @@ -97,12 +97,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/hdtime.yml b/src/Jackett.Common/Definitions/hdtime.yml index 9e087ed4c..765751d1c 100644 --- a/src/Jackett.Common/Definitions/hdtime.yml +++ b/src/Jackett.Common/Definitions/hdtime.yml @@ -119,12 +119,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/hdu.yml b/src/Jackett.Common/Definitions/hdu.yml index 4a4e20489..da6172dce 100644 --- a/src/Jackett.Common/Definitions/hdu.yml +++ b/src/Jackett.Common/Definitions/hdu.yml @@ -86,12 +86,11 @@ search: fields: title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" category: selector: a[href^="?cat="] attribute: href diff --git a/src/Jackett.Common/Definitions/hdzone.yml b/src/Jackett.Common/Definitions/hdzone.yml index 504d935aa..1dac978e1 100644 --- a/src/Jackett.Common/Definitions/hdzone.yml +++ b/src/Jackett.Common/Definitions/hdzone.yml @@ -139,12 +139,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/hhanclub.yml b/src/Jackett.Common/Definitions/hhanclub.yml index 7bf88f9d7..80f20807e 100644 --- a/src/Jackett.Common/Definitions/hhanclub.yml +++ b/src/Jackett.Common/Definitions/hhanclub.yml @@ -96,12 +96,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/icc2022.yml b/src/Jackett.Common/Definitions/icc2022.yml index 39cc36c62..7b5009973 100644 --- a/src/Jackett.Common/Definitions/icc2022.yml +++ b/src/Jackett.Common/Definitions/icc2022.yml @@ -127,12 +127,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/ihdbits.yml b/src/Jackett.Common/Definitions/ihdbits.yml index 51dabe23c..f7c74fe0b 100644 --- a/src/Jackett.Common/Definitions/ihdbits.yml +++ b/src/Jackett.Common/Definitions/ihdbits.yml @@ -119,12 +119,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/kamept.yml b/src/Jackett.Common/Definitions/kamept.yml index f4750c1b7..1baf421eb 100644 --- a/src/Jackett.Common/Definitions/kamept.yml +++ b/src/Jackett.Common/Definitions/kamept.yml @@ -118,12 +118,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/keepfriends.yml b/src/Jackett.Common/Definitions/keepfriends.yml index 31b34bf7a..48552b603 100644 --- a/src/Jackett.Common/Definitions/keepfriends.yml +++ b/src/Jackett.Common/Definitions/keepfriends.yml @@ -113,13 +113,12 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title_raw: selector: a[title][href^="details.php?id="] attribute: title - title_raw: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" - # note: final title processing is at the bottom after descrptions is fetched. + optional: true + default: "{{ .Result.title_default }}" + # note: final title processing is at the bottom after descriptions is fetched. details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/lemonhd.yml b/src/Jackett.Common/Definitions/lemonhd.yml index f30ffb5b8..394e7a062 100644 --- a/src/Jackett.Common/Definitions/lemonhd.yml +++ b/src/Jackett.Common/Definitions/lemonhd.yml @@ -95,12 +95,11 @@ search: args: "cat_(.+?)$" title_default: selector: a[href^="details_"] > b - title_optional: - optional: true + title: selector: a[title][href^="details_"] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details_"] attribute: href diff --git a/src/Jackett.Common/Definitions/mteamtp.yml b/src/Jackett.Common/Definitions/mteamtp.yml index dc442dcb5..e3db83194 100644 --- a/src/Jackett.Common/Definitions/mteamtp.yml +++ b/src/Jackett.Common/Definitions/mteamtp.yml @@ -143,13 +143,12 @@ search: title_default: # shortened for long release names selector: a[href^="details.php?id="] > b - title_optional: + title: # not available if IMDB tooltips are turned on - optional: true selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" category: selector: a[href^="?cat="] attribute: href diff --git a/src/Jackett.Common/Definitions/mteamtp2fa.yml b/src/Jackett.Common/Definitions/mteamtp2fa.yml index 3dc7e1687..57ef9c52d 100644 --- a/src/Jackett.Common/Definitions/mteamtp2fa.yml +++ b/src/Jackett.Common/Definitions/mteamtp2fa.yml @@ -146,13 +146,12 @@ search: title_default: # shortened for long release names selector: a[href^="details.php?id="] > b - title_optional: + title: # not available if IMDB tooltips are turned on - optional: true selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" category: selector: a[href^="?cat="] attribute: href diff --git a/src/Jackett.Common/Definitions/nicept.yml b/src/Jackett.Common/Definitions/nicept.yml index 1617ff430..f1015f984 100644 --- a/src/Jackett.Common/Definitions/nicept.yml +++ b/src/Jackett.Common/Definitions/nicept.yml @@ -111,12 +111,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/opencd.yml b/src/Jackett.Common/Definitions/opencd.yml index 50b21c2e7..5aafc0c22 100644 --- a/src/Jackett.Common/Definitions/opencd.yml +++ b/src/Jackett.Common/Definitions/opencd.yml @@ -121,12 +121,11 @@ search: td:not([title]): 9 title_default: selector: a[href*="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href*="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href*="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/oshenpt.yml b/src/Jackett.Common/Definitions/oshenpt.yml index 5e1774751..2228e037e 100644 --- a/src/Jackett.Common/Definitions/oshenpt.yml +++ b/src/Jackett.Common/Definitions/oshenpt.yml @@ -120,12 +120,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/ourbits.yml b/src/Jackett.Common/Definitions/ourbits.yml index b60dfd13a..c3d659247 100644 --- a/src/Jackett.Common/Definitions/ourbits.yml +++ b/src/Jackett.Common/Definitions/ourbits.yml @@ -75,12 +75,11 @@ search: fields: title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" category: selector: a[href^="?cat="] attribute: href diff --git a/src/Jackett.Common/Definitions/ptchina.yml b/src/Jackett.Common/Definitions/ptchina.yml index ea104b83e..95565f59d 100644 --- a/src/Jackett.Common/Definitions/ptchina.yml +++ b/src/Jackett.Common/Definitions/ptchina.yml @@ -112,12 +112,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/pterclub.yml b/src/Jackett.Common/Definitions/pterclub.yml index 8c6b84435..790734789 100644 --- a/src/Jackett.Common/Definitions/pterclub.yml +++ b/src/Jackett.Common/Definitions/pterclub.yml @@ -103,12 +103,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="], a[href^="detailsgame.php?"] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="], a[title][href^="detailsgame.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="], a[href^="detailsgame.php?"] attribute: href diff --git a/src/Jackett.Common/Definitions/ptsbao.yml b/src/Jackett.Common/Definitions/ptsbao.yml index f36c701f8..037342545 100644 --- a/src/Jackett.Common/Definitions/ptsbao.yml +++ b/src/Jackett.Common/Definitions/ptsbao.yml @@ -102,12 +102,11 @@ search: args: cat title_default: selector: table.torrentname td a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/pttime.yml b/src/Jackett.Common/Definitions/pttime.yml index 0c2234307..84e94d594 100644 --- a/src/Jackett.Common/Definitions/pttime.yml +++ b/src/Jackett.Common/Definitions/pttime.yml @@ -109,12 +109,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/putao.yml b/src/Jackett.Common/Definitions/putao.yml index 79757d394..f9641c59a 100644 --- a/src/Jackett.Common/Definitions/putao.yml +++ b/src/Jackett.Common/Definitions/putao.yml @@ -132,12 +132,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/sharkpt.yml b/src/Jackett.Common/Definitions/sharkpt.yml index 1005d2423..fc3b9513b 100644 --- a/src/Jackett.Common/Definitions/sharkpt.yml +++ b/src/Jackett.Common/Definitions/sharkpt.yml @@ -96,12 +96,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/snowpt.yml b/src/Jackett.Common/Definitions/snowpt.yml index d4ceb1804..ff09614fa 100644 --- a/src/Jackett.Common/Definitions/snowpt.yml +++ b/src/Jackett.Common/Definitions/snowpt.yml @@ -49,12 +49,11 @@ search: text: 1 title_default: selector: a[href^="/forum.php?mod=viewthread&tid="] - title_optional: - optional: true + title: selector: a[title][href^="/forum.php?mod=viewthread&tid="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="/forum.php?mod=viewthread&tid="] attribute: href diff --git a/src/Jackett.Common/Definitions/soulvoice.yml b/src/Jackett.Common/Definitions/soulvoice.yml index ab9ddc282..41e5a38fb 100644 --- a/src/Jackett.Common/Definitions/soulvoice.yml +++ b/src/Jackett.Common/Definitions/soulvoice.yml @@ -97,12 +97,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/springsunday.yml b/src/Jackett.Common/Definitions/springsunday.yml index 61d287d0e..2e31e688b 100644 --- a/src/Jackett.Common/Definitions/springsunday.yml +++ b/src/Jackett.Common/Definitions/springsunday.yml @@ -100,12 +100,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/tjupt.yml b/src/Jackett.Common/Definitions/tjupt.yml index fd4871a33..0379bf9fc 100644 --- a/src/Jackett.Common/Definitions/tjupt.yml +++ b/src/Jackett.Common/Definitions/tjupt.yml @@ -104,12 +104,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" filters: - name: re_replace args: ["^\\[([^\\]]+)\\]\\[([^\\]]+)\\]\\[([^\\]]+)\\](.*)$", "$3 [$1][$2]$4"] diff --git a/src/Jackett.Common/Definitions/tlfbits.yml b/src/Jackett.Common/Definitions/tlfbits.yml index c13d9c878..1f362a9e7 100644 --- a/src/Jackett.Common/Definitions/tlfbits.yml +++ b/src/Jackett.Common/Definitions/tlfbits.yml @@ -112,12 +112,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/u2.yml b/src/Jackett.Common/Definitions/u2.yml index 8df3355fb..359056d21 100644 --- a/src/Jackett.Common/Definitions/u2.yml +++ b/src/Jackett.Common/Definitions/u2.yml @@ -116,12 +116,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/ydypt.yml b/src/Jackett.Common/Definitions/ydypt.yml index 2475334b6..ddede6348 100644 --- a/src/Jackett.Common/Definitions/ydypt.yml +++ b/src/Jackett.Common/Definitions/ydypt.yml @@ -108,12 +108,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/zmpt.yml b/src/Jackett.Common/Definitions/zmpt.yml index ed61478c7..a3e54363a 100644 --- a/src/Jackett.Common/Definitions/zmpt.yml +++ b/src/Jackett.Common/Definitions/zmpt.yml @@ -116,12 +116,11 @@ search: args: cat title_default: selector: a[href^="details.php?id="] - title_optional: - optional: true + title: selector: a[title][href^="details.php?id="] attribute: title - title: - text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" + optional: true + default: "{{ .Result.title_default }}" details: selector: a[href^="details.php?id="] attribute: href