oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #389 from TheNain38/patch-1

Browse source 
Allow to use custom ZeroNet site to resolve .bit domains
This commit is contained in:
ZeroNet 2016-03-23 22:28:56 +01:00
commit 5b0ae42d13
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/Zeroname/SiteManagerPlugin.py
View file

@ -1,6 +1,7 @@
import logging import logging
import re import re
from Config import config
from Plugin import PluginManager from Plugin import PluginManager
allow_reload = False # No reload supported allow_reload = False # No reload supported
@ -10,13 +11,12 @@ log = logging.getLogger("ZeronamePlugin")
@PluginManager.registerTo("SiteManager") @PluginManager.registerTo("SiteManager")
class SiteManagerPlugin(object): class SiteManagerPlugin(object):
zeroname_address = "1Name2NXVi1RDPDgf5617UoW7xA6YrhM9F"
site_zeroname = None site_zeroname = None
def load(self): def load(self):
super(SiteManagerPlugin, self).load() super(SiteManagerPlugin, self).load()
if not self.get(self.zeroname_address): if not self.get(config.bit_resolver):
self.need(self.zeroname_address) # Need ZeroName site self.need(config.bit_resolver) # Need ZeroName site
# Checks if its a valid address # Checks if its a valid address
def isAddress(self, address): def isAddress(self, address):
@ -34,7 +34,7 @@ class SiteManagerPlugin(object):
def resolveDomain(self, domain): def resolveDomain(self, domain):
domain = domain.lower() domain = domain.lower()
if not self.site_zeroname: if not self.site_zeroname:
self.site_zeroname = self.need(self.zeroname_address) self.site_zeroname = self.need(config.bit_resolver)
self.site_zeroname.needFile("data/names.json", priority=10) self.site_zeroname.needFile("data/names.json", priority=10)
db = self.site_zeroname.storage.loadJson("data/names.json") db = self.site_zeroname.storage.loadJson("data/names.json")
return db.get(domain) return db.get(domain)

9
plugins/Zeroname/UiRequestPlugin.py
View file

@ -1,4 +1,5 @@
import re import re
from Plugin import PluginManager from Plugin import PluginManager
@ -40,3 +41,11 @@ class UiRequestPlugin(object):
return True return True
else: # Invalid referer else: # Invalid referer
return False return False
@PluginManager.registerTo("ConfigPlugin")
class ConfigPlugin(object):
def createArguments(self):
group = self.parser.add_argument_group("Zeroname plugin")
group.add_argument('--bit_resolver', help='ZeroNet site to resolve .bit domains', default="1Name2NXVi1RDPDgf5617UoW7xA6YrhM9F", metavar="address")
return super(ConfigPlugin, self).createArguments()