X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fmediafile.php;h=9fe5432ad503273c47d35160a481dc84b6c5d3e7;hb=543d968b81b97c9ebd46de063d8d70621c12015b;hp=3bbbd162f0c18985d7cfc6238ab2b2d39854d8a5;hpb=c6b1b3e5e3ad1c47c7bd25b5bcfb0a8cb1cb2bb5;p=quix0rs-gnu-social.git diff --git a/lib/mediafile.php b/lib/mediafile.php index 3bbbd162f0..9fe5432ad5 100644 --- a/lib/mediafile.php +++ b/lib/mediafile.php @@ -42,12 +42,13 @@ class MediaFile var $short_fileurl = null; var $mimetype = null; - function __construct(Profile $scoped, $filename = null, $mimetype = null) + function __construct(Profile $scoped, $filename = null, $mimetype = null, $filehash = null) { $this->scoped = $scoped; $this->filename = $filename; $this->mimetype = $mimetype; + $this->filehash = $filehash; $this->fileRecord = $this->storeFile(); $this->fileurl = common_local_url('attachment', @@ -60,7 +61,7 @@ class MediaFile public function attachToNotice(Notice $notice) { - File_to_post::processNew($this->fileRecord->id, $notice->id); + File_to_post::processNew($this->fileRecord, $notice); } public function getPath() @@ -73,6 +74,11 @@ class MediaFile return $this->short_fileurl; } + function getEnclosure() + { + return $this->getFile()->getEnclosure(); + } + function delete() { $filepath = File::path($this->filename); @@ -90,16 +96,40 @@ class MediaFile protected function storeFile() { + $filepath = File::path($this->filename); + if (!empty($this->filename) && $this->filehash === null) { + // Calculate if we have an older upload method somewhere (Qvitter) that + // doesn't do this before calling new MediaFile on its local files... + $this->filehash = hash_file(File::FILEHASH_ALG, $filepath); + if ($this->filehash === false) { + throw new ServerException('Could not read file for hashing'); + } + } + + try { + $file = File::getByHash($this->filehash); + // We're done here. Yes. Already. We assume sha256 won't collide on us anytime soon. + return $file; + } catch (NoResultException $e) { + // Well, let's just continue below. + } + + $fileurl = File::url($this->filename); $file = new File; $file->filename = $this->filename; - $file->url = File::url($this->filename); - $filepath = File::path($this->filename); + $file->urlhash = File::hashurl($fileurl); + $file->url = $fileurl; + $file->filehash = $this->filehash; $file->size = filesize($filepath); + if ($file->size === false) { + throw new ServerException('Could not read file to get its size'); + } $file->date = time(); $file->mimetype = $this->mimetype; + $file_id = $file->insert(); if ($file_id===false) { @@ -139,10 +169,11 @@ class MediaFile function maybeAddRedir($file_id, $url) { - $file_redir = File_redirection::getKV('url', $url); - - if (!$file_redir instanceof File_redirection) { + try { + $file_redir = File_redirection::getByUrl($url); + } catch (NoResultException $e) { $file_redir = new File_redirection; + $file_redir->urlhash = File::hashurl($url); $file_redir->url = $url; $file_redir->file_id = $file_id; @@ -203,49 +234,86 @@ class MediaFile throw new ClientException(_('System error uploading file.')); } - // Throws exception if additional size does not respect quota - File::respectsQuota($scoped, $_FILES[$param]['size']); + // TODO: Make documentation clearer that this won't work for files >2GiB because + // PHP is stupid in its 32bit head. But noone accepts 2GiB files with PHP + // anyway... I hope. + $filehash = hash_file(File::FILEHASH_ALG, $_FILES[$param]['tmp_name']); + + try { + $file = File::getByHash($filehash); + // If no exception is thrown the file exists locally, so we'll use that and just add redirections. + $filename = $file->filename; + $mimetype = $file->mimetype; + + } catch (NoResultException $e) { + // We have to save the upload as a new local file. This is the normal course of action. - $mimetype = self::getUploadedMimeType($_FILES[$param]['tmp_name'], - $_FILES[$param]['name']); + // Throws exception if additional size does not respect quota + // This test is only needed, of course, if we're uploading something new. + File::respectsQuota($scoped, $_FILES[$param]['size']); - $basename = basename($_FILES[$param]['name']); - $filename = File::filename($scoped, $basename, $mimetype); - $filepath = File::path($filename); + $mimetype = self::getUploadedMimeType($_FILES[$param]['tmp_name'], $_FILES[$param]['name']); + + switch (common_config('attachments', 'filename_base')) { + case 'upload': + $basename = basename($_FILES[$param]['name']); + $filename = File::filename($scoped, $basename, $mimetype); + break; + case 'hash': + default: + $filename = strtolower($filehash) . '.' . File::guessMimeExtension($mimetype); + } + $filepath = File::path($filename); - $result = move_uploaded_file($_FILES[$param]['tmp_name'], $filepath); + $result = move_uploaded_file($_FILES[$param]['tmp_name'], $filepath); - if (!$result) { - // TRANS: Client exception thrown when a file upload operation fails because the file could - // TRANS: not be moved from the temporary folder to the permanent file location. - throw new ClientException(_('File could not be moved to destination directory.')); + if (!$result) { + // TRANS: Client exception thrown when a file upload operation fails because the file could + // TRANS: not be moved from the temporary folder to the permanent file location. + throw new ClientException(_('File could not be moved to destination directory.')); + } } - return new MediaFile($scoped, $filename, $mimetype); + return new MediaFile($scoped, $filename, $mimetype, $filehash); } static function fromFilehandle($fh, Profile $scoped) { - $stream = stream_get_meta_data($fh); + // So far we're only handling filehandles originating from tmpfile(), + // so we can always do hash_file on $stream['uri'] as far as I can tell! + $filehash = hash_file(File::FILEHASH_ALG, $stream['uri']); - File::respectsQuota($scoped, filesize($stream['uri'])); - - $mimetype = self::getUploadedMimeType($stream['uri']); - - $filename = File::filename($scoped, "email", $mimetype); - - $filepath = File::path($filename); + try { + $file = File::getByHash($filehash); + // Already have it, so let's reuse the locally stored File + $filename = $file->filename; + $mimetype = $file->mimetype; + } catch (NoResultException $e) { + File::respectsQuota($scoped, filesize($stream['uri'])); + + $mimetype = self::getUploadedMimeType($stream['uri']); + + switch (common_config('attachments', 'filename_base')) { + case 'upload': + $filename = File::filename($scoped, "email", $mimetype); + break; + case 'hash': + default: + $filename = strtolower($filehash) . '.' . File::guessMimeExtension($mimetype); + } + $filepath = File::path($filename); - $result = copy($stream['uri'], $filepath) && chmod($filepath, 0664); + $result = copy($stream['uri'], $filepath) && chmod($filepath, 0664); - if (!$result) { - // TRANS: Client exception thrown when a file upload operation fails because the file could - // TRANS: not be moved from the temporary folder to the permanent file location. - throw new ClientException(_('File could not be moved to destination directory.' . - $stream['uri'] . ' ' . $filepath)); + if (!$result) { + // TRANS: Client exception thrown when a file upload operation fails because the file could + // TRANS: not be moved from the temporary folder to the permanent file location. + throw new ClientException(_('File could not be moved to destination directory.' . + $stream['uri'] . ' ' . $filepath)); + } } - return new MediaFile($scoped, $filename, $mimetype); + return new MediaFile($scoped, $filename, $mimetype, $filehash); } /** @@ -269,6 +337,7 @@ class MediaFile $unclearTypes = array('application/octet-stream', 'application/vnd.ms-office', 'application/zip', + 'text/html', // Ironically, Wikimedia Commons' SVG_logo.svg is identified as text/html // TODO: for XML we could do better content-based sniffing too 'text/xml');