Page MenuHomePhabricator
Files F13177668

D10216.diff
No OneTemporary
Actions

D10216.diff
View Options

diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -1,5 +1,21 @@
<?php
+/**
+ * Parameters
+ * ==========
+ *
+ * When creating a new file using a method like @{method:newFromFileData}, these
+ * parameters are supported:
+ *
+ * | name | Human readable filename.
+ * | authorPHID | User PHID of uploader.
+ * | ttl | Temporary file lifetime, in seconds.
+ * | viewPolicy | File visibility policy.
+ * | isExplicitUpload | Used to show users files they explicitly uploaded.
+ * | canCDN | Allows the file to be cached and delivered over a CDN.
+ * | mime-type | Optional, explicit file MIME type.
+ *
+ */
final class PhabricatorFile extends PhabricatorFileDAO
implements
PhabricatorTokenReceiverInterface,
@@ -159,10 +175,11 @@
return $file;
}
- public static function newFileFromContentHash($hash, $params) {
+ public static function newFileFromContentHash($hash, array $params) {
// Check to see if a file with same contentHash exist
$file = id(new PhabricatorFile())->loadOneWhere(
- 'contentHash = %s LIMIT 1', $hash);
+ 'contentHash = %s LIMIT 1',
+ $hash);
if ($file) {
// copy storageEngine, storageHandle, storageFormat
@@ -172,21 +189,9 @@
$copy_of_byteSize = $file->getByteSize();
$copy_of_mimeType = $file->getMimeType();
- $file_name = idx($params, 'name');
- $file_name = self::normalizeFileName($file_name);
- $file_ttl = idx($params, 'ttl');
- $authorPHID = idx($params, 'authorPHID');
-
$new_file = new PhabricatorFile();
- $new_file->setName($file_name);
$new_file->setByteSize($copy_of_byteSize);
- $new_file->setAuthorPHID($authorPHID);
- $new_file->setTtl($file_ttl);
-
- if (idx($params, 'viewPolicy')) {
- $new_file->setViewPolicy($params['viewPolicy']);
- }
$new_file->setContentHash($hash);
$new_file->setStorageEngine($copy_of_storage_engine);
@@ -195,6 +200,8 @@
$new_file->setMimeType($copy_of_mimeType);
$new_file->copyDimensions($file);
+ $new_file->readPropertiesFromParameters($params);
+
$new_file->save();
return $new_file;
@@ -253,39 +260,19 @@
$exceptions);
}
- $file_name = idx($params, 'name');
- $file_name = self::normalizeFileName($file_name);
- $file_ttl = idx($params, 'ttl');
-
- // If for whatever reason, authorPHID isn't passed as a param
- // (always the case with newFromFileDownload()), store a ''
- $authorPHID = idx($params, 'authorPHID');
-
- $file->setName($file_name);
$file->setByteSize(strlen($data));
- $file->setAuthorPHID($authorPHID);
- $file->setTtl($file_ttl);
$file->setContentHash(self::hashFileContent($data));
- if (idx($params, 'viewPolicy')) {
- $file->setViewPolicy($params['viewPolicy']);
- }
-
- if (idx($params, 'canCDN')) {
- $file->setCanCDN(true);
- }
-
$file->setStorageEngine($engine_identifier);
$file->setStorageHandle($data_handle);
// TODO: This is probably YAGNI, but allows for us to do encryption or
// compression later if we want.
$file->setStorageFormat(self::STORAGE_FORMAT_RAW);
- $file->setIsExplicitUpload(idx($params, 'isExplicitUpload') ? 1 : 0);
- if (isset($params['mime-type'])) {
- $file->setMimeType($params['mime-type']);
- } else {
+ $file->readPropertiesFromParameters($params);
+
+ if (!$file->getMimeType()) {
$tmp = new TempFile();
Filesystem::writeFile($tmp, $data);
$file->setMimeType(Filesystem::getMimeType($tmp));
@@ -936,6 +923,49 @@
}
+ /**
+ * Configure a newly created file object according to specified parameters.
+ *
+ * This method is called both when creating a file from fresh data, and
+ * when creating a new file which reuses existing storage.
+ *
+ * @param map<string, wild> Bag of parameters, see @{class:PhabricatorFile}
+ * for documentation.
+ * @return this
+ */
+ private function readPropertiesFromParameters(array $params) {
+ $file_name = idx($params, 'name');
+ $file_name = self::normalizeFileName($file_name);
+ $this->setName($file_name);
+
+ $author_phid = idx($params, 'authorPHID');
+ $this->setAuthorPHID($author_phid);
+
+ $file_ttl = idx($params, 'ttl');
+ $this->setTtl($file_ttl);
+
+ $view_policy = idx($params, 'viewPolicy');
+ if ($view_policy) {
+ $this->setViewPolicy($params['viewPolicy']);
+ }
+
+ $is_explicit = (idx($params, 'isExplicitUpload') ? 1 : 0);
+ $this->setIsExplicitUpload($is_explicit);
+
+ $can_cdn = idx($params, 'canCDN');
+ if ($can_cdn) {
+ $this->setCanCDN(true);
+ }
+
+ $mime_type = idx($params, 'mime-type');
+ if ($mime_type) {
+ $this->setMimeType($mime_type);
+ }
+
+ return $this;
+ }
+
+
/* -( PhabricatorPolicyInterface Implementation )-------------------------- */

File Metadata

Mime Type
text/plain
Expires
Thu, May 9, 7:52 PM (3 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6276056
Default Alt Text
D10216.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility