From 7244f2c557624a1fb0c702d119b3428b9ec25c9b Mon Sep 17 00:00:00 2001 From: Roland Date: Sat, 22 Jan 2022 19:54:46 -0700 Subject: [PATCH 1/2] Mounting test directory to api's /media/wrolpi. Updating Archive's Sanic to avoid depreciation error with uvloop. --- docker-compose.yml | 1 + docker/archive/requirements.txt | 2 +- main.py | 4 +++- wrolpi/common.py | 17 +++++++++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 02df6191..3f76eb13 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,6 +23,7 @@ services: - './modules:/opt/wrolpi/modules' - './config:/opt/wrolpi/config' - './test:/opt/wrolpi/test' + - './test:/media/wrolpi' - './alembic:/opt/wrolpi/alembic' - './alembic.ini:/opt/wrolpi/alembic.ini' ports: diff --git a/docker/archive/requirements.txt b/docker/archive/requirements.txt index 5396f7f7..f2be8f6e 100644 --- a/docker/archive/requirements.txt +++ b/docker/archive/requirements.txt @@ -1 +1 @@ -sanic==20.12.0 +sanic==21.9.1 diff --git a/main.py b/main.py index b1419f4f..67a272a9 100755 --- a/main.py +++ b/main.py @@ -9,7 +9,7 @@ import pytz from sanic import Sanic from wrolpi import root_api, BEFORE_STARTUP_FUNCTIONS, after_startup, limit_concurrent -from wrolpi.common import logger, get_config, wrol_mode_enabled, import_modules +from wrolpi.common import logger, get_config, wrol_mode_enabled, import_modules, check_media_directory from wrolpi.dates import set_timezone from wrolpi.downloader import download_manager from wrolpi.vars import PROJECT_DIR, DOCKERIZED @@ -82,6 +82,8 @@ async def main(loop): tz = pytz.timezone(config['timezone']) set_timezone(tz) + check_media_directory() + # Import the API in every module. Each API should attach itself to `root_api`. import_modules() diff --git a/wrolpi/common.py b/wrolpi/common.py index 2351cb22..bf12bbf0 100644 --- a/wrolpi/common.py +++ b/wrolpi/common.py @@ -406,6 +406,23 @@ def get_media_directory() -> Path: return MEDIA_DIRECTORY +def check_media_directory(): + """ + Check that the media directory exists and is readable/writeable. Log an error if the directory + is unusable. + """ + media_directory = get_media_directory() + if not media_directory.is_dir(): + logger.error(f'Media directory does not exist: {media_directory}') + try: + # Write a file into the media directory, log an error if this is not possible. This file should be cleaned up + # by tempfile. + with tempfile.NamedTemporaryFile(dir=media_directory) as tf: + tf.write(b'test') + except Exception as e: + logger.error(f'Could not write to media directory: {media_directory}', exc_info=e) + + def get_absolute_media_path(path: str) -> Path: """ Get the absolute path of file/directory within the config media directory. From 4145aad23c635ca38c89bfec8338ba6ed2840740 Mon Sep 17 00:00:00 2001 From: Roland Date: Sat, 22 Jan 2022 19:56:19 -0700 Subject: [PATCH 2/2] Bumping verion for fix. --- wrolpi/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrolpi/version.py b/wrolpi/version.py index 82f32bb3..d5375990 100644 --- a/wrolpi/version.py +++ b/wrolpi/version.py @@ -1,4 +1,4 @@ -__version__ = '0.1.1-beta' +__version__ = '0.1.2-beta' import subprocess