Skip to content

Commit

Permalink
Add seek support. Parse extra tvh commands to ffmpeg
Browse files Browse the repository at this point in the history
  • Loading branch information
matthuisman committed Jul 6, 2019
1 parent 1de9e5c commit d220980
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
Empty file modified iptv_merge.m3u8.sh
100644 → 100755
Empty file.
Empty file modified proxy
100644 → 100755
Empty file.
12 changes: 10 additions & 2 deletions proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,9 @@ def ListItem_addContextMenuItems(self, items, replaceItems=False):
def ListItem_setProperty(self, key, value):
self._data['property'][key] = value

def ListItem_getProperty(self, key):
return self._data['property'].get(key, '')

def ListItem_setPath(self, path):
self._data['path'] = path

Expand Down Expand Up @@ -625,6 +628,7 @@ def Window_save(self):
xbmcgui.ListItem.addStreamInfo = ListItem_addStreamInfo
xbmcgui.ListItem.addContextMenuItems = ListItem_addContextMenuItems
xbmcgui.ListItem.setProperty = ListItem_setProperty
xbmcgui.ListItem.getProperty = ListItem_getProperty
xbmcgui.ListItem.setPath = ListItem_setPath
xbmcgui.ListItem.getPath = ListItem_getPath
xbmcgui.ListItem.__str__ = ListItem_str
Expand Down Expand Up @@ -727,10 +731,14 @@ def output_tvh(listitem):
else:
url, headers = path, ''

seek = listitem.getProperty('ResumeTime')
if seek:
seek = '-ss {}'.format(seek)

if name:
name = "-metadata service_name='{name}' ".format(name=name)
name = "-metadata service_name='{}'".format(name)

print("-loglevel fatal {headers}-i '{url}' -vcodec copy -acodec copy {name}-f mpegts pipe:1".format(headers=headers, url=url, name=name))
print("-loglevel fatal {headers} {seek} -i '{url}' {name}".format(headers=headers, seek=seek, url=url, name=name))
sys.exit(200)

def addSortMethod(handle, sortMethod, label2Mask=""):
Expand Down
5 changes: 3 additions & 2 deletions tvh.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ SCRIPT_PATH="$(dirname $SCRIPT)"
OUTPUT="$(proxy_type=TVH $SCRIPT_PATH/.env/bin/python $SCRIPT_PATH/proxy.py $1)"

if [ $? -eq 200 ]; then
eval "ffmpeg $OUTPUT"
shift
eval "ffmpeg $OUTPUT $@ -vcodec copy -acodec copy -f mpegts pipe:1"
else
echo "$OUTPUT"
fi
fi

0 comments on commit d220980

Please sign in to comment.