Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions server/mergin/sync/public_api_v2_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,11 @@ def create_project_version(id):
db.session.add(pv)
db.session.add(project)
db.session.commit()

# let's move uploaded files where they are expected to be
temp_files_dir = os.path.join(upload.upload_dir, "files", v_next_version)
os.renames(temp_files_dir, version_dir)
if to_be_added_files or to_be_updated_files:
temp_files_dir = os.path.join(upload.upload_dir, "files", v_next_version)
os.renames(temp_files_dir, version_dir)

logging.info(
f"Push finished for project: {project.id}, project version: {v_next_version}, upload id: {upload.id}."
Expand Down
15 changes: 15 additions & 0 deletions server/mergin/tests/test_public_api_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,21 @@ def test_project_members(client):
204,
None,
),
# only delete files
(
{
"version": "v1",
"changes": {
"added": [],
"removed": [
file_info(test_project_dir, "base.gpkg"),
],
"updated": [],
},
},
201,
None,
),
# broken .gpkg file
(
{"version": "v1", "changes": _get_changes_with_diff_0_size(test_project_dir)},
Expand Down
Loading