cron fixes

This commit is contained in:
Zsolt Ero
2024-01-03 20:07:22 +01:00
parent b6b8e6ac84
commit 3654d523d2
5 changed files with 47 additions and 34 deletions

View File

@@ -18,7 +18,7 @@ def download_and_extract_tileset(area: str, version: str, runs_dir: Path) -> boo
version_dir = runs_dir / area / version
btrfs_file = version_dir / 'tiles.btrfs'
if btrfs_file.exists():
print(' file exists, skipping download')
print(' file exists, skipping download')
return False
temp_dir = runs_dir / '_tmp'

View File

@@ -4,11 +4,39 @@ from pathlib import Path
from http_host_lib import DEFAULT_RUNS_DIR, MNT_DIR
def create_fstab():
fstab_new = []
for area in ['planet', 'monaco']:
area_dir = (DEFAULT_RUNS_DIR / area).resolve()
if not area_dir.exists():
continue
versions = sorted(area_dir.iterdir())
for version in versions:
version_str = version.name
btrfs_file = area_dir / version_str / 'tiles.btrfs'
if not btrfs_file.is_file():
continue
mnt_folder = MNT_DIR / f'{area}-{version_str}'
mnt_folder.mkdir(exist_ok=True, parents=True)
fstab_new.append(f'{btrfs_file} {mnt_folder} btrfs loop,ro 0 0\n')
print(f' created fstab entry for {btrfs_file} -> {mnt_folder}')
with open('/etc/fstab') as fp:
fstab_orig = [l for l in fp.readlines() if f'{MNT_DIR}/' not in l]
with open('/etc/fstab', 'w') as fp:
fp.writelines(fstab_orig + fstab_new)
def clean_up_mounts(mnt_dir):
if not mnt_dir.exists():
return
print('Cleaning up mounts')
print(' cleaning up mounts')
# handle deleted files
p = subprocess.run(['mount'], capture_output=True, text=True, check=True)
@@ -32,31 +60,3 @@ def clean_up_mounts(mnt_dir):
print(f' removing old mount {subdir}')
subprocess.run(['umount', subdir], check=True)
subdir.rmdir()
def create_fstab():
fstab_new = []
for area in ['planet', 'monaco']:
area_dir = (DEFAULT_RUNS_DIR / area).resolve()
if not area_dir.exists():
continue
versions = sorted(area_dir.iterdir())
for version in versions:
version_str = version.name
btrfs_file = area_dir / version_str / 'tiles.btrfs'
if not btrfs_file.is_file():
continue
mnt_folder = MNT_DIR / f'{area}-{version_str}'
mnt_folder.mkdir(exist_ok=True, parents=True)
fstab_new.append(f'{btrfs_file} {mnt_folder} btrfs loop,ro 0 0\n')
print(f'Created fstab entry for {btrfs_file} -> {mnt_folder}')
with open('/etc/fstab') as fp:
fstab_orig = [l for l in fp.readlines() if f'{MNT_DIR}/' not in l]
with open('/etc/fstab', 'w') as fp:
fp.writelines(fstab_orig + fstab_new)

View File

@@ -39,7 +39,7 @@ def get_remote_file_size(url: str) -> int | None:
def download_file_aria2(url: str, local_file: Path):
print(f'Downloading: {url} into {local_file}')
print(f' downloading: {url} into {local_file}')
subprocess.run(
[