src: consolidate compute_md5 functions

Add compute_md5 function in src/utils/fs.py

Remove identical md5 functions from src/live/ogOperations.py and
src/utils/tiptorrent.py

Move error checks from ogOperations.py into compute_md5 function in
src/utils/fs.py

1 files changed, 2 insertions, 12 deletions

diff --git a/src/utils/tiptorrent.py b/src/utils/tiptorrent.py
index 095f17f..7392725 100644
--- a/src/utils/tiptorrent.py
+++ b/src/utils/tiptorrent.py
@@ -6,7 +6,6 @@
 # Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 
-import hashlib
 import logging
 import os
 import shlex
@@ -15,16 +14,7 @@ import subprocess
 import urllib.request
 from src.log import OgError
 from src.utils.cache import *
-
-def _compute_md5(path, bs=2**20):
-    m = hashlib.md5()
-    with open(path, 'rb') as f:
-        while True:
-            buf = f.read(bs)
-            if not buf:
-                break
-            m.update(buf)
-    return m.hexdigest()
+from src.utils.fs import compute_md5
 
 
 def tip_fetch_csum(tip_addr, image_name):
@@ -64,7 +54,7 @@ def tip_write_csum(image_name):
     logging.info('*DO NOT REBOOT OR POWEROFF* the client during this time')
 
     filename = image_path + ".full.sum"
-    csum = _compute_md5(image_path)
+    csum = compute_md5(image_path)
     try:
         with open(filename, 'w') as f:
             f.write(csum)