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

Merge pull request #1683 from geekless/Zeroname-fixes

Browse source 
Allow using other domain resolver plugins along with Zeroname
This commit is contained in:
ZeroNet 2018-10-08 15:19:44 +02:00 committed by GitHub
commit 29964aa90c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
plugins/Zeroname/SiteManagerPlugin.py
View file

@ -21,15 +21,16 @@ class SiteManagerPlugin(object):
if not self.get(config.bit_resolver): if not self.get(config.bit_resolver):
self.need(config.bit_resolver) # Need ZeroName site self.need(config.bit_resolver) # Need ZeroName site
# Checks if its a valid address # Checks if it's a valid address
def isAddress(self, address): def isAddress(self, address):
if self.isDomain(address): return self.isBitDomain(address) or super(SiteManagerPlugin, self).isAddress(address)
return True
else:
return super(SiteManagerPlugin, self).isAddress(address)
# Return: True if the address is domain # Return: True if the address is domain
def isDomain(self, address): def isDomain(self, address):
return self.isBitDomain(address) or super(SiteManagerPlugin, self).isDomain(address)
# Return: True if the address is .bit domain
def isBitDomain(self, address):
return re.match("(.*?)([A-Za-z0-9_-]+\.bit)$", address) return re.match("(.*?)([A-Za-z0-9_-]+\.bit)$", address)
# Resolve domain # Resolve domain
@ -54,7 +55,7 @@ class SiteManagerPlugin(object):
# Return or create site and start download site files # Return or create site and start download site files
# Return: Site or None if dns resolve failed # Return: Site or None if dns resolve failed
def need(self, address, *args, **kwargs): def need(self, address, *args, **kwargs):
if self.isDomain(address): # Its looks like a domain if self.isBitDomain(address): # Its looks like a domain
address_resolved = self.resolveDomain(address) address_resolved = self.resolveDomain(address)
if address_resolved: if address_resolved:
address = address_resolved address = address_resolved
@ -67,7 +68,7 @@ class SiteManagerPlugin(object):
def get(self, address): def get(self, address):
if not self.loaded: # Not loaded yet if not self.loaded: # Not loaded yet
self.load() self.load()
if self.isDomain(address): # Its looks like a domain if self.isBitDomain(address): # Its looks like a domain
address_resolved = self.resolveDomain(address) address_resolved = self.resolveDomain(address)
if address_resolved: # Domain found if address_resolved: # Domain found
site = self.sites.get(address_resolved) site = self.sites.get(address_resolved)
@ -79,5 +80,5 @@ class SiteManagerPlugin(object):
site = self.sites.get(address) site = self.sites.get(address)
else: # Access by site address else: # Access by site address
site = self.sites.get(address) site = super(SiteManagerPlugin, self).get(address)
return site return site