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

try to check whether file exists over and over and over

This commit is contained in:
Evan Prodromou 2011-09-30 13:03:42 -04:00
parent f2a98e2329
commit e3c010a870
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
classes/File.php
View File

@ -85,14 +85,22 @@ class File extends Managed_DataObject
* @return File * @return File
*/ */
function saveNew(array $redir_data, $given_url) { function saveNew(array $redir_data, $given_url) {
$x = new File;
$x->url = $given_url; // I don't know why we have to keep doing this but I'm adding this last check to avoid
if (!empty($redir_data['protected'])) $x->protected = $redir_data['protected']; // uniqueness bugs.
if (!empty($redir_data['title'])) $x->title = $redir_data['title'];
if (!empty($redir_data['type'])) $x->mimetype = $redir_data['type']; $x = File::staticGet('url', $given_url);
if (!empty($redir_data['size'])) $x->size = intval($redir_data['size']);
if (isset($redir_data['time']) && $redir_data['time'] > 0) $x->date = intval($redir_data['time']); if (empty($x)) {
$file_id = $x->insert(); $x = new File;
$x->url = $given_url;
if (!empty($redir_data['protected'])) $x->protected = $redir_data['protected'];
if (!empty($redir_data['title'])) $x->title = $redir_data['title'];
if (!empty($redir_data['type'])) $x->mimetype = $redir_data['type'];
if (!empty($redir_data['size'])) $x->size = intval($redir_data['size']);
if (isset($redir_data['time']) && $redir_data['time'] > 0) $x->date = intval($redir_data['time']);
$file_id = $x->insert();
}
$x->saveOembed($redir_data, $given_url); $x->saveOembed($redir_data, $given_url);
return $x; return $x;
@ -192,7 +200,7 @@ class File extends Managed_DataObject
} }
if (empty($x)) { if (empty($x)) {
$x = File::staticGet($file_id); $x = File::staticGet('id', $file_id);
if (empty($x)) { if (empty($x)) {
// @todo FIXME: This could possibly be a clearer message :) // @todo FIXME: This could possibly be a clearer message :)
// TRANS: Server exception thrown when... Robin thinks something is impossible! // TRANS: Server exception thrown when... Robin thinks something is impossible!

8
plugins/Bookmark/bookmarkforurl.php
View File

@ -78,7 +78,13 @@ class BookmarkforurlAction extends Action
throw new ClientException(_('Invalid URL.'), 400); throw new ClientException(_('Invalid URL.'), 400);
} }
$f = File::processNew($this->url); $f = File::staticGet('url', $this->url);
if (empty($url)) {
$f = File::processNew($this->url);
}
// How about now?
if (!empty($f)) { if (!empty($f)) {
$this->oembed = File_oembed::staticGet('file_id', $f->id); $this->oembed = File_oembed::staticGet('file_id', $f->id);