Skip to content

Commit

Permalink
Merge branch 'dev' into master
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/utils/utilities.py
  • Loading branch information
ddc committed Aug 11, 2020
2 parents c1d6b0b + e8408d6 commit 43dcfb6
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions src/utils/utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,19 +155,14 @@ def dialog_get_file_path():

################################################################################
def md5_checksum(file_path):
BUF_SIZE = 8192
md5 = hashlib.md5()
# sha1 = hashlib.sha1()

with open(file_path, 'rb') as f:
while True:
data = f.read(BUF_SIZE)
data = f.read(md5.block_size)
if not data:
break
md5.update(data)
# sha1.update(data)
# return sha1.hexdigest()
return md5.hexdigest()
return md5.hexdigest().upper()


################################################################################
Expand Down

0 comments on commit 43dcfb6

Please sign in to comment.