voussoir/voussoirkit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename equal -> equal_handle, quickid -> quickid_handle.

Browse source 
It's too easy to forget if the plain equal/quickid names refer
to functions that take path arguments or handle arguments.
This commit is contained in:
Ethan Dalool 2020-02-25 10:42:05 -08:00
parent b0c33b8137
commit ebf1c86a9f
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
voussoirkit/quickid.py
View file

@ -11,22 +11,24 @@ SEEK_END = 2
CHUNK_SIZE = 2 * 2**20 CHUNK_SIZE = 2 * 2**20
FORMAT = '{size}_{chunk_size}_{hash}' FORMAT = '{size}_{chunk_size}_{hash}'
def equal(handle1, handle2, *args, **kwargs): def equal_handle(handle1, handle2, *args, **kwargs):
size1 = handle1.seek(0, SEEK_END) size1 = handle1.seek(0, SEEK_END)
size2 = handle2.seek(0, SEEK_END) size2 = handle2.seek(0, SEEK_END)
handle1.seek(0) handle1.seek(0)
handle2.seek(0) handle2.seek(0)
if size1 != size2: if size1 != size2:
return False return False
return quickid(handle1, *args, **kwargs) == quickid(handle2, *args, **kwargs) id1 = quickid_handle(handle1, *args, **kwargs)
id2 = quickid_handle(handle2, *args, **kwargs)
return id1 == id2
def equal_file(filename1, filename2, *args, **kwargs): def equal_file(filename1, filename2, *args, **kwargs):
filename1 = os.path.abspath(filename1) filename1 = os.path.abspath(filename1)
filename2 = os.path.abspath(filename2) filename2 = os.path.abspath(filename2)
with open(filename1, 'rb') as handle1, open(filename2, 'rb') as handle2: with open(filename1, 'rb') as handle1, open(filename2, 'rb') as handle2:
return equal(handle1, handle2, *args, **kwargs) return equal_handle(handle1, handle2, *args, **kwargs)
def quickid(handle, hashclass=None, chunk_size=None): def quickid_handle(handle, hashclass=None, chunk_size=None):
if hashclass is None: if hashclass is None:
hashclass = hashlib.md5 hashclass = hashlib.md5
if chunk_size is None: if chunk_size is None:
@ -48,7 +50,7 @@ def quickid(handle, hashclass=None, chunk_size=None):
def quickid_file(filename, *args, **kwargs): def quickid_file(filename, *args, **kwargs):
filename = os.path.abspath(filename) filename = os.path.abspath(filename)
with open(filename, 'rb') as handle: with open(filename, 'rb') as handle:
return quickid(handle, *args, **kwargs) return quickid_handle(handle, *args, **kwargs)
def main(argv): def main(argv):
print(quickid_file(argv[0])) print(quickid_file(argv[0]))