Rename hash function name

This commit is contained in:
jimmy 2021-08-01 02:12:50 +00:00
parent da0ae0136e
commit 5c63add3b2
3 changed files with 18 additions and 12 deletions

View File

@ -27,7 +27,7 @@ async def hook(req: Request):
pack.pull() pack.pull()
pack.collate() pack.collate()
pack.compress() pack.compress()
pack.hash() pack.hashPack()
pack.upload() pack.upload()
return "Updated " + pack.gethash() return "Updated " + pack.gethash()

View File

@ -49,8 +49,10 @@ class Pack:
print("Compressing") print("Compressing")
shutil.make_archive("files/pack", 'zip', "files/pack") shutil.make_archive("files/pack", 'zip', "files/pack")
shutil.rmtree("files/pack") shutil.rmtree("files/pack")
print("Compressed")
def hash(self): def hashPack(self):
try:
print("Hashing") print("Hashing")
sha1sum = hashlib.sha1() sha1sum = hashlib.sha1()
with open("files/pack.zip", "rb") as pack: with open("files/pack.zip", "rb") as pack:
@ -59,8 +61,12 @@ class Pack:
sha1sum.update(block) sha1sum.update(block)
block = pack.read(2**16) block = pack.read(2**16)
self.hash = sha1sum.hexdigest() self.hash = sha1sum.hexdigest()
print("Write hash")
with open("files/hash", 'w') as hashfile: with open("files/hash", 'w') as hashfile:
hashfile.write(self.hash) hashfile.write(self.hash)
except Exception:
print("Failed to hash")
def upload(self): def upload(self):
print("Uploading") print("Uploading")

View File

@ -7,6 +7,6 @@ def test_pack():
pack.pull() pack.pull()
pack.collate() pack.collate()
pack.compress() pack.compress()
pack.hash() pack.hashPack()
pack.upload() pack.upload()