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

Use new ::getByUrl for File and File_redirection

Browse Source 
and make use of the exceptions instead endless if statements
This commit is contained in:
Mikael Nordfeldth 2015-02-19 19:29:55 +01:00
parent 5b940f255f
commit 8ac8e2e734
1 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
classes/File.php
View File

@ -127,16 +127,23 @@ class File extends Managed_DataObject
throw new ServerException('No canonical URL from given URL to process'); throw new ServerException('No canonical URL from given URL to process');
} }
$file = File::getKV('url', $given_url); $file = null;
if (!$file instanceof File) {
try {
$file = File::getByUrl($given_url);
} catch (NoResultException $e) {
// First check if we have a lookup trace for this URL already // First check if we have a lookup trace for this URL already
$file_redir = File_redirection::getKV('url', $given_url); try {
if ($file_redir instanceof File_redirection) { $file_redir = File_redirection::getByUrl($given_url);
$file = File::getKV('id', $file_redir->file_id); $file = File::getKV('id', $file_redir->file_id);
if (!$file instanceof File) { if (!$file instanceof File) {
// File did not exist, let's clean up the File_redirection entry // File did not exist, let's clean up the File_redirection entry
$file_redir->delete(); $file_redir->delete();
} }
} catch (NoResultException $e) {
// We just wanted to doublecheck whether a File_thumbnail we might've had
// actually referenced an existing File object.
}
} }
// If we still don't have a File object, let's create one now! // If we still don't have a File object, let's create one now!
@ -156,8 +163,7 @@ class File extends Managed_DataObject
throw new ServerException(sprintf(_("Cannot process URL '%s'"), $given_url)); throw new ServerException(sprintf(_("Cannot process URL '%s'"), $given_url));
} }
// TODO: max field length if ($redir_url === $given_url || !$followRedirects) {
if ($redir_url === $given_url || strlen($redir_url) > 255 || !$followRedirects) {
// Save the File object based on our lookup trace // Save the File object based on our lookup trace
$file = File::saveNew($redir_data, $given_url); $file = File::saveNew($redir_data, $given_url);
} else { } else {
@ -172,7 +178,6 @@ class File extends Managed_DataObject
$file = self::processNew($redir_url, $notice_id, /*followRedirects*/false); $file = self::processNew($redir_url, $notice_id, /*followRedirects*/false);
File_redirection::saveNew($redir_data, $file->id, $given_url); File_redirection::saveNew($redir_data, $file->id, $given_url);
} }
}
if (!$file instanceof File) { if (!$file instanceof File) {
// This should only happen if File::saveNew somehow did not return a File object, // This should only happen if File::saveNew somehow did not return a File object,