From 357ecf994c338faa164a3961de0e638b829d5210 Mon Sep 17 00:00:00 2001 From: Maff Date: Wed, 1 May 2019 11:42:03 +0000 Subject: [PATCH] Update 'trashtalker.py' --- trashtalker.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/trashtalker.py b/trashtalker.py index 6af1dc6..f5a7f1b 100644 --- a/trashtalker.py +++ b/trashtalker.py @@ -158,6 +158,19 @@ def PjDeinit(): elog(1, "deinit", "pjsip error when clearing down: %s" % str(e)) pass +def loadplaylist(): + olog(2, "playlist-load", "loading playlist files") + global sourcepath + if not sourcepath.endswith('/'): + olog(1, "playlist-load", "appending trailing / to TT_MEDIA_SOURCE") + sourcepath="%s/" % sourcepath + global files + files=listdir(sourcepath) + files[:]=[sourcepath+file for file in files] + assert (len(files) > 1), "playlist path %s must contain more than one audio file" % sourcepath + olog(1, "playlist-load", + "load playlist from %s, got %s files" % (sourcepath, len(files))) + def main(): olog(1, "init", "initialising trashtalker") global mainloop @@ -168,14 +181,7 @@ def main(): signal(SIGTERM, sighandle) assert sourcepath.startswith('/'), "Environment variable TT_MEDIA_PATH must be an absolute path!" try: - if not sourcepath.endswith('/'): - olog(1, "playlist-load", "appending trailing / to TT_MEDIA_PATH") - sourcepath=''.join(sourcepath, '/') - files=listdir(sourcepath) - files[:]=[sourcepath+file for file in files] - assert (len(files) > 1), "Playlist path must contain more than one audio file" - olog(1, "playlist-load", - "load playlist from %s, got %s files" % (sourcepath, len(files))) + loadplaylist() except: elog(1, "playlist-load", "exception encountered while loading playlist from path %s" % sourcepath) raise Exception("Unable to load playlist")