File width and height is now properly set for File

diff --git a/classes/File.php b/classes/File.php
index 9c04228735e35004e4438267d87b82cf0ce3a46c..2925819c36e1f4fa2d0cd238cadae5756889f556 100644 (file)
--- a/classes/File.php
+++ b/classes/File.php
@@ -498,36 +498,13 @@ class File extends Managed_DataObject
      */
     protected function generateThumbnail($width, $height, $crop)
     {
-        $imgPath = null;
-        $media = common_get_mime_media($this->mimetype);
         $width = intval($width);
         if ($height === null) {
             $height = $width;
             $crop = true;
         }
 
-        if (Event::handle('CreateFileImageThumbnailSource', array($this, &$imgPath, $media))) {
-            switch ($media) {
-            case 'image':
-                $imgPath = $this->getPath();
-                break;
-            default:
-                throw new UnsupportedMediaException(_('Unsupported media format.'), $this->getPath());
-            }
-        }
-        if (!file_exists($imgPath)) {
-            throw new ServerException(sprintf('Thumbnail source is not stored locally: %s', $imgPath));
-        }
-
-        try {
-            $image = new ImageFile($this->id, $imgPath);
-        } catch (UnsupportedMediaException $e) {
-            // Avoid deleting the original
-            if ($image->getPath() != $this->getPath()) {
-                $image->unlink();
-            }
-            throw $e;
-        }
+        $image = ImageFile::fromFileObject($this);
 
         list($width, $height, $x, $y, $w2, $h2) =
                                 $image->scaleToFit($width, $height, $crop);

diff --git a/lib/imagefile.php b/lib/imagefile.php
index f99469bbf0b790e518ba7d4eedc9152ece30ecbe..337c27b87a16627ebb6e45fc028936846a14e34a 100644 (file)
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -76,6 +76,36 @@ class ImageFile
         $this->height = ($info) ? $info[1]:$height;
     }
 
+    public static function fromFileObject(File $file)
+    {
+        $imgPath = null;
+        $media = common_get_mime_media($file->mimetype);
+        if (Event::handle('CreateFileImageThumbnailSource', array($file, &$imgPath, $media))) {
+            switch ($media) {
+            case 'image':
+                $imgPath = $file->getPath();
+                break;
+            default:
+                throw new UnsupportedMediaException(_('Unsupported media format.'), $file->getPath());
+            }
+        }
+
+        if (!file_exists($imgPath)) {
+            throw new ServerException(sprintf('Image not available locally: %s', $imgPath));
+        }
+
+        try {
+            $image = new ImageFile($file->id, $imgPath);
+        } catch (UnsupportedMediaException $e) {
+            // Avoid deleting the original
+            if ($imgPath != $file->getPath()) {
+                unlink($imgPath);
+            }
+            throw $e;
+        }
+        return $image;
+    }
+
     public function getPath()
     {
         if (!file_exists($this->filepath)) {

diff --git a/lib/mediafile.php b/lib/mediafile.php
index e1a9d1247c9001f5b29d164317db5fffcd5ca830..6f456fca4f15000af3918906fe020228aa205920 100644 (file)
--- a/lib/mediafile.php
+++ b/lib/mediafile.php
@@ -81,7 +81,8 @@ class MediaFile
         @unlink($filepath);
     }
 
-    function storeFile() {
+    protected function storeFile()
+    {
 
         $file = new File;
 
@@ -94,12 +95,33 @@ class MediaFile
 
         $file_id = $file->insert();
 
-        if (!$file_id) {
+        if ($file_id===false) {
             common_log_db_error($file, "INSERT", __FILE__);
             // TRANS: Client exception thrown when a database error was thrown during a file upload operation.
             throw new ClientException(_('There was a database error while saving your file. Please try again.'));
         }
 
+        // Set file geometrical properties if available
+        try {
+            $image = ImageFile::fromFileObject($file);
+            $orig = clone($file);
+            $file->width = $image->width;
+            $file->height = $image->height;
+            $file->update($orig);
+
+            // We have to cleanup after ImageFile, since it
+            // may have generated a temporary file from a
+            // video support plugin or something.
+            // FIXME: Do this more automagically.
+            if ($image->getPath() != $file->getPath()) {
+                $image->unlink();
+            }
+        } catch (ServerException $e) {
+            // We just couldn't make out an image from the file. This
+            // does not have to be UnsupportedMediaException, as we can
+            // also get ServerException from files not existing etc.
+        }
+
         return $file;
     }
 
@@ -139,46 +161,46 @@ class MediaFile
         }
 
         switch ($_FILES[$param]['error']) {
-        case UPLOAD_ERR_OK: // success, jump out
-            break;
-        case UPLOAD_ERR_INI_SIZE:
-            // TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-            throw new ClientException(_('The uploaded file exceeds the ' .
-                'upload_max_filesize directive in php.ini.'));
-        case UPLOAD_ERR_FORM_SIZE:
-            throw new ClientException(
+            case UPLOAD_ERR_OK: // success, jump out
+                break;
+            case UPLOAD_ERR_INI_SIZE:
+                // TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+                throw new ClientException(_('The uploaded file exceeds the ' .
+                            'upload_max_filesize directive in php.ini.'));
+            case UPLOAD_ERR_FORM_SIZE:
+                throw new ClientException(
+                        // TRANS: Client exception.
+                        _('The uploaded file exceeds the MAX_FILE_SIZE directive' .
+                            ' that was specified in the HTML form.'));
+            case UPLOAD_ERR_PARTIAL:
+                @unlink($_FILES[$param]['tmp_name']);
                 // TRANS: Client exception.
-                _('The uploaded file exceeds the MAX_FILE_SIZE directive' .
-                ' that was specified in the HTML form.'));
-        case UPLOAD_ERR_PARTIAL:
-            @unlink($_FILES[$param]['tmp_name']);
-            // TRANS: Client exception.
-            throw new ClientException(_('The uploaded file was only' .
-                ' partially uploaded.'));
-        case UPLOAD_ERR_NO_FILE:
-            // No file; probably just a non-AJAX submission.
-            return;
-        case UPLOAD_ERR_NO_TMP_DIR:
-            // TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-            throw new ClientException(_('Missing a temporary folder.'));
-        case UPLOAD_ERR_CANT_WRITE:
-            // TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-            throw new ClientException(_('Failed to write file to disk.'));
-        case UPLOAD_ERR_EXTENSION:
-            // TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-            throw new ClientException(_('File upload stopped by extension.'));
-        default:
-            common_log(LOG_ERR, __METHOD__ . ": Unknown upload error " .
-                $_FILES[$param]['error']);
-            // TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-            throw new ClientException(_('System error uploading file.'));
+                throw new ClientException(_('The uploaded file was only' .
+                            ' partially uploaded.'));
+            case UPLOAD_ERR_NO_FILE:
+                // No file; probably just a non-AJAX submission.
+                return;
+            case UPLOAD_ERR_NO_TMP_DIR:
+                // TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+                throw new ClientException(_('Missing a temporary folder.'));
+            case UPLOAD_ERR_CANT_WRITE:
+                // TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+                throw new ClientException(_('Failed to write file to disk.'));
+            case UPLOAD_ERR_EXTENSION:
+                // TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+                throw new ClientException(_('File upload stopped by extension.'));
+            default:
+                common_log(LOG_ERR, __METHOD__ . ": Unknown upload error " .
+                        $_FILES[$param]['error']);
+                // TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+                throw new ClientException(_('System error uploading file.'));
         }
 
         // Throws exception if additional size does not respect quota
         File::respectsQuota($scoped, $_FILES[$param]['size']);
 
         $mimetype = self::getUploadedMimeType($_FILES[$param]['tmp_name'],
-                                                   $_FILES[$param]['name']);
+                $_FILES[$param]['name']);
 
         $basename = basename($_FILES[$param]['name']);
         $filename = File::filename($scoped, $basename, $mimetype);

diff --git a/scripts/upgrade.php b/scripts/upgrade.php
index adce2555efabb84c6fcb37f01175089951461c3a..8d89773955153f6a99a342de276274e982291443 100644 (file)
--- a/scripts/upgrade.php
+++ b/scripts/upgrade.php
@@ -428,16 +428,23 @@ function fixupFileGeometry()
 
     if ($file->find()) {
         while ($file->fetch()) {
-            // Add support for video sizes too
+            // Set file geometrical properties if available
             try {
-                $image = new ImageFile($file->id, $file->getPath());
-            } catch (UnsupportedMediaException $e) {
+                $image = ImageFile::fromFileObject($file);
+            } catch (ServerException $e) {
+                // We couldn't make out an image from the file.
                 continue;
             }
             $orig = clone($file);
             $file->width = $image->width;
             $file->height = $image->height;
             $file->update($orig);
+
+            // FIXME: Do this more automagically inside ImageFile or so.
+            if ($image->getPath() != $file->getPath()) {
+                $image->unlink();
+            }
+            unset($image);
         }
     }