From 08ee823bba2e77f1d0d0c6b857ea2d2dcf3945d3 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 16 Sep 2018 17:36:53 +0200 Subject: [PATCH 1/6] Added 2 new syntaxes --- data/Syntax.json | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/data/Syntax.json b/data/Syntax.json index fb2cf0e41..599408c7c 100644 --- a/data/Syntax.json +++ b/data/Syntax.json @@ -2,7 +2,7 @@ { "id": 1, "definitionUrl": "https://en.wikipedia.org/wiki/Hosts_(file)", - "name": "Hosts" + "name": "Hosts (localhost)" }, { "id": 2, @@ -37,7 +37,7 @@ { "id": 9, "definitionUrl": null, - "name": "IPs" + "name": "IPs (Singular or singular+range)" }, { "id": 10, @@ -58,5 +58,15 @@ "id": 13, "definitionUrl": "https://github.com/xd4rker/MinerBlock", "name": "MinerBlock" + }, + { + "id": 14, + "definitionUrl": "https://en.wikipedia.org/wiki/Hosts_(file)", + "name": "Non-localhost hosts" + }, + { + "id": 15, + "definitionUrl": null, + "name": "IPs (Range-only)" } -] \ No newline at end of file +] From 3aac04e32481e0caffb639993d4f41b80ec19605 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 16 Sep 2018 17:40:41 +0200 Subject: [PATCH 2/6] Assigned syntaxes to 2 lists --- data/FilterList.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index f8fb29d13..068145bd1 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -7071,7 +7071,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": 1, + "syntaxId": 14, "viewUrl": "https://raw.githubusercontent.com/Lerist/Go-Hosts/master/hosts", "viewUrlMirror1": null, "viewUrlMirror2": null @@ -8919,7 +8919,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": 1, + "syntaxId": 14, "viewUrl": "https://raw.githubusercontent.com/googlehosts/hosts/master/hosts-files/hosts", "viewUrlMirror1": "https://coding.net/u/scaffrey/p/hosts/git/raw/master/hosts-files/hosts", "viewUrlMirror2": null From b2beec73716119dd4807ce3629cf5778f8971889 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 16 Sep 2018 17:45:33 +0200 Subject: [PATCH 3/6] Update Software.json --- data/Software.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/data/Software.json b/data/Software.json index b51afa87b..eff1c5af2 100644 --- a/data/Software.json +++ b/data/Software.json @@ -38,7 +38,7 @@ "id": 6, "downloadUrl": "https://getadblock.com/", "homeUrl": "https://getadblock.com/", - "isAbpSubscribable": false, + "isAbpSubscribable": true, "name": "AdBlock" }, { @@ -94,7 +94,7 @@ "id": 15, "downloadUrl": "https://www.ublock.org/", "homeUrl": "https://www.ublock.org/", - "isAbpSubscribable": false, + "isAbpSubscribable": true, "name": "uBlock" }, { @@ -110,5 +110,12 @@ "homeUrl": "https://www.jeffersonscher.com/gm/google-hit-hider/", "isAbpSubscribable": false, "name": "Google Hit Hider by Domain" + }, + { + "id": 18, + "downloadUrl": "https://firehol.org/installing/", + "homeUrl": "https://firehol.org/", + "isAbpSubscribable": false, + "name": "FireHOL" } -] \ No newline at end of file +] From 830258b73c996a37ae0e461869ce6f3766738695 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 16 Sep 2018 17:48:02 +0200 Subject: [PATCH 4/6] Assigned some syntaxes to softwares or something --- data/SoftwareSyntax.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index e23e704c1..a7d46833f 100644 --- a/data/SoftwareSyntax.json +++ b/data/SoftwareSyntax.json @@ -119,6 +119,10 @@ "softwareId": 5, "syntaxId": 9 }, + { + "softwareId": 18, + "syntaxId": 9 + }, { "softwareId": 16, "syntaxId": 10 @@ -134,5 +138,21 @@ { "softwareId": 13, "syntaxId": 13 + }, + { + "softwareId": 7, + "syntaxId": 14 + }, + { + "softwareId": 11, + "syntaxId": 14 + }, + { + "softwareId": 12, + "syntaxId": 14 + }, + { + "softwareId": 18, + "syntaxId": 15 } ] From 92fcc4684bc134a19276121a3f554646aabe838c Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 16 Sep 2018 17:52:09 +0200 Subject: [PATCH 5/6] Assigned dynamic uBO lists to uBO and Nano --- data/SoftwareSyntax.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index a7d46833f..96a1ef974 100644 --- a/data/SoftwareSyntax.json +++ b/data/SoftwareSyntax.json @@ -103,6 +103,14 @@ "softwareId": 5, "syntaxId": 6 }, + { + "softwareId": 1, + "syntaxId": 7 + }, + { + "softwareId": 5, + "syntaxId": 7 + }, { "softwareId": 1, "syntaxId": 8 From 8a2922cb7a44384d394edaca28cabde333a730b2 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 16 Sep 2018 17:56:48 +0200 Subject: [PATCH 6/6] Filled a few syntax gaps --- data/FilterList.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 068145bd1..6488d495c 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -5601,7 +5601,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": null, + "syntaxId": 4, "viewUrl": "https://mirror1.malwaredomains.com/files/bulk_registrars.txt", "viewUrlMirror1": null, "viewUrlMirror2": null @@ -5916,7 +5916,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": null, + "syntaxId": 2, "viewUrl": "https://mirror1.malwaredomains.com/files/dynamic_dns.txt", "viewUrlMirror1": null, "viewUrlMirror2": null @@ -5937,7 +5937,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": null, + "syntaxId": 2, "viewUrl": "https://mirror1.malwaredomains.com/files/freewebhosts.txt", "viewUrlMirror1": null, "viewUrlMirror2": null @@ -5958,7 +5958,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": null, + "syntaxId": 2, "viewUrl": "https://mirror1.malwaredomains.com/files/justdomains", "viewUrlMirror1": "https://mirror.cedia.org.ec/malwaredomains/justdomains", "viewUrlMirror2": null @@ -5979,7 +5979,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": null, + "syntaxId": 2, "viewUrl": "https://mirror1.malwaredomains.com/files/immortal_domains.txt", "viewUrlMirror1": null, "viewUrlMirror2": null