Rename methods for creating missing directory names

Author: rogerdahl

lib_common/src/d1_common/util.py

@@ -65,14 +65,18 @@ def abs_path(rel_path):
   )
 
 
-def ensure_dir_exists(dir_path):
+def create_missing_directories(dir_path):
   try:
     os.makedirs(dir_path)
   except OSError as e:
     if e.errno != errno.EEXIST:
       raise
 
 
+def create_missing_directories_for_file(file_path):
+  create_missing_directories(os.path.dirname(file_path))
+
+
 def get_content_type(content_type):
   m = email.message.Message()
   m['Content-Type'] = content_type
@@ -139,8 +143,11 @@ def count(self, event_str, inc_int=1):
     self._event_dict.setdefault(event_str, 0)
     self._event_dict[event_str] += inc_int
 
-  def log_and_count(self, event_str, inc_int=1):
-    logging.info(event_str)
+  def log_and_count(self, event_str, log_str=None, inc_int=1):
+    """{event_str} is both a key for the count and part of the log message.
+    {log_str} is a message with details that may change for each call
+    """
+    logging.info(event_str + ('. ' + log_str if log_str else ''))
     self.count(event_str, inc_int)
 
   def dump_to_log(self):

test_utilities/src/d1_test/sample.py

@@ -52,8 +52,8 @@ def start_tidy():
   logging.info('Moving files to tidy dir')
   sample_dir_path = os.path.join(d1_common.util.abs_path('test_docs'))
   tidy_dir_path = os.path.join(d1_common.util.abs_path('test_docs_tidy'))
-  d1_common.util.ensure_dir_exists(sample_dir_path)
-  d1_common.util.ensure_dir_exists(tidy_dir_path)
+  d1_common.util.create_missing_directories(sample_dir_path)
+  d1_common.util.create_missing_directories(tidy_dir_path)
   i = 0
   for i, item_name in enumerate(os.listdir(sample_dir_path)):
     sample_path = os.path.join(sample_dir_path, item_name)