Saverr/svtplay-dl
1
0
Fork 0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-27 21:54:17 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #136 from Cybjit/master

Browse Source 
Python 3 fixes
This commit is contained in:
Johan Andersson 2014-09-28 23:29:48 +02:00
commit a94cb4474e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/svtplay_dl/fetcher/rtmp.py
View File

@ -22,9 +22,7 @@ class RTMP(VideoRetriever):
if self.options.resume: if self.options.resume:
args.append("-e") args.append("-e")
file_d = output(self.options, self.options.output, "flv", False) output(self.options, self.options.output, "flv", False)
if hasattr(file_d, "read") is False:
return
args += ["-o", self.options.output] args += ["-o", self.options.output]
if self.options.silent or self.options.output == "-": if self.options.silent or self.options.output == "-":
args.append("-q") args.append("-q")

2
lib/svtplay_dl/service/aftonbladet.py
View File

@ -56,7 +56,7 @@ class Aftonbladet(Service):
plist = "http://%s/%s/%s" % (address, path, hls["filename"]) plist = "http://%s/%s/%s" % (address, path, hls["filename"])
if playlist: if playlist:
streams = hlsparse(plist) streams = hlsparse(plist)
print streams log.info("streams %r", streams)
for n in list(streams.keys()): for n in list(streams.keys()):
yield HLS(copy.copy(options), streams[n], n) yield HLS(copy.copy(options), streams[n], n)
else: else: