diff options
| -rw-r--r-- | src/webvicli/webvicli/client.py | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/webvicli/webvicli/client.py b/src/webvicli/webvicli/client.py index 78e1a2d..8b68bf6 100644 --- a/src/webvicli/webvicli/client.py +++ b/src/webvicli/webvicli/client.py @@ -28,6 +28,7 @@ import time import re import datetime import urllib +import shlex import libxml2 import webvi.api import webvi.utils @@ -489,19 +490,23 @@ class WVClient: if '%s' not in player: player = player + ' %s' - try: - # Hack for playing from fifo in VLC - if 'vlc' in player and streamurl.startswith('file://'): - streamurl = 'stream://' + streamurl[len('file://'):] + playcmd = shlex.split(player) + + # Hack for playing from fifo in VLC + if 'vlc' in playcmd[0] and streamurl.startswith('file://'): + realurl = 'stream://' + streamurl[len('file://'):] + else: + realurl = streamurl - playcmd = player.replace('%s', streamurl, 1) - except TypeError: + try: + playcmd[playcmd.index('%s')] = realurl + except ValueError: print 'Can\'t substitute URL in', player continue try: - print 'Trying player: ' + playcmd - retcode = subprocess.call(playcmd, shell=True) + print 'Trying player: ' + ' '.join(playcmd) + retcode = subprocess.call(playcmd) if retcode > 0: print 'Player failed with returncode', retcode else: |