djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reorder filters

Browse Source
This commit is contained in:
jb-alvarado 2020-12-20 13:45:48 +01:00
parent 600aed8ace
commit 96123a1e9c
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ffplayout/filter/README.md → ffplayout/filters/README.md
View File

0
ffplayout/filter/__init__.py → ffplayout/filters/__init__.py
View File

7
ffplayout/filters.py → ffplayout/filters/default.py
View File

@ -23,7 +23,7 @@ import re
from glob import glob from glob import glob
from pydoc import locate from pydoc import locate
from .utils import _global, _pre, _text from ffplayout.utils import _global, _pre, _text
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# building filters, # building filters,
@ -250,13 +250,12 @@ def split_filter(filter_type):
def custom_filter(probe, type): def custom_filter(probe, type):
script_dir = os.path.dirname(os.path.abspath(__file__)) filter_dir = os.path.dirname(os.path.abspath(__file__))
filter_dir = os.path.join(script_dir, 'filter')
filters = [] filters = []
for filter in glob(os.path.join(filter_dir, f'{type}_*')): for filter in glob(os.path.join(filter_dir, f'{type}_*')):
filter = os.path.splitext(os.path.basename(filter))[0] 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)) filters.append(filter_func(probe))
return filters return filters

0
ffplayout/filter/v_drawtext.py → ffplayout/filters/v_drawtext.py
View File

2
ffplayout/folder.py
View File

@ -25,7 +25,7 @@ import time
from watchdog.events import PatternMatchingEventHandler from watchdog.events import PatternMatchingEventHandler
from watchdog.observers import Observer 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 from .utils import MediaProbe, _current, _ff, _storage, messenger, stdin_args
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

9
ffplayout/playlist.py
View File

@ -23,11 +23,10 @@ import ssl
import time import time
from urllib import request from urllib import request
from ffplayout.filters import build_filtergraph from .filters.default import build_filtergraph
from ffplayout.utils import (MediaProbe, _playlist, gen_filler, get_date, from .utils import (MediaProbe, _playlist, gen_filler, get_date, get_delta,
get_delta, get_time, is_float, messenger, get_time, is_float, messenger, stdin_args, timed_source,
stdin_args, timed_source, valid_json, valid_json, validate_thread)
validate_thread)
class GetSourceFromPlaylist: class GetSourceFromPlaylist: