Skip to content

Fix geodiff working dir #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarcelGeo merged 2 commits into from
Sep 26, 2024
Merged

Fix geodiff working dir #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6cebff
Make sure moving temp works with live and geodiff dirs
varmar05 Sep 26, 2024
9bd4e7a
Add default geodiff working dir more reasonable
varmar05 Sep 26, 2024
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
2 changes: 1 addition & 1 deletion server/mergin/sync/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ class Configuration(object):
# working directory for geodiff actions - should be a fast local storage
GEODIFF_WORKING_DIR = config(
"GEODIFF_WORKING_DIR",
default=os.path.join(LOCAL_PROJECTS, os.pardir, "geodiff_tmp"),
default=os.path.join(LOCAL_PROJECTS, "geodiff_tmp"),
)
7 changes: 3 additions & 4 deletions server/mergin/sync/storages/disk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,9 @@ def move_to_tmp(src, dest=None):
if not os.path.exists(src):
return
dest = dest if dest else str(uuid.uuid4())
rel_path = os.path.relpath(
src, start=current_app.config["LOCAL_PROJECTS"]
) # take relative path from parent of all project files
temp_path = os.path.join(current_app.config["TEMP_DIR"], dest, rel_path)
temp_path = os.path.join(
current_app.config["TEMP_DIR"], dest, os.path.basename(src)
)
os.renames(src, temp_path)
return temp_path

Expand Down
2 changes: 1 addition & 1 deletion server/mergin/tests/test_celery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def test_clean_temp_files(app):
assert os.path.exists(path)
# patch modification time of parent dir
t = datetime.utcnow() - timedelta(days=(app.config["TEMP_EXPIRATION"] + 1))
parent_dir = os.path.dirname(os.path.dirname(path))
parent_dir = os.path.dirname(path)
os.utime(parent_dir, (datetime.timestamp(t), datetime.timestamp(t)))
remove_temp_files()
assert not os.path.exists(path)
Expand Down