about summary refs log tree commit diff
path: root/gn3
diff options
context:
space:
mode:
authorBonfaceKilz2021-03-03 10:58:55 +0300
committerBonfaceKilz2021-03-08 21:09:58 +0300
commit9dff9888f81b7eec0e698466518ce4cb55b8bd8c (patch)
treebdd937882498267d1f51864af779a7d8294e014d /gn3
parent5000815bdcb5f85a2898831589849088e50b93f2 (diff)
downloadgenenetwork3-9dff9888f81b7eec0e698466518ce4cb55b8bd8c.tar.gz
Delete "lookup_file" procedure
Diffstat (limited to 'gn3')
-rw-r--r--gn3/file_utils.py23
1 files changed, 8 insertions, 15 deletions
diff --git a/gn3/file_utils.py b/gn3/file_utils.py
index 16b2f94..ca80373 100644
--- a/gn3/file_utils.py
+++ b/gn3/file_utils.py
@@ -27,21 +27,14 @@ def get_dir_hash(directory: str) -> str:
     return md5hash.hexdigest()
 
 
-def lookup_file(environ_var: str,
-                root_dir: str,
-                file_name: str) -> str:
-    """Look up FILE_NAME in the path defined by ENVIRON_VAR/ROOT_DIR/; If
-ENVIRON_VAR/ROOT_DIR/FILE_NAME does not exist, raise an exception.
-Otherwise return ENVIRON_VAR/ROOT_DIR/FILE_NAME.
-
-    """
-    _dir = APP_DEFAULTS.get(environ_var,
-                            os.environ.get(environ_var))
-    if _dir:
-        _file = os.path.join(_dir, root_dir, file_name)
-        if os.path.isfile(_file):
-            return _file
-    raise FileNotFoundError
+def get_dir_hash(directory: str) -> str:
+    """Return the hash of a DIRECTORY"""
+    if not os.path.exists(directory):
+        raise FileNotFoundError
+    all_files = [os.path.join(root, names)
+                 for root, _, files in os.walk(directory)
+                 for names in sorted(files)]
+    return get_hash_of_files(all_files)
 
 
 def jsonfile_to_dict(json_file: str) -> Dict: