X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FFile_thumbnail.php;h=fb2515f9f5c02efd028205c45f48b8c318cb108c;hb=3e1a6a65e65e0f5a051e39b3b792b53e1cc358cb;hp=4d76b7dc55fc2e61036f9756aecc71f07183842d;hpb=3927acdde547a2d908f91358360bd99c20c94a04;p=quix0rs-gnu-social.git

diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php
index 4d76b7dc55..fb2515f9f5 100644
--- 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;                             // text
+    public $filename;                        // text
     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' => 'text', 'not null' => false, 'description' => 'URL of thumbnail'),
+                'filename' => array('type' => 'text', '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->getID());
+        if (!$file_thumbnail instanceof File_thumbnail) {
+            throw new ServerException(sprintf('No File_thumbnail entry for File id==%u', $file->getID()));
+        }
+        return $file_thumbnail;
+    }
+
     /**
      * Save a thumbnail record for the referenced file record.
      *
@@ -108,39 +117,40 @@ class File_thumbnail extends Managed_DataObject
         return File::path($filename);
     }
 
-    public function getUrl()
+    static function url($filename)
     {
-        if (!empty($this->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.
-                // also we're fixing possible changes from http to https, or paths
-                $this->updateUrl($url);
-            }
-            return $url;
-        }
-
-        // No local filename available, return the URL we have stored
-        return $this->url;
+        // TODO: Store thumbnails in their own directory and don't use File::url here
+        return File::url($filename);
     }
 
-    public function updateUrl($url)
+    public function getPath()
     {
-        $file = File_thumbnail::getKV('url', $url);
-        if ($file instanceof File_thumbnail) {
-            throw new ServerException('URL already exists in DB');
+        $filepath = self::path($this->filename);
+        if (!file_exists($filepath)) {
+            throw new FileNotFoundException($filepath);
         }
-        $sql = 'UPDATE %1$s SET url=%2$s WHERE url=%3$s;';
-        $result = $this->query(sprintf($sql, $this->__table,
-                                             $this->_quote((string)$url),
-                                             $this->_quote((string)$this->url)));
-        if ($result === false) {
-            common_log_db_error($this, 'UPDATE', __FILE__);
-            throw new ServerException("Could not UPDATE {$this->__table}.url");
+        return $filepath;
+    }
+
+    public function getUrl()
+    {
+        if (!empty($this->getFile()->filename)) {
+            // A locally stored File, so we can dynamically generate a URL.
+            if (!empty($this->url)) {
+                // Let's just clear this field as there is no point in having it for local files.
+                $orig = clone($this);
+                $this->url = null;
+                $this->update($orig);
+            }
+            $url = common_local_url('attachment_thumbnail', array('attachment'=>$this->file_id));
+            if (strpos($url, '?') === false) {
+                $url .= '?';
+            }
+            return $url . http_build_query(array('w'=>$this->width, 'h'=>$this->height));
         }
 
-        return $result;
+        // No local filename available, return the URL we have stored
+        return $this->url;
     }
 
     public function delete($useWhere=false)
@@ -157,11 +167,6 @@ class File_thumbnail extends Managed_DataObject
 
     public function getFile()
     {
-        $file = new File();
-        $file->id = $this->file_id;
-        if (!$file->find(true)) {
-            throw new NoResultException($file);
-        }
-        return $file;
+        return File::getByID($this->file_id);
     }
 }