diff --git a/src/Jackett.Common/Definitions/animeclipse.yml b/src/Jackett.Common/Definitions/animeclipse.yml index fce15dd0c..bb9032190 100644 --- a/src/Jackett.Common/Definitions/animeclipse.yml +++ b/src/Jackett.Common/Definitions/animeclipse.yml @@ -79,9 +79,6 @@ search: args: "02/01/2006 15:04:05 -07:00" grabs: selector: td:contains("[Completed:") > span.torrentInfoData - filters: - - name: replace - args: ["---", "0"] seeders: selector: td:contains("Seeders") > span.torrentInfoData leechers: diff --git a/src/Jackett.Common/Definitions/dmhy.yml b/src/Jackett.Common/Definitions/dmhy.yml index 4246fff0f..fbbef1ca4 100644 --- a/src/Jackett.Common/Definitions/dmhy.yml +++ b/src/Jackett.Common/Definitions/dmhy.yml @@ -86,19 +86,10 @@ search: selector: td:nth-child(5) seeders: selector: td:nth-child(6) - filters: - - name: replace - args: ["-", "0"] leechers: selector: td:nth-child(7) - filters: - - name: replace - args: ["-", "0"] grabs: selector: td:nth-child(8) - filters: - - name: replace - args: ["-", "0"] downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/eztv.yml b/src/Jackett.Common/Definitions/eztv.yml index efea03887..2ca109200 100644 --- a/src/Jackett.Common/Definitions/eztv.yml +++ b/src/Jackett.Common/Definitions/eztv.yml @@ -100,9 +100,8 @@ search: args: " ago" seeders: selector: td:nth-child(6) - filters: - - name: replace - args: ["-", "0"] + leechers: + text: 0 downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/fantasticheaven.yml b/src/Jackett.Common/Definitions/fantasticheaven.yml index 5fa42cf70..533eb4ed2 100644 --- a/src/Jackett.Common/Definitions/fantasticheaven.yml +++ b/src/Jackett.Common/Definitions/fantasticheaven.yml @@ -172,9 +172,6 @@ search: attribute: href grabs: selector: div.selection_unter_ae - filters: - - name: replace - args: [" x", ""] size: selector: div.selection_unter_ad seeders: diff --git a/src/Jackett.Common/Definitions/ibit.yml b/src/Jackett.Common/Definitions/ibit.yml index 35aeac8e1..5fc14f451 100644 --- a/src/Jackett.Common/Definitions/ibit.yml +++ b/src/Jackett.Common/Definitions/ibit.yml @@ -89,21 +89,10 @@ search: - name: timeago size: selector: td:nth-child(5) - filters: - - name: replace - args: ["-", "0 B"] seeders: selector: td:nth-child(6) - filters: - - name: replace - args: [",", ""] - - name: replace - args: ["-", "0"] leechers: selector: td:nth-child(7) - filters: - - name: replace - args: [",", ""] downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/legittorrents.yml b/src/Jackett.Common/Definitions/legittorrents.yml index 833ad2db7..2567e4ddc 100644 --- a/src/Jackett.Common/Definitions/legittorrents.yml +++ b/src/Jackett.Common/Definitions/legittorrents.yml @@ -92,9 +92,6 @@ search: selector: td:nth-of-type(6) grabs: selector: td:nth-of-type(7) - filters: - - name: replace - args: ["---", "0"] downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/linuxtracker.yml b/src/Jackett.Common/Definitions/linuxtracker.yml index fefbbb211..90baa10b3 100644 --- a/src/Jackett.Common/Definitions/linuxtracker.yml +++ b/src/Jackett.Common/Definitions/linuxtracker.yml @@ -377,9 +377,6 @@ search: grabs: selector: td:nth-child(2) > table > tbody > tr:nth-child(5) > td remove: strong - filters: - - name: replace - args: ["---", "0"] cat: selector: a[href^="index.php?page=torrents&category="] attribute: href diff --git a/src/Jackett.Common/Definitions/p2pbg.yml b/src/Jackett.Common/Definitions/p2pbg.yml index a2aece052..af9145466 100644 --- a/src/Jackett.Common/Definitions/p2pbg.yml +++ b/src/Jackett.Common/Definitions/p2pbg.yml @@ -184,9 +184,6 @@ search: selector: td:nth-child(9) grabs: selector: td:nth-child(10) - filters: - - name: replace - args: ["---", "0"] downloadvolumefactor: text: 1 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/rockbox.yml b/src/Jackett.Common/Definitions/rockbox.yml index 20fa82036..fe46e28b3 100644 --- a/src/Jackett.Common/Definitions/rockbox.yml +++ b/src/Jackett.Common/Definitions/rockbox.yml @@ -103,9 +103,6 @@ search: selector: td:nth-child(10) grabs: selector: td:nth-child(11) - filters: - - name: replace - args: ["---", "0"] downloadvolumefactor: text: 1 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/sportscult.yml b/src/Jackett.Common/Definitions/sportscult.yml index 194bf5886..4a3a6148b 100644 --- a/src/Jackett.Common/Definitions/sportscult.yml +++ b/src/Jackett.Common/Definitions/sportscult.yml @@ -155,9 +155,6 @@ search: selector: td:nth-child(7) grabs: selector: td:nth-child(8) - filters: - - name: replace - args: ["---", "0"] date: selector: td:nth-child(5) filters: diff --git a/src/Jackett.Common/Models/ReleaseInfo.cs b/src/Jackett.Common/Models/ReleaseInfo.cs index 890ef3c7f..9ce0f2159 100644 --- a/src/Jackett.Common/Models/ReleaseInfo.cs +++ b/src/Jackett.Common/Models/ReleaseInfo.cs @@ -76,10 +76,12 @@ namespace Jackett.Common.Models public virtual object Clone() => new ReleaseInfo(this); - // ex: " 3.5 gb " + // ex: " 3.5 gb " -> "3758096384" , "3,5GB" -> "3758096384" , "296,98 MB" -> "311406100.48" , "1.018,29 MB" -> "1067754455.04" + // ex: "1.018.29mb" -> "1067754455.04" , "-" -> "0" , "---" -> "0" public static long GetBytes(string str) { - var valStr = new string(str.Where(c => char.IsDigit(c) || c == '.').ToArray()); + var valStr = new string(str.Where(c => char.IsDigit(c) || c == '.' || c == ',').ToArray()); + valStr = (valStr.Length == 0) ? "0" : valStr.Replace(",", "."); if (valStr.Count(c => c == '.') > 1) { var lastOcc = valStr.LastIndexOf('.');