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

Let quickid functions take pathclass paths as arguments.

Browse source
This commit is contained in:
Ethan Dalool 2020-09-09 14:34:08 -07:00
parent 52afa2489a
commit d924e273b9
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
voussoirkit/quickid.py
View file

@ -6,6 +6,8 @@ import hashlib
import os import os
import sys import sys
from voussoirkit import pathclass
SEEK_END = 2 SEEK_END = 2
CHUNK_SIZE = 2**20 CHUNK_SIZE = 2**20
FORMAT = '{size}_{hashtype}_{chunk_size}_{hash}' FORMAT = '{size}_{hashtype}_{chunk_size}_{hash}'
@ -28,8 +30,8 @@ def equal_handle(handle1, handle2, *args, **kwargs):
return id1 == id2 return id1 == id2
def equal_file(filename1, filename2, *args, **kwargs): def equal_file(filename1, filename2, *args, **kwargs):
filename1 = os.path.abspath(filename1) filename1 = pathclass.Path(filename1).absolute_path
filename2 = os.path.abspath(filename2) filename2 = pathclass.Path(filename2).absolute_path
if os.path.getsize(filename1) != os.path.getsize(filename2): if os.path.getsize(filename1) != os.path.getsize(filename2):
return False return False
with open(filename1, 'rb') as handle1, open(filename2, 'rb') as handle2: with open(filename1, 'rb') as handle1, open(filename2, 'rb') as handle2:
@ -59,7 +61,7 @@ def quickid_handle(handle, hashtype='md5', chunk_size=None):
return output return output
def quickid_file(filename, *args, **kwargs): def quickid_file(filename, *args, **kwargs):
filename = os.path.abspath(filename) filename = pathclass.Path(filename).absolute_path
with open(filename, 'rb') as handle: with open(filename, 'rb') as handle:
return quickid_handle(handle, *args, **kwargs) return quickid_handle(handle, *args, **kwargs)