mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-10-26 19:01:39 -04:00
Merge pull request #82 from lrnselfreliance/bugfix/api-media-directory-fix
Bugfix with Docker API media mount
This commit is contained in:
commit
4dc3ebf2b8
5 changed files with 23 additions and 3 deletions
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
sanic==20.12.0
|
||||
sanic==21.9.1
|
||||
|
|
|
|||
4
main.py
4
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()
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
__version__ = '0.1.1-beta'
|
||||
__version__ = '0.1.2-beta'
|
||||
|
||||
import subprocess
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue