From 119352a685fd7bd397906be3ac1507d76f4c298f Mon Sep 17 00:00:00 2001 From: caryoscelus Date: Mon, 28 Nov 2022 09:13:32 +0000 Subject: [PATCH 1/2] Revert "remove unused code" This reverts commit dc804b9d5f3a2a9f1fffa1b97d82e0e04c44508b. fixes #182 --- src/Site/Site.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Site/Site.py b/src/Site/Site.py index 7deab5cc..ea19c4a2 100644 --- a/src/Site/Site.py +++ b/src/Site/Site.py @@ -35,6 +35,7 @@ class Site(object): def __init__(self, address, allow_create=True, settings=None): self.address = str(re.sub("[^A-Za-z0-9]", "", address)) # Make sure its correct address self.address_hash = hashlib.sha256(self.address.encode("ascii")).digest() + self.address_sha1 = hashlib.sha1(self.address.encode("ascii")).digest() self.address_short = "%s..%s" % (self.address[:6], self.address[-4:]) # Short address for logging self.log = logging.getLogger("Site:%s" % self.address_short) self.addEventListeners() From f02e57697304c19c04f2a4412a54f62455f7d1e3 Mon Sep 17 00:00:00 2001 From: caryoscelus Date: Mon, 28 Nov 2022 09:28:52 +0000 Subject: [PATCH 2/2] code comment --- src/Config.py | 2 +- src/Site/Site.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Config.py b/src/Config.py index 0f9c89b8..9149d165 100644 --- a/src/Config.py +++ b/src/Config.py @@ -100,7 +100,7 @@ class Config(object): self.version = "0.7.8+" self.user_agent = "conservancy" # DEPRECATED ; replace with git-generated commit - self.rev = 5037 + self.rev = 5038 self.user_agent_rev = 8192 self.argv = argv self.action = None diff --git a/src/Site/Site.py b/src/Site/Site.py index ea19c4a2..ffdb2bb0 100644 --- a/src/Site/Site.py +++ b/src/Site/Site.py @@ -35,6 +35,7 @@ class Site(object): def __init__(self, address, allow_create=True, settings=None): self.address = str(re.sub("[^A-Za-z0-9]", "", address)) # Make sure its correct address self.address_hash = hashlib.sha256(self.address.encode("ascii")).digest() + # sha1 is used for clearnet trackers self.address_sha1 = hashlib.sha1(self.address.encode("ascii")).digest() self.address_short = "%s..%s" % (self.address[:6], self.address[-4:]) # Short address for logging self.log = logging.getLogger("Site:%s" % self.address_short)