Dynamically generate thumbnails (see full text)

[quix0rs-gnu-social.git] / lib / attachmentlist.php

diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index cf7c9acc147fe8ab24ddc0c525f5b6c5a43fff16..073581593381fb3ea3405286d663b71670ae8705 100644 (file)
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('GNUSOCIAL') && !defined('STATUSNET')) {
     exit(1);
 }
 
@@ -67,16 +67,16 @@ class AttachmentList extends Widget
     }
 
     /**
-     * show the list of notices
+     * show the list of attachments
      *
      * "Uses up" the stream by looping through it. So, probably can't
      * be called twice on the same list.
      *
-     * @return int count of notices listed.
+     * @return int count of items listed.
      */
     function show()
     {
-        $att = File::getAttachments($this->notice->id);
+       $att = $this->notice->attachments();
         if (empty($att)) return 0;
         $this->showListStart();
 
@@ -101,16 +101,13 @@ class AttachmentList extends Widget
     }
 
     /**
-     * returns a new list item for the current notice
+     * returns a new list item for the current attachment
      *
-     * Recipe (factory?) method; overridden by sub-classes to give
-     * a different list item class.
+     * @param File $attachment the current attachment
      *
-     * @param Notice $notice the current notice
-     *
-     * @return NoticeListItem a list item for displaying the notice
+     * @return AttachmentListItem a list item for displaying the attachment
      */
-    function newListItem($attachment)
+    function newListItem(File $attachment)
     {
         return new AttachmentListItem($attachment, $this->out);
     }
@@ -142,23 +139,19 @@ class AttachmentListItem extends Widget
     var $oembed = null;
 
     /**
-     * constructor
-     *
-     * Also initializes the profile attribute.
-     *
-     * @param Notice $notice The notice we'll display
+     * @param File $attachment the attachment we will display
      */
-    function __construct($attachment, $out=null)
+    function __construct(File $attachment, $out=null)
     {
         parent::__construct($out);
         $this->attachment  = $attachment;
-        $this->oembed = File_oembed::staticGet('file_id', $this->attachment->id);
+        $this->oembed = File_oembed::getKV('file_id', $this->attachment->id);
     }
 
     function title() {
         if (empty($this->attachment->title)) {
             if (empty($this->oembed->title)) {
-                $title = $this->attachment->url;
+                $title = $this->attachment->filename;
             } else {
                 $title = $this->oembed->title;
             }
@@ -192,7 +185,7 @@ class AttachmentListItem extends Widget
         return array('class' => 'attachment',
                      'href' => $this->attachment->url,
                      'id' => 'attachment-' . $this->attachment->id,
-                     'title' => $this->title());
+                     'title' => $this->linkTitle());
     }
 
     function showLink() {
@@ -208,34 +201,14 @@ class AttachmentListItem extends Widget
     }
 
     function showRepresentation() {
-        $thumb = $this->getThumbInfo();
-        if ($thumb) {
-            $this->out->element('img', array('alt' => '', 'src' => $thumb->url, 'width' => $thumb->width, 'height' => $thumb->height));
+        try {
+            $thumb = $this->attachment->getThumbnail();
+            $this->out->element('img', array('alt' => '', 'src' => $thumb->getUrl(), 'width' => $thumb->width, 'height' => $thumb->height));
+        } catch (Exception $e) {
+            // Image representation unavailable
         }
     }
 
-    /**
-     * Pull a thumbnail image reference for the given file, and if necessary
-     * resize it to match currently thumbnail size settings.
-     *
-     * @return File_Thumbnail or false/null
-     */
-    function getThumbInfo()
-    {
-        $thumbnail = File_thumbnail::staticGet('file_id', $this->attachment->id);
-        if ($thumbnail) {
-            $maxWidth = common_config('attachments', 'thumb_width');
-            $maxHeight = common_config('attachments', 'thumb_height');
-            if ($thumbnail->width > $maxWidth) {
-                $thumb = clone($thumbnail);
-                $thumb->width = $maxWidth;
-                $thumb->height = intval($thumbnail->height * $maxWidth / $thumbnail->width);
-                return $thumb;
-            }
-        }
-        return $thumbnail;
-    }
-
     /**
      * start a single notice.
      *
@@ -329,11 +302,6 @@ class Attachment extends AttachmentListItem
                     break;
 
                 case 'application/ogg':
-                case 'audio/x-speex':
-                case 'video/mpeg':
-                case 'audio/mpeg':
-                case 'video/mp4':
-                case 'video/quicktime':
                     $arr  = array('type' => $this->attachment->mimetype,
                         'data' => $this->attachment->url,
                         'width' => 320,
@@ -345,6 +313,31 @@ class Attachment extends AttachmentListItem
                     $this->out->elementEnd('object');
                     break;
 
+                case 'audio/ogg':
+                case 'audio/x-speex':
+                case 'video/mpeg':
+                case 'audio/mpeg':
+                case 'video/mp4':
+                case 'video/ogg':
+                case 'video/quicktime':
+                case 'video/webm':
+                    $mediatype = common_get_mime_media($this->attachment->mimetype);
+                    try {
+                        $thumb = $this->attachment->getThumbnail();
+                        $poster = $thumb->getUrl();
+                    } catch (Exception $e) {
+                        $poster = null;
+                    }
+                    $this->out->elementStart($mediatype,
+                                        array('class'=>'attachment_player',
+                                            'poster'=>$poster,
+                                            'controls'=>'controls'));
+                    $this->out->element('source',
+                                        array('src'=>$this->attachment->url,
+                                            'type'=>$this->attachment->mimetype));
+                    $this->out->elementEnd($mediatype);
+                    break;
+
                 case 'text/html':
                     if ($this->attachment->filename) {
                         // Locally-uploaded HTML. Scrub and display inline.