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

[Media] Upload of previously uploaded files now works (bug fix)

Browse Source 
This bug was introduced with the commit "[Media] Fix issues with database file storage"
due to the API change "File::getByHash now returns a yield of files".

I had updated this function on that commit but had missed this little detail.
This commit is contained in:
Diogo Peralta Cordeiro 2021-02-18 17:49:10 +00:00
parent cab2112f1c
commit 4fec13eb20
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/media/mediafile.php
View File

@ -435,11 +435,13 @@ class MediaFile
} }
$filehash = strtolower(self::getHashOfFile($_FILES[$param]['tmp_name'])); $filehash = strtolower(self::getHashOfFile($_FILES[$param]['tmp_name']));
$fileid = null;
try { try {
$file = File::getByHash($filehash); $file = File::getByHash($filehash);
// There can be more than one file for the same filehash IF the url are different (due to different metadata).
while ($file->fetch()) { while ($file->fetch()) {
if ($file->getUrl(false)) { if ($file->getUrl(false)) {
// Files uploaded by Actors of this instance won't have an url, skip.
continue; continue;
} }
try { try {
@ -448,10 +450,11 @@ class MediaFile
return MediaFile::fromFileObject($file); return MediaFile::fromFileObject($file);
} }
} }
// If no exception is thrown the file exists locally, so we'll use that and just add redirections. // If no exception is thrown then this file was already uploaded by a local actor once, so we'll use that and just add redirections.
// but if the _actual_ locally stored file doesn't exist, getPath will throw FileNotFoundException // but if the _actual_ locally stored file doesn't exist, getPath will throw FileNotFoundException
$filepath = $file->getPath(); $filepath = $file->getPath();
$mimetype = $file->mimetype; $mimetype = $file->mimetype;
$fileid = $file->getID();
} catch (FileNotFoundException | NoResultException $e) { } catch (FileNotFoundException | NoResultException $e) {
// We have to save the upload as a new local file. This is the normal course of action. // We have to save the upload as a new local file. This is the normal course of action.
if ($scoped instanceof Profile) { if ($scoped instanceof Profile) {
@ -493,7 +496,7 @@ class MediaFile
return new ImageFile(null, $filepath, $filehash); return new ImageFile(null, $filepath, $filehash);
} }
} }
return new self($filepath, $mimetype, $filehash, null); return new self($filepath, $mimetype, $filehash, $fileid);
} }
/** /**