Fix download/pull of subdirs with just empty file(s)

Fixes MerginMaps/qgis-plugin#160

Author: wonder-sk

mergin/client_pull.py

@@ -237,6 +237,7 @@ def apply(self, directory, mp):
         basename = os.path.basename(self.file_path)   #file['diff']['path']) if diff_only else os.path.basename(file['path'])
         file_dir = os.path.dirname(os.path.normpath(os.path.join(directory, self.file_path)))
         dest_file_path = os.path.join(file_dir, basename)
+        os.makedirs(file_dir, exist_ok=True)
 
         # merge chunks together (and delete them afterwards)
         file_to_merge = FileToMerge(dest_file_path, self.download_queue_items)
@@ -372,6 +373,7 @@ def pull_project_async(mc, directory):
         file_dir = os.path.dirname(os.path.normpath(os.path.join(temp_dir, file['path'])))
         basename = os.path.basename(file['diff']['path']) if diff_only else os.path.basename(file['path'])
         dest_file_path = os.path.join(file_dir, basename)
+        os.makedirs(file_dir, exist_ok=True)
         files_to_merge.append( FileToMerge(dest_file_path, items) )
 
 

mergin/test/test_client.py

@@ -428,3 +428,32 @@ def test_missing_basefile_pull(mc):
     # try to sync again  -- it should not crash
     mc.pull_project(project_dir)
     mc.push_project(project_dir)
+
+
+def test_empty_file_in_subdir(mc):
+    """ Test pull of a project where there is an empty file in a sub-directory """
+
+    test_project = 'test_empty_file_in_subdir'
+    project = API_USER + '/' + test_project
+    project_dir = os.path.join(TMP_DIR, test_project)  # primary project dir for updates
+    project_dir_2 = os.path.join(TMP_DIR, test_project + '_2')  # concurrent project dir
+    test_data_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), test_project)
+
+    cleanup(mc, project, [project_dir, project_dir_2])
+    # create remote project
+    shutil.copytree(test_data_dir, project_dir)
+    mc.create_project_and_push(test_project, project_dir)
+
+    # try to check out the project
+    mc.download_project(project, project_dir_2)
+    assert os.path.exists(os.path.join(project_dir_2, 'subdir', 'empty.txt'))
+
+    # add another empty file in a different subdir
+    os.mkdir(os.path.join(project_dir, 'subdir2'))
+    shutil.copy(os.path.join(project_dir, 'subdir', 'empty.txt'),
+                os.path.join(project_dir, 'subdir2', 'empty2.txt'))
+    mc.push_project(project_dir)
+
+    # check that pull works fine
+    mc.pull_project(project_dir_2)
+    assert os.path.exists(os.path.join(project_dir_2, 'subdir2', 'empty2.txt'))

mergin/test/test_empty_file_in_subdir/nonempty.txt

@@ -0,0 +1 @@
+hello Mergin