stb/tivomirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Fehlerhafte) Detektion falscher MAKs ausschalten, Kosmetik

Browse source
This commit is contained in:
Stefan Bethke 2010-12-22 17:12:24 +00:00
parent 9fe8a84533
commit f7a86d19f0
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/tivomirror/tivomirror
View file

@ -1,6 +1,6 @@
#!/usr/local/bin/python #!/usr/local/bin/python
# $Schlepperbande: src/tivomirror/tivomirror,v 1.38 2010/12/18 10:03:31 stb Exp $ # $Schlepperbande: src/tivomirror/tivomirror,v 1.39 2010/12/18 22:53:24 stb Exp $
# #
# Stefans Script, um die Sendungen vom Tivo runterzuladen und in MPEG4 # Stefans Script, um die Sendungen vom Tivo runterzuladen und in MPEG4
# zu transkodieren. # zu transkodieren.
@ -176,14 +176,14 @@ def transcode(file, src, passno, ar):
def download(file, url, mak, target): def download(file, url, mak, target):
print "--- dowloading \"%s\"" % (url) print "--- dowloading \"%s\"" % (url)
start = time.clock() start = time.time()
p_curl = subprocess.Popen(["curl", "--anyauth", "--fail", \ p_curl = subprocess.Popen(["curl", "--anyauth", "--fail", \
"--insecure", "--cookie", "tivo/.cookies.txt", \ "--insecure", "--cookie", "tivo/.cookies.txt", \
"--silent", "--show-error", \ "--silent", "--show-error", \
"--user", "tivo:%s" % mak, "--url", url ], \ "--user", "tivo:%s" % mak, "--url", url ], \
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
p_decode = subprocess.Popen(["tivodecode", "--mak", mak, \ p_decode = subprocess.Popen(["tivodecode", "--mak", mak, \
"--out", target, "-"], stdin=p_curl.stdout) "--no-verify", "--out", target, "-"], stdin=p_curl.stdout)
try: try:
waitForProcs([p_curl.pid, p_decode.pid]) waitForProcs([p_curl.pid, p_decode.pid])
except Exception, e: except Exception, e:
@ -197,9 +197,10 @@ def download(file, url, mak, target):
print "error transcoding file: too small" print "error transcoding file: too small"
os.remove(target) os.remove(target)
raise TivoException("downloaded file is too small") raise TivoException("downloaded file is too small")
elapsed = time.clock() - start elapsed = time.time() - start
throughput = size / elapsed throughput = size / elapsed
print "%d bytes transferred in %d seconds, %4.1fk/s" % (size, elapsed, throughput / 1000.0) print "%5.3fGB transferred in %.f.%02.f hours, %.1fkB/s" % (
size/1e9, elapsed/3600, int(elapsed / 60) % 60, throughput/1e3)
def download_decode(file, url, mak, ar): def download_decode(file, url, mak, ar):