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

support config as argument

Browse Source
This commit is contained in:
Jonathan Baecker 2019-08-20 14:45:05 +02:00
parent e7ce224ef9
commit 2fc4513806
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ffplayout.py
View File

@ -44,13 +44,42 @@ from threading import Thread
from types import SimpleNamespace from types import SimpleNamespace
from urllib import request from urllib import request
# ------------------------------------------------------------------------------
# argument parsing
# ------------------------------------------------------------------------------
stdin_parser = ArgumentParser(
description='python and ffmpeg based playout',
epilog="don't use parameters if you want to use this settings from config")
stdin_parser.add_argument(
'-c', '--config', help='file path to ffplayout.conf'
)
stdin_parser.add_argument(
'-f', '--folder', help='play folder content'
)
stdin_parser.add_argument(
'-l', '--log', help='file path for logfile'
)
stdin_parser.add_argument(
'-p', '--playlist', help='path from playlist'
)
stdin_args = stdin_parser.parse_args()
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# read variables from config file # read variables from config file
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# read config # read config
cfg = configparser.ConfigParser() cfg = configparser.ConfigParser()
if os.path.isfile('/etc/ffplayout/ffplayout.conf'):
if stdin_args.config:
cfg.read(stdin_args.config)
elif os.path.isfile('/etc/ffplayout/ffplayout.conf'):
cfg.read('/etc/ffplayout/ffplayout.conf') cfg.read('/etc/ffplayout/ffplayout.conf')
else: else:
cfg.read('ffplayout.conf') cfg.read('ffplayout.conf')
@ -135,27 +164,10 @@ _playout = SimpleNamespace(
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# logging and argument parsing # logging
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
stdin_parser = ArgumentParser(
description='python and ffmpeg based playout',
epilog="don't use parameters if you want to take the settings from config")
stdin_parser.add_argument(
'-l', '--log', help='file path for logfile'
)
stdin_parser.add_argument(
'-p', '--playlist', help='path from playlist'
)
stdin_parser.add_argument(
'-f', '--folder', help='play folder content'
)
# If the log file is specified on the command line then override the default # If the log file is specified on the command line then override the default
stdin_args = stdin_parser.parse_args()
if stdin_args.log: if stdin_args.log:
_log.path = stdin_args.log _log.path = stdin_args.log