utf8mb4 conversion on database with index adjusts

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

diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php
index 4d76b7dc55fc2e61036f9756aecc71f07183842d..af3551028e804182f8abacd230d73e3da465018e 100644 (file)
--- a/classes/File_thumbnail.php
+++ b/classes/File_thumbnail.php
@@ -17,9 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Table Definition for file_thumbnail
@@ -29,8 +27,8 @@ class File_thumbnail extends Managed_DataObject
 {
     public $__table = 'file_thumbnail';                  // table name
     public $file_id;                         // int(4)  primary_key not_null
-    public $url;                             // varchar(255)  unique_key
-    public $filename;                        // varchar(255)
+    public $url;                             // varchar(191)  unique_key   not 255 because utf8mb4 takes more space
+    public $filename;                        // varchar(191)   not 255 because utf8mb4 takes more space
     public $width;                           // int(4)  primary_key
     public $height;                          // int(4)  primary_key
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
@@ -40,8 +38,8 @@ class File_thumbnail extends Managed_DataObject
         return array(
             'fields' => array(
                 'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'thumbnail for what URL/file'),
-                'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of thumbnail'),
-                'filename' => array('type' => 'varchar', 'length' => 255, 'description' => 'if stored locally, filename is put here'),
+                'url' => array('type' => 'varchar', 'length' => 191, 'description' => 'URL of thumbnail'),
+                'filename' => array('type' => 'varchar', 'length' => 191, 'description' => 'if stored locally, filename is put here'),
                 'width' => array('type' => 'int', 'description' => 'width of thumbnail'),
                 'height' => array('type' => 'int', 'description' => 'height of thumbnail'),
                 'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
@@ -80,6 +78,17 @@ class File_thumbnail extends Managed_DataObject
         }
     }
 
+    /**
+     * Fetch an entry by using a File's id
+     */
+    static function byFile(File $file) {
+        $file_thumbnail = self::getKV('file_id', $file->id);
+        if (!$file_thumbnail instanceof File_thumbnail) {
+            throw new ServerException(sprintf('No File_thumbnail entry for File id==%u', $file->id));
+        }
+        return $file_thumbnail;
+    }
+
     /**
      * Save a thumbnail record for the referenced file record.
      *
@@ -108,10 +117,15 @@ class File_thumbnail extends Managed_DataObject
         return File::path($filename);
     }
 
+    public function getPath()
+    {
+        return self::path($this->filename);
+    }
+
     public function getUrl()
     {
-        if (!empty($this->filename)) {
-            // A locally stored file, so let's generate a URL for our instance.
+        if (!empty($this->getFile()->filename)) {
+            // A locally stored File, so let's generate a URL for our instance.
             $url = File::url($this->filename);
             if ($url != $this->url) {
                 // For indexing purposes, in case we do a lookup on the 'url' field.