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

add folder argument

Browse Source
This commit is contained in:
jb-alvarado 2019-08-09 17:55:21 +02:00
parent d619cd3c8b
commit 0e7e4724fd
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ffplayout.py
View File

@ -145,7 +145,11 @@ stdin_parser.add_argument(
) )
stdin_parser.add_argument( stdin_parser.add_argument(
'-f', '--file', help='playlist file' '-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
@ -775,8 +779,8 @@ class GetSourceIter(object):
self.ad_next = False self.ad_next = False
def get_playlist(self): def get_playlist(self):
if stdin_args.file: if stdin_args.playlist:
self.json_file = stdin_args.file self.json_file = stdin_args.playlist
else: else:
year, month, day = self.list_date.split('-') year, month, day = self.list_date.split('-')
self.json_file = os.path.join( self.json_file = os.path.join(
@ -1097,7 +1101,7 @@ def main():
stdin=PIPE stdin=PIPE
) )
if _playlist.mode: if _playlist.mode and not stdin_args.folder:
watcher = None watcher = None
get_source = GetSourceIter(encoder) get_source = GetSourceIter(encoder)
else: else:
@ -1144,7 +1148,7 @@ def main():
if __name__ == '__main__': if __name__ == '__main__':
if not _playlist.mode: if not _playlist.mode or stdin_args.folder:
from watchdog.events import PatternMatchingEventHandler from watchdog.events import PatternMatchingEventHandler
from watchdog.observers import Observer from watchdog.observers import Observer