X-Git-Url: http://git.pippins.net/embedvideo/.git/static/images/checkmark.gif?a=blobdiff_plain;f=ItemAddEmbedVideo.inc;h=983ec79d041f82e00dcbb2c4968928f06d7ade98;hb=b219b04f87d68297cc8fd849aec6a2b6df92ba39;hp=6d1e8d7c5f26f945d6d670856bbf2c38ce1b762e;hpb=2266d371cd774ad41e57be7520b3121486437615;p=embedvideo%2F.git
diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc
index 6d1e8d7..983ec79 100644
--- a/ItemAddEmbedVideo.inc
+++ b/ItemAddEmbedVideo.inc
@@ -85,18 +85,37 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$flvThumbnail = $this->getParameter($ItemAddEmbedVideo, 'flvThumbnail', "");
$useRemoteSize = $this->getParameter($ItemAddEmbedVideo, 'useRemoteSize', "false");
$autoStart = $this->getParameter($ItemAddEmbedVideo, 'autoStart', "false");
-
+
+ /* Print our stored/set Parameters */
+ if(!strcmp($debugOutput,"true")) {
+ print "
";
+ print "Variable Parameters
";
+ print "debugOutput=$debugOutput
";
+ print "useInternalFlvPlayer=$useInternalFlvPlayer
";
+ print "youtubeDevId=$youtubeDevId
";
+ print "width=$width
";
+ print "height=$height
";
+ print "externalFlvPlayer=$externalFlvPlayer
";
+ print "externalFlvPlayerVars=$externalFlvPlayerVars
";
+ print "flvThumbnail=$flvThumbnail
";
+ print "useRemoteSize=$useRemoteSize
";
+ print "autoStart=$autoStart
";
+ print "
";
+ }
+
/* Store other string constants we'll use later */
/* youtube */
$youtubeUrlPattern="youtube.com";
$youtubeApiUrl="http://www.youtube.com/api2_rest";
+ /* We can't extract the server size from youtube */
$youtubeWidth="425";
$youtubeHeight="350";
/* google */
$googleUrlPattern="video.google.com";
$googlePlayer="http://video.google.com/googleplayer.swf";
+ /* We can't extract the server size from google video */
$googleWidth="400";
$googleHeight="326";
@@ -152,7 +171,9 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
}
if(!strcmp($debugOutput,"true")) {
+ print "Youtube XML Dump
";
print "$xml";
+ print "
";
}
/* Extract certain information from the xml feed */
@@ -252,10 +273,10 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
}
/* Format the description to hold a reference to the embedded video */
- $description = '';
$description.= "
$summary";
@@ -485,17 +506,13 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$tmpDir = $gallery->getConfig('data.gallery.tmp');
$tmpFile = $platform->tempnam($tmpDir, 'add');
$tmpFile.= ".jpg";
-
- if(!strcmp($debugOutput,"true")) {
- print "thumbnail: $thumbnail
";
- }
-
+
/* Fetch the thumbnail and save it to a local file */
list ($successfullyCopied, $response, $headers) =
GalleryCoreApi::fetchWebFile($thumbnail, $tmpFile, $extraHeaders);
if (!$successfullyCopied) {
return array(GalleryCoreApi::error(ERROR_STORAGE_FAILURE,__FILE__,__LINE__,
- "Unable to copy thumbnail from url: $url - $response"),null,null);
+ "Unable to copy thumbnail from url: $thumbnail - $response"),null,null);
}
/* Obtain the mimeType of the thumbnail */
@@ -510,42 +527,49 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
/* General debug output */
if(!strcmp($debugOutput,"true")) {
+ print "Item Parameters
";
+ print "url: $url
";
print "title: $title
";
- print "";
- print "\n".$summary."
";
- print "$description
";
+ print "thumbnailUrl: \n".$summary."";
+ print "description: $description
";
print "thumbnail: $tmpFile
";
print "mimeType: $mimeType
";
print "fileName: $fileName
";
- print "
Video Successfully Added to your Gallery Album
";
+ print "width: $width
";
+ print "height: $height
";
+ print "
";
}
/* Resize the thumbnail image to the size indicated by our album */
+ $debugString="";
list ($ret, $toolkit) = GalleryCoreApi::getToolkitByOperation($mimeType, 'resize');
if (!$ret) {
- if(!strcmp($debugOutput,"true")) {
- print "Checking to see if toolkit was found
";
- }
- if (isset($toolkit)) {
- $newTmpFile = $platform->tempnam($tmpDir, 'add');
- $newTmpFile.= ".jpg";
- $thumbnailSize = 150;
- list ($ret, $preferences) = GalleryCoreApi::fetchDerivativePreferencesForItem($item->getId());
- if(!$ret) {
- foreach ($preferences as $preference) {
- if (preg_match('/thumbnail\|(\d+)/',
- $preference['derivativeOperations'], $matches)) {
- $thumbnailSize = $matches[1];
- break;
+ $debugString.="Checking to see if a toolkit that can resize images was found.
";
+ if (isset($toolkit)) {
+ $newTmpFile = $platform->tempnam($tmpDir, 'add');
+ $newTmpFile.= ".jpg";
+ $thumbnailSize = 150;
+ list ($ret, $preferences) =
+ GalleryCoreApi::fetchDerivativePreferencesForItem($item->getId());
+ if(!$ret) {
+ foreach ($preferences as $preference) {
+ if (preg_match('/thumbnail\|(\d+)/',
+ $preference['derivativeOperations'], $matches)) {
+ $thumbnailSize = $matches[1];
+ $debugString.="Found thumbnail size in album preferences: $thumbnailSize
";
+ break;
+ }
+ }
}
- }
- }
- if(!strcmp($debugOutput,"true")) {
- print "Resizing thumbnail image to $thumbnailSize: $tmpFile -> $newTmpFile
";
+ $debugString.="Resizing thumbnail image to $thumbnailSize: $tmpFile -> $newTmpFile
";
+ $toolkit->performOperation($mimeType, 'resize', $tmpFile, $newTmpFile,
+ array($thumbnailSize,$thumbnailSize));
}
- $toolkit->performOperation($mimeType, 'resize', $tmpFile, $newTmpFile,
- array($thumbnailSize,$thumbnailSize));
- }
+ }
+ if(!strcmp($debugOutput,"true")) {
+ print "Thumbnail Resize
";
+ print "$debugString";
+ print "
";
}
/* Make the gallery2 call to add this item to the album */
@@ -564,6 +588,10 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$status['addedFiles'][] = array('fileName' => $url,
'id' => $newItem->getId(),
'warnings' => array());
+
+ if(!strcmp($debugOutput,"true")) {
+ print "
Video Successfully Added to your Gallery Album
";
+ }
}
/* Keep the tmpfiles around if we are in debug mode. Otherwise, remove them. */