mirrors/pferd
1
0
Fork 0
mirror of https://github.com/Garmelon/PFERD.git synced 2023-12-21 10:23:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure tmp files are deleted

Browse Source 
This doesn't seem to fix the case where an exception bubbles up to the top of
the event loop. It also doesn't seem to fix the case when a KeyboardInterrupt is
thrown, since that never makes its way into the event loop in the first place.

Both of these cases lead to the event loop stopping, which means that the tmp
file cleanup doesn't get executed even though it's inside a "with" or "finally".
This commit is contained in:
Joscha 2021-05-15 23:00:40 +02:00
parent 989032fe0c
commit 9fd356d290
1 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
PFERD/output_dir.py
View File

@ -3,13 +3,14 @@ import os
import random import random
import shutil import shutil
import string import string
from contextlib import asynccontextmanager from contextlib import asynccontextmanager, contextmanager
from dataclasses import dataclass from dataclasses import dataclass
from datetime import datetime from datetime import datetime
from enum import Enum from enum import Enum
from pathlib import Path, PurePath from pathlib import Path, PurePath
# TODO In Python 3.9 and above, AsyncContextManager is deprecated # TODO In Python 3.9 and above, AsyncContextManager is deprecated
from typing import AsyncContextManager, AsyncIterator, BinaryIO, Optional from typing import (AsyncContextManager, AsyncIterator, BinaryIO, Iterator,
Optional)
from rich.markup import escape from rich.markup import escape
@ -327,36 +328,42 @@ class OutputDirectory:
mtimestamp = mtime.timestamp() mtimestamp = mtime.timestamp()
os.utime(info.local_path, times=(mtimestamp, mtimestamp)) os.utime(info.local_path, times=(mtimestamp, mtimestamp))
@contextmanager
def _ensure_deleted(self, path: Path) -> Iterator[None]:
try:
yield
finally:
path.unlink(missing_ok=True)
async def _after_download(self, info: DownloadInfo) -> None: async def _after_download(self, info: DownloadInfo) -> None:
changed = False with self._ensure_deleted(info.tmp_path):
changed = False
if not info.success: if not info.success:
info.tmp_path.unlink()
return
# Solve conflicts arising from existing local file
if info.local_path.exists():
changed = True
if filecmp.cmp(info.local_path, info.tmp_path):
self._update_metadata(info)
info.tmp_path.unlink()
return return
if not await self._conflict_lfrf(info.on_conflict, info.path): # Solve conflicts arising from existing local file
info.tmp_path.unlink() if info.local_path.exists():
return changed = True
info.tmp_path.replace(info.local_path) if filecmp.cmp(info.local_path, info.tmp_path):
self._update_metadata(info) self._update_metadata(info)
return
if changed: if not await self._conflict_lfrf(info.on_conflict, info.path):
self._conductor.print( return
f"[bold bright_yellow]Changed[/] {escape(str(info.path))}")
self._report.change_file(info.path) info.tmp_path.replace(info.local_path)
else: self._update_metadata(info)
self._conductor.print(
f"[bold bright_green]Added[/] {escape(str(info.path))}") if changed:
self._report.add_file(info.path) self._conductor.print(
f"[bold bright_yellow]Changed[/] {escape(str(info.path))}")
self._report.change_file(info.path)
else:
self._conductor.print(
f"[bold bright_green]Added[/] {escape(str(info.path))}")
self._report.add_file(info.path)
async def cleanup(self) -> None: async def cleanup(self) -> None:
await self._cleanup_dir(self._root, PurePath()) await self._cleanup_dir(self._root, PurePath())