Used isort to sort imports. Also added to the git pre-commit hook.

[python_utils.git] / directory_filter.py

diff --git a/directory_filter.py b/directory_filter.py
index 8d03ff603d425bddc24267061a902f67ac7bb3b1..b076badf25dff7e34e2358b3e45d52c49692a424 100644 (file)
--- a/directory_filter.py
+++ b/directory_filter.py
@@ -3,7 +3,7 @@
 import hashlib
 import logging
 import os
-from typing import Any, Optional
+from typing import Any, Dict, Optional, Set
 
 logger = logging.getLogger(__name__)
 
@@ -38,8 +38,8 @@ class DirectoryFileFilter(object):
         if not file_utils.does_directory_exist(directory):
             raise ValueError(directory)
         self.directory = directory
-        self.md5_by_filename = {}
-        self.mtime_by_filename = {}
+        self.md5_by_filename: Dict[str, str] = {}
+        self.mtime_by_filename: Dict[str, float] = {}
         self._update()
 
     def _update(self):
@@ -55,11 +55,10 @@ class DirectoryFileFilter(object):
         assert file_utils.does_file_exist(filename)
         if mtime is None:
             mtime = file_utils.get_file_raw_mtime(filename)
+        assert mtime
         if self.mtime_by_filename.get(filename, 0) != mtime:
             md5 = file_utils.get_file_md5(filename)
-            logger.debug(
-                f'Computed/stored {filename}\'s MD5 at ts={mtime} ({md5})'
-            )
+            logger.debug(f'Computed/stored {filename}\'s MD5 at ts={mtime} ({md5})')
             self.mtime_by_filename[filename] = mtime
             self.md5_by_filename[filename] = md5
 
@@ -104,7 +103,7 @@ class DirectoryAllFilesFilter(DirectoryFileFilter):
     """
 
     def __init__(self, directory: str):
-        self.all_md5s = set()
+        self.all_md5s: Set[str] = set()
         super().__init__(directory)
 
     def _update_file(self, filename: str, mtime: Optional[float] = None):
@@ -113,13 +112,15 @@ class DirectoryAllFilesFilter(DirectoryFileFilter):
         assert file_utils.does_file_exist(filename)
         if mtime is None:
             mtime = file_utils.get_file_raw_mtime(filename)
+        assert mtime
         if self.mtime_by_filename.get(filename, 0) != mtime:
             md5 = file_utils.get_file_md5(filename)
             self.mtime_by_filename[filename] = mtime
             self.md5_by_filename[filename] = md5
             self.all_md5s.add(md5)
 
-    def apply(self, item: Any) -> bool:
+    def apply(self, item: Any, ignored_filename: str = None) -> bool:
+        assert not ignored_filename
         self._update()
         mem_hash = hashlib.md5()
         mem_hash.update(item)