MediaFile thumbnail event hooks + VideoThumbnails plugin

[quix0rs-gnu-social.git] / classes / File.php

diff --git a/classes/File.php b/classes/File.php
index a5914b506e670f414e23a33b5de65a87fdbeebeb..8d0623bf489023ca0a08ee28d5a424fa5a02ddb2 100644 (file)
--- a/classes/File.php
+++ b/classes/File.php
@@ -116,7 +116,9 @@ class File extends Managed_DataObject
             } catch (Exception $e) {
                 return false;
             }
-
+            if ($oembed_data === false) {
+                return false;
+            }
             $fo = File_oembed::getKV('file_id', $this->id);
 
             if ($fo instanceof File_oembed) {
@@ -263,20 +265,13 @@ class File extends Managed_DataObject
 
     static function filename($profile, $basename, $mimetype)
     {
-        require_once 'MIME/Type/Extension.php';
-
-        // We have to temporarily disable auto handling of PEAR errors...
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-
-        $mte = new MIME_Type_Extension();
-        $ext = $mte->getExtension($mimetype);
-        if (PEAR::isError($ext)) {
-            $ext = strtolower(preg_replace('/\W/', '', $mimetype));
+        try {
+            $ext = common_supported_mime_to_ext($mimetype);
+        } catch (Exception $e) {
+            // We don't support this mimetype, but let's guess the extension
+            $ext = substr(strrchr($mimetype, '/'), 1);
         }
 
-        // Restore error handling.
-        PEAR::staticPopErrorHandling();
-
         $nickname = $profile->nickname;
         $datestamp = strftime('%Y%m%dT%H%M%S', time());
         $random = strtolower(common_confirmation_code(32));
@@ -438,6 +433,11 @@ class File extends Managed_DataObject
         return File_thumbnail::getKV('file_id', $this->id);
     }
 
+    public function getPath()
+    {
+        return self::path($this->filename);
+    }
+
     /**
      * Blow the cache of notices that link to this URL
      *