diff --git a/src/Jackett/Definitions/bithumen.yml b/src/Jackett/Definitions/bithumen.yml
index b481bd5a0..6701e8a8a 100644
--- a/src/Jackett/Definitions/bithumen.yml
+++ b/src/Jackett/Definitions/bithumen.yml
@@ -1,4 +1,4 @@
----
+---
site: bithumen
name: BitHUmen
language: hu-hu
@@ -72,7 +72,8 @@
attribute: href
title:
selector: a[href^="details.php?id="]
- title|optional:
+ title:
+ optional: true
selector: a[href^="details.php?id="]
attribute: title
details:
@@ -108,14 +109,16 @@
selector: td:nth-child(6) > u
downloadvolumefactor:
text: "1"
- downloadvolumefactor|optional:
+ downloadvolumefactor:
+ optional: true
selector: td:nth-child(6) > nobr > font:contains(" × ")
filters:
- name: replace
args: ["×", ""]
uploadvolumefactor:
text: "1"
- uploadvolumefactor|optional:
+ uploadvolumefactor:
+ optional: true
selector: td:nth-child(5) > nobr > font:contains(" × ")
filters:
- name: replace
@@ -131,4 +134,3 @@
description:
selector: td:nth-child(2) > div
-
\ No newline at end of file
diff --git a/src/Jackett/Definitions/bitspyder.yml b/src/Jackett/Definitions/bitspyder.yml
index 4dd210d68..fc23ac42e 100755
--- a/src/Jackett/Definitions/bitspyder.yml
+++ b/src/Jackett/Definitions/bitspyder.yml
@@ -1,4 +1,4 @@
----
+---
site: bitspyder
name: Bitspyder
language: en-us
@@ -102,7 +102,8 @@
selector: td.rowcol:nth-last-child(3)
leechers:
selector: td.rowcol:nth-last-child(2)
- date|optional|1:
+ date:
+ optional: true
selector: font[color="5F5F5F"]
filters:
- name: split
@@ -113,7 +114,8 @@
args: " +00:00"
- name: dateparse
args: "2006-01-02 15:04:05 -07:00"
- date|optional|2:
+ date:
+ optional: true
selector: a[title^="Upploaded at"]
attribute: title
filters:
@@ -129,5 +131,6 @@
uploadvolumefactor:
case:
"*": "1"
- description|optional:
+ description:
+ optional: true
selector: font[color="#990000"]
diff --git a/src/Jackett/Definitions/chdbits.yml b/src/Jackett/Definitions/chdbits.yml
index 98944a5a2..30c682570 100644
--- a/src/Jackett/Definitions/chdbits.yml
+++ b/src/Jackett/Definitions/chdbits.yml
@@ -1,4 +1,4 @@
----
+---
site: chdbits
name: CHDBits
description: "A general tracker"
@@ -54,7 +54,8 @@
fields:
title:
selector: a[href^="details.php?id="]
- title|optional:
+ title:
+ optional: true
selector: a[title][href^="details.php?id="]
attribute: title
category:
diff --git a/src/Jackett/Definitions/diablotorrent.yml b/src/Jackett/Definitions/diablotorrent.yml
index b2add5ee9..ce05651cb 100644
--- a/src/Jackett/Definitions/diablotorrent.yml
+++ b/src/Jackett/Definitions/diablotorrent.yml
@@ -1,4 +1,4 @@
----
+---
site: diablotorrent
name: Diablo Torrent
language: hu-hu
@@ -114,13 +114,15 @@
args: "2006-01-0215:04:05 -07:00"
size:
selector: div.box_size
- banner|optional:
+ banner:
+ optional: true
selector: a.cover_a
attribute: title
filters:
- name: regexp
args: src='(.*?)'
- imdb|optional:
+ imdb:
+ optional: true
selector: a[href^="http://www.imdb.com/title/"]
attribute: href
description:
diff --git a/src/Jackett/Definitions/eztv.yml b/src/Jackett/Definitions/eztv.yml
index 6b2be1acb..b37186b8e 100644
--- a/src/Jackett/Definitions/eztv.yml
+++ b/src/Jackett/Definitions/eztv.yml
@@ -43,7 +43,8 @@
download:
selector: td:nth-child(3) a.magnet, td:nth-child(3) a
attribute: href
- size|optional:
+ size:
+ optional: true
selector: td:nth-child(4)
date:
selector: td:nth-child(5)
diff --git a/src/Jackett/Definitions/funkytorrents.yml b/src/Jackett/Definitions/funkytorrents.yml
index a7bfaf4a3..0b9e6fc2e 100644
--- a/src/Jackett/Definitions/funkytorrents.yml
+++ b/src/Jackett/Definitions/funkytorrents.yml
@@ -1,4 +1,4 @@
----
+---
site: funkytorrents
name: FunkyTorrents
language: en-us
@@ -72,7 +72,8 @@
rows:
selector: table.mainouter > tbody > tr > td.outer > table > tbody > tr.mouse_out
fields:
- description|optional:
+ description:
+ optional: true
selector: td:nth-child(2) > font
title:
selector: td:nth-child(2)
@@ -83,7 +84,8 @@
filters:
- name: querystring
args: cat
- category|optional:
+ category:
+ optional: true
case:
a[href="/browse.php?ext=1&bitrate=Lossless"]: "3040"
a[href="/browse.php?ext=1&format=MP3"]: "3010"
@@ -116,4 +118,4 @@
"*": "1"
uploadvolumefactor:
case:
- "*": "1"
\ No newline at end of file
+ "*": "1"
diff --git a/src/Jackett/Definitions/hon3yhd.yml b/src/Jackett/Definitions/hon3yhd.yml
index cb2a86505..d910e646c 100644
--- a/src/Jackett/Definitions/hon3yhd.yml
+++ b/src/Jackett/Definitions/hon3yhd.yml
@@ -1,4 +1,4 @@
----
+---
site: hon3yhd
name: Hon3y HD
language: en-us
@@ -88,7 +88,8 @@
download:
selector: a[href^="download.php?torrent="]
attribute: href
- banner|optional:
+ banner:
+ optional: true
selector: a[href^="details.php?id="]
attribute: onmouseover
filters:
diff --git a/src/Jackett/Definitions/insanetracker.yml b/src/Jackett/Definitions/insanetracker.yml
index 947820bc2..f33561dcf 100644
--- a/src/Jackett/Definitions/insanetracker.yml
+++ b/src/Jackett/Definitions/insanetracker.yml
@@ -1,4 +1,4 @@
----
+---
site: insanetracker
name: Insane Tracker
language: hu-hu
@@ -80,13 +80,16 @@
download:
selector: a[href^="download.php/"]
attribute: href
- imdb|optional:
+ imdb:
+ optional: true
selector: a[title="IMDb link"]
attribute: href
- banner|optional|1:
+ banner:
+ optional: true
selector: img[alt="offer"]
attribute: src
- banner|optional|2:
+ banner:
+ optional: true
selector: a.cover
attribute: href
files:
diff --git a/src/Jackett/Definitions/kapaki.yml b/src/Jackett/Definitions/kapaki.yml
index 877d4d9b0..e867532d5 100644
--- a/src/Jackett/Definitions/kapaki.yml
+++ b/src/Jackett/Definitions/kapaki.yml
@@ -1,4 +1,4 @@
----
+---
site: kapaki
name: Kapaki
language: el-gr
@@ -108,7 +108,8 @@
selector: a[rel="torrent_leechers"]
grabs:
selector: a[rel="times_completed"]
- banner|optional:
+ banner:
+ optional: true
selector: a[rel="fancybox"]
attribute: href
description:
@@ -120,10 +121,12 @@
uploadvolumefactor:
case:
"*": "1"
- date|optional|1:
+ date:
+ optional: true
selector: div.torrentOwner > abbr.timeago
attribute: data-time
- date|optional|2:
+ date:
+ optional: true
selector: div.torrentOwner:not(:has(abbr.timeago))
remove: span
filters:
@@ -156,4 +159,4 @@
- name: dateparse
args: "02-01-2006 15:04"
-
\ No newline at end of file
+
diff --git a/src/Jackett/Definitions/limetorrents.yml b/src/Jackett/Definitions/limetorrents.yml
index cadb64fa1..bd7149abb 100644
--- a/src/Jackett/Definitions/limetorrents.yml
+++ b/src/Jackett/Definitions/limetorrents.yml
@@ -57,7 +57,8 @@
download:
selector: div.tt-name > a[href^="/"]
attribute: href
- category|optional:
+ category:
+ optional: true
selector: td:nth-child(2)
filters:
- name: split
diff --git a/src/Jackett/Definitions/linkomanija.yml b/src/Jackett/Definitions/linkomanija.yml
index 8268c74c3..29d471490 100644
--- a/src/Jackett/Definitions/linkomanija.yml
+++ b/src/Jackett/Definitions/linkomanija.yml
@@ -1,4 +1,4 @@
----
+---
site: linkomanija
name: LinkoManija
language: lt-lt
@@ -72,7 +72,8 @@
attribute: href
title:
selector: a[href^="details?"]
- description|optional:
+ description:
+ optional: true
selector: td:nth-child(2) > span
details:
selector: a[href^="details?"]
@@ -108,4 +109,4 @@
- name: dateparse
args: "2006-01-0215:04:05 -07:00"
-
\ No newline at end of file
+
diff --git a/src/Jackett/Definitions/losslessclub.yml b/src/Jackett/Definitions/losslessclub.yml
index a47095050..6564a004d 100644
--- a/src/Jackett/Definitions/losslessclub.yml
+++ b/src/Jackett/Definitions/losslessclub.yml
@@ -1,4 +1,4 @@
----
+---
site: losslessclub
name: LosslessClub
language: ru-ru
@@ -45,12 +45,14 @@
download:
selector: a[href^="download.php?id="]
attribute: href
- banner|optional:
+ banner:
+ optional: true
selector: img.thumbnail
attribute: src
size:
selector: td:nth-child(5)
- grabs|optional:
+ grabs:
+ optional: true
selector: td:nth-child(6) br + span
seeders:
selector: td:nth-child(6)
diff --git a/src/Jackett/Definitions/magico.yml b/src/Jackett/Definitions/magico.yml
index 24c609515..71b3d4dee 100644
--- a/src/Jackett/Definitions/magico.yml
+++ b/src/Jackett/Definitions/magico.yml
@@ -1,4 +1,4 @@
----
+---
site: magico
name: Magico
language: el-gr
@@ -165,7 +165,8 @@
selector: a[rel="torrent_leechers"]
grabs:
selector: a[rel="times_completed"]
- banner|optional:
+ banner:
+ optional: true
selector: a[rel="fancybox"]
attribute: href
description:
@@ -177,10 +178,12 @@
uploadvolumefactor:
case:
"*": "1"
- date|optional|1:
+ date:
+ optional: true
selector: div.torrentOwner > abbr.timeago
attribute: data-time
- date|optional|2:
+ date:
+ optional: true
selector: div.torrentOwner:not(:has(abbr.timeago))
remove: span
filters:
@@ -213,4 +216,4 @@
- name: dateparse
args: "02-01-2006 15:04"
-
\ No newline at end of file
+
diff --git a/src/Jackett/Definitions/majomparade.yml b/src/Jackett/Definitions/majomparade.yml
index d4e5da81f..00151bf23 100644
--- a/src/Jackett/Definitions/majomparade.yml
+++ b/src/Jackett/Definitions/majomparade.yml
@@ -1,4 +1,4 @@
----
+---
site: majomparade
name: Majomparádé
language: hu-hu
@@ -115,10 +115,12 @@
details:
selector: a[href^="details.php?id="]
attribute: href
- imdb|optional:
+ imdb:
+ optional: true
selector: a[href^="https://www.imdb.com/title/"]
attribute: href
- banner|optional:
+ banner:
+ optional: true
selector: img[src="pic/borito.png"]
attribute: title
filters:
diff --git a/src/Jackett/Definitions/ourbits.yml b/src/Jackett/Definitions/ourbits.yml
index 16b5345dd..4d4230814 100644
--- a/src/Jackett/Definitions/ourbits.yml
+++ b/src/Jackett/Definitions/ourbits.yml
@@ -1,4 +1,4 @@
----
+---
site: ourbits
name: Ourbits
language: zh-cn
@@ -56,7 +56,8 @@
fields:
title:
selector: a[href^="details.php?id="]
- title|optional:
+ title:
+ optional: true
selector: a[title][href^="details.php?id="]
attribute: title
category:
@@ -71,7 +72,8 @@
download:
selector: a[href^="download.php?id="]
attribute: href
- imdb|optional:
+ imdb:
+ optional: true
selector: div.imdb_100 > a
attribute: href
size:
diff --git a/src/Jackett/Definitions/polishsource.yml b/src/Jackett/Definitions/polishsource.yml
index 8c6824702..c78d9cb0f 100644
--- a/src/Jackett/Definitions/polishsource.yml
+++ b/src/Jackett/Definitions/polishsource.yml
@@ -1,4 +1,4 @@
----
+---
site: polishsource
name: PolishSource
language: pl-pl
@@ -72,24 +72,32 @@
download:
selector: a[href^="downloadssl.php?id="]
attribute: href
- description|optional:
+ description:
+ optional: true
selector: td:nth-child(2) > small
filters:
- name: prepend
args: "Genre: "
- name: append
args: "\n
"
- description|optional|append|1:
+ description:
+ optional: true
selector: img[src="pic/pl.png"]
filters:
- name: append
args: "Language: polish\n
"
- description|optional|append|2:
+ - name: prepend
+ args: {{ .Result.description }}
+ description:
+ optional: true
selector: img[src="pic/napisy.png"]
filters:
- name: append
args: "Subbed\n
"
- imdb|optional:
+ - name: prepend
+ args: {{ .Result.description }}
+ imdb:
+ optional: true
selector: a[href^="http://www.imdb.com/title/tt"]
grabs:
selector: td:nth-child(6)
diff --git a/src/Jackett/Definitions/rodvd.yml b/src/Jackett/Definitions/rodvd.yml
index 526b314c1..805b7280d 100644
--- a/src/Jackett/Definitions/rodvd.yml
+++ b/src/Jackett/Definitions/rodvd.yml
@@ -1,4 +1,4 @@
----
+---
site: rodvd
name: RoDVD
language: ro-ro
@@ -98,7 +98,8 @@
download:
selector: a[href^="download.php"]
attribute: href
- imdb|optional:
+ imdb:
+ optional: true
selector: a[href*="http://www.imdb.com/title/tt"]
attribute: href
size:
diff --git a/src/Jackett/Definitions/torrentccf.yml b/src/Jackett/Definitions/torrentccf.yml
index dce38c891..26cb9ad8c 100644
--- a/src/Jackett/Definitions/torrentccf.yml
+++ b/src/Jackett/Definitions/torrentccf.yml
@@ -1,4 +1,4 @@
----
+---
site: torrentccf
name: TorrentCCF
language: zh-cn
@@ -65,7 +65,8 @@
fields:
title:
selector: a[href^="details.php?id="]
- title|optional:
+ title:
+ optional: true
selector: a[title][href^="details.php?id="]
attribute: title
category:
@@ -80,7 +81,8 @@
download:
selector: a[href^="download.php?id="]
attribute: href
- imdb|optional:
+ imdb:
+ optional: true
selector: div.imdb_100 > a
attribute: href
size:
diff --git a/src/Jackett/Definitions/torrenthr.yml b/src/Jackett/Definitions/torrenthr.yml
index 7134d2f2d..94b64649b 100644
--- a/src/Jackett/Definitions/torrenthr.yml
+++ b/src/Jackett/Definitions/torrenthr.yml
@@ -1,4 +1,4 @@
----
+---
site: torrenthr
name: TorrentHR
language: hr-hr
@@ -64,10 +64,12 @@
fields:
title:
selector: a[href^="details.php?id="]
- title|optional|1:
+ title:
+ optional: true
selector: a[href^="details.php?id="][title]
attribute: title
- title|optional|2:
+ title:
+ optional: true
selector: a[href^="details.php?id="][onmousemove]
attribute: onmousemove
filters:
@@ -105,7 +107,8 @@
selector: td:nth-child(9)
leechers:
selector: td:nth-child(10)
- banner|optional:
+ banner:
+ optional: true
selector: a[href^="details.php?id="][onmousemove]
attribute: onmousemove
filters:
@@ -124,6 +127,7 @@
args: " +00:00"
- name: dateparse
args: "02.01.2006 15:04:05 -07:00"
- description|optional:
+ description:
+ optional: true
selector: td:nth-child(2)
- remove: a, br, small
\ No newline at end of file
+ remove: a, br, small
diff --git a/src/Jackett/Definitions/torrentproject.yml b/src/Jackett/Definitions/torrentproject.yml
index de38e0be0..138d09f78 100644
--- a/src/Jackett/Definitions/torrentproject.yml
+++ b/src/Jackett/Definitions/torrentproject.yml
@@ -69,7 +69,8 @@
args: "&dn={{ .Result.magfile }}.torrent"
- name: append
args: "&tr=http://182.176.139.129:6969/announce&tr=http://explodie.org:6969/announce&tr=http://tracker.mgtracker.org:2710/announce&tr=udp://tracker.coppersurfer.tk:6969/announce&tr=udp://tracker.leechers-paradise.org:6969/announce&tr=udp://tracker.pirateparty.gr:6969/announce&tr=udp://tracker.sktorrent.net:6969/announce&tr=udp://tracker.zer0day.to:1337/announce"
- category|optional:
+ category:
+ optional: true
selector: div > span:nth-child(1) > span
date:
selector: div > span:nth-child(4)
@@ -85,4 +86,4 @@
downloadvolumefactor:
text: "0"
uploadvolumefactor:
- text: "1"
\ No newline at end of file
+ text: "1"
diff --git a/src/Jackett/Definitions/torrentz2.yml b/src/Jackett/Definitions/torrentz2.yml
index 912ef825a..99f1a92dd 100644
--- a/src/Jackett/Definitions/torrentz2.yml
+++ b/src/Jackett/Definitions/torrentz2.yml
@@ -78,7 +78,8 @@
args: "magnet:?xt=urn:btih:"
- name: append
args: "&dn={{ .Result.title }}.torrent"
- category|optional:
+ category:
+ optional: true
selector: dt
remove: a
filters: