Skip to content

Store pull files in temp directory #253

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
merged 2 commits into from
Aug 6, 2025
Merged

Store pull files in temp directory #253

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56d8b8b
change directory where pull files are stored
JanCaha Jul 23, 2025
52bd00c
move temp_dir to TemporaryDirectory instance
JanCaha Jul 23, 2025
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
21 changes: 10 additions & 11 deletions mergin/client_pull.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ def __init__(
self.version = version
self.files_to_merge = files_to_merge # list of FileToMerge instances
self.download_queue_items = download_queue_items
self.temp_dir = temp_dir # full path to temporary directory where we store downloaded files
self.temp_dir = temp_dir # TemporaryDirectory instance where we store downloaded files
self.mp = mp # MerginProject instance
self.is_cancelled = False
self.project_info = project_info # parsed JSON with project info returned from the server
Expand Down Expand Up @@ -413,8 +413,7 @@ def pull_project_async(mc, directory):
# then we just download the whole file
_pulling_file_with_diffs = lambda f: "diffs" in f and len(f["diffs"]) != 0

temp_dir = mp.fpath_meta(f"fetch_{local_version}-{server_version}")
os.makedirs(temp_dir, exist_ok=True)
temp_dir = tempfile.TemporaryDirectory(prefix="mm-pull-", ignore_cleanup_errors=True, delete=True)
pull_changes = mp.get_pull_changes(server_info["files"])
mp.log.debug("pull changes:\n" + pprint.pformat(pull_changes))
fetch_files = []
Expand All @@ -441,10 +440,10 @@ def pull_project_async(mc, directory):

for file in fetch_files:
diff_only = _pulling_file_with_diffs(file)
items = _download_items(file, temp_dir, diff_only)
items = _download_items(file, temp_dir.name, diff_only)

# figure out destination path for the file
file_dir = os.path.dirname(os.path.normpath(os.path.join(temp_dir, file["path"])))
file_dir = os.path.dirname(os.path.normpath(os.path.join(temp_dir.name, 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)
Expand All @@ -465,8 +464,8 @@ def pull_project_async(mc, directory):
file_path = file["path"]
mp.log.info(f"missing base file for {file_path} -> going to download it (version {server_version})")
file["version"] = server_version
items = _download_items(file, temp_dir, diff_only=False)
dest_file_path = mp.fpath(file["path"], temp_dir)
items = _download_items(file, temp_dir.name, diff_only=False)
dest_file_path = mp.fpath(file["path"], temp_dir.name)
# dest_file_path = os.path.join(os.path.dirname(os.path.normpath(os.path.join(temp_dir, file['path']))), os.path.basename(file['path']))
files_to_merge.append(FileToMerge(dest_file_path, items))
continue
Expand Down Expand Up @@ -604,10 +603,10 @@ def pull_project_finalize(job: PullJob):
# download their full versions so we have them up-to-date for applying changes
for file_path, file_diffs in job.basefiles_to_patch:
basefile = job.mp.fpath_meta(file_path)
server_file = job.mp.fpath(file_path, job.temp_dir)
server_file = job.mp.fpath(file_path, job.temp_dir.name)

shutil.copy(basefile, server_file)
diffs = [job.mp.fpath(f, job.temp_dir) for f in file_diffs]
diffs = [job.mp.fpath(f, job.temp_dir.name) for f in file_diffs]
patch_error = job.mp.apply_diffs(server_file, diffs)
if patch_error:
# that's weird that we are unable to apply diffs to the basefile!
Expand All @@ -623,7 +622,7 @@ def pull_project_finalize(job: PullJob):
raise ClientError("Cannot patch basefile {}! Please try syncing again.".format(basefile))

try:
conflicts = job.mp.apply_pull_changes(job.pull_changes, job.temp_dir, job.project_info, job.mc)
conflicts = job.mp.apply_pull_changes(job.pull_changes, job.temp_dir.name, job.project_info, job.mc)
except Exception as e:
job.mp.log.error("Failed to apply pull changes: " + str(e))
job.mp.log.info("--- pull aborted")
Expand All @@ -636,7 +635,7 @@ def pull_project_finalize(job: PullJob):
else:
job.mp.log.info("--- pull finished -- at version " + job.mp.version())

shutil.rmtree(job.temp_dir)
job.temp_dir.cleanup() # delete our temporary dir and all its content
return conflicts


Expand Down