diff --git a/ffplayout/filter/README.md b/ffplayout/filters/README.md similarity index 100% rename from ffplayout/filter/README.md rename to ffplayout/filters/README.md diff --git a/ffplayout/filter/__init__.py b/ffplayout/filters/__init__.py similarity index 100% rename from ffplayout/filter/__init__.py rename to ffplayout/filters/__init__.py diff --git a/ffplayout/filters.py b/ffplayout/filters/default.py similarity index 97% rename from ffplayout/filters.py rename to ffplayout/filters/default.py index df56d829..c3f9eeb9 100644 --- a/ffplayout/filters.py +++ b/ffplayout/filters/default.py @@ -23,7 +23,7 @@ import re from glob import glob from pydoc import locate -from .utils import _global, _pre, _text +from ffplayout.utils import _global, _pre, _text # ------------------------------------------------------------------------------ # building filters, @@ -250,13 +250,12 @@ def split_filter(filter_type): def custom_filter(probe, type): - script_dir = os.path.dirname(os.path.abspath(__file__)) - filter_dir = os.path.join(script_dir, 'filter') + filter_dir = os.path.dirname(os.path.abspath(__file__)) filters = [] for filter in glob(os.path.join(filter_dir, f'{type}_*')): filter = os.path.splitext(os.path.basename(filter))[0] - filter_func = locate(f'ffplayout.filter.{filter}.filter') + filter_func = locate(f'ffplayout.filters.{filter}.filter') filters.append(filter_func(probe)) return filters diff --git a/ffplayout/filter/v_drawtext.py b/ffplayout/filters/v_drawtext.py similarity index 100% rename from ffplayout/filter/v_drawtext.py rename to ffplayout/filters/v_drawtext.py diff --git a/ffplayout/folder.py b/ffplayout/folder.py index 598e8551..82560182 100644 --- a/ffplayout/folder.py +++ b/ffplayout/folder.py @@ -25,7 +25,7 @@ import time from watchdog.events import PatternMatchingEventHandler from watchdog.observers import Observer -from .filters import build_filtergraph +from .filters.default import build_filtergraph from .utils import MediaProbe, _current, _ff, _storage, messenger, stdin_args # ------------------------------------------------------------------------------ diff --git a/ffplayout/playlist.py b/ffplayout/playlist.py index f666ace4..ccd03ca9 100644 --- a/ffplayout/playlist.py +++ b/ffplayout/playlist.py @@ -23,11 +23,10 @@ import ssl import time from urllib import request -from ffplayout.filters import build_filtergraph -from ffplayout.utils import (MediaProbe, _playlist, gen_filler, get_date, - get_delta, get_time, is_float, messenger, - stdin_args, timed_source, valid_json, - validate_thread) +from .filters.default import build_filtergraph +from .utils import (MediaProbe, _playlist, gen_filler, get_date, get_delta, + get_time, is_float, messenger, stdin_args, timed_source, + valid_json, validate_thread) class GetSourceFromPlaylist: