More fixes for youtube.cgi

diff --git a/scripts/youtube.cgi b/scripts/youtube.cgi
index 9efe0869c00baad2b6a4335980ef41fb5bd5caec..a5d63d294947157498e24bf1a6ce78f985472d98 100755 (executable)
--- a/scripts/youtube.cgi
+++ b/scripts/youtube.cgi
@@ -92,17 +92,6 @@ def get_video_url(doc):
 
        return video_url, filename
 
-def print_filename_header(filename):
-       sys.stdout.write("Content-Disposition: attachment; filename=\"%s\"\r\n" % filename)
-
-def print_stream_file(video_url):
-       data = urllib.urlopen(video_url)
-       httpinfo = data.info()
-       sys.stdout.write("Content-Length: %s\r\n" % httpinfo.getheader("Content-Length"))
-       shutil.copyfileobj(data, sys.stdout)
-       data.close()
-
-
 def cgimain():
        args = cgi.parse()
        try:
@@ -114,8 +103,13 @@ def cgimain():
        try:
                doc = parse_url(url)
                video_url, filename = get_video_url(doc)
-               print_filename_header(filename)
-               print_stream_file(video_url)
+               data = urllib.urlopen(video_url)
+               httpinfo = data.info()
+               sys.stdout.write("Content-Disposition: attachment; filename=\"%s\"\r\n" % filename)
+               sys.stdout.write("Content-Length: %s\r\n" % httpinfo.getheader("Content-Length"))
+               sys.stdout.write("\r\n")
+               shutil.copyfileobj(data, sys.stdout)
+               data.close()
        except Exception, e:
                print_form(
                        url=url,