Added ability to check for "File not found" HTTP error when embedding link to remote...

diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc
index 7b79cc28c737b462202c1aa0db93e46de9a9e355..b8941f60e09fcc5409f20bec9ea527629f35eea1 100644 (file)
--- a/ItemAddEmbedVideo.inc
+++ b/ItemAddEmbedVideo.inc
@@ -123,7 +123,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
                 GalleryCoreApi::fetchWebPage($feed, $extraHeaders);
               if (!$successfullyCopied) {
                   return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
-                               "Unable to get video information at url: $url"),null,null);
+                               "Unable to get video information at url: $url - $response"),null,null);
               }
 
 
@@ -181,7 +181,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
                 GalleryCoreApi::fetchWebPage($url, $extraHeaders);
               if (!$successfullyCopied) {
                   return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
-                               "Unable to get video information at url: $url"),null,null);
+                               "Unable to get video information at url: $url - $response"),NULL,NULL);
               }
 
               /* Extract the summary from the webpage contents */
@@ -190,9 +190,12 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
               $summary=$matches[1];
 
               /* Extract the title from the webpage contents */
-              preg_match('/<title>(.+?)\s+- Google Video<\/title>/i',
-                         $contents, $matches);
-              $title=$matches[1];
+              $title="Unknown";
+              if(preg_match('/<title>(.+?)\s+- Google Video<\/title>/i', $contents, $matches)) {
+                $title=$matches[1];
+              } else if(preg_match('/<title>(.+?)<\/title>/i', $contents, $matches)) {
+                $title=$matches[1];
+              }
 
               /* Extract the thumbnail URL from the webpage contents */
               preg_match('/<img src="(http:\/\/video\.google\.com\/ThumbnailServer2.+?)" /i',
@@ -234,11 +237,12 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
                 * Check to make sure the URL to the remote flv file is valid
                * (That the file exists at the URL given)
                 */
-              /*
-                * TODO: How can we check if the remote file exists without actually
-                * downloading the entire file? For now, if the file doesn't exist,
-                * a gallery item is still added, and the embedded player won't play it.
-                */ 
+              list ($successfullyCopied, $response, $headers) =
+                $this->fetchWebFileHeaders($url, $extraHeaders);
+              if (!$successfullyCopied) {
+                return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
+                             "Unable to find the video at url: $url - $response"),NULL,NULL);
+              }
               
               /*
                 * Format the description to hold a reference to the embedded video
@@ -347,7 +351,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
             GalleryCoreApi::fetchWebFile($thumbnail, $tmpFile, $extraHeaders);
           if (!$successfullyCopied) {
               return array(GalleryCoreApi::error(ERROR_STORAGE_FAILURE,__FILE__,__LINE__,
-                           "Unable to copy thumbnail from url: $url"),null,null);
+                           "Unable to copy thumbnail from url: $url - $response"),null,null);
           }
           
           /* Obtain the mimeType of the thumbnail */
@@ -368,6 +372,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
               print "thumbnail: $tmpFile <br>";
               print "mimeType: $mimeType <br>";
               print "fileName: $fileName <br>";
+              print "<br><br><b>Video Successfully Added to your Gallery Album</b><br><br>";
           }
 
           /* Make the gallery2 call to add this item to the album */
@@ -404,6 +409,103 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
      return($params['default'][$name]);
    }
  }
+
+ /**
+  * A simple function to get the headers only (no body) for a given URL
+  *
+  */
+ function fetchWebFileHeaders($url, $requestHeaders=array()) {
+     global $gallery;
+     
+     $requestMethod='GET';
+
+     /* Convert illegal characters */
+     $url = str_replace(' ', '%20', $url);
+     
+     /* Unescape ampersands, since if the URL comes from form input it will be escaped */
+     $url = str_replace('&amp;', '&', $url);
+
+     $platform =& $gallery->getPlatform();
+     
+     $urlComponents = parse_url($url);
+     if (empty($urlComponents['port'])) {
+         $urlComponents['port'] = 80;
+     }
+     if (empty($urlComponents['path'])) {
+         $urlComponents['path'] = '/';
+     }
+
+     $handle = @$platform->fsockopen(
+                                    $urlComponents['host'], $urlComponents['port'], $errno, $errstr, 5);
+     if (empty($handle)) {
+         $gallery->debug("Error $errno: '$errstr' requesting $url");
+         return array(null, null, null);
+     }
+     
+     $requestUri = $urlComponents['path'];
+     if (!empty($urlComponents['query'])) {
+         $requestUri .= '?' . $urlComponents['query'];
+     }
+     $headerLines = array('Host: ' . $urlComponents['host']);
+     foreach ($requestHeaders as $key => $value) {
+         $headerLines[] = $key . ': ' . $value;
+     }
+     
+     $success = $platform->fwrite($handle, sprintf("%s %s HTTP/1.0\r\n%s\r\n\r\n%s",
+                                                  $requestMethod,
+                                                  $requestUri,
+                                                  implode("\r\n", $headerLines),
+                                                  $requestBody));
+     if (!$success) {
+         /* Zero bytes written or false was returned */
+         $gallery->debug(
+                        "fwrite failed in requestWebPage($url)" . ($success === false ? ' - false' : ''));
+        return array(null, null, null);
+     }
+     $platform->fflush($handle);
+     
+     
+     /*
+      * Read the status line.  fgets stops after newlines.  The first line is the protocol
+      * version followed by a numeric status code and its associated textual phrase.
+      */
+     $responseStatus = trim($platform->fgets($handle, 4096));
+     if (empty($responseStatus)) {
+         $gallery->debug('Empty http response code, maybe timeout');
+         return array(null, null, null);
+     }
+     
+     /* Read the headers */
+     $responseHeaders = array();
+     while (!$platform->feof($handle)) {
+         $line = trim($platform->fgets($handle, 4096));
+         if (empty($line)) {
+            break;
+        }
+       
+        /* Normalize the line endings */
+        $line = str_replace("\r", '', $line);
+        
+        list ($key, $value) = explode(':', $line, 2);
+        if (isset($responseHeaders[$key])) {
+            if (!is_array($responseHeaders[$key])) {
+              $responseHeaders[$key] = array($responseHeaders[$key]);
+            }
+            $responseHeaders[$key][] = trim($value);
+        } else {
+            $responseHeaders[$key] = trim($value);
+        }
+     }
+     $platform->fclose($handle);
+
+     if(preg_match("/Not found/i", $responseStatus)) {
+         $success = 0;
+     }
+
+     //print "success: $success <br>responseStatus: $responseStatus <br>responseHeaders: $responseHeaders <br>";
+     
+     return array($success, $responseStatus, $responseHeaders);
+ }
  
  /**
   * @see ItemAdd:loadTemplate

diff --git a/templates/ItemAddEmbedVideo.tpl b/templates/ItemAddEmbedVideo.tpl
index a07a0b7fee1dcc9eeab368801d60defe42b614d6..5aaaf3c3b587295549b60d4e83a48ab006c33c64 100644 (file)
--- a/templates/ItemAddEmbedVideo.tpl
+++ b/templates/ItemAddEmbedVideo.tpl
@@ -20,7 +20,7 @@
 
     <br> 
     <b><u>Supported Video Sites:</u></b> <br>
-    <b>YouTube:</b> http://video.google.com/videoplay?docid=xxxxxxxxxxx&hl=en<br>
+    <b>YouTube:</b> http://video.google.com/videoplay?docid=xxxxxxxxxxx<br>
     <b>GoogleVideo:</b> http://www.youtube.com/watch?v=xxxxxxxxxxx<br>
     <br>
     <b><u>Supported File Types:</u></b><br>