Changeset 600e713

Timestamp:

Aug 16, 2010, 8:15:05 PM (14 years ago)

Author:

Kyle Brogle <broglek@…>

Branches:

master, debian, mac, no-cups

Children:

04a6a66

Parents:

9dee329

git-author:

Kyle Brogle <broglek@…> (08/16/10 20:15:05)

git-committer:

Kyle Brogle <broglek@…> (08/16/10 20:15:05)

Message:

[Trac #12] Youtube urls now stream instead of downloading to the server.

Files:

• client/bin/gbr (modified) (1 diff)
• server/lib/gutenbach (modified) (1 diff)

client/bin/gbr

@@ -52 +52 @@
 foreach my $file(@files) {
     if ($file =~ m|http://www\.youtube\.com/watch\?v=|) {
-        open FILE, ">", "/tmp/gutenbach-youtube\n" or die "Couldn't create temporary file";
+        open FILE, ">", "/tmp/gutenbach-youtube" or die "Couldn't create temporary file";
         print FILE $file;
         $title = $file;

server/lib/gutenbach

@@ -174 +174 @@
     # YouTube URLs are resolved by the youtube-dl command.
     # Launch youtube-dl
-    $pid = open(YTDL, "-|");
-    if ($pid) {
-        print ZEPHYR "YouTube video $filepath.\nCurrently downloading, please wait...";
-        close ZEPHYR;
-        while (<YTDL>) {
-            open(ZEPHYR, "|-", @zwrite_command);
-            print ZEPHYR $_;
-            close ZEPHYR;
-        }
-        open(ZEPHYR, "|-", @zwrite_command);
-        print ZEPHYR "Done downloading.";
-        close ZEPHYR;
-    }
-    else {
-        my @args = ("youtube-dl", "-q", "-o", "/tmp/youtube.flv", $filepath);
-        exec(@args) or die "Couldn't exec youtube-dl";
-    }
-
-    $filepath = "/tmp/youtube.flv";
-    # Print the title to zephyr and the status string.
+    $pid = open(YTDL, "-|", "youtube-dl","-b", "-g", $filepath) or die "Unable to invoke youtube-dl";
+        print ZEPHYR "YouTube video $filepath\n$title";
+        $status .= " YouTube video $filepath. $title.";
+        # youtube-dl prints the URL of the flash video, which we pass to mplayer as a filename.
+        $filepath = <YTDL>;
+        chomp $filepath;
+
+
   } else { # Doesn't appear to be a YouTube URL.
     print STDERR "Resolved external reference to $filepath\n";