From 684e7a6f247af7c792fc98505fa273bdeb2a9a84 Mon Sep 17 00:00:00 2001 From: jo Date: Wed, 1 Mar 2023 20:58:28 +0100 Subject: [PATCH] chore: move mime type utils --- .../libretime_playout/{player => }/mime.types | 0 playout/libretime_playout/player/fetch.py | 10 +--------- playout/libretime_playout/utils.py | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 9 deletions(-) rename playout/libretime_playout/{player => }/mime.types (100%) diff --git a/playout/libretime_playout/player/mime.types b/playout/libretime_playout/mime.types similarity index 100% rename from playout/libretime_playout/player/mime.types rename to playout/libretime_playout/mime.types diff --git a/playout/libretime_playout/player/fetch.py b/playout/libretime_playout/player/fetch.py index c32dafc04..12cfca71f 100644 --- a/playout/libretime_playout/player/fetch.py +++ b/playout/libretime_playout/player/fetch.py @@ -1,6 +1,5 @@ import copy import logging -import mimetypes import os import time from pathlib import Path @@ -24,15 +23,8 @@ from .schedule import get_schedule logger = logging.getLogger(__name__) here = Path(__file__).parent -mimetypes.init([str(here / "mime.types")]) - -def mime_guess_extension(mime: str) -> str: - extension = mimetypes.guess_extension(mime, strict=False) - if extension is None: - logger.warning("could not determine file extension from mime: %s", mime) - return "" - return extension +from ..utils import mime_guess_extension # pylint: disable=too-many-instance-attributes diff --git a/playout/libretime_playout/utils.py b/playout/libretime_playout/utils.py index 8b67ce90b..a7d6c6277 100644 --- a/playout/libretime_playout/utils.py +++ b/playout/libretime_playout/utils.py @@ -1,4 +1,11 @@ +import logging +import mimetypes from datetime import datetime +from pathlib import Path + +logger = logging.getLogger(__name__) + +here = Path(__file__).parent def seconds_between(base: datetime, target: datetime) -> float: @@ -8,3 +15,14 @@ def seconds_between(base: datetime, target: datetime) -> float: Return 0 if target is older than base. """ return max(0, (target - base).total_seconds()) + + +mimetypes.init([str(here / "mime.types")]) + + +def mime_guess_extension(mime: str) -> str: + extension = mimetypes.guess_extension(mime, strict=False) + if extension is None: + logger.warning("could not determine file extension from mime: %s", mime) + return "" + return extension