diff --git a/src/Jackett.Common/Content/index.html b/src/Jackett.Common/Content/index.html index 258759e3e..3730d2d96 100644 --- a/src/Jackett.Common/Content/index.html +++ b/src/Jackett.Common/Content/index.html @@ -408,7 +408,7 @@ {{jacketTimespan PublishDate}} {{jacketTimespan FirstSeen}} {{Tracker}} - {{Title}} + {{Title}} {{Size}} {{jacketSize Size}} {{Files}} @@ -529,7 +529,7 @@ {{PublishDate}} {{jacketTimespan PublishDate}} {{Tracker}} - {{Title}} + {{Title}} {{Size}} {{jacketSize Size}} {{Files}} diff --git a/src/Jackett.Common/Definitions/aither.yml b/src/Jackett.Common/Definitions/aither.yml index 84b76c97a..875a9fddb 100644 --- a/src/Jackett.Common/Definitions/aither.yml +++ b/src/Jackett.Common/Definitions/aither.yml @@ -118,9 +118,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/asiancinema.yml b/src/Jackett.Common/Definitions/asiancinema.yml index 30882689b..606597d10 100644 --- a/src/Jackett.Common/Definitions/asiancinema.yml +++ b/src/Jackett.Common/Definitions/asiancinema.yml @@ -110,9 +110,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/blutopia.yml b/src/Jackett.Common/Definitions/blutopia.yml index ad6a203fd..47fa24614 100644 --- a/src/Jackett.Common/Definitions/blutopia.yml +++ b/src/Jackett.Common/Definitions/blutopia.yml @@ -117,9 +117,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/broadcity.yml b/src/Jackett.Common/Definitions/broadcity.yml index 89a8c9597..b6e816d18 100644 --- a/src/Jackett.Common/Definitions/broadcity.yml +++ b/src/Jackett.Common/Definitions/broadcity.yml @@ -104,9 +104,6 @@ search: download: selector: a[href*="download.php?id="] attribute: href - comments: - selector: td:nth-child(4) a - attribute: href size: selector: td:nth-child(5) grabs: diff --git a/src/Jackett.Common/Definitions/btetree.yml b/src/Jackett.Common/Definitions/btetree.yml index bdbebb83d..8e1aaeb12 100644 --- a/src/Jackett.Common/Definitions/btetree.yml +++ b/src/Jackett.Common/Definitions/btetree.yml @@ -55,9 +55,6 @@ search: attribute: href files: selector: td:nth-child(4) - comments: - selector: td:nth-child(5) a - attribute: href date: selector: td:nth-child(6) filters: diff --git a/src/Jackett.Common/Definitions/channelx.yml b/src/Jackett.Common/Definitions/channelx.yml index 3c23fb0ae..9c6a180c9 100644 --- a/src/Jackett.Common/Definitions/channelx.yml +++ b/src/Jackett.Common/Definitions/channelx.yml @@ -112,9 +112,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/chilebt.yml b/src/Jackett.Common/Definitions/chilebt.yml index 898dbc5e2..8d6e516b6 100644 --- a/src/Jackett.Common/Definitions/chilebt.yml +++ b/src/Jackett.Common/Definitions/chilebt.yml @@ -120,9 +120,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/desireleasers.yml b/src/Jackett.Common/Definitions/desireleasers.yml index e17f15a3a..8189b8e90 100644 --- a/src/Jackett.Common/Definitions/desireleasers.yml +++ b/src/Jackett.Common/Definitions/desireleasers.yml @@ -112,9 +112,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/dxdhd.yml b/src/Jackett.Common/Definitions/dxdhd.yml index 0f3dbd63c..f3f3bb965 100644 --- a/src/Jackett.Common/Definitions/dxdhd.yml +++ b/src/Jackett.Common/Definitions/dxdhd.yml @@ -120,9 +120,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/esharenet.yml b/src/Jackett.Common/Definitions/esharenet.yml index 3bc074587..6ea123e1a 100644 --- a/src/Jackett.Common/Definitions/esharenet.yml +++ b/src/Jackett.Common/Definitions/esharenet.yml @@ -136,9 +136,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/ethor.yml b/src/Jackett.Common/Definitions/ethor.yml index 892c073ef..62c6d6f3a 100644 --- a/src/Jackett.Common/Definitions/ethor.yml +++ b/src/Jackett.Common/Definitions/ethor.yml @@ -134,7 +134,7 @@ search: filters: - name: querystring args: cat - comments: + details: selector: a[href^="/details.php"]:has(b) attribute: href files: diff --git a/src/Jackett.Common/Definitions/freetorrent.yml b/src/Jackett.Common/Definitions/freetorrent.yml index dec868683..77643f414 100644 --- a/src/Jackett.Common/Definitions/freetorrent.yml +++ b/src/Jackett.Common/Definitions/freetorrent.yml @@ -116,9 +116,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/gay-torrentsorg.yml b/src/Jackett.Common/Definitions/gay-torrentsorg.yml index d69858e9c..e9a5b1937 100644 --- a/src/Jackett.Common/Definitions/gay-torrentsorg.yml +++ b/src/Jackett.Common/Definitions/gay-torrentsorg.yml @@ -116,9 +116,6 @@ search: args: ["No downloads yet", "0"] - name: regexp args: ([\d,]+) - comments: - selector: a[href^="details.php?id="] - attribute: href download: selector: a[href^="download.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/hdbitscom.yml b/src/Jackett.Common/Definitions/hdbitscom.yml index eed0ae9c2..d6a3f1d7e 100644 --- a/src/Jackett.Common/Definitions/hdbitscom.yml +++ b/src/Jackett.Common/Definitions/hdbitscom.yml @@ -63,7 +63,7 @@ search: div.cats_tvseries: 3 div.cats_applications: 4 div.cats_xxx: 5 - comments: + details: selector: a[href^="torrents.php?id="] attribute: href imdb: diff --git a/src/Jackett.Common/Definitions/hdforever.yml b/src/Jackett.Common/Definitions/hdforever.yml index e2a69eb15..75ad33624 100644 --- a/src/Jackett.Common/Definitions/hdforever.yml +++ b/src/Jackett.Common/Definitions/hdforever.yml @@ -257,9 +257,6 @@ search: details: selector: a[href^="torrents.php?id="] attribute: href - comments: - selector: a[href^="torrents.php?id="] - attribute: href files: selector: td:nth-child(3) date: diff --git a/src/Jackett.Common/Definitions/hdme.yml b/src/Jackett.Common/Definitions/hdme.yml index d442328b4..418d88b3d 100644 --- a/src/Jackett.Common/Definitions/hdme.yml +++ b/src/Jackett.Common/Definitions/hdme.yml @@ -116,7 +116,7 @@ search: title: selector: td:nth-child(3) > a attribute: title - comments: + details: selector: td:nth-child(3) > a attribute: href download: diff --git a/src/Jackett.Common/Definitions/hdolimpo.yml b/src/Jackett.Common/Definitions/hdolimpo.yml index c06818b0a..403564147 100644 --- a/src/Jackett.Common/Definitions/hdolimpo.yml +++ b/src/Jackett.Common/Definitions/hdolimpo.yml @@ -129,9 +129,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/hdonly.yml b/src/Jackett.Common/Definitions/hdonly.yml index fd8af33bc..3367ada30 100644 --- a/src/Jackett.Common/Definitions/hdonly.yml +++ b/src/Jackett.Common/Definitions/hdonly.yml @@ -262,9 +262,6 @@ search: details: selector: a[href^="torrents.php?id="] attribute: href - comments: - selector: a[href^="torrents.php?id="] - attribute: href files: selector: td:nth-child(3) date: diff --git a/src/Jackett.Common/Definitions/hdspain.yml b/src/Jackett.Common/Definitions/hdspain.yml index 1a9342be1..db5bff5ba 100644 --- a/src/Jackett.Common/Definitions/hdspain.yml +++ b/src/Jackett.Common/Definitions/hdspain.yml @@ -92,9 +92,6 @@ search: download: selector: td.descargar a attribute: href - comments: - selector: td.foro a - attribute: href description: optional: true selector: td.titulo a[class] diff --git a/src/Jackett.Common/Definitions/hdturk.yml b/src/Jackett.Common/Definitions/hdturk.yml index 0b02eed3c..502a9a38b 100644 --- a/src/Jackett.Common/Definitions/hdturk.yml +++ b/src/Jackett.Common/Definitions/hdturk.yml @@ -143,9 +143,6 @@ search: download: selector: a[href*="download.php?id="] attribute: href - comments: - selector: td:nth-child(4) a - attribute: href size: selector: td:nth-child(5) grabs: diff --git a/src/Jackett.Common/Definitions/hdzone.yml b/src/Jackett.Common/Definitions/hdzone.yml index 973e8c1d8..e66a95c75 100644 --- a/src/Jackett.Common/Definitions/hdzone.yml +++ b/src/Jackett.Common/Definitions/hdzone.yml @@ -151,9 +151,6 @@ search: optional: true selector: a[href*="imdb.com/title/tt"] attribute: href - comments: - selector: td:nth-child(3) a - attribute: href date: # time type: time elapsed (default) selector: td:nth-child(4) > span[title] diff --git a/src/Jackett.Common/Definitions/hush.yml b/src/Jackett.Common/Definitions/hush.yml index 5dd1c2405..3f16e34e1 100644 --- a/src/Jackett.Common/Definitions/hush.yml +++ b/src/Jackett.Common/Definitions/hush.yml @@ -132,9 +132,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/immortuos.yml b/src/Jackett.Common/Definitions/immortuos.yml index de75e39a8..6be42cf2b 100644 --- a/src/Jackett.Common/Definitions/immortuos.yml +++ b/src/Jackett.Common/Definitions/immortuos.yml @@ -102,9 +102,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/jptv.yml b/src/Jackett.Common/Definitions/jptv.yml index 3257d2115..5bf1ee4db 100644 --- a/src/Jackett.Common/Definitions/jptv.yml +++ b/src/Jackett.Common/Definitions/jptv.yml @@ -113,9 +113,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/latinop2p.yml b/src/Jackett.Common/Definitions/latinop2p.yml index 37e1f8f5d..3cb437186 100644 --- a/src/Jackett.Common/Definitions/latinop2p.yml +++ b/src/Jackett.Common/Definitions/latinop2p.yml @@ -145,9 +145,6 @@ search: magnet: selector: a[href^="magnet:?xt="] attribute: href - comments: - selector: td:nth-child(4) a - attribute: href size: selector: td:nth-child(5) grabs: diff --git a/src/Jackett.Common/Definitions/legacyhd.yml b/src/Jackett.Common/Definitions/legacyhd.yml index ae0f384b0..6a1f3f5ed 100644 --- a/src/Jackett.Common/Definitions/legacyhd.yml +++ b/src/Jackett.Common/Definitions/legacyhd.yml @@ -117,9 +117,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/mma-torrents.yml b/src/Jackett.Common/Definitions/mma-torrents.yml index c28a526c0..1268b06f8 100644 --- a/src/Jackett.Common/Definitions/mma-torrents.yml +++ b/src/Jackett.Common/Definitions/mma-torrents.yml @@ -138,9 +138,6 @@ search: details: selector: a[href^="torrents-details.php?id="] attribute: href - comments: - selector: a[href^="comments.php?type=torrent&id="] - attribute: href download: selector: a[href^="download.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/nethd.yml b/src/Jackett.Common/Definitions/nethd.yml index 115e06e20..eec9cc876 100644 --- a/src/Jackett.Common/Definitions/nethd.yml +++ b/src/Jackett.Common/Definitions/nethd.yml @@ -109,9 +109,6 @@ search: poster: selector: td.name > a.poster-preview img attribute: src - comments: - selector: a[href*="#comments"] - attribute: href download: selector: td.name > div > a[href*="-torrent-"][title] attribute: href diff --git a/src/Jackett.Common/Definitions/newretro.yml b/src/Jackett.Common/Definitions/newretro.yml index 5a7a82f03..c7f92773b 100644 --- a/src/Jackett.Common/Definitions/newretro.yml +++ b/src/Jackett.Common/Definitions/newretro.yml @@ -100,7 +100,7 @@ search: filters: - name: querystring args: cat - comments: + details: selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(4) > a attribute: href size: diff --git a/src/Jackett.Common/Definitions/onlyscene.yml b/src/Jackett.Common/Definitions/onlyscene.yml index 479ede3f7..00f4efd56 100644 --- a/src/Jackett.Common/Definitions/onlyscene.yml +++ b/src/Jackett.Common/Definitions/onlyscene.yml @@ -161,9 +161,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/piratadigital.yml b/src/Jackett.Common/Definitions/piratadigital.yml index dcba4979e..ec0089bb2 100644 --- a/src/Jackett.Common/Definitions/piratadigital.yml +++ b/src/Jackett.Common/Definitions/piratadigital.yml @@ -111,9 +111,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/purovicio.yml b/src/Jackett.Common/Definitions/purovicio.yml index 6c6e11cba..fb18c9d7e 100644 --- a/src/Jackett.Common/Definitions/purovicio.yml +++ b/src/Jackett.Common/Definitions/purovicio.yml @@ -112,10 +112,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href - optional: true imdb: optional: true selector: a[href*="imdb.com/title/tt"] diff --git a/src/Jackett.Common/Definitions/racing4everyone.yml b/src/Jackett.Common/Definitions/racing4everyone.yml index c61279e50..ae8e0ea63 100644 --- a/src/Jackett.Common/Definitions/racing4everyone.yml +++ b/src/Jackett.Common/Definitions/racing4everyone.yml @@ -138,9 +138,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/rockbox.yml b/src/Jackett.Common/Definitions/rockbox.yml index 1ad558177..fe46e28b3 100644 --- a/src/Jackett.Common/Definitions/rockbox.yml +++ b/src/Jackett.Common/Definitions/rockbox.yml @@ -76,9 +76,6 @@ search: details: selector: td a[href^="details.php?id="] attribute: href - comments: - selector: td a[href^="details.php?id="] - attribute: href download: selector: td a[href^="download.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/shareisland.yml b/src/Jackett.Common/Definitions/shareisland.yml index 7aeac5d7a..d015bd91f 100644 --- a/src/Jackett.Common/Definitions/shareisland.yml +++ b/src/Jackett.Common/Definitions/shareisland.yml @@ -150,9 +150,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/shareuniversity.yml b/src/Jackett.Common/Definitions/shareuniversity.yml index a16fdfd9f..580edfc6c 100644 --- a/src/Jackett.Common/Definitions/shareuniversity.yml +++ b/src/Jackett.Common/Definitions/shareuniversity.yml @@ -129,9 +129,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/tellytorrent.yml b/src/Jackett.Common/Definitions/tellytorrent.yml index d51de12e7..54454aaff 100644 --- a/src/Jackett.Common/Definitions/tellytorrent.yml +++ b/src/Jackett.Common/Definitions/tellytorrent.yml @@ -116,9 +116,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/thehorrorcharnel.yml b/src/Jackett.Common/Definitions/thehorrorcharnel.yml index 397a61a19..ce83a81db 100644 --- a/src/Jackett.Common/Definitions/thehorrorcharnel.yml +++ b/src/Jackett.Common/Definitions/thehorrorcharnel.yml @@ -178,10 +178,6 @@ search: filters: - name: regexp args: "src=\\\\'(.*?)\\\\'" - comments: - selector: td:nth-child(7) a - attribute: href - optional: true download: selector: a[href^="download.php"] attribute: href diff --git a/src/Jackett.Common/Definitions/theshinning.yml b/src/Jackett.Common/Definitions/theshinning.yml index 9395104e1..cd93913d4 100644 --- a/src/Jackett.Common/Definitions/theshinning.yml +++ b/src/Jackett.Common/Definitions/theshinning.yml @@ -119,10 +119,6 @@ search: filters: - name: replace args: ["https://theshinning.me/img/nocover.png", ""] - comments: - selector: a[href*="#comments"] - attribute: href - optional: true imdb: optional: true selector: a[href*="imdb.com/title/tt"] diff --git a/src/Jackett.Common/Definitions/torrentbd.yml b/src/Jackett.Common/Definitions/torrentbd.yml index 0edda183a..e6e599075 100644 --- a/src/Jackett.Common/Definitions/torrentbd.yml +++ b/src/Jackett.Common/Definitions/torrentbd.yml @@ -146,9 +146,6 @@ search: - name: replace args: ["y", "years"] - name: timeago - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-child(6) seeders: diff --git a/src/Jackett.Common/Definitions/torrentsectorcrew.yml b/src/Jackett.Common/Definitions/torrentsectorcrew.yml index 89692cf97..edcfdd4bf 100644 --- a/src/Jackett.Common/Definitions/torrentsectorcrew.yml +++ b/src/Jackett.Common/Definitions/torrentsectorcrew.yml @@ -150,9 +150,6 @@ search: details: selector: a[title][href^="details.php"] attribute: href - comments: - selector: a[href*="&tocomm="] - attribute: href download: selector: a[href^="download_ssl.php"] attribute: href diff --git a/src/Jackett.Common/Definitions/tvchaosuk.yml b/src/Jackett.Common/Definitions/tvchaosuk.yml index 1927198e9..4f85cf30e 100644 --- a/src/Jackett.Common/Definitions/tvchaosuk.yml +++ b/src/Jackett.Common/Definitions/tvchaosuk.yml @@ -122,9 +122,6 @@ search: filters: - name: replace args: ["https://via.placeholder.com/600x900", ""] - comments: - selector: a[href*="#comments"] - attribute: href size: selector: td:nth-last-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/uhdbits.yml b/src/Jackett.Common/Definitions/uhdbits.yml index 43c0d963a..34584328c 100644 --- a/src/Jackett.Common/Definitions/uhdbits.yml +++ b/src/Jackett.Common/Definitions/uhdbits.yml @@ -127,12 +127,6 @@ search: args: [" / 2x", ""] - name: re_replace args: [" / ", " "] - comments: - selector: a.torrent_name - attribute: href - filters: - - name: replace - args: ["\t", " "] details: selector: a.torrent_name attribute: href diff --git a/src/Jackett.Common/Definitions/x-ite.me.yml b/src/Jackett.Common/Definitions/x-ite.me.yml index 6ba158bee..636571bbc 100644 --- a/src/Jackett.Common/Definitions/x-ite.me.yml +++ b/src/Jackett.Common/Definitions/x-ite.me.yml @@ -126,9 +126,6 @@ search: details: selector: a[href^="torrents-details.php?id="] attribute: href - comments: - selector: a[href^="comments.php?type=torrent&id="] - attribute: href download: selector: a[href^="download.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/yggcookie.yml b/src/Jackett.Common/Definitions/yggcookie.yml index 2c34a5e6f..7221862b0 100644 --- a/src/Jackett.Common/Definitions/yggcookie.yml +++ b/src/Jackett.Common/Definitions/yggcookie.yml @@ -294,10 +294,6 @@ search: category: # changed the catid into and hidden div as of last tracker problem selector: ":nth-child(1) > div.hidden" - comments: - optional: true - selector: td:nth-child(1) > a[href$="#comments"] - attribute: href download: text: "https://{{ .Config.searchanddlurl }}/engine/download_torrent?id={{ .Result._id }}" date: diff --git a/src/Jackett.Common/Definitions/yggtorrent.yml b/src/Jackett.Common/Definitions/yggtorrent.yml index 51874c328..772bcfe7c 100644 --- a/src/Jackett.Common/Definitions/yggtorrent.yml +++ b/src/Jackett.Common/Definitions/yggtorrent.yml @@ -302,10 +302,6 @@ search: category: # changed the catid into and hidden div as of last tracker problem selector: ":nth-child(1) > div.hidden" - comments: - optional: true - selector: td:nth-child(1) > a[href$="#comments"] - attribute: href download: text: "https://{{ .Config.searchanddlurl }}/engine/download_torrent?id={{ .Result._id }}" date: diff --git a/src/Jackett.Common/Indexers/Abnormal.cs b/src/Jackett.Common/Indexers/Abnormal.cs index bf9deba3a..0d9cd9944 100644 --- a/src/Jackett.Common/Indexers/Abnormal.cs +++ b/src/Jackett.Common/Indexers/Abnormal.cs @@ -34,9 +34,7 @@ namespace Jackett.Common.Indexers { private string LoginUrl => SiteLink + "login.php"; private string SearchUrl => SiteLink + "torrents.php"; - private string TorrentCommentUrl => TorrentDescriptionUrl; - private string TorrentDescriptionUrl => SiteLink + "torrents.php?id="; - private string TorrentDownloadUrl => SiteLink + "torrents.php?action=download&id={id}&authkey={auth_key}&torrent_pass={torrent_pass}"; + private string DetailsUrl => SiteLink + "torrents.php?id="; private string ReplaceMulti => ConfigData.ReplaceMulti.Value; private bool Latency => ConfigData.Latency.Value; private bool DevMode => ConfigData.DevMode.Value; @@ -342,12 +340,8 @@ namespace Jackett.Common.Indexers output("Released on: " + date); // Torrent Details URL - var detailsLink = new Uri(TorrentDescriptionUrl + id); - output("Details: " + detailsLink.AbsoluteUri); - - // Torrent Comments URL - var commentsLink = new Uri(TorrentCommentUrl + id); - output("Comments Link: " + commentsLink.AbsoluteUri); + var details = new Uri(DetailsUrl + id); + output("Details: " + details.AbsoluteUri); // Torrent Download URL Uri downloadLink = null; @@ -382,8 +376,8 @@ namespace Jackett.Common.Indexers Peers = seeders + leechers, PublishDate = date, Size = size, - Guid = detailsLink, - Comments = commentsLink, + Guid = details, + Details = details, Link = downloadLink, MinimumRatio = 1, MinimumSeedTime = 172800, // 48 hours diff --git a/src/Jackett.Common/Indexers/Abstract/AvistazTracker.cs b/src/Jackett.Common/Indexers/Abstract/AvistazTracker.cs index 8b51820e3..698a920ab 100644 --- a/src/Jackett.Common/Indexers/Abstract/AvistazTracker.cs +++ b/src/Jackett.Common/Indexers/Abstract/AvistazTracker.cs @@ -172,7 +172,7 @@ without this configuration the torrent download does not work.
You can find var jsonContent = JToken.Parse(response.ContentString); foreach (var row in jsonContent.Value("data")) { - var comments = new Uri(row.Value("url")); + var details = new Uri(row.Value("url")); var link = new Uri(row.Value("download")); var publishDate = DateTime.ParseExact(row.Value("created_at"), "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture); @@ -210,8 +210,8 @@ without this configuration the torrent download does not work.
You can find Title = row.Value("file_name"), Link = link, InfoHash = row.Value("info_hash"), - Comments = comments, - Guid = comments, + Details = details, + Guid = details, Category = cats, PublishDate = publishDate, Description = description, diff --git a/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs b/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs index feeb815a4..aa97a6ec7 100644 --- a/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs +++ b/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs @@ -100,7 +100,7 @@ namespace Jackett.Common.Indexers.Abstract var release = new ReleaseInfo { Title = (string)r["release_name"], - Comments = new Uri((string)r["details_url"]), + Details = new Uri((string)r["details_url"]), Link = new Uri((string)r["download_url"]) }; release.Guid = release.Link; diff --git a/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs b/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs index 161af352f..00e36f672 100644 --- a/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs +++ b/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs @@ -340,8 +340,8 @@ namespace Jackett.Common.Indexers.Abstract release.Size = (long)torrent["size"]; release.Seeders = (int)torrent["seeders"]; release.Peers = (int)torrent["leechers"] + release.Seeders; - release.Comments = new Uri(DetailsUrl + torrentId); - release.Guid = release.Comments; + release.Details = new Uri(DetailsUrl + torrentId); + release.Guid = release.Details; release.Link = new Uri(DownloadUrl + torrentId); var category = (string)torrent["category"]; if (category == null || category.Contains("Select Category")) diff --git a/src/Jackett.Common/Indexers/Abstract/XtremeZoneTracker.cs b/src/Jackett.Common/Indexers/Abstract/XtremeZoneTracker.cs index 081455c0f..258f78499 100644 --- a/src/Jackett.Common/Indexers/Abstract/XtremeZoneTracker.cs +++ b/src/Jackett.Common/Indexers/Abstract/XtremeZoneTracker.cs @@ -122,7 +122,7 @@ namespace Jackett.Common.Indexers.Abstract foreach (var row in rows) { var id = row.Value("id"); - var comments = new Uri($"{SiteLink}browse/{id}"); + var details = new Uri($"{SiteLink}browse/{id}"); var link = new Uri($"{SiteLink}api/torrent/{id}/download"); var publishDate = DateTime.Parse(row.Value("created_at"), CultureInfo.InvariantCulture); var cat = row.Value("category").Value("id"); @@ -141,8 +141,8 @@ namespace Jackett.Common.Indexers.Abstract { Title = row.Value("name"), Link = link, - Comments = comments, - Guid = comments, + Details = details, + Guid = details, Category = MapTrackerCatToNewznab(cat), PublishDate = publishDate, Description = description, diff --git a/src/Jackett.Common/Indexers/AniDUB.cs b/src/Jackett.Common/Indexers/AniDUB.cs index 633fbdd4e..59648cab9 100644 --- a/src/Jackett.Common/Indexers/AniDUB.cs +++ b/src/Jackett.Common/Indexers/AniDUB.cs @@ -241,7 +241,7 @@ namespace Jackett.Common.Indexers { Title = BuildReleaseTitle(baseTitle, tabNode), Guid = guid, - Comments = uri, + Details = uri, Link = GetReleaseLink(tabNode), PublishDate = date, Category = categories, diff --git a/src/Jackett.Common/Indexers/AniLibria.cs b/src/Jackett.Common/Indexers/AniLibria.cs index 251feba4c..d41e27f79 100644 --- a/src/Jackett.Common/Indexers/AniLibria.cs +++ b/src/Jackett.Common/Indexers/AniLibria.cs @@ -109,7 +109,7 @@ namespace Jackett.Common.Indexers { Title = composeTitle(r), Poster = new Uri(Configuration.StaticLink.Value + r.poster.url), - Comments = new Uri(SiteLink + "/release/" + r.code + ".html"), + Details = new Uri(SiteLink + "/release/" + r.code + ".html"), DownloadVolumeFactor = 0, UploadVolumeFactor = 1, Category = new [] diff --git a/src/Jackett.Common/Indexers/Anidex.cs b/src/Jackett.Common/Indexers/Anidex.cs index a2a6be664..960555f50 100644 --- a/src/Jackett.Common/Indexers/Anidex.cs +++ b/src/Jackett.Common/Indexers/Anidex.cs @@ -199,8 +199,8 @@ namespace Jackett.Common.Indexers release.Seeders = ParseIntValueFromRow(r, nameof(release.Seeders), "td:nth-child(9)"); release.Peers = ParseIntValueFromRow(r, nameof(release.Peers), "td:nth-child(10)") + release.Seeders; release.Grabs = ParseIntValueFromRow(r, nameof(release.Grabs), "td:nth-child(11)"); - release.Comments = ParseValueFromRow(r, nameof(release.Comments), "td:nth-child(3) a", (e) => GetAbsoluteUrl(e.Attributes["href"].Value)); - release.Guid = release.Comments; + release.Details = ParseValueFromRow(r, nameof(release.Details), "td:nth-child(3) a", (e) => GetAbsoluteUrl(e.Attributes["href"].Value)); + release.Guid = release.Details; release.DownloadVolumeFactor = 0; release.UploadVolumeFactor = 1; diff --git a/src/Jackett.Common/Indexers/AnimeBytes.cs b/src/Jackett.Common/Indexers/AnimeBytes.cs index 34dd37374..2da2cde8d 100644 --- a/src/Jackett.Common/Indexers/AnimeBytes.cs +++ b/src/Jackett.Common/Indexers/AnimeBytes.cs @@ -273,8 +273,7 @@ namespace Jackett.Common.Indexers var uploadTimeString = (string)torrent["UploadTime"]; var uploadTime = DateTime.ParseExact(uploadTimeString, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture); var publishDate = DateTime.SpecifyKind(uploadTime, DateTimeKind.Utc).ToLocalTime(); - var commentsLink = SiteLink + "torrent/" + torrentId + "/group"; - var commentsLinkUri = new Uri(commentsLink); + var details = new Uri(SiteLink + "torrent/" + torrentId + "/group"); var size = (long)torrent["Size"]; var snatched = (long)torrent["Snatched"]; var seeders = (int)torrent["Seeders"]; @@ -366,13 +365,13 @@ namespace Jackett.Common.Indexers $"{title} {year} {releaseGroup}{infoString}" : $"{releaseGroup}{title} {releaseInfo} {infoString}"; - var guid = new Uri(commentsLinkUri + "&nh=" + StringUtil.Hash(title)); + var guid = new Uri(details + "&nh=" + StringUtil.Hash(title)); var release = new ReleaseInfo { MinimumRatio = 1, MinimumSeedTime = minimumSeedTime, Title = releaseTitle, - Comments = commentsLinkUri, + Details = details, Guid = guid, Link = linkUri, Poster = poster, diff --git a/src/Jackett.Common/Indexers/AnimeTorrents.cs b/src/Jackett.Common/Indexers/AnimeTorrents.cs index 5c33cb0b9..e71377a2c 100644 --- a/src/Jackett.Common/Indexers/AnimeTorrents.cs +++ b/src/Jackett.Common/Indexers/AnimeTorrents.cs @@ -149,7 +149,7 @@ namespace Jackett.Common.Indexers } release.Guid = new Uri(qTitleLink.GetAttribute("href")); - release.Comments = release.Guid; + release.Details = release.Guid; var dateString = row.QuerySelector("td:nth-of-type(5)").TextContent; release.PublishDate = DateTime.ParseExact(dateString, "dd MMM yy", CultureInfo.InvariantCulture); @@ -161,10 +161,10 @@ namespace Jackett.Common.Indexers } else { - // use comments link as placeholder + // use details link as placeholder // null causes errors during export to torznab // skipping the release prevents newbie users from adding the tracker (empty result) - release.Link = release.Comments; + release.Link = release.Details; } var sizeStr = row.QuerySelector("td:nth-of-type(6)").TextContent; diff --git a/src/Jackett.Common/Indexers/Animedia.cs b/src/Jackett.Common/Indexers/Animedia.cs index 75c30c668..d02e90bf0 100644 --- a/src/Jackett.Common/Indexers/Animedia.cs +++ b/src/Jackett.Common/Indexers/Animedia.cs @@ -129,7 +129,7 @@ namespace Jackett.Common.Indexers { Title = composeBaseTitle(document), Poster = new Uri(document.QuerySelector("div.widget__post-info__poster > a").Attributes["href"].Value), - Comments = uri, + Details = uri, DownloadVolumeFactor = 0, UploadVolumeFactor = 1, Category = new[]{ TorznabCatType.TVAnime.ID } diff --git a/src/Jackett.Common/Indexers/Anthelion.cs b/src/Jackett.Common/Indexers/Anthelion.cs index 62673fb9c..ea5eae8c5 100644 --- a/src/Jackett.Common/Indexers/Anthelion.cs +++ b/src/Jackett.Common/Indexers/Anthelion.cs @@ -116,7 +116,7 @@ namespace Jackett.Common.Indexers var tags = row.QuerySelector("div.torrent_info").FirstChild.TextContent.Replace(" / ", " ").Trim(); var title = $"{qDetailsLink.TextContent} {year} {tags}"; var description = row.QuerySelector("div.tags").TextContent.Trim(); - var comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); + var details = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); var torrentId = qDetailsLink.GetAttribute("href").Split('=').Last(); var link = new Uri(SiteLink + "torrents.php?action=download&id=" + torrentId); var posterStr = qDetailsLink.GetAttribute("data-cover"); @@ -156,7 +156,7 @@ namespace Jackett.Common.Indexers PublishDate = publishDate, Category = category, Link = link, - Comments = comments, + Details = details, Guid = link, Imdb = imdb, Poster = poster, diff --git a/src/Jackett.Common/Indexers/AwesomeHD.cs b/src/Jackett.Common/Indexers/AwesomeHD.cs index 86d7d7363..5360f2b54 100644 --- a/src/Jackett.Common/Indexers/AwesomeHD.cs +++ b/src/Jackett.Common/Indexers/AwesomeHD.cs @@ -166,7 +166,7 @@ namespace Jackett.Common.Indexers var torrentId = torrent.FirstValue("id"); var groupId = torrent.FirstValue("groupid"); - var comments = new Uri($"{TorrentUrl}?id={groupId}&torrentid={torrentId}"); + var details = new Uri($"{TorrentUrl}?id={groupId}&torrentid={torrentId}"); var link = new Uri($"{TorrentUrl}?action=download&id={torrentId}&authkey={authkey}&torrent_pass={passkey}"); var publishDate = DateTime.Parse(torrent.FirstValue("time")); @@ -197,7 +197,7 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo { Title = title.ToString(), - Comments = comments, + Details = details, Link = link, Guid = link, PublishDate = publishDate, diff --git a/src/Jackett.Common/Indexers/BB.cs b/src/Jackett.Common/Indexers/BB.cs index 2e5d48cda..f0dd07182 100644 --- a/src/Jackett.Common/Indexers/BB.cs +++ b/src/Jackett.Common/Indexers/BB.cs @@ -175,8 +175,8 @@ namespace Jackett.Common.Indexers release.Category = MapTrackerCatToNewznab(catStr); var qDetails = row.Children[1].QuerySelector("a[title='View Torrent']"); - release.Comments = new Uri(BaseUri + qDetails.GetAttribute("href")); - release.Guid = release.Comments; + release.Details = new Uri(BaseUri + qDetails.GetAttribute("href")); + release.Guid = release.Details; var qDownload = row.Children[1].QuerySelector("a[title='Download']"); release.Link = new Uri(BaseUri + qDownload.GetAttribute("href")); diff --git a/src/Jackett.Common/Indexers/BJShare.cs b/src/Jackett.Common/Indexers/BJShare.cs index 1101e1b0c..a92ba68ba 100644 --- a/src/Jackett.Common/Indexers/BJShare.cs +++ b/src/Jackett.Common/Indexers/BJShare.cs @@ -411,7 +411,7 @@ namespace Jackett.Common.Indexers var size = qSize.TextContent; release.Size = ReleaseInfo.GetBytes(size); release.Link = new Uri(SiteLink + qDlLink.GetAttribute("href")); - release.Comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); + release.Details = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); release.Guid = release.Link; release.Grabs = ParseUtil.CoerceLong(qGrabs.TextContent); release.Seeders = ParseUtil.CoerceInt(qSeeders.TextContent); @@ -539,7 +539,7 @@ namespace Jackett.Common.Indexers release.Title += " " + extraInfo.TrimEnd(); release.Category = MapTrackerCatToNewznab(catStr); release.Link = new Uri(SiteLink + qDlLink.GetAttribute("href")); - release.Comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); + release.Details = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); release.Guid = release.Link; release.Seeders = ParseUtil.CoerceInt(qSeeders.TextContent); release.Peers = ParseUtil.CoerceInt(qLeechers.TextContent) + release.Seeders; diff --git a/src/Jackett.Common/Indexers/BakaBT.cs b/src/Jackett.Common/Indexers/BakaBT.cs index 51caca729..546814dde 100644 --- a/src/Jackett.Common/Indexers/BakaBT.cs +++ b/src/Jackett.Common/Indexers/BakaBT.cs @@ -194,7 +194,7 @@ namespace Jackett.Common.Indexers release.Category = currentCategories; release.Description = row.QuerySelector("span.tags")?.TextContent; release.Guid = new Uri(SiteLink + qTitleLink.GetAttribute("href")); - release.Comments = release.Guid; + release.Details = release.Guid; release.Link = new Uri(SiteLink + row.QuerySelector(".peers a").GetAttribute("href")); diff --git a/src/Jackett.Common/Indexers/BitCityReloaded.cs b/src/Jackett.Common/Indexers/BitCityReloaded.cs index 1015e8125..6cacdc678 100644 --- a/src/Jackett.Common/Indexers/BitCityReloaded.cs +++ b/src/Jackett.Common/Indexers/BitCityReloaded.cs @@ -176,7 +176,7 @@ namespace Jackett.Common.Indexers var titleLink = row.QuerySelector("table tbody tr:nth-of-type(1) td a:has(b)"); var dlLink = row.QuerySelector("td.tableb > a:has(img[title=\"Torrent herunterladen\"])"); - release.Comments = new Uri(SiteLink + titleLink.GetAttribute("href").Replace("&hit=1", "")); + release.Details = new Uri(SiteLink + titleLink.GetAttribute("href").Replace("&hit=1", "")); release.Link = new Uri(SiteLink + dlLink.GetAttribute("href")); release.Title = titleLink.TextContent.Trim(); diff --git a/src/Jackett.Common/Indexers/BitHDTV.cs b/src/Jackett.Common/Indexers/BitHDTV.cs index ce082904e..e45319b85 100644 --- a/src/Jackett.Common/Indexers/BitHDTV.cs +++ b/src/Jackett.Common/Indexers/BitHDTV.cs @@ -138,7 +138,7 @@ namespace Jackett.Common.Indexers release.Files = ParseUtil.CoerceLong(row.Children[3].TextContent); release.Grabs = ParseUtil.CoerceLong(row.Children[7].TextContent); release.Guid = detailsLink; - release.Comments = release.Guid; + release.Details = release.Guid; release.Link = new Uri(SiteLink + row.QuerySelector("a[href^=\"download.php\"]").GetAttribute("href")); var catUrl = new Uri(SiteLink + row.Children[1].FirstElementChild.GetAttribute("href")); var catQuery = HttpUtility.ParseQueryString(catUrl.Query); diff --git a/src/Jackett.Common/Indexers/BroadcasTheNet.cs b/src/Jackett.Common/Indexers/BroadcasTheNet.cs index f8f08faac..4113abfba 100644 --- a/src/Jackett.Common/Indexers/BroadcasTheNet.cs +++ b/src/Jackett.Common/Indexers/BroadcasTheNet.cs @@ -158,12 +158,12 @@ namespace Jackett.Common.Indexers descriptions.Add("Youtube Trailer: " + btnResult.YoutubeTrailer + ""); var imdb = ParseUtil.GetImdbID(btnResult.ImdbID); var link = new Uri(btnResult.DownloadURL); - var comments = new Uri($"{SiteLink}torrents.php?id={btnResult.GroupID}&torrentid={btnResult.TorrentID}"); + var details = new Uri($"{SiteLink}torrents.php?id={btnResult.GroupID}&torrentid={btnResult.TorrentID}"); var publishDate = DateTimeUtil.UnixTimestampToDateTime(btnResult.Time); var release = new ReleaseInfo { Category = MapTrackerCatToNewznab(btnResult.Resolution), - Comments = comments, + Details = details, Guid = link, Link = link, MinimumRatio = 1, diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs index 0e3d71451..8d9b154ac 100644 --- a/src/Jackett.Common/Indexers/CardigannIndexer.cs +++ b/src/Jackett.Common/Indexers/CardigannIndexer.cs @@ -1395,20 +1395,11 @@ namespace Jackett.Common.Indexers break; case "details": var url = resolvePath(value, searchUrlUri); - release.Guid = url; - release.Comments = url; + release.Details = url; if (release.Guid == null) release.Guid = url; value = url.ToString(); break; - case "comments": - var CommentsUrl = resolvePath(value, searchUrlUri); - if (release.Comments == null) - release.Comments = CommentsUrl; - if (release.Guid == null) - release.Guid = CommentsUrl; - value = CommentsUrl.ToString(); - break; case "title": if (FieldModifiers.Contains("append")) release.Title += value; diff --git a/src/Jackett.Common/Indexers/Cinecalidad.cs b/src/Jackett.Common/Indexers/Cinecalidad.cs index 95dc02c60..86f0a7954 100644 --- a/src/Jackett.Common/Indexers/Cinecalidad.cs +++ b/src/Jackett.Common/Indexers/Cinecalidad.cs @@ -172,7 +172,7 @@ namespace Jackett.Common.Indexers { Title = title, Link = link, - Comments = link, + Details = link, Guid = link, Category = new List { TorznabCatType.MoviesHD.ID }, Poster = poster, diff --git a/src/Jackett.Common/Indexers/CorsaroRed.cs b/src/Jackett.Common/Indexers/CorsaroRed.cs index 1431f5e54..b1d36f6c0 100644 --- a/src/Jackett.Common/Indexers/CorsaroRed.cs +++ b/src/Jackett.Common/Indexers/CorsaroRed.cs @@ -241,7 +241,7 @@ namespace Jackett.Common.Indexers { //https://corsaro.red/details/E5BB62E2E58C654F4450325046723A3F013CD7A4 var magnetUri = new Uri((string)torrent["magnet"]); - var comments = new Uri($"{SiteLink}details/{(string)torrent["hash"]}"); + var details = new Uri($"{SiteLink}details/{(string)torrent["hash"]}"); var seeders = (int)torrent["seeders"]; var publishDate = torrent["last_updated"] != null ? DateTime.Parse((string)torrent["last_updated"]) @@ -256,10 +256,10 @@ namespace Jackett.Common.Indexers Seeders = seeders, InfoHash = (string)torrent["hash"], MagnetUri = magnetUri, - Comments = comments, + Details = details, DownloadVolumeFactor = 0, UploadVolumeFactor = 1, - Guid = comments, + Guid = details, Peers = seeders + (int)torrent["leechers"], PublishDate = publishDate, Category = MapTrackerCatToNewznab(cat), diff --git a/src/Jackett.Common/Indexers/DarmoweTorrenty.cs b/src/Jackett.Common/Indexers/DarmoweTorrenty.cs index 40454c0ab..cac0eb2a2 100644 --- a/src/Jackett.Common/Indexers/DarmoweTorrenty.cs +++ b/src/Jackett.Common/Indexers/DarmoweTorrenty.cs @@ -189,7 +189,7 @@ namespace Jackett.Common.Indexers UploadVolumeFactor = 1, InfoHash = infoHash, // magnet link is auto generated from infohash Guid = detailsLink, - Comments = detailsLink, + Details = detailsLink, Size = sizeMatch.Success ? ReleaseInfo.GetBytes(sizeMatch.Groups[1].Value) : 0 }; return release; diff --git a/src/Jackett.Common/Indexers/DigitalCore.cs b/src/Jackett.Common/Indexers/DigitalCore.cs index de22a0247..1f5a19e19 100644 --- a/src/Jackett.Common/Indexers/DigitalCore.cs +++ b/src/Jackett.Common/Indexers/DigitalCore.cs @@ -174,8 +174,8 @@ namespace Jackett.Common.Indexers release.Files = row.numfiles; release.Grabs = row.times_completed; - release.Comments = new Uri(SiteLink + "torrent/" + row.id.ToString() + "/"); - release.Guid = release.Comments; + release.Details = new Uri(SiteLink + "torrent/" + row.id.ToString() + "/"); + release.Guid = release.Details; release.Link = new Uri(SiteLink + "api/v1/torrents/download/" + row.id.ToString()); if (row.frileech == 1) diff --git a/src/Jackett.Common/Indexers/DivxTotal.cs b/src/Jackett.Common/Indexers/DivxTotal.cs index c81dd7917..664b95896 100644 --- a/src/Jackett.Common/Indexers/DivxTotal.cs +++ b/src/Jackett.Common/Indexers/DivxTotal.cs @@ -179,9 +179,9 @@ namespace Jackett.Common.Indexers bool matchWords) { var anchor = row.QuerySelector("a"); - var commentsLink = anchor.GetAttribute("href"); + var detailsStr = anchor.GetAttribute("href"); var title = anchor.TextContent.Trim(); - var cat = commentsLink.Split('/')[3]; + var cat = detailsStr.Split('/')[3]; var categories = MapTrackerCatToNewznab(cat); var publishStr = row.QuerySelectorAll("td")[2].TextContent.Trim(); var publishDate = TryToParseDate(publishStr, DateTime.Now); @@ -197,24 +197,24 @@ namespace Jackett.Common.Indexers // parsing is different for each category if (cat == DivxTotalCategories.Series) - await ParseSeriesRelease(releases, query, commentsLink, cat, publishDate); + await ParseSeriesRelease(releases, query, detailsStr, cat, publishDate); else if (query.Episode == null) // if it's scene series, we don't return other categories { if (cat == DivxTotalCategories.Peliculas || cat == DivxTotalCategories.PeliculasHd || cat == DivxTotalCategories.Peliculas3D || cat == DivxTotalCategories.PeliculasDvdr) - ParseMovieRelease(releases, query, title, commentsLink, cat, publishDate, sizeStr); + ParseMovieRelease(releases, query, title, detailsStr, cat, publishDate, sizeStr); else { var size = TryToParseSize(sizeStr, DivxTotalFizeSizes.Otros); - GenerateRelease(releases, title, commentsLink, commentsLink, cat, publishDate, size); + GenerateRelease(releases, title, detailsStr, detailsStr, cat, publishDate, size); } } } private async Task ParseSeriesRelease(ICollection releases, TorznabQuery query, - string commentsLink, string cat, DateTime publishDate) + string detailsStr, string cat, DateTime publishDate) { - var result = await RequestWithCookiesAsync(commentsLink); + var result = await RequestWithCookiesAsync(detailsStr); if (result.Status != HttpStatusCode.OK) throw new ExceptionWithConfigData(result.ContentString, configData); @@ -249,14 +249,14 @@ namespace Jackett.Common.Indexers if (query.Episode != null && !episodeTitle.Contains(query.GetEpisodeSearchString())) continue; - GenerateRelease(releases, episodeTitle, commentsLink, downloadLink, cat, episodePublish, + GenerateRelease(releases, episodeTitle, detailsStr, downloadLink, cat, episodePublish, DivxTotalFizeSizes.Series); } } } private void ParseMovieRelease(ICollection releases, TorznabQuery query, string title, - string commentsLink, string cat, DateTime publishDate, string sizeStr) + string detailsStr, string cat, DateTime publishDate, string sizeStr) { // parse tags in title, we need to put the year after the real title (before the tags) // La Maldicion ( HD-CAM) @@ -292,18 +292,18 @@ namespace Jackett.Common.Indexers else throw new Exception("Unknown category " + cat); - GenerateRelease(releases, title, commentsLink, commentsLink, cat, publishDate, size); + GenerateRelease(releases, title, detailsStr, detailsStr, cat, publishDate, size); } - private void GenerateRelease(ICollection releases, string title, string commentsLink, + private void GenerateRelease(ICollection releases, string title, string detailsStr, string downloadLink, string cat, DateTime publishDate, long size) { var link = new Uri(downloadLink); - var comments = new Uri(commentsLink); + var details = new Uri(detailsStr); var release = new ReleaseInfo { Title = title, - Comments = comments, + Details = details, Link = link, Guid = link, Category = MapTrackerCatToNewznab(cat), diff --git a/src/Jackett.Common/Indexers/EliteTracker.cs b/src/Jackett.Common/Indexers/EliteTracker.cs index 1526fa81a..4d0db0756 100644 --- a/src/Jackett.Common/Indexers/EliteTracker.cs +++ b/src/Jackett.Common/Indexers/EliteTracker.cs @@ -213,7 +213,7 @@ namespace Jackett.Common.Indexers var title = row.Children[1].QuerySelector("a").TextContent; var qLinks = row.Children[2].QuerySelectorAll("a"); var link = new Uri(configData.TorrentHTTPSMode.Value ? qLinks[1].GetAttribute("href") : qLinks[0].GetAttribute("href")); - var comments = new Uri(row.Children[1].QuerySelector("a").GetAttribute("href")); + var details = new Uri(row.Children[1].QuerySelector("a").GetAttribute("href")); var size = row.Children[4].TextContent; var grabs = row.Children[5].QuerySelector("a").TextContent; var seeders = ParseUtil.CoerceInt(row.Children[6].QuerySelector("a").TextContent); @@ -233,7 +233,7 @@ namespace Jackett.Common.Indexers Category = MapTrackerCatToNewznab(cat), Title = title, Link = link, - Comments = comments, + Details = details, Size = ReleaseInfo.GetBytes(size), Seeders = seeders, Grabs = ParseUtil.CoerceLong(grabs), diff --git a/src/Jackett.Common/Indexers/EpubLibre.cs b/src/Jackett.Common/Indexers/EpubLibre.cs index 5970d734e..d86b05e6e 100644 --- a/src/Jackett.Common/Indexers/EpubLibre.cs +++ b/src/Jackett.Common/Indexers/EpubLibre.cs @@ -120,7 +120,7 @@ namespace Jackett.Common.Indexers var poster = new Uri(row.QuerySelector("img[id=catalog]").GetAttribute("src")); var qLink = row.QuerySelector("a"); - var comments = new Uri(qLink.GetAttribute("href")); + var details = new Uri(qLink.GetAttribute("href")); var qTooltip = parser.ParseDocument(qLink.GetAttribute("data-content")); // we get the language from the last class tag => class="pull-right sprite idioma_5" @@ -134,9 +134,9 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo { Title = title, - Comments = comments, - Link = comments, - Guid = comments, + Details = details, + Link = details, + Guid = details, PublishDate = lastPublishDate, Poster = poster, Description = description, diff --git a/src/Jackett.Common/Indexers/Feeds/BaseNewznabIndexer.cs b/src/Jackett.Common/Indexers/Feeds/BaseNewznabIndexer.cs index d44fe69a6..e2ac031f8 100644 --- a/src/Jackett.Common/Indexers/Feeds/BaseNewznabIndexer.cs +++ b/src/Jackett.Common/Indexers/Feeds/BaseNewznabIndexer.cs @@ -54,7 +54,7 @@ namespace Jackett.Common.Indexers.Feeds Title = item.FirstValue("title"), Guid = new Uri(item.FirstValue("guid")), Link = new Uri(item.FirstValue("link")), - Comments = new Uri(item.FirstValue("comments")), + Details = new Uri(item.FirstValue("comments")), PublishDate = DateTime.Parse(item.FirstValue("pubDate")), Category = new List { int.Parse(attributes.First(e => e.Attribute("name").Value == "category").Attribute("value").Value) }, Size = size, diff --git a/src/Jackett.Common/Indexers/FileList.cs b/src/Jackett.Common/Indexers/FileList.cs index 04b235d1e..724d23671 100644 --- a/src/Jackett.Common/Indexers/FileList.cs +++ b/src/Jackett.Common/Indexers/FileList.cs @@ -140,7 +140,7 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo { Title = (string)row["name"], - Comments = detailsUri, + Details = detailsUri, Link = link, Category = MapTrackerCatDescToNewznab((string)row["category"]), Size = (long)row["size"], diff --git a/src/Jackett.Common/Indexers/FunFile.cs b/src/Jackett.Common/Indexers/FunFile.cs index fc2fd0824..4d225b2fd 100644 --- a/src/Jackett.Common/Indexers/FunFile.cs +++ b/src/Jackett.Common/Indexers/FunFile.cs @@ -133,7 +133,7 @@ namespace Jackett.Common.Indexers var qDetailsLink = row.QuerySelector("a[href^=\"details.php?id=\"]"); var title = qDetailsLink.GetAttribute("title").Trim(); - var comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); + var details = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); var qCatLink = row.QuerySelector("a[href^=\"browse.php?cat=\"]"); var catStr = qCatLink.GetAttribute("href").Split('=')[1].Split('&')[0]; @@ -152,7 +152,7 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo { Title = title, - Comments = comments, + Details = details, Link = link, Guid = link, Category = MapTrackerCatToNewznab(catStr), diff --git a/src/Jackett.Common/Indexers/Fuzer.cs b/src/Jackett.Common/Indexers/Fuzer.cs index d6eecbc23..bcebeb4de 100644 --- a/src/Jackett.Common/Indexers/Fuzer.cs +++ b/src/Jackett.Common/Indexers/Fuzer.cs @@ -191,9 +191,9 @@ namespace Jackett.Common.Indexers release.Seeders; var fullSize = row.QuerySelector("td:nth-child(4)").TextContent; release.Size = ReleaseInfo.GetBytes(fullSize); - release.Comments = new Uri(SiteLink + row.QuerySelector("a.threadlink[href]").GetAttribute("href")); + release.Details = new Uri(SiteLink + row.QuerySelector("a.threadlink[href]").GetAttribute("href")); release.Link = new Uri(SiteLink + row.QuerySelector("a:has(div.dlimg)").GetAttribute("href")); - release.Guid = release.Comments; + release.Guid = release.Details; //some releases have invalid poster URLs, ignore the posters in this case if (Uri.TryCreate(row.QuerySelector("a[imgsrc]").GetAttribute("imgsrc"), UriKind.Absolute, out var poster)) diff --git a/src/Jackett.Common/Indexers/GazelleGames.cs b/src/Jackett.Common/Indexers/GazelleGames.cs index e062fe6a1..db2b97185 100644 --- a/src/Jackett.Common/Indexers/GazelleGames.cs +++ b/src/Jackett.Common/Indexers/GazelleGames.cs @@ -296,10 +296,11 @@ namespace Jackett.Common.Indexers var publishDate = DateTime.SpecifyKind( DateTime.ParseExact(Time, "MMM dd yyyy, HH:mm", CultureInfo.InvariantCulture), DateTimeKind.Unspecified).ToLocalTime(); - var comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); + var details = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); var grabs = ParseUtil.CoerceLong(qGrabs.TextContent); var leechers = ParseUtil.CoerceInt(qLeechers.TextContent); var size = ReleaseInfo.GetBytes(sizeString); + var release = new ReleaseInfo { MinimumRatio = 1, @@ -307,7 +308,7 @@ namespace Jackett.Common.Indexers Category = GroupCategory, PublishDate = publishDate, Size = size, - Comments = comments, + Details = details, Link = link, Guid = link, Grabs = grabs, diff --git a/src/Jackett.Common/Indexers/GimmePeers.cs b/src/Jackett.Common/Indexers/GimmePeers.cs index 011eebcf6..3397dfe69 100644 --- a/src/Jackett.Common/Indexers/GimmePeers.cs +++ b/src/Jackett.Common/Indexers/GimmePeers.cs @@ -164,7 +164,7 @@ namespace Jackett.Common.Indexers var link = row.QuerySelector("td:nth-of-type(2) a:nth-of-type(1)"); release.Guid = new Uri(SiteLink + link.GetAttribute("href")); - release.Comments = release.Guid; + release.Details = release.Guid; release.Title = link.TextContent.Trim(); release.Description = release.Title; diff --git a/src/Jackett.Common/Indexers/HDBitsApi.cs b/src/Jackett.Common/Indexers/HDBitsApi.cs index 5deb3d2c2..b9c8c7212 100644 --- a/src/Jackett.Common/Indexers/HDBitsApi.cs +++ b/src/Jackett.Common/Indexers/HDBitsApi.cs @@ -135,11 +135,11 @@ namespace Jackett.Common.Indexers configData.Passkey.Value); var seeders = (int)r["seeders"]; var publishDate = DateTimeUtil.UnixTimestampToDateTime((int)r["utadded"]); - var comments = new Uri(SiteLink + "details.php?id=" + (string)r["id"]); + var details = new Uri(SiteLink + "details.php?id=" + (string)r["id"]); var release = new ReleaseInfo { Title = (string)r["name"], - Comments = comments, + Details = details, Link = link, Category = MapTrackerCatToNewznab((string)r["type_category"]), Size = (long)r["size"], diff --git a/src/Jackett.Common/Indexers/HDSpace.cs b/src/Jackett.Common/Indexers/HDSpace.cs index 9b9a175ba..2468d055d 100644 --- a/src/Jackett.Common/Indexers/HDSpace.cs +++ b/src/Jackett.Common/Indexers/HDSpace.cs @@ -152,8 +152,8 @@ namespace Jackett.Common.Indexers var qLink = row.Children[1].FirstElementChild; release.Title = qLink.TextContent.Trim(); - release.Comments = new Uri(SiteLink + qLink.GetAttribute("href")); - release.Guid = release.Comments; + release.Details = new Uri(SiteLink + qLink.GetAttribute("href")); + release.Guid = release.Details; var imdbLink = row.Children[1].QuerySelector("a[href*=imdb]"); if (imdbLink != null) diff --git a/src/Jackett.Common/Indexers/HDTorrents.cs b/src/Jackett.Common/Indexers/HDTorrents.cs index d2df15784..2ea6c16f2 100644 --- a/src/Jackett.Common/Indexers/HDTorrents.cs +++ b/src/Jackett.Common/Indexers/HDTorrents.cs @@ -159,7 +159,7 @@ namespace Jackett.Common.Indexers { var mainLink = row.Children[2].QuerySelector("a"); var title = mainLink.TextContent; - var comments = new Uri(SiteLink + mainLink.GetAttribute("href")); + var details = new Uri(SiteLink + mainLink.GetAttribute("href")); var posterMatch = _posterRegex.Match(mainLink.GetAttribute("onmouseover")); var poster = posterMatch.Success ? new Uri(SiteLink + posterMatch.Groups[1].Value.Replace("\\", "/")) : null; @@ -221,8 +221,8 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo { Title = title, - Comments = comments, - Guid = comments, + Details = details, + Guid = details, Link = link, PublishDate = publishDate, Category = cat, diff --git a/src/Jackett.Common/Indexers/Hebits.cs b/src/Jackett.Common/Indexers/Hebits.cs index c42badf28..5910f44d1 100644 --- a/src/Jackett.Common/Indexers/Hebits.cs +++ b/src/Jackett.Common/Indexers/Hebits.cs @@ -142,7 +142,7 @@ namespace Jackett.Common.Indexers var titleParts = qTitle.TextContent.Split('/'); release.Title = titleParts.Length >= 2 ? titleParts[1].Trim() : titleParts[0].Trim(); var qDetailsLink = qTitle.QuerySelector("a[href^=\"details.php\"]"); - release.Comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); + release.Details = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); release.Link = new Uri(SiteLink + row.QuerySelector("a[href^=\"download.php\"]").GetAttribute("href")); release.Guid = release.Link; var dateString = row.QuerySelector("div:last-child").TextContent.Trim(); diff --git a/src/Jackett.Common/Indexers/IPTorrents.cs b/src/Jackett.Common/Indexers/IPTorrents.cs index 8ca2f9661..0522bdd0c 100644 --- a/src/Jackett.Common/Indexers/IPTorrents.cs +++ b/src/Jackett.Common/Indexers/IPTorrents.cs @@ -215,7 +215,7 @@ namespace Jackett.Common.Indexers // drop invalid char that seems to have cropped up in some titles. #6582 var title = qTitleLink.TextContent.Trim().Replace("\u000f", ""); - var comments = new Uri(SiteLink + qTitleLink.GetAttribute("href").TrimStart('/')); + var details = new Uri(SiteLink + qTitleLink.GetAttribute("href").TrimStart('/')); var qLink = row.QuerySelector("a[href^=\"/download.php/\"]"); var link = new Uri(SiteLink + qLink.GetAttribute("href").TrimStart('/')); @@ -251,8 +251,8 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo { Title = title, - Comments = comments, - Guid = comments, + Details = details, + Guid = details, Link = link, PublishDate = publishDate, Category = cat, diff --git a/src/Jackett.Common/Indexers/ImmortalSeed.cs b/src/Jackett.Common/Indexers/ImmortalSeed.cs index a62565489..d0b996957 100644 --- a/src/Jackett.Common/Indexers/ImmortalSeed.cs +++ b/src/Jackett.Common/Indexers/ImmortalSeed.cs @@ -170,7 +170,7 @@ namespace Jackett.Common.Indexers var qLink = row.QuerySelector("a[href*=\"download.php\"]"); release.Link = new Uri(qLink.GetAttribute("href")); release.Guid = release.Link; - release.Comments = new Uri(qDetails.GetAttribute("href")); + release.Details = new Uri(qDetails.GetAttribute("href")); // 07-22-2015 11:08 AM var dateString = row.QuerySelectorAll("td:nth-of-type(2) div").Last().LastChild.TextContent.Trim(); diff --git a/src/Jackett.Common/Indexers/InternetArchive.cs b/src/Jackett.Common/Indexers/InternetArchive.cs index c7d135794..4cad1e96d 100644 --- a/src/Jackett.Common/Indexers/InternetArchive.cs +++ b/src/Jackett.Common/Indexers/InternetArchive.cs @@ -23,7 +23,7 @@ namespace Jackett.Common.Indexers public class InternetArchive : BaseWebIndexer { private string SearchUrl => SiteLink + "advancedsearch.php"; - private string CommentsUrl => SiteLink + "details/"; + private string DetailsUrl => SiteLink + "details/"; private string LinkUrl => SiteLink + "download/"; private string _sort; @@ -181,15 +181,15 @@ namespace Jackett.Common.Indexers { var id = GetFieldAs("identifier", torrent); var title = GetFieldAs("title", torrent) ?? id; - var comments = new Uri(CommentsUrl + id); + var details = new Uri(DetailsUrl + id); var btih = GetFieldAs("btih", torrent); var link = new Uri(LinkUrl + id + "/" + id + "_archive.torrent"); var release = new ReleaseInfo { Title = title, - Comments = comments, - Guid = comments, + Details = details, + Guid = details, PublishDate = GetFieldAs("publicdate", torrent), Category = MapTrackerCatToNewznab(GetFieldAs("mediatype", torrent)), Size = GetFieldAs("item_size", torrent), diff --git a/src/Jackett.Common/Indexers/Libble.cs b/src/Jackett.Common/Indexers/Libble.cs index e3a9e4dec..4757ade91 100644 --- a/src/Jackett.Common/Indexers/Libble.cs +++ b/src/Jackett.Common/Indexers/Libble.cs @@ -240,7 +240,7 @@ namespace Jackett.Common.Indexers release.Link = new Uri(SiteLink + releaseDownloadDetails.GetAttribute("href")); release.Guid = release.Link; - release.Comments = new Uri(SiteLink + albumNameNode.GetAttribute("href")); + release.Details = new Uri(SiteLink + albumNameNode.GetAttribute("href")); // Aug 31 2020, 15:50 try diff --git a/src/Jackett.Common/Indexers/LostFilm.cs b/src/Jackett.Common/Indexers/LostFilm.cs index 57bba5abf..fd57868b3 100644 --- a/src/Jackett.Common/Indexers/LostFilm.cs +++ b/src/Jackett.Common/Indexers/LostFilm.cs @@ -445,7 +445,7 @@ namespace Jackett.Common.Indexers var playButton = document.QuerySelector("div.external-btn"); if (playButton != null && !playButton.ClassList.Contains("inactive")) { - var comments = new Uri(url); + var details = new Uri(url); var dateString = document.QuerySelector("div.title-block > div.details-pane > div.left-box").TextContent; dateString = TrimString(dateString, "eng: ", " г."); // '... Дата выхода eng: 09 марта 2012 г. ...' -> '09 марта 2012' @@ -464,7 +464,7 @@ namespace Jackett.Common.Indexers foreach (var release in episodeReleases) { - release.Comments = comments; + release.Details = details; release.PublishDate = date; } releases.AddRange(episodeReleases); @@ -526,14 +526,14 @@ namespace Jackett.Common.Indexers var dateColumn = lastEpisode.QuerySelector("td.delta"); var date = DateFromEpisodeColumn(dateColumn); - var comments = new Uri(url); // Current season(-s) page url + var details = new Uri(url); // Current season(-s) page url var urlDetails = new TrackerUrlDetails(seasonButton); var seasonReleases = await FetchTrackerReleases(urlDetails); foreach (var release in seasonReleases) { - release.Comments = comments; + release.Details = details; release.PublishDate = date; } @@ -592,14 +592,14 @@ namespace Jackett.Common.Indexers var link = dateColumn.GetAttribute("onclick"); // goTo('/series/Prison_Break/season_5/episode_9/',false) link = TrimString(link, '\'', '\''); var episodeUrl = SiteLink + link.TrimStart('/'); - var comments = new Uri(episodeUrl); + var details = new Uri(episodeUrl); var urlDetails = new TrackerUrlDetails(playButton); var episodeReleases = await FetchTrackerReleases(urlDetails); foreach (var release in episodeReleases) { - release.Comments = comments; + release.Details = details; release.PublishDate = date; } releases.AddRange(episodeReleases); diff --git a/src/Jackett.Common/Indexers/Magnetico.cs b/src/Jackett.Common/Indexers/Magnetico.cs index 1692db7b4..9c280f88f 100644 --- a/src/Jackett.Common/Indexers/Magnetico.cs +++ b/src/Jackett.Common/Indexers/Magnetico.cs @@ -118,7 +118,7 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo { Title = torrent.name, - Comments = new Uri($"{TorrentsUrl}/{torrent.infoHash}"), + Details = new Uri($"{TorrentsUrl}/{torrent.infoHash}"), Guid = details, InfoHash = torrent.infoHash, PublishDate = publishDate, diff --git a/src/Jackett.Common/Indexers/MejorTorrent.cs b/src/Jackett.Common/Indexers/MejorTorrent.cs index 5eb05eef6..de334ba1c 100644 --- a/src/Jackett.Common/Indexers/MejorTorrent.cs +++ b/src/Jackett.Common/Indexers/MejorTorrent.cs @@ -147,9 +147,9 @@ namespace Jackett.Common.Indexers var doc = searchResultParser.ParseDocument(result.ContentString); var container = doc.QuerySelector("#main_table_center_center1 table div"); - var parsedCommentsLink = new List(); + var parsedDetailsLink = new List(); string rowTitle = null; - string rowCommentsLink = null; + string rowDetailsLink = null; string rowPublishDate = null; string rowQuality = null; @@ -157,7 +157,7 @@ namespace Jackett.Common.Indexers if (row.TagName.Equals("A")) { rowTitle = row.TextContent; - rowCommentsLink = SiteLink + row.GetAttribute("href"); + rowDetailsLink = SiteLink + row.GetAttribute("href"); } else if (rowPublishDate == null && row.TagName.Equals("SPAN")) rowPublishDate = row.TextContent; @@ -165,17 +165,17 @@ namespace Jackett.Common.Indexers rowQuality = row.TextContent; else if (row.TagName.Equals("BR")) { - // we add parsed items to parsedCommentsLink to avoid duplicates in newest torrents + // we add parsed items to rowDetailsLink to avoid duplicates in newest torrents // list results - if (!parsedCommentsLink.Contains(rowCommentsLink)) + if (!parsedDetailsLink.Contains(rowDetailsLink)) { - await ParseRelease(releases, rowTitle, rowCommentsLink, null, + await ParseRelease(releases, rowTitle, rowDetailsLink, null, rowPublishDate, rowQuality, query, false); - parsedCommentsLink.Add(rowCommentsLink); + parsedDetailsLink.Add(rowDetailsLink); } // clean the current row rowTitle = null; - rowCommentsLink = null; + rowDetailsLink = null; rowPublishDate = null; rowQuality = null; } @@ -216,13 +216,13 @@ namespace Jackett.Common.Indexers { var link = row.QuerySelector("td a"); var rowTitle = link.TextContent; - var rowCommentsLink = SiteLink + link.GetAttribute("href").TrimStart('/'); + var rowDetailsLink = SiteLink + link.GetAttribute("href").TrimStart('/'); var rowMejortorrentCat = row.QuerySelectorAll("td")[1].TextContent; string rowQuality = null; if (row.QuerySelector("td span") != null) rowQuality = row.QuerySelector("td span").TextContent; - await ParseRelease(releases, rowTitle, rowCommentsLink, rowMejortorrentCat, + await ParseRelease(releases, rowTitle, rowDetailsLink, rowMejortorrentCat, null, rowQuality, query, matchWords); } } @@ -235,7 +235,7 @@ namespace Jackett.Common.Indexers return releases; } - private async Task ParseRelease(ICollection releases, string title, string commentsLink, + private async Task ParseRelease(ICollection releases, string title, string detailsStr, string mejortorrentCat, string publishStr, string quality, TorznabQuery query, bool matchWords) { // Remove trailing dot. Eg Harry Potter Y La Orden Del Fénix. @@ -243,7 +243,7 @@ namespace Jackett.Common.Indexers if (title.EndsWith(".")) title = title.Remove(title.Length - 1).Trim(); - var cat = GetMejortorrentCategory(mejortorrentCat, commentsLink, title); + var cat = GetMejortorrentCategory(mejortorrentCat, detailsStr, title); if (cat == MejorTorrentCatType.Otro) return; // skip releases from this category @@ -260,24 +260,24 @@ namespace Jackett.Common.Indexers // parsing is different for each category if (cat == MejorTorrentCatType.Serie || cat == MejorTorrentCatType.SerieHd) - await ParseSeriesRelease(releases, query, title, commentsLink, cat, publishDate); + await ParseSeriesRelease(releases, query, title, detailsStr, cat, publishDate); else if (query.Episode == null) // if it's scene series, we don't return other categories { if (cat == MejorTorrentCatType.Pelicula) - ParseMovieRelease(releases, query, title, commentsLink, cat, publishDate, quality); + ParseMovieRelease(releases, query, title, detailsStr, cat, publishDate, quality); else { const long size = 104857600L; // 100 MB - var release = GenerateRelease(title, commentsLink, commentsLink, cat, publishDate, size); + var release = GenerateRelease(title, detailsStr, detailsStr, cat, publishDate, size); releases.Add(release); } } } private async Task ParseSeriesRelease(ICollection releases, TorznabQuery query, string title, - string commentsLink, string cat, DateTime publishDate) + string detailsStr, string cat, DateTime publishDate) { - var result = await RequestWithCookiesAsync(commentsLink); + var result = await RequestWithCookiesAsync(detailsStr); if (result.Status != HttpStatusCode.OK) throw new ExceptionWithConfigData(result.ContentString, configData); @@ -309,14 +309,14 @@ namespace Jackett.Common.Indexers if (episodeTitle.ToLower().Contains("720p")) size = 1288490188L; // 1.2 GB - var release = GenerateRelease(episodeTitle, commentsLink, downloadLink, cat, episodePublish, size); + var release = GenerateRelease(episodeTitle, detailsStr, downloadLink, cat, episodePublish, size); releases.Add(release); } } private void ParseMovieRelease(ICollection releases, TorznabQuery query, string title, - string commentsLink, string cat, DateTime publishDate, string quality) + string detailsStr, string cat, DateTime publishDate, string quality) { title = title.Trim(); @@ -370,19 +370,19 @@ namespace Jackett.Common.Indexers else if (title.ToLower().Contains("bdremux")) size = 21474836480L; // 20 GB - var release = GenerateRelease(title, commentsLink, commentsLink, cat, publishDate, size); + var release = GenerateRelease(title, detailsStr, detailsStr, cat, publishDate, size); releases.Add(release); } - private ReleaseInfo GenerateRelease(string title, string commentsLink, string downloadLink, string cat, + private ReleaseInfo GenerateRelease(string title, string detailsStr, string downloadLink, string cat, DateTime publishDate, long size) { var link = new Uri(downloadLink); - var comments = new Uri(commentsLink); + var details = new Uri(detailsStr); var release = new ReleaseInfo { Title = title, - Comments = comments, + Details = details, Link = link, Guid = link, Category = MapTrackerCatToNewznab(cat), @@ -516,17 +516,17 @@ namespace Jackett.Common.Indexers return newTitle; } - private static string GetMejortorrentCategory(string mejortorrentCat, string commentsLink, string title) + private static string GetMejortorrentCategory(string mejortorrentCat, string detailsStr, string title) { // get root category var cat = MejorTorrentCatType.Otro; if (mejortorrentCat == null) { - if (commentsLink.Contains("peliculas_extend")) + if (detailsStr.Contains("peliculas_extend")) cat = MejorTorrentCatType.Pelicula; - else if (commentsLink.Contains("series_extend")) + else if (detailsStr.Contains("series_extend")) cat = MejorTorrentCatType.Serie; - else if (commentsLink.Contains("musica_extend")) + else if (detailsStr.Contains("musica_extend")) cat = MejorTorrentCatType.Musica; } else if (mejortorrentCat.Equals(MejorTorrentCatType.Pelicula) || diff --git a/src/Jackett.Common/Indexers/Milkie.cs b/src/Jackett.Common/Indexers/Milkie.cs index c3d86148d..aba7f5748 100644 --- a/src/Jackett.Common/Indexers/Milkie.cs +++ b/src/Jackett.Common/Indexers/Milkie.cs @@ -121,15 +121,15 @@ namespace Jackett.Common.Indexers foreach (var torrent in response.Torrents) { var link = new Uri($"{TorrentsEndpoint}/{torrent.Id}/torrent?{dlQueryParams.GetQueryString()}"); - var comments = new Uri($"{SiteLink}browse/{torrent.Id}"); + var details = new Uri($"{SiteLink}browse/{torrent.Id}"); var publishDate = DateTimeUtil.FromUnknown(torrent.CreatedAt); var release = new ReleaseInfo { Title = torrent.ReleaseName, Link = link, - Comments = comments, - Guid = comments, + Details = details, + Guid = details, PublishDate = publishDate, Category = MapTrackerCatToNewznab(torrent.Category.ToString()), Size = torrent.Size, diff --git a/src/Jackett.Common/Indexers/MoreThanTV.cs b/src/Jackett.Common/Indexers/MoreThanTV.cs index 2d190f46c..5a1038413 100644 --- a/src/Jackett.Common/Indexers/MoreThanTV.cs +++ b/src/Jackett.Common/Indexers/MoreThanTV.cs @@ -29,7 +29,7 @@ namespace Jackett.Common.Indexers private string LoginUrl => SiteLink + "login.php"; private string SearchUrl => SiteLink + "ajax.php?action=browse&searchstr="; private string DownloadUrl => SiteLink + "torrents.php?action=download&id="; - private string CommentsUrl => SiteLink + "torrents.php?torrentid="; + private string DetailsUrl => SiteLink + "torrents.php?torrentid="; private ConfigurationDataBasicLogin ConfigData => (ConfigurationDataBasicLogin)configData; @@ -283,7 +283,7 @@ namespace Jackett.Common.Indexers var grabs = int.Parse(torrentData[1].TextContent, NumberStyles.AllowThousands, CultureInfo.InvariantCulture); var seeders = int.Parse(torrentData[2].TextContent, NumberStyles.AllowThousands, CultureInfo.InvariantCulture); var leechers = int.Parse(torrentData[3].TextContent, NumberStyles.AllowThousands, CultureInfo.InvariantCulture); - var comments = new Uri(CommentsUrl + torrentId); + var details = new Uri(DetailsUrl + torrentId); var link = new Uri(DownloadUrl + torrentId); return new ReleaseInfo @@ -299,8 +299,8 @@ namespace Jackett.Common.Indexers Files = files, Size = size, Grabs = grabs, - Guid = comments, - Comments = comments, + Guid = details, + Details = details, DownloadVolumeFactor = 0, // ratioless tracker UploadVolumeFactor = 1 }; diff --git a/src/Jackett.Common/Indexers/MyAnonamouse.cs b/src/Jackett.Common/Indexers/MyAnonamouse.cs index 976cf45d0..7d714538a 100644 --- a/src/Jackett.Common/Indexers/MyAnonamouse.cs +++ b/src/Jackett.Common/Indexers/MyAnonamouse.cs @@ -265,8 +265,8 @@ namespace Jackett.Common.Indexers release.Category = MapTrackerCatToNewznab(category); release.Link = new Uri(sitelink, "/tor/download.php?tid=" + id); - release.Comments = new Uri(sitelink, "/t/" + id); - release.Guid = release.Comments; + release.Details = new Uri(sitelink, "/t/" + id); + release.Guid = release.Details; var dateStr = item.Value("added"); var dateTime = DateTime.ParseExact(dateStr, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture); diff --git a/src/Jackett.Common/Indexers/NCore.cs b/src/Jackett.Common/Indexers/NCore.cs index 3d9e3ef73..0577dd7f3 100644 --- a/src/Jackett.Common/Indexers/NCore.cs +++ b/src/Jackett.Common/Indexers/NCore.cs @@ -249,10 +249,8 @@ namespace Jackett.Common.Indexers var downloadId = ParseUtil.GetArgumentFromQueryString(torrentLink, "id"); //Build site links - var baseLink = SiteLink + "torrents.php?action=details&id=" + downloadId; + var details = new Uri(SiteLink + "torrents.php?action=details&id=" + downloadId); var downloadLink = SiteLink + "torrents.php?action=download&id=" + downloadId; - var commentsUri = new Uri(baseLink + "#comments"); - var guidUri = new Uri(baseLink); var linkUri = new Uri(QueryHelpers.AddQueryString(downloadLink, "key", key)); var seeders = ParseUtil.CoerceInt(row.QuerySelector(".box_s2 a").TextContent); @@ -283,8 +281,8 @@ namespace Jackett.Common.Indexers DownloadVolumeFactor = 0, UploadVolumeFactor = 1, Link = linkUri, - Comments = commentsUri, - Guid = guidUri, + Details = details, + Guid = details, Seeders = seeders, Peers = leechers + seeders, Imdb = imdbId, diff --git a/src/Jackett.Common/Indexers/Nebulance.cs b/src/Jackett.Common/Indexers/Nebulance.cs index dda777dfb..c1ea30976 100644 --- a/src/Jackett.Common/Indexers/Nebulance.cs +++ b/src/Jackett.Common/Indexers/Nebulance.cs @@ -128,8 +128,8 @@ namespace Jackett.Common.Indexers var posterStr = row.QuerySelector("img")?.GetAttribute("src"); var poster = !string.IsNullOrWhiteSpace(posterStr) ? new Uri(posterStr) : null; - var commentsUri = new Uri(SiteLink + row.QuerySelector("a[data-src]").GetAttribute("href")); - var linkUri = new Uri(SiteLink + row.QuerySelector("a[href*='action=download']").GetAttribute("href")); + var details = new Uri(SiteLink + row.QuerySelector("a[data-src]").GetAttribute("href")); + var link = new Uri(SiteLink + row.QuerySelector("a[href*='action=download']").GetAttribute("href")); var qColSize = row.QuerySelector("td:nth-child(3)"); var size = ReleaseInfo.GetBytes(qColSize.Children[0].TextContent); @@ -149,9 +149,9 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo { Title = title, - Guid = commentsUri, - Comments = commentsUri, - Link = linkUri, + Guid = details, + Details = details, + Link = link, Category = new List { TvCategoryParser.ParseTvShowQuality(title) }, Size = size, Files = files, diff --git a/src/Jackett.Common/Indexers/NewPCT.cs b/src/Jackett.Common/Indexers/NewPCT.cs index a3c7de85c..a169bd89c 100644 --- a/src/Jackett.Common/Indexers/NewPCT.cs +++ b/src/Jackett.Common/Indexers/NewPCT.cs @@ -665,7 +665,7 @@ namespace Jackett.Common.Indexers result.Title = FixedTitle(result, quality, language); result.Link = new Uri(detailsUrl); result.Guid = result.Link; - result.Comments = result.Link; + result.Details = result.Link; result.PublishDate = publishDate; result.Poster = new Uri(poster); result.Seeders = 1; diff --git a/src/Jackett.Common/Indexers/NewRealWorld.cs b/src/Jackett.Common/Indexers/NewRealWorld.cs index 3dc609079..3ab9496ac 100644 --- a/src/Jackett.Common/Indexers/NewRealWorld.cs +++ b/src/Jackett.Common/Indexers/NewRealWorld.cs @@ -211,7 +211,7 @@ namespace Jackett.Common.Indexers var dateGerman = DateTime.SpecifyKind(DateTime.ParseExact(dateStr, "dd.MM.yyyy HH:mm:ss", CultureInfo.InvariantCulture), DateTimeKind.Unspecified); var pubDateUtc = TimeZoneInfo.ConvertTimeToUtc(dateGerman, germanyTz); var files = ParseUtil.CoerceInt(row.QuerySelector("td:contains(Datei) > strong ~ strong").TextContent); - var comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); + var details = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); var leechers = ParseUtil.CoerceInt(qLeechers.Text()); var size = ReleaseInfo.GetBytes(qSize.TextContent.Replace(".", "").Replace(",", ".")); var downloadVolumeFactor = row.QuerySelector("img[title=\"OnlyUpload\"]") != null ? 0 : 1; @@ -222,7 +222,7 @@ namespace Jackett.Common.Indexers Title = title, Category = MapTrackerCatToNewznab(catStr), Link = link, - Comments = comments, + Details = details, Guid = link, Size = size, Seeders = seeders, diff --git a/src/Jackett.Common/Indexers/NorBits.cs b/src/Jackett.Common/Indexers/NorBits.cs index 1547e54c5..472aeaed9 100644 --- a/src/Jackett.Common/Indexers/NorBits.cs +++ b/src/Jackett.Common/Indexers/NorBits.cs @@ -30,8 +30,7 @@ namespace Jackett.Common.Indexers private string LoginUrl => SiteLink + "login.php"; private string LoginCheckUrl => SiteLink + "takelogin.php"; private string SearchUrl => SiteLink + "browse.php"; - private string TorrentCommentUrl => SiteLink + "details.php?id={id}&comonly=1#page1"; - private string TorrentDescriptionUrl => SiteLink + "details.php?id={id}"; + private string TorrentDetailsUrl => SiteLink + "details.php?id={id}"; private string TorrentDownloadUrl => SiteLink + "download.php?id={id}&passkey={passkey}"; private bool Latency => ConfigData.Latency.Value; private bool DevMode => ConfigData.DevMode.Value; @@ -359,12 +358,8 @@ namespace Jackett.Common.Indexers Output("Released on: " + date); // Torrent Details URL - var detailsLink = new Uri(TorrentDescriptionUrl.Replace("{id}", id.ToString())); - Output("Details: " + detailsLink.AbsoluteUri); - - // Torrent Comments URL - var commentsLink = new Uri(TorrentCommentUrl.Replace("{id}", id.ToString())); - Output("Comments Link: " + commentsLink.AbsoluteUri); + var details = new Uri(TorrentDetailsUrl.Replace("{id}", id.ToString())); + Output("Details: " + details.AbsoluteUri); // Torrent Download URL var passkey = row.QuerySelector("td:nth-of-type(2) > a:nth-of-type(2)").GetAttribute("href"); @@ -383,8 +378,8 @@ namespace Jackett.Common.Indexers Size = size, Files = files, Grabs = completed, - Guid = detailsLink, - Comments = commentsLink, + Guid = details, + Details = details, Link = downloadLink, MinimumRatio = 1, MinimumSeedTime = 172800 // 48 hours diff --git a/src/Jackett.Common/Indexers/Partis.cs b/src/Jackett.Common/Indexers/Partis.cs index f7aec0976..fd2d2c95f 100644 --- a/src/Jackett.Common/Indexers/Partis.cs +++ b/src/Jackett.Common/Indexers/Partis.cs @@ -199,8 +199,8 @@ namespace Jackett.Common.Indexers // Title and torrent link release.Title = qDetailsLink.TextContent; - release.Comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href").TrimStart('/')); - release.Guid = release.Comments; + release.Details = new Uri(SiteLink + qDetailsLink.GetAttribute("href").TrimStart('/')); + release.Guid = release.Details; // Date of torrent creation var liopis = Row.QuerySelector("div.listeklink div span.middle"); diff --git a/src/Jackett.Common/Indexers/PassThePopcorn.cs b/src/Jackett.Common/Indexers/PassThePopcorn.cs index 492f9f552..d15256e8b 100644 --- a/src/Jackett.Common/Indexers/PassThePopcorn.cs +++ b/src/Jackett.Common/Indexers/PassThePopcorn.cs @@ -171,7 +171,7 @@ namespace Jackett.Common.Indexers continue; var link = new Uri($"{SearchUrl}?{releaseLinkQuery.GetQueryString()}"); var seeders = int.Parse((string)torrent["Seeders"]); - var comments = new Uri($"{SearchUrl}?id={WebUtility.UrlEncode(movieGroupId)}&torrentid={WebUtility.UrlEncode(torrentId)}"); + var details = new Uri($"{SearchUrl}?id={WebUtility.UrlEncode(movieGroupId)}&torrentid={WebUtility.UrlEncode(torrentId)}"); var size = long.Parse((string)torrent["Size"]); var grabs = long.Parse((string)torrent["Snatched"]); var publishDate = DateTime.ParseExact((string)torrent["UploadTime"], @@ -184,7 +184,7 @@ namespace Jackett.Common.Indexers Description = $"Title: {movieTitle}", Poster = poster, Imdb = movieImdbId, - Comments = comments, + Details = details, Size = size, Grabs = grabs, Seeders = seeders, diff --git a/src/Jackett.Common/Indexers/PirateTheNet.cs b/src/Jackett.Common/Indexers/PirateTheNet.cs index c6957b4db..cb30b9c02 100644 --- a/src/Jackett.Common/Indexers/PirateTheNet.cs +++ b/src/Jackett.Common/Indexers/PirateTheNet.cs @@ -173,7 +173,7 @@ namespace Jackett.Common.Indexers var seeders = ParseUtil.CoerceInt(qSeeders.Text()); var files = ParseUtil.CoerceInt(row.QuerySelector("td:nth-child(4)").TextContent); var grabs = ParseUtil.CoerceInt(row.QuerySelector("td:nth-child(8)").TextContent); - var comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); + var details = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); var size = ReleaseInfo.GetBytes(sizeStr); var leechers = ParseUtil.CoerceInt(qLeechers.Text()); var title = qDetailsLink.GetAttribute("alt"); @@ -184,7 +184,7 @@ namespace Jackett.Common.Indexers Title = title, Category = MapTrackerCatToNewznab(catStr), Link = link, - Comments = comments, + Details = details, Guid = link, PublishDate = pubDateUtc.ToLocalTime(), Size = size, diff --git a/src/Jackett.Common/Indexers/PixelHD.cs b/src/Jackett.Common/Indexers/PixelHD.cs index 4910edded..fe19367f2 100644 --- a/src/Jackett.Common/Indexers/PixelHD.cs +++ b/src/Jackett.Common/Indexers/PixelHD.cs @@ -182,11 +182,12 @@ namespace Jackett.Common.Indexers var Leechers = Row.QuerySelector("td:nth-child(8)"); var link = new Uri(SiteLink + Row.QuerySelector("a[href^=\"torrents.php?action=download\"]").GetAttribute("href")); var seeders = ParseUtil.CoerceInt(Seeders.TextContent); - var comments = new Uri(SiteLink + title.GetAttribute("href")); + var details = new Uri(SiteLink + title.GetAttribute("href")); var size = ReleaseInfo.GetBytes(Size.TextContent); var leechers = ParseUtil.CoerceInt(Leechers.TextContent); var grabs = ParseUtil.CoerceLong(Grabs.TextContent); var publishDate = DateTimeUtil.FromTimeAgo(added.TextContent); + var release = new ReleaseInfo { MinimumRatio = 1, @@ -194,7 +195,7 @@ namespace Jackett.Common.Indexers Title = group + " " + title.TextContent, Category = new List { TorznabCatType.MoviesHD.ID }, Link = link, - Comments = comments, + Details = details, Guid = link, Size = size, Seeders = seeders, diff --git a/src/Jackett.Common/Indexers/PolishTracker.cs b/src/Jackett.Common/Indexers/PolishTracker.cs index 38e602acb..49d243079 100644 --- a/src/Jackett.Common/Indexers/PolishTracker.cs +++ b/src/Jackett.Common/Indexers/PolishTracker.cs @@ -134,7 +134,7 @@ namespace Jackett.Common.Indexers foreach (var torrent in torrents) { var torrentId = (long)torrent.id; - var comments = new Uri(SiteLink + "torrents/" + torrentId); + var details = new Uri(SiteLink + "torrents/" + torrentId); var link = new Uri(SiteLink + "download/" + torrentId); var publishDate = DateTime.Parse(torrent.added.ToString()); var imdbId = ParseUtil.GetImdbID(torrent.imdb_id.ToString()); @@ -161,8 +161,8 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo { Title = torrent.name.ToString(), - Comments = comments, - Guid = comments, + Details = details, + Guid = details, Link = link, PublishDate = publishDate, Category = MapTrackerCatToNewznab(torrent.category.ToString()), diff --git a/src/Jackett.Common/Indexers/PornoLab.cs b/src/Jackett.Common/Indexers/PornoLab.cs index 0216e9e86..ea3f26c78 100644 --- a/src/Jackett.Common/Indexers/PornoLab.cs +++ b/src/Jackett.Common/Indexers/PornoLab.cs @@ -304,7 +304,7 @@ namespace Jackett.Common.Indexers MinimumRatio = 1, MinimumSeedTime = 0, Title = title, - Comments = link, + Details = link, Description = qForumLink.TextContent, Link = link, Guid = link, diff --git a/src/Jackett.Common/Indexers/PreToMe.cs b/src/Jackett.Common/Indexers/PreToMe.cs index 35f665fa5..f6586f062 100644 --- a/src/Jackett.Common/Indexers/PreToMe.cs +++ b/src/Jackett.Common/Indexers/PreToMe.cs @@ -231,7 +231,7 @@ namespace Jackett.Common.Indexers if (!query.MatchQueryStringAND(title)) continue; // we have to skip bad titles due to tags + any word search - var comments = new Uri(SiteLink + qLink.GetAttribute("href")); + var details = new Uri(SiteLink + qLink.GetAttribute("href")); var link = new Uri(SiteLink + row.Children[2].QuerySelector("a").GetAttribute("href")); var dateStr = Regex.Replace(row.Children[5].InnerHtml, @"\", " "); var publishDate = DateTimeUtil.FromTimeAgo(dateStr); @@ -245,8 +245,8 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo { Title = title, - Comments = comments, - Guid = comments, + Details = details, + Guid = details, Link = link, PublishDate = publishDate, Size = size, diff --git a/src/Jackett.Common/Indexers/RarBG.cs b/src/Jackett.Common/Indexers/RarBG.cs index c37396307..b0634b816 100644 --- a/src/Jackett.Common/Indexers/RarBG.cs +++ b/src/Jackett.Common/Indexers/RarBG.cs @@ -168,7 +168,7 @@ namespace Jackett.Common.Indexers var infoHash = magnetStr.Split(':')[3].Split('&')[0]; // append app_id to prevent api server returning 403 forbidden - var comments = new Uri(item.Value("info_page") + "&app_id=" + _appId); + var details = new Uri(item.Value("info_page") + "&app_id=" + _appId); // ex: 2015-08-16 21:25:08 +0000 var dateStr = item.Value("pubdate").Replace(" +0000", ""); @@ -185,7 +185,7 @@ namespace Jackett.Common.Indexers Category = MapTrackerCatDescToNewznab(item.Value("category")), MagnetUri = magnetUri, InfoHash = infoHash, - Comments = comments, + Details = details, PublishDate = publishDate, Guid = magnetUri, Seeders = seeders, diff --git a/src/Jackett.Common/Indexers/RevolutionTT.cs b/src/Jackett.Common/Indexers/RevolutionTT.cs index db198c72e..1a4417b8d 100644 --- a/src/Jackett.Common/Indexers/RevolutionTT.cs +++ b/src/Jackett.Common/Indexers/RevolutionTT.cs @@ -153,9 +153,9 @@ namespace Jackett.Common.Indexers foreach (var row in rows.Skip(1)) { - var qComments = row.QuerySelector(".br_right > a"); - var comments = new Uri(SiteLink + qComments.GetAttribute("href")); - var title = qComments.QuerySelector("b").TextContent; + var qDetails = row.QuerySelector(".br_right > a"); + var details = new Uri(SiteLink + qDetails.GetAttribute("href")); + var title = qDetails.QuerySelector("b").TextContent; var qLink = row.QuerySelector("td:nth-child(4) > a"); if (qLink == null) @@ -179,8 +179,8 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo { - Comments = comments, - Guid = comments, + Details = details, + Guid = details, Title = title, Link = link, PublishDate = publishDate, diff --git a/src/Jackett.Common/Indexers/RuTracker.cs b/src/Jackett.Common/Indexers/RuTracker.cs index 10623e95e..a056d8e37 100644 --- a/src/Jackett.Common/Indexers/RuTracker.cs +++ b/src/Jackett.Common/Indexers/RuTracker.cs @@ -1448,7 +1448,7 @@ namespace Jackett.Common.Indexers continue; var qDetailsLink = row.QuerySelector("td.t-title-col > div.t-title > a.tLink"); var qSize = row.QuerySelector("td.tor-size"); - var comments = new Uri(SiteLink + "forum/" + qDetailsLink.GetAttribute("href")); + var details = new Uri(SiteLink + "forum/" + qDetailsLink.GetAttribute("href")); var seeders = 0; var qSeeders = row.QuerySelector("td:nth-child(7)"); if (qSeeders != null && !qSeeders.TextContent.Contains("дн")) @@ -1470,9 +1470,9 @@ namespace Jackett.Common.Indexers MinimumRatio = 1, MinimumSeedTime = 0, Title = qDetailsLink.TextContent, - Comments = comments, + Details = details, Link = link, - Guid = comments, + Guid = details, Size = size, Seeders = seeders, Peers = leechers + seeders, diff --git a/src/Jackett.Common/Indexers/SceneHD.cs b/src/Jackett.Common/Indexers/SceneHD.cs index dd78848c2..3359c5109 100644 --- a/src/Jackett.Common/Indexers/SceneHD.cs +++ b/src/Jackett.Common/Indexers/SceneHD.cs @@ -20,7 +20,7 @@ namespace Jackett.Common.Indexers public class SceneHD : BaseWebIndexer { private string SearchUrl => SiteLink + "browse.php?"; - private string CommentsUrl => SiteLink + "details.php?"; + private string DetailsUrl => SiteLink + "details.php?"; private string DownloadUrl => SiteLink + "download.php?"; private new ConfigurationDataPasskey configData => (ConfigurationDataPasskey)base.configData; @@ -117,7 +117,7 @@ namespace Jackett.Common.Indexers continue; var id = item.Value("id"); - var comments = new Uri(CommentsUrl + "id=" + id); + var details = new Uri(DetailsUrl + "id=" + id); var link = new Uri(DownloadUrl + "id=" + id + "&passkey=" + passkey); var publishDate = DateTime.ParseExact(item.Value("added"), "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture); var dlVolumeFactor = item.Value("is_freeleech") == 1 ? 0 : 1; @@ -126,8 +126,8 @@ namespace Jackett.Common.Indexers { Title = title, Link = link, - Comments = comments, - Guid = comments, + Details = details, + Guid = details, Category = MapTrackerCatToNewznab(item.Value("category")), PublishDate = publishDate, Size = item.Value("size"), diff --git a/src/Jackett.Common/Indexers/SceneTime.cs b/src/Jackett.Common/Indexers/SceneTime.cs index 1bb98b43e..90b4c3dda 100644 --- a/src/Jackett.Common/Indexers/SceneTime.cs +++ b/src/Jackett.Common/Indexers/SceneTime.cs @@ -183,8 +183,8 @@ namespace Jackett.Common.Indexers if (!query.MatchQueryStringAND(release.Title)) continue; - release.Comments = new Uri(SiteLink + "/" + qLink.GetAttribute("href")); - release.Guid = release.Comments; + release.Details = new Uri(SiteLink + "/" + qLink.GetAttribute("href")); + release.Guid = release.Details; var torrentId = qLink.GetAttribute("href").Split('=')[1]; release.Link = new Uri(string.Format(DownloadUrl, torrentId)); diff --git a/src/Jackett.Common/Indexers/Shazbat.cs b/src/Jackett.Common/Indexers/Shazbat.cs index 0ca710d6c..c5f1ea3cf 100644 --- a/src/Jackett.Common/Indexers/Shazbat.cs +++ b/src/Jackett.Common/Indexers/Shazbat.cs @@ -146,7 +146,7 @@ namespace Jackett.Common.Indexers release.Link = new Uri(SiteLink + qLink.GetAttribute("href")); release.Guid = release.Link; var qLinkComm = row.QuerySelector("td:nth-of-type(5) a.internal"); - release.Comments = new Uri(SiteLink + qLinkComm.GetAttribute("href")); + release.Details = new Uri(SiteLink + qLinkComm.GetAttribute("href")); var dateString = row.QuerySelector(".datetime")?.GetAttribute("data-timestamp"); if (dateString != null) release.PublishDate = DateTimeUtil.UnixTimestampToDateTime(ParseUtil.CoerceDouble(dateString)); diff --git a/src/Jackett.Common/Indexers/ShizaProject.cs b/src/Jackett.Common/Indexers/ShizaProject.cs index 8fe636356..c8d7e0669 100644 --- a/src/Jackett.Common/Indexers/ShizaProject.cs +++ b/src/Jackett.Common/Indexers/ShizaProject.cs @@ -155,7 +155,7 @@ namespace Jackett.Common.Indexers { Title = composeBaseTitle(r), Poster = new Uri(SiteLink + r.QuerySelector("a[data-fancybox]").Attributes["href"].Value), - Comments = uri, + Details = uri, DownloadVolumeFactor = 0, UploadVolumeFactor = 1, Category = new[]{ TorznabCatType.TVAnime.ID } diff --git a/src/Jackett.Common/Indexers/ShowRSS.cs b/src/Jackett.Common/Indexers/ShowRSS.cs index 35f01b52d..1decb79e5 100644 --- a/src/Jackett.Common/Indexers/ShowRSS.cs +++ b/src/Jackett.Common/Indexers/ShowRSS.cs @@ -89,12 +89,12 @@ namespace Jackett.Common.Indexers var magnetUri = new Uri(node.SelectSingleNode("link")?.InnerText); var publishDate = DateTime.Parse(node.SelectSingleNode("pubDate").InnerText, CultureInfo.InvariantCulture); var infoHash = node.SelectSingleNode(".//*[local-name()='info_hash']").InnerText; - var commentsUri = new Uri(BrowseUrl + node.SelectSingleNode(".//*[local-name()='show_id']").InnerText); + var details = new Uri(BrowseUrl + node.SelectSingleNode(".//*[local-name()='show_id']").InnerText); var release = new ReleaseInfo { Title = title, - Comments = commentsUri, + Details = details, Category = new List { category }, Guid = magnetUri, PublishDate = publishDate, diff --git a/src/Jackett.Common/Indexers/SolidTorrents.cs b/src/Jackett.Common/Indexers/SolidTorrents.cs index 122b242c0..8c85a0316 100644 --- a/src/Jackett.Common/Indexers/SolidTorrents.cs +++ b/src/Jackett.Common/Indexers/SolidTorrents.cs @@ -164,16 +164,17 @@ namespace Jackett.Common.Indexers private ReleaseInfo MakeRelease(JToken torrent) { // https://solidtorrents.net/view/5e10885d651df640a70ee826 - var comments = new Uri(SiteLink + "view/" + (string)torrent["_id"]); + var details = new Uri(SiteLink + "view/" + (string)torrent["_id"]); var swarm = torrent["swarm"]; var seeders = (int)swarm["seeders"]; var publishDate = torrent["imported"] != null ? DateTime.Parse((string)torrent["imported"]) : DateTime.Now; var magnetUri = new Uri((string)torrent["magnet"]); + return new ReleaseInfo { Title = (string)torrent["title"], - Comments = comments, - Guid = comments, + Details = details, + Guid = details, PublishDate = publishDate, Category = MapTrackerCatToNewznab((string)torrent["category"]), Size = (long)torrent["size"], diff --git a/src/Jackett.Common/Indexers/SpeedCD.cs b/src/Jackett.Common/Indexers/SpeedCD.cs index 16c0e4e88..569cef905 100644 --- a/src/Jackett.Common/Indexers/SpeedCD.cs +++ b/src/Jackett.Common/Indexers/SpeedCD.cs @@ -184,7 +184,7 @@ namespace Jackett.Common.Indexers var title = row.QuerySelector("td[class='lft'] > div > a").TextContent.Trim(); var link = new Uri(SiteLink + row.QuerySelector("img[title='Download']").ParentElement.GetAttribute("href").TrimStart('/')); - var comments = new Uri(SiteLink + row.QuerySelector("td[class='lft'] > div > a").GetAttribute("href").TrimStart('/')); + var details = new Uri(SiteLink + row.QuerySelector("td[class='lft'] > div > a").GetAttribute("href").TrimStart('/')); var size = ReleaseInfo.GetBytes(cells[5].TextContent); var grabs = ParseUtil.CoerceInt(cells[6].TextContent); var seeders = ParseUtil.CoerceInt(cells[7].TextContent); @@ -201,7 +201,7 @@ namespace Jackett.Common.Indexers Title = title, Link = link, Guid = link, - Comments = comments, + Details = details, PublishDate = publishDate, Category = MapTrackerCatToNewznab(cat), Size = size, diff --git a/src/Jackett.Common/Indexers/SuperBits.cs b/src/Jackett.Common/Indexers/SuperBits.cs index 24832c7e4..ab63b2dc1 100644 --- a/src/Jackett.Common/Indexers/SuperBits.cs +++ b/src/Jackett.Common/Indexers/SuperBits.cs @@ -166,8 +166,8 @@ namespace Jackett.Common.Indexers release.Files = row.numfiles; release.Grabs = row.times_completed; - release.Comments = new Uri(SiteLink + "torrent/" + row.id.ToString() + "/"); - release.Guid = release.Comments; + release.Details = new Uri(SiteLink + "torrent/" + row.id.ToString() + "/"); + release.Guid = release.Details; release.Link = new Uri(SiteLink + "api/v1/torrents/download/" + row.id.ToString()); if (row.frileech == 1) diff --git a/src/Jackett.Common/Indexers/TVVault.cs b/src/Jackett.Common/Indexers/TVVault.cs index bdc534be5..360bf5ea6 100644 --- a/src/Jackett.Common/Indexers/TVVault.cs +++ b/src/Jackett.Common/Indexers/TVVault.cs @@ -118,7 +118,7 @@ namespace Jackett.Common.Indexers var description = qDetailsLink.NextSibling.TextContent.Trim(); title += " " + description; - var comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); + var details = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); var torrentId = qDetailsLink.GetAttribute("href").Split('=').Last(); var link = new Uri(SiteLink + "torrents.php?action=download&id=" + torrentId); @@ -142,7 +142,7 @@ namespace Jackett.Common.Indexers PublishDate = publishDate, Category = category, Link = link, - Comments = comments, + Details = details, Guid = link, Seeders = seeders, Peers = leechers + seeders, diff --git a/src/Jackett.Common/Indexers/ThePirateBay.cs b/src/Jackett.Common/Indexers/ThePirateBay.cs index a7226091f..a6133f290 100644 --- a/src/Jackett.Common/Indexers/ThePirateBay.cs +++ b/src/Jackett.Common/Indexers/ThePirateBay.cs @@ -213,14 +213,14 @@ namespace Jackett.Common.Indexers private ReleaseInfo CreateReleaseInfo(QueryResponseItem item) { - var commentsUri = item.Id == 0 ? null : new Uri($"{SiteLink}description.php?id={item.Id}"); + var details = item.Id == 0 ? null : new Uri($"{SiteLink}description.php?id={item.Id}"); var imdbId = string.IsNullOrEmpty(item.Imdb) ? null : ParseUtil.GetImdbID(item.Imdb); return new ReleaseInfo { Title = item.Name, Category = MapTrackerCatToNewznab(item.Category.ToString()), - Guid = commentsUri, - Comments = commentsUri, + Guid = details, + Details = details, InfoHash = item.InfoHash, // magnet link is auto generated from infohash PublishDate = DateTimeUtil.UnixTimestampToDateTime(item.Added), Seeders = item.Seeders, diff --git a/src/Jackett.Common/Indexers/Toloka.cs b/src/Jackett.Common/Indexers/Toloka.cs index d438f0c45..4e8a2a86e 100644 --- a/src/Jackett.Common/Indexers/Toloka.cs +++ b/src/Jackett.Common/Indexers/Toloka.cs @@ -279,7 +279,7 @@ namespace Jackett.Common.Indexers var timestr = Row.QuerySelector("td:nth-child(13)").TextContent; var forum = Row.QuerySelector("td:nth-child(2) > a"); var forumid = forum.GetAttribute("href").Split('=')[1]; - var comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); + var details = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); var link = new Uri(SiteLink + qDownloadLink.GetAttribute("href")); var size = ReleaseInfo.GetBytes(qSize.TextContent); var leechers = ParseUtil.CoerceInt(Row.QuerySelector("td:nth-child(11) > b").TextContent); @@ -289,9 +289,9 @@ namespace Jackett.Common.Indexers MinimumRatio = 1, MinimumSeedTime = 0, Title = qDetailsLink.TextContent, - Comments = comments, + Details = details, Link = link, - Guid = comments, + Guid = details, Size = size, Seeders = seeders, Peers = leechers + seeders, diff --git a/src/Jackett.Common/Indexers/TorrenTech.cs b/src/Jackett.Common/Indexers/TorrenTech.cs index df06c2357..5cb42cb12 100644 --- a/src/Jackett.Common/Indexers/TorrenTech.cs +++ b/src/Jackett.Common/Indexers/TorrenTech.cs @@ -139,14 +139,14 @@ namespace Jackett.Common.Indexers var qDetailsLink = Row.QuerySelector("a[onmouseover][href*=\"index.php?showtopic=\"]"); release.Title = qDetailsLink.TextContent; - release.Comments = new Uri(qDetailsLink.GetAttribute("href")); - release.Link = release.Comments; + release.Details = new Uri(qDetailsLink.GetAttribute("href")); + release.Link = release.Details; release.Guid = release.Link; release.DownloadVolumeFactor = 1; release.UploadVolumeFactor = 1; - var id = QueryHelpers.ParseQuery(release.Comments.Query)["showtopic"].FirstOrDefault(); + var id = QueryHelpers.ParseQuery(release.Details.Query)["showtopic"].FirstOrDefault(); var desc = Row.QuerySelector("span.desc"); var forange = desc.QuerySelector("font.forange"); diff --git a/src/Jackett.Common/Indexers/TorrentBytes.cs b/src/Jackett.Common/Indexers/TorrentBytes.cs index ac4518047..7e67c0137 100644 --- a/src/Jackett.Common/Indexers/TorrentBytes.cs +++ b/src/Jackett.Common/Indexers/TorrentBytes.cs @@ -156,7 +156,7 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo(); var link = row.QuerySelector("td:nth-of-type(2) a:nth-of-type(2)"); release.Guid = new Uri(SiteLink + link.GetAttribute("href")); - release.Comments = release.Guid; + release.Details = release.Guid; release.Title = link.GetAttribute("title"); // There isn't a title attribute if the release name isn't truncated. diff --git a/src/Jackett.Common/Indexers/TorrentDay.cs b/src/Jackett.Common/Indexers/TorrentDay.cs index 3734d43e6..28773932e 100644 --- a/src/Jackett.Common/Indexers/TorrentDay.cs +++ b/src/Jackett.Common/Indexers/TorrentDay.cs @@ -188,7 +188,7 @@ namespace Jackett.Common.Indexers if ((!query.IsImdbQuery || !TorznabCaps.MovieSearchImdbAvailable) && !query.MatchQueryStringAND(title)) continue; var torrentId = (long)row.t; - var comments = new Uri(SiteLink + "details.php?id=" + torrentId); + var details = new Uri(SiteLink + "details.php?id=" + torrentId); var seeders = (int)row.seeders; var imdbId = (string)row["imdb-id"]; var downloadMultiplier = (double?)row["download-multiplier"] ?? 1; @@ -199,8 +199,8 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo { Title = title, - Comments = comments, - Guid = comments, + Details = details, + Guid = details, Link = link, PublishDate = publishDate, Category = MapTrackerCatToNewznab(row.c.ToString()), diff --git a/src/Jackett.Common/Indexers/TorrentHeaven.cs b/src/Jackett.Common/Indexers/TorrentHeaven.cs index 2a016a9d4..eb8bff40a 100644 --- a/src/Jackett.Common/Indexers/TorrentHeaven.cs +++ b/src/Jackett.Common/Indexers/TorrentHeaven.cs @@ -233,7 +233,7 @@ namespace Jackett.Common.Indexers else downloadFactor = 1; var title = titleRegexp.Match(qDetailsLink.GetAttribute("onmouseover")).Groups[1].Value; - var comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); + var details = new Uri(SiteLink + qDetailsLink.GetAttribute("href")); var size = ReleaseInfo.GetBytes(qColumn1[1].TextContent); var seeders = ParseUtil.CoerceInt(qColumn2[2].TextContent); var leechers = ParseUtil.CoerceInt(qColumn1[3].TextContent); @@ -246,7 +246,7 @@ namespace Jackett.Common.Indexers MinimumSeedTime = 0, Title = title, Category = MapTrackerCatToNewznab(catStr), - Comments = comments, + Details = details, Link = link, Guid = link, Size = size, diff --git a/src/Jackett.Common/Indexers/TorrentLeech.cs b/src/Jackett.Common/Indexers/TorrentLeech.cs index 7b6e600b4..06a70755e 100644 --- a/src/Jackett.Common/Indexers/TorrentLeech.cs +++ b/src/Jackett.Common/Indexers/TorrentLeech.cs @@ -180,7 +180,7 @@ namespace Jackett.Common.Indexers continue; var torrentId = row["fid"].ToString(); - var comments = new Uri(SiteLink + "torrent/" + torrentId); + var details = new Uri(SiteLink + "torrent/" + torrentId); var link = new Uri(SiteLink + "download/" + torrentId + "/" + row["filename"]); var publishDate = DateTime.ParseExact(row["addedTimestamp"].ToString(), "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture); var seeders = (int)row["seeders"]; @@ -192,8 +192,8 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo { Title = title, - Comments = comments, - Guid = comments, + Details = details, + Guid = details, Link = link, PublishDate = publishDate, Category = MapTrackerCatToNewznab(row["categoryID"].ToString()), diff --git a/src/Jackett.Common/Indexers/TorrentMafya.cs b/src/Jackett.Common/Indexers/TorrentMafya.cs index b89ad96ec..ac0d3211a 100644 --- a/src/Jackett.Common/Indexers/TorrentMafya.cs +++ b/src/Jackett.Common/Indexers/TorrentMafya.cs @@ -138,7 +138,7 @@ namespace Jackett.Common.Indexers return new ReleaseInfo { Title = firstColumn.QuerySelector("a")?.TextContent, - Comments = detailsLink, + Details = detailsLink, Guid = detailsLink, Link = string.IsNullOrWhiteSpace(fileLink) ? null : new Uri(fileLink), MagnetUri = string.IsNullOrWhiteSpace(magnetLink) ? null : new Uri(magnetLink), diff --git a/src/Jackett.Common/Indexers/TorrentNetwork.cs b/src/Jackett.Common/Indexers/TorrentNetwork.cs index 68896e783..457d13eb0 100644 --- a/src/Jackett.Common/Indexers/TorrentNetwork.cs +++ b/src/Jackett.Common/Indexers/TorrentNetwork.cs @@ -221,7 +221,7 @@ namespace Jackett.Common.Indexers foreach (JArray torrent in data) { var torrentID = (long)torrent[2]; - var comments = new Uri(SiteLink + "torrent/" + torrentID); + var details = new Uri(SiteLink + "torrent/" + torrentID); //var preDelaySeconds = (long)torrent[4]; var seeders = (int)torrent[6]; //var imdbRating = (double)torrent[8] / 10; @@ -249,8 +249,8 @@ namespace Jackett.Common.Indexers MinimumSeedTime = 172800, // 48 hours Category = MapTrackerCatToNewznab(torrent[0].ToString()), Title = torrent[1].ToString(), - Comments = comments, - Guid = comments, + Details = details, + Guid = details, Link = link, PublishDate = publishDate, Size = (long)torrent[5], diff --git a/src/Jackett.Common/Indexers/TorrentSeeds.cs b/src/Jackett.Common/Indexers/TorrentSeeds.cs index ffe8d4105..4843ad14b 100644 --- a/src/Jackett.Common/Indexers/TorrentSeeds.cs +++ b/src/Jackett.Common/Indexers/TorrentSeeds.cs @@ -185,8 +185,8 @@ namespace Jackett.Common.Indexers var qDlLink = row.QuerySelector("a[href^=\"/download.php?torrent=\"]"); release.Link = new Uri(SiteLink + qDlLink.GetAttribute("href").TrimStart('/')); - release.Comments = new Uri(SiteLink + qDetailsLink.GetAttribute("href").TrimStart('/')); - release.Guid = release.Comments; + release.Details = new Uri(SiteLink + qDetailsLink.GetAttribute("href").TrimStart('/')); + release.Guid = release.Details; var qColumns = row.QuerySelectorAll("td"); release.Files = ParseUtil.CoerceInt(qColumns[3].TextContent); diff --git a/src/Jackett.Common/Indexers/TorrentSyndikat.cs b/src/Jackett.Common/Indexers/TorrentSyndikat.cs index 7f3265925..db71bca02 100644 --- a/src/Jackett.Common/Indexers/TorrentSyndikat.cs +++ b/src/Jackett.Common/Indexers/TorrentSyndikat.cs @@ -163,7 +163,7 @@ namespace Jackett.Common.Indexers var dateTime = new DateTime(1970,1,1,0,0,0,0,DateTimeKind.Utc); var id = row.Value("id"); - var comments = new Uri(SiteLink + "details.php?id=" + id); + var details = new Uri(SiteLink + "details.php?id=" + id); var seeders = row.Value("seeders"); var release = new ReleaseInfo @@ -172,8 +172,8 @@ namespace Jackett.Common.Indexers MinimumSeedTime = 96 * 60 * 60, DownloadVolumeFactor = 1, UploadVolumeFactor = 1, - Guid = comments, - Comments = comments, + Guid = details, + Details = details, Link = new Uri(SiteLink + "download.php?id=" + id), Title = row.Value("name"), Category = MapTrackerCatToNewznab(row.Value("category").ToString()), diff --git a/src/Jackett.Common/Indexers/TorrentsCSV.cs b/src/Jackett.Common/Indexers/TorrentsCSV.cs index 8a77b1980..61a5f2d59 100644 --- a/src/Jackett.Common/Indexers/TorrentsCSV.cs +++ b/src/Jackett.Common/Indexers/TorrentsCSV.cs @@ -73,7 +73,7 @@ namespace Jackett.Common.Indexers { Title = "[NOT IMPLEMENTED] Empty search is unsupported in this indexer", Guid = new Uri(SiteLink), - Comments = new Uri(SiteLink), + Details = new Uri(SiteLink), MagnetUri = new Uri("magnet:?xt=urn:btih:3333333333333333333333333333333333333333"), // unknown torrent Category = new List { TorznabCatType.Other.ID }, PublishDate = new DateTime(), @@ -121,7 +121,7 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo { Title = title, - Comments = new Uri(SiteLink), // there is no comments or details link + Details = new Uri(SiteLink), // there is no details link Guid = new Uri($"magnet:?xt=urn:btih:{infoHash}"), InfoHash = infoHash, // magnet link is auto generated from infohash Category = new List { TorznabCatType.Other.ID }, diff --git a/src/Jackett.Common/Indexers/XSpeeds.cs b/src/Jackett.Common/Indexers/XSpeeds.cs index a87b93ce4..1e624b3f0 100644 --- a/src/Jackett.Common/Indexers/XSpeeds.cs +++ b/src/Jackett.Common/Indexers/XSpeeds.cs @@ -264,7 +264,7 @@ namespace Jackett.Common.Indexers release.Guid = new Uri(row.QuerySelector("td:nth-of-type(3) a").GetAttribute("href")); release.Link = release.Guid; - release.Comments = new Uri(qDetails.GetAttribute("href")); + release.Details = new Uri(qDetails.GetAttribute("href")); //08-08-2015 12:51 release.PublishDate = DateTime.ParseExact( row.QuerySelectorAll("td:nth-of-type(2) div").Last().TextContent.Trim(), "dd-MM-yyyy H:mm", diff --git a/src/Jackett.Common/Indexers/Xthor.cs b/src/Jackett.Common/Indexers/Xthor.cs index 2f1ee93e4..ec58802a3 100644 --- a/src/Jackett.Common/Indexers/Xthor.cs +++ b/src/Jackett.Common/Indexers/Xthor.cs @@ -31,8 +31,7 @@ namespace Jackett.Common.Indexers "https://xthor.to" }; - private string TorrentCommentUrl => TorrentDescriptionUrl; - private string TorrentDescriptionUrl => SiteLink + "details.php?id={id}"; + private string TorrentDetailsUrl => SiteLink + "details.php?id={id}"; private string ReplaceMulti => ConfigData.ReplaceMulti.Value; private bool EnhancedAnime => ConfigData.EnhancedAnime.Value; private bool DevMode => ConfigData.DevMode.Value; @@ -254,8 +253,8 @@ namespace Jackett.Common.Indexers var publishDate = DateTimeUtil.UnixTimestampToDateTime(torrent.added); //TODO replace with download link? - var guid = new Uri(TorrentDescriptionUrl.Replace("{id}", torrent.id.ToString())); - var comments = new Uri(TorrentCommentUrl.Replace("{id}", torrent.id.ToString())); + var guid = new Uri(TorrentDetailsUrl.Replace("{id}", torrent.id.ToString())); + var details = new Uri(TorrentDetailsUrl.Replace("{id}", torrent.id.ToString())); var link = new Uri(torrent.download_link); var release = new ReleaseInfo { @@ -273,7 +272,7 @@ namespace Jackett.Common.Indexers UploadVolumeFactor = 1, DownloadVolumeFactor = (torrent.freeleech == 1 ? 0 : 1), Guid = guid, - Comments = comments, + Details = details, Link = link, TMDb = torrent.tmdb_id }; diff --git a/src/Jackett.Common/Indexers/YTS.cs b/src/Jackett.Common/Indexers/YTS.cs index 7e6ad10ed..3435d8419 100644 --- a/src/Jackett.Common/Indexers/YTS.cs +++ b/src/Jackett.Common/Indexers/YTS.cs @@ -167,7 +167,7 @@ namespace Jackett.Common.Indexers release.DownloadVolumeFactor = 0; release.UploadVolumeFactor = 1; - release.Comments = new Uri(movie_item.Value("url")); + release.Details = new Uri(movie_item.Value("url")); release.Poster = new Uri(movie_item.Value("large_cover_image")); release.Guid = release.Link; diff --git a/src/Jackett.Common/Indexers/ZonaQ.cs b/src/Jackett.Common/Indexers/ZonaQ.cs index 45a4d12be..9752cf21f 100644 --- a/src/Jackett.Common/Indexers/ZonaQ.cs +++ b/src/Jackett.Common/Indexers/ZonaQ.cs @@ -163,9 +163,9 @@ namespace Jackett.Common.Indexers continue; var title = qTitleLink.TextContent.Trim(); - var commentsLink = qTitleLink.GetAttribute("href"); - var comments = new Uri(commentsLink); - var link = new Uri(commentsLink.Replace("/index.php?page=torrent-details&", "/download.php?")); + var detailsStr = qTitleLink.GetAttribute("href"); + var details = new Uri(detailsStr); + var link = new Uri(detailsStr.Replace("/index.php?page=torrent-details&", "/download.php?")); var qPoster = qTitleLink.GetAttribute("title"); var poster = qPoster != null ? new Uri(qPoster) : null; @@ -188,8 +188,8 @@ namespace Jackett.Common.Indexers var release = new ReleaseInfo { Title = title, - Comments = comments, - Guid = comments, + Details = details, + Guid = details, Link = link, PublishDate = publishDate, Poster = poster, diff --git a/src/Jackett.Common/Models/ReleaseInfo.cs b/src/Jackett.Common/Models/ReleaseInfo.cs index 2277b9414..501e5bb6c 100644 --- a/src/Jackett.Common/Models/ReleaseInfo.cs +++ b/src/Jackett.Common/Models/ReleaseInfo.cs @@ -13,7 +13,7 @@ namespace Jackett.Common.Models public string Title { get; set; } public Uri Guid { get; set; } public Uri Link { get; set; } - public Uri Comments { get; set; } + public Uri Details { get; set; } public DateTime PublishDate { get; set; } public ICollection Category { get; set; } public long? Size { get; set; } @@ -51,7 +51,7 @@ namespace Jackett.Common.Models Title = copyFrom.Title; Guid = copyFrom.Guid; Link = copyFrom.Link; - Comments = copyFrom.Comments; + Details = copyFrom.Details; PublishDate = copyFrom.PublishDate; Category = copyFrom.Category; Size = copyFrom.Size; @@ -108,6 +108,6 @@ namespace Jackett.Common.Models public static long BytesFromKB(float kb) => (long)(kb * 1024f); public override string ToString() => - $"[ReleaseInfo: Title={Title}, Guid={Guid}, Link={Link}, Comments={Comments}, PublishDate={PublishDate}, Category={Category}, Size={Size}, Files={Files}, Grabs={Grabs}, Description={Description}, RageID={RageID}, TVDBId={TVDBId}, Imdb={Imdb}, TMDb={TMDb}, Seeders={Seeders}, Peers={Peers}, Poster={Poster}, InfoHash={InfoHash}, MagnetUri={MagnetUri}, MinimumRatio={MinimumRatio}, MinimumSeedTime={MinimumSeedTime}, DownloadVolumeFactor={DownloadVolumeFactor}, UploadVolumeFactor={UploadVolumeFactor}, Gain={Gain}]"; + $"[ReleaseInfo: Title={Title}, Guid={Guid}, Link={Link}, Details={Details}, PublishDate={PublishDate}, Category={Category}, Size={Size}, Files={Files}, Grabs={Grabs}, Description={Description}, RageID={RageID}, TVDBId={TVDBId}, Imdb={Imdb}, TMDb={TMDb}, Seeders={Seeders}, Peers={Peers}, Poster={Poster}, InfoHash={InfoHash}, MagnetUri={MagnetUri}, MinimumRatio={MinimumRatio}, MinimumSeedTime={MinimumSeedTime}, DownloadVolumeFactor={DownloadVolumeFactor}, UploadVolumeFactor={UploadVolumeFactor}, Gain={Gain}]"; } } diff --git a/src/Jackett.Common/Models/ResultPage.cs b/src/Jackett.Common/Models/ResultPage.cs index bd79d90d5..dd084dafd 100644 --- a/src/Jackett.Common/Models/ResultPage.cs +++ b/src/Jackett.Common/Models/ResultPage.cs @@ -84,7 +84,7 @@ namespace Jackett.Common.Models new XElement("title", RemoveInvalidXMLChars(r.Title)), new XElement("guid", r.Guid.AbsoluteUri), // GUID and (Link or Magnet) are mandatory new XElement("jackettindexer", new XAttribute("id", r.Origin.Id), r.Origin.DisplayName), - r.Comments == null ? null : new XElement("comments", r.Comments.AbsoluteUri), + r.Details == null ? null : new XElement("comments", r.Details.AbsoluteUri), r.PublishDate == DateTime.MinValue ? new XElement("pubDate", XmlDateFormat(DateTime.Now)) : new XElement("pubDate", XmlDateFormat(r.PublishDate)), r.Size == null ? null : new XElement("size", r.Size), r.Files == null ? null : new XElement("files", r.Files), diff --git a/src/Jackett.Server/Controllers/ResultsController.cs b/src/Jackett.Server/Controllers/ResultsController.cs index fa381a6f1..12bd4fb5d 100644 --- a/src/Jackett.Server/Controllers/ResultsController.cs +++ b/src/Jackett.Server/Controllers/ResultsController.cs @@ -523,7 +523,7 @@ namespace Jackett.Server.Controllers { release_name = release.Title + "[" + CurrentIndexer.DisplayName + "]", // Suffix the indexer so we can see which tracker we are using in CPS as it just says torrentpotato >.> torrent_id = release.Guid.AbsoluteUri, // GUID and (Link or Magnet) are mandatory - details_url = release.Comments?.AbsoluteUri, + details_url = release.Details?.AbsoluteUri, download_url = (release.Link != null ? release.Link.AbsoluteUri : release.MagnetUri.AbsoluteUri), imdb_id = release.Imdb.HasValue ? ParseUtil.GetFullImdbID("tt" + release.Imdb) : null, freeleech = (release.DownloadVolumeFactor == 0 ? true : false), diff --git a/src/Jackett.Test/Common/Models/ResultPageTests.cs b/src/Jackett.Test/Common/Models/ResultPageTests.cs index ddc2da023..729bbf6a0 100644 --- a/src/Jackett.Test/Common/Models/ResultPageTests.cs +++ b/src/Jackett.Test/Common/Models/ResultPageTests.cs @@ -59,7 +59,7 @@ namespace Jackett.Test.Common.Models Title = text, Guid = link, Link = link, - Comments = link, + Details = link, PublishDate = new DateTime(2020, 09, 22), Description = text, Author = text,