diff --git a/src/Jackett.Common/Definitions/aftershock.yml b/src/Jackett.Common/Definitions/aftershock.yml index 373b9f56a..34e973500 100644 --- a/src/Jackett.Common/Definitions/aftershock.yml +++ b/src/Jackett.Common/Definitions/aftershock.yml @@ -142,7 +142,7 @@ search: attribute: onmouseover filters: - name: regexp - args: "src=(.*?) width=" + args: src=([^\s]+) imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href diff --git a/src/Jackett.Common/Definitions/cartoonchaos.yml b/src/Jackett.Common/Definitions/cartoonchaos.yml index e85f4e37a..4c8b14fa4 100644 --- a/src/Jackett.Common/Definitions/cartoonchaos.yml +++ b/src/Jackett.Common/Definitions/cartoonchaos.yml @@ -129,13 +129,11 @@ search: - name: regexp args: tt(\d+) poster: - selector: td a[href^="index.php?page=torrent-details"] + selector: td a[href^="index.php?page=torrent-details"]:not(a[onmouseover*="torrentimg/nocover.jpg"]) attribute: onmouseover filters: - name: regexp - args: "src=(.+?) width" - - name: replace - args: ["torrentimg/nocover.jpg", ""] + args: src=([^\s]+) size: selector: td:nth-child(10) # two flavours of dates diff --git a/src/Jackett.Common/Definitions/docspedia.yml b/src/Jackett.Common/Definitions/docspedia.yml index 67e670207..4ed0ccba1 100644 --- a/src/Jackett.Common/Definitions/docspedia.yml +++ b/src/Jackett.Common/Definitions/docspedia.yml @@ -121,7 +121,7 @@ search: attribute: onmouseover filters: - name: regexp - args: "src=(.*?) width" + args: src=([^\s]+) files: selector: div.torrenttable:nth-last-child(6) size: diff --git a/src/Jackett.Common/Definitions/kinorun.yml b/src/Jackett.Common/Definitions/kinorun.yml index 3d326b1de..7b6e561f5 100644 --- a/src/Jackett.Common/Definitions/kinorun.yml +++ b/src/Jackett.Common/Definitions/kinorun.yml @@ -143,7 +143,7 @@ search: attribute: onmouseover filters: - name: regexp - args: "src=(.+?) width" + args: src=([^\s]+) date: selector: td:nth-child(2) i filters: diff --git a/src/Jackett.Common/Definitions/libranet.yml b/src/Jackett.Common/Definitions/libranet.yml index 781f1eef3..0c9759887 100644 --- a/src/Jackett.Common/Definitions/libranet.yml +++ b/src/Jackett.Common/Definitions/libranet.yml @@ -89,7 +89,7 @@ search: attribute: onmouseover filters: - name: regexp - args: "src=(.*?) width" + args: src=([^\s]+) date: selector: td:nth-last-child(7) filters: diff --git a/src/Jackett.Common/Definitions/mnv.yml b/src/Jackett.Common/Definitions/mnv.yml index b670d8456..2eaeda010 100644 --- a/src/Jackett.Common/Definitions/mnv.yml +++ b/src/Jackett.Common/Definitions/mnv.yml @@ -126,7 +126,7 @@ search: attribute: onMouseover filters: - name: regexp - args: "src=(.*?) width" + args: src=([^\s]+) date: selector: td.tablea > table > tbody > tr:nth-child(2) > td:nth-child(2) > b filters: diff --git a/src/Jackett.Common/Definitions/movietorrentz.yml b/src/Jackett.Common/Definitions/movietorrentz.yml index 1599159a1..13638c311 100644 --- a/src/Jackett.Common/Definitions/movietorrentz.yml +++ b/src/Jackett.Common/Definitions/movietorrentz.yml @@ -107,13 +107,11 @@ search: selector: a[href^="download.php?id="] attribute: href poster: - selector: a[href^="torrents-details.php?id="] + selector: a[href^="torrents-details.php?id="]:not(a[onmouseover*="images/nocover.jpg"]) attribute: onmouseover filters: - name: regexp - args: "src=(.+?) width" - - name: replace - args: ["images/nocover.jpg", ""] + args: src=([^\s]+) imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href diff --git a/src/Jackett.Common/Definitions/p2pbg.yml b/src/Jackett.Common/Definitions/p2pbg.yml index 15fd53e18..282b71a64 100644 --- a/src/Jackett.Common/Definitions/p2pbg.yml +++ b/src/Jackett.Common/Definitions/p2pbg.yml @@ -165,7 +165,7 @@ search: attribute: onmouseover filters: - name: regexp - args: "src=(.+?) width=" + args: src=([^\s]+) # two flavours date_day: # Yesterday diff --git a/src/Jackett.Common/Definitions/punkshorror.yml b/src/Jackett.Common/Definitions/punkshorror.yml index dd25ff279..7d3adf547 100644 --- a/src/Jackett.Common/Definitions/punkshorror.yml +++ b/src/Jackett.Common/Definitions/punkshorror.yml @@ -144,7 +144,7 @@ search: attribute: onmouseover filters: - name: regexp - args: "src=(.*?) width" + args: src=([^\s]+) size: selector: td:nth-child(7) grabs: diff --git a/src/Jackett.Common/Definitions/seedoff.yml b/src/Jackett.Common/Definitions/seedoff.yml index 32cb69e30..a7257744f 100644 --- a/src/Jackett.Common/Definitions/seedoff.yml +++ b/src/Jackett.Common/Definitions/seedoff.yml @@ -270,7 +270,7 @@ search: attribute: onmouseover filters: - name: regexp - args: "src=(.*?) width" + args: src=([^\s]+) date: selector: td:nth-last-child(4) filters: diff --git a/src/Jackett.Common/Definitions/speedtorrentreloaded.yml b/src/Jackett.Common/Definitions/speedtorrentreloaded.yml index 07568534d..337addc66 100644 --- a/src/Jackett.Common/Definitions/speedtorrentreloaded.yml +++ b/src/Jackett.Common/Definitions/speedtorrentreloaded.yml @@ -131,7 +131,7 @@ search: attribute: onmouseover filters: - name: regexp - args: "