GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Use getUrl() on File and File_thumbnail instead of ->url

Browse Source
This commit is contained in:
Mikael Nordfeldth
2015-03-04 13:13:04 +01:00
parent a4af51b5ba
commit 286b54e527
4 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
classes/File_thumbnail.php
View File

@@ -38,7 +38,7 @@ 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' => 'text', 'description' => 'URL of thumbnail'),
'url' => array('type' => 'text', 'not null' => false, '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'),
@@ -117,6 +117,12 @@ class File_thumbnail extends Managed_DataObject
return File::path($filename);
}
static function url($filename)
{
// TODO: Store thumbnails in their own directory and don't use File::url here
return File::url($filename);
}
public function getPath()
{
$filepath = self::path($this->filename);
@@ -129,38 +135,20 @@ class File_thumbnail extends Managed_DataObject
public function getUrl()
{
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.
// also we're fixing possible changes from http to https, or paths
$this->updateUrl($url);
// 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);
}
return $url;
return self::url($this->filename);
}
// No local filename available, return the URL we have stored
return $this->url;
}
public function updateUrl($url)
{
$file = File_thumbnail::getKV('url', $url);
if ($file instanceof File_thumbnail) {
throw new ServerException('URL already exists in DB');
}
$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 $result;
}
public function delete($useWhere=false)
{
if (!empty($this->filename) && file_exists(File_thumbnail::path($this->filename))) {

6
lib/activityobject.php
View File

@@ -512,11 +512,11 @@ class ActivityObject
switch (self::canonicalType($object->type)) {
case 'image':
$object->largerImage = $file->url;
$object->largerImage = $file->getUrl();
break;
case 'video':
case 'audio':
$object->stream = $file->url;
$object->stream = $file->getUrl();
break;
}
@@ -861,7 +861,7 @@ class ActivityObject
if (is_string($this->thumbnail)) {
$object['image'] = array('url' => $this->thumbnail);
} else {
$object['image'] = array('url' => $this->thumbnail->url);
$object['image'] = array('url' => $this->thumbnail->getUrl());
if ($this->thumbnail->width) {
$object['image']['width'] = $this->thumbnail->width;
}

4
plugins/Bookmark/BookmarkPlugin.php
View File

@@ -409,7 +409,7 @@ class BookmarkPlugin extends MicroAppPlugin
$target = $attachments[0];
$attrs = array('rel' => 'related',
'href' => $target->url);
'href' => $target->getUrl());
if (!empty($target->title)) {
$attrs['title'] = $target->title;
@@ -422,7 +422,7 @@ class BookmarkPlugin extends MicroAppPlugin
try {
$thumbnail = $target->getThumbnail();
$tattrs = array('rel' => 'preview',
'href' => $thumbnail->url);
'href' => $thumbnail->getUrl());
if (!empty($thumbnail->width)) {
$tattrs['media:width'] = $thumbnail->width;

2
plugins/Bookmark/forms/bookmark.php
View File

@@ -131,7 +131,7 @@ class BookmarkForm extends Form
$this->_thumbnail->height);
$this->out->element('img',
array('src' => $this->_thumbnail->url,
array('src' => $this->_thumbnail->getUrl(),
'class' => 'bookmarkform-thumbnail',
'width' => $width,
'height' => $height));