-

cool-RR · cool-RR · commit bb0939d1a876 · 2014-01-06T15:25:34.000+02:00
diff --git a/source_py3/python_toolbox/file_tools.py b/source_py3/python_toolbox/file_tools.py
@@ -4,6 +4,7 @@
 '''Defines various tools related to temporary files.'''
 
 import pathlib
+import os
 import re
 
 from python_toolbox import cute_iter_tools
@@ -27,20 +28,20 @@ def _get_next_path(path):
     '''
     assert isinstance(path, pathlib.Path)
     suffix = path.suffix
-    suffixless_name = path.name[:-len(suffix)]
-    parent_with_separator = str(path)[:-len(path.name)]
-    assert pathlib.Path('{}{}{}'.format(parent_with_separator,
-                                        suffixless_name, suffix)) == path
-    match = numbered_name_pattern.match(suffixless_name)
+    suffixless_last_part = path.parts[-1][:-len(suffix)]
+    head = str(path)[:-len(path.parts[-1])]
+    assert pathlib.Path('{}{}{}'.format(head,
+                                        suffixless_last_part, suffix)) == path
+    match = numbered_name_pattern.match(suffixless_last_part)
     if match:
         fixed_suffixless_name = '{} ({})'.format(
             match.group('raw_name'),
             int(match.group('number'))+1,
         )
     else:
-        fixed_suffixless_name = '{} (1)'.format(suffixless_name,)
+        fixed_suffixless_name = '{} (1)'.format(suffixless_last_part,)
     return pathlib.Path(
-        '{}{}{}'.format(parent_with_separator, fixed_suffixless_name, suffix)
+        '{}{}{}'.format(head, fixed_suffixless_name, suffix)
     )
 
 
@@ -59,14 +60,38 @@ def iterate_file_paths(path):
         path = _get_next_path(path)
     
     
+def create_folder_renaming_if_taken(path):
+    '''
+    Create a new folder with name `path` for writing, renaming if name taken.
+    
+    If the name given is "example", the new name would be "example
+    (1)", and if that's taken "example (1)", and so on.
+    
+    Returns a path object to the newly-created folder
+    '''
+    for path in cute_iter_tools.shorten(iterate_file_paths(pathlib.Path(path)),
+                                        N_MAX_ATTEMPTS):
+        try:
+            os.makedirs(str(path), exist_ok=False)
+        except OSError:
+            pass
+        else:
+            return path
+    else:
+        raise Exception("Exceeded {} tries, can't create folder {}".format(
+            N_MAX_ATTEMPTS,
+            path
+        ))
+    
+
 def create_file_renaming_if_taken(path, mode='x',
                                   buffering=-1, encoding=None,
                                   errors=None, newline=None):
     '''
     Create a new file with name `path` for writing, renaming it if name taken.
     
     If the name given is "example.zip", the new name would be "example
-    (1).zip", and if that's taken "example (1).zip", and so on.
+    (1).zip", and if that's taken "example (2).zip", and so on.
     
     Returns the file open and ready for writing. It's best to use this as a
     context manager similarly to `open` so the file would be closed.
@@ -94,7 +119,7 @@ def write_to_file_renaming_if_taken(path, data, mode='x',
     Write `data` to a new file with name `path`, renaming it if name taken.
     
     If the name given is "example.zip", the new name would be "example
-    (1).zip", and if that's taken "example (1).zip", and so on.
+    (1).zip", and if that's taken "example (2).zip", and so on.
     '''
     with create_file_renaming_if_taken(
         path, mode=mode, buffering=buffering, encoding=encoding, errors=errors,
diff --git a/source_py3/test_python_toolbox/test_file_tools/test_renaming.py b/source_py3/test_python_toolbox/test_file_tools/test_renaming.py
@@ -55,3 +55,22 @@ def test():
         with pathlib.Path(last_file.name).open('r') as last_file_input:
             assert last_file_input.read() == string_to_write
             
+        folder_1 = file_tools.create_folder_renaming_if_taken(
+            temporary_folder / 'woof'
+        )
+        folder_2 = file_tools.create_folder_renaming_if_taken(
+            temporary_folder / 'woof'
+        )
+        folder_3 = file_tools.create_folder_renaming_if_taken(
+            temporary_folder / 'woof'
+        )
+        
+        assert folder_1.name == 'woof'
+        assert folder_2.name == 'woof (1)'
+        assert folder_3.name == 'woof (2)'
+        
+        assert get_file_names_set() == {'meow.txt', 'meow (1).txt',
+                                        'meow (2).txt', 'meow (3).txt',
+                                        'meow (4).txt', 'woof', 'woof (1)',
+                                        'woof (2)'}
+        
