Seperated searX and SearXNG in the list #120

2 files changed, 75 insertions, 52 deletions

diff --git a/src/instances/data.json b/src/instances/data.json
index 1155cc36..3cdba246 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -210,51 +210,48 @@
     "tor": []
   },
   "searx": {
+    "tor": [
+      "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
+      "http://z34ambyi6makk6ta7ksog2sljly2ctt2sa3apekb7wkllk72sxecdtad.onion",
+      "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
+      "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
+      "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
+      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
+      "http://searx.bsbvtqi5oq2cqzn32zt4cr2f2z2rwots3dq7gmdcnlyqoxko2wx6reqd.onion"
+    ],
+    "i2p": [
+      "http://ransack.i2p",
+      "http://mqamk4cfykdvhw5kjez2gnvse56gmnqxn7vkvvbuor4k4j2lbbnq.b32.i2p"
+    ],
     "normal": [
       "https://anon.sx",
-      "https://darmarit.org/searx",
       "https://dynabyte.ca",
       "https://engo.mint.lgbt",
       "https://jsearch.pw",
       "https://nibblehole.com",
-      "https://northboot.xyz",
-      "https://paulgo.io",
       "https://procurx.pt",
-      "https://s.zhaocloud.net",
       "https://search.antonkling.se",
       "https://search.asynchronousexchange.com",
-      "https://search.bus-hit.me",
       "https://search.disroot.org",
       "https://search.ethibox.fr",
       "https://search.jpope.org",
-      "https://search.mdosch.de",
-      "https://search.neet.works",
-      "https://search.ononoki.org",
       "https://search.snopyta.org",
       "https://search.st8.at",
       "https://search.stinpriza.org",
       "https://search.trom.tf",
       "https://search.zdechov.net",
-      "https://search.zzls.xyz",
-      "https://searx.be",
       "https://searx.bissisoft.com",
       "https://searx.divided-by-zero.eu",
       "https://searx.dresden.network",
-      "https://searx.ebnar.xyz",
-      "https://searx.esmailelbob.xyz",
       "https://searx.everdot.org",
-      "https://searx.fmac.xyz",
       "https://searx.fossencdi.org",
-      "https://searx.gnous.eu",
       "https://searx.gnu.style",
       "https://searx.hardwired.link",
       "https://searx.josie.lol",
       "https://searx.kujonello.cf",
       "https://searx.mastodontech.de",
-      "https://searx.mha.fi",
       "https://searx.mxchange.org",
       "https://searx.nakhan.net",
-      "https://searx.namejeff.xyz",
       "https://searx.netzspielplatz.de",
       "https://searx.nevrlands.de",
       "https://searx.ninja",
@@ -262,7 +259,6 @@
       "https://searx.openhoofd.nl",
       "https://searx.operationtulip.com",
       "https://searx.org",
-      "https://searx.prvcy.eu",
       "https://searx.pwoss.org",
       "https://searx.rasp.fr",
       "https://searx.roughs.ru",
@@ -276,7 +272,6 @@
       "https://searx.sp-codes.de",
       "https://searx.stuehieyr.com",
       "https://searx.theanonymouse.xyz",
-      "https://searx.tiekoetter.com",
       "https://searx.tk",
       "https://searx.tux.land",
       "https://searx.tuxcloud.net",
@@ -286,37 +281,49 @@
       "https://searx.xyz",
       "https://searx.zapashcanon.fr",
       "https://searx.zecircle.xyz",
-      "https://searxng.zackptg5.com",
-      "https://serx.cf",
       "https://spot.ecloud.global",
       "https://suche.dasnetzundich.de",
       "https://suche.tromdienste.de",
       "https://suche.uferwerk.org",
-      "https://swag.pw",
       "https://sx.catgirl.cloud",
       "https://timdor.noip.me/searx",
       "https://trovu.komun.org",
       "https://www.gruble.de",
-      "https://www.webrats.xyz",
-      "https://xzx.ro",
       "https://searx.roflcopter.fr"
-    ],
+    ]
+  },
+  "searxng": {
     "tor": [
-      "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
       "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
-      "http://z34ambyi6makk6ta7ksog2sljly2ctt2sa3apekb7wkllk72sxecdtad.onion",
-      "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
-      "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
-      "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
-      "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
-      "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
-      "http://searx.bsbvtqi5oq2cqzn32zt4cr2f2z2rwots3dq7gmdcnlyqoxko2wx6reqd.onion"
+      "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion"
     ],
-    "i2p": [
-      "http://ransack.i2p",
-      "http://mqamk4cfykdvhw5kjez2gnvse56gmnqxn7vkvvbuor4k4j2lbbnq.b32.i2p"
+    "i2p": [],
+    "normal": [
+      "https://darmarit.org/searx",
+      "https://northboot.xyz",
+      "https://paulgo.io",
+      "https://s.zhaocloud.net",
+      "https://search.bus-hit.me",
+      "https://search.mdosch.de",
+      "https://search.neet.works",
+      "https://search.ononoki.org",
+      "https://search.zzls.xyz",
+      "https://searx.be",
+      "https://searx.ebnar.xyz",
+      "https://searx.esmailelbob.xyz",
+      "https://searx.fmac.xyz",
+      "https://searx.gnous.eu",
+      "https://searx.mha.fi",
+      "https://searx.namejeff.xyz",
+      "https://searx.prvcy.eu",
+      "https://searx.tiekoetter.com",
+      "https://searxng.zackptg5.com",
+      "https://serx.cf",
+      "https://swag.pw",
+      "https://www.webrats.xyz",
+      "https://xzx.ro"
     ]
   },
   "whoogle": {
@@ -341,15 +348,22 @@
       "https://rimgo.pussthecat.org",
       "https://img.riverside.rocks",
       "https://rimgo.totaldarkness.net",
-      "https://rimgo.bus-hit.me"
+      "https://rimgo.bus-hit.me",
+      "https://rimgo.esmailelbob.xyz",
+      "https://rimgo.lunar.icu",
+      "https://i.actionsack.com",
+      "https://xazdnfgtzmcbcxhmcbbvr4uodd6jtn4fdiayasghywdn227xsmoa.b32.i2p"
     ],
     "tor": [
       "http://l4d4owboqr6xcmd6lf64gbegel62kbudu3x3jnldz2mx6mhn3bsv3zyd.onion",
       "http://jx3dpcwedpzu2mh54obk5gvl64i2ln7pt5mrzd75s4jnndkqwzaim7ad.onion",
-      "http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion"
+      "http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
+      "http://be7udfhmnzqyt7cxysg6c4pbawarvaofjjywp35nhd5qamewdfxl6sid.onion"
     ]
   },
   "peertube": [
+    "https://video.germanische-heilkunde.at",
+    "https://pt.irnok.net",
     "https://tubulus.openlatin.org",
     "https://raudsepp.live",
     "https://shiotube.f5.si",
@@ -372,7 +386,6 @@
     "https://tube.sleeping.town",
     "https://tube.globalfrens.com",
     "https://peertuibe.fedsinfo.nohost.me",
-    "https://peertube.retroedgetech.com",
     "https://peertube.miguelcr.me",
     "https://peertube.hacknews.pmdcollab.org",
     "https://peertube.2demo.top",
@@ -411,7 +424,6 @@
     "https://redundant2.peertube.support",
     "https://peertube.ignifi.me",
     "https://docker.videos.lecygnenoir.info",
-    "https://poketnetpeertube.online",
     "https://auf1.gegenstimme.tv",
     "https://video.barcelo.cf",
     "https://videotube.duckdns.org",
@@ -847,7 +859,6 @@
     "https://tv.piejacker.net",
     "https://videos.shmalls.pw",
     "https://peertube.iriseden.eu",
-    "https://tube.tardis.world",
     "https://video.shitposter.club",
     "https://tv.mattchristiansenmedia.com",
     "https://tube.hackerscop.org",
@@ -1253,7 +1264,6 @@
     "https://tube.kdy.ch",
     "https://widemus.de",
     "https://video.nesven.eu",
-    "https://vidz.dou.bet",
     "https://tube.rebellion.global",
     "https://videos.koumoul.com",
     "https://tube.undernet.uy",
diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py
index 13eb80a8..1d2409a7 100644
--- a/src/instances/get_instances.py
+++ b/src/instances/get_instances.py
@@ -141,24 +141,37 @@ mightyList['lingva'] = lingvaList
 print('fetched LinvgaTranslate')
 
 
-# SearX
+# SearX, SearXNG
 r = requests.get('https://searx.space/data/instances.json')
 rJson = json.loads(r.text)
 searxList = {}
-searxList['normal'] = []
 searxList['tor'] = []
 searxList['i2p'] = []
-for item in rJson['instances'].keys():
-    item = item[:-1]
-    if item.endswith('.onion'):
-        searxList['tor'].append(item)
-    elif item.endswith('.i2p'):
-        searxList['i2p'].append(item)
+searxList['normal'] = []
+searxngList = {}
+searxngList['tor'] = []
+searxngList['i2p'] = []
+searxngList['normal'] = []
+for item in rJson['instances']:
+    if item[:-1].endswith('.onion'):
+        if (rJson['instances'][item].get('generator') == 'searxng'):
+            searxngList['tor'].append(item[:-1])
+        else:
+            searxList['tor'].append(item[:-1])
+    elif item[:-1].endswith('.i2p'):
+        if (rJson['instances'][item].get('generator') == 'searxng'):
+            searxngList['i2p'].append(item[:-1])
+        else:
+            searxList['i2p'].append(item[:-1])
     else:
-        searxList['normal'].append(item)
-mightyList['searx'] = searxList
-print('fetched SearX')
+        if (rJson['instances'][item].get('generator') == 'searxng'):
+            searxngList['normal'].append(item[:-1])
+        else:
+            searxList['normal'].append(item[:-1])
 
+mightyList['searx'] = searxList
+mightyList['searxng'] = searxngList
+print('fetched SearX, SearXNG')
 
 # Whoogle
 r = requests.get(