Page MenuHomePhabricator
Files F15489075

D15743.id37940.diff
No OneTemporary
Actions

D15743.id37940.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1009,6 +1009,7 @@
'FileAllocateConduitAPIMethod' => 'applications/files/conduit/FileAllocateConduitAPIMethod.php',
'FileConduitAPIMethod' => 'applications/files/conduit/FileConduitAPIMethod.php',
'FileCreateMailReceiver' => 'applications/files/mail/FileCreateMailReceiver.php',
+ 'FileDeletionWorker' => 'applications/files/worker/FileDeletionWorker.php',
'FileDownloadConduitAPIMethod' => 'applications/files/conduit/FileDownloadConduitAPIMethod.php',
'FileInfoConduitAPIMethod' => 'applications/files/conduit/FileInfoConduitAPIMethod.php',
'FileMailReceiver' => 'applications/files/mail/FileMailReceiver.php',
@@ -5253,6 +5254,7 @@
'FileAllocateConduitAPIMethod' => 'FileConduitAPIMethod',
'FileConduitAPIMethod' => 'ConduitAPIMethod',
'FileCreateMailReceiver' => 'PhabricatorMailReceiver',
+ 'FileDeletionWorker' => 'PhabricatorWorker',
'FileDownloadConduitAPIMethod' => 'FileConduitAPIMethod',
'FileInfoConduitAPIMethod' => 'FileConduitAPIMethod',
'FileMailReceiver' => 'PhabricatorObjectMailReceiver',
diff --git a/src/applications/files/controller/PhabricatorFileDeleteController.php b/src/applications/files/controller/PhabricatorFileDeleteController.php
--- a/src/applications/files/controller/PhabricatorFileDeleteController.php
+++ b/src/applications/files/controller/PhabricatorFileDeleteController.php
@@ -25,7 +25,15 @@
}
if ($request->isFormPost()) {
- $file->delete();
+ // Mark the file for deletion, save it, and schedule a worker to
+ // sweep by later and pick it up.
+ $file->setDeleted(true)->save();
+
+ PhabricatorWorker::scheduleTask(
+ 'FileDeletionWorker',
+ array('fileID' => $id),
+ array('priority' => PhabricatorWorker::PRIORITY_DEFAULT));
+
return id(new AphrontRedirectResponse())->setURI('/file/');
}
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
@@ -34,6 +34,7 @@
const METADATA_BUILTIN = 'builtin';
const METADATA_PARTIAL = 'partial';
const METADATA_PROFILE = 'profile';
+ const METADATA_DELETED = 'deleted';
protected $name;
protected $mimeType;
@@ -1070,6 +1071,15 @@
return idx($this->metadata, self::METADATA_IMAGE_WIDTH);
}
+ public function setDeleted($deleted) {
+ $this->metadata[self::METADATA_DELETED] = $deleted ? 1 : 0;
+ return $this;
+ }
+
+ public function getDeleted() {
+ return idx($this->metadata, self::METADATA_DELETED);
+ }
+
public function getCanCDN() {
if (!$this->isViewableImage()) {
return false;
diff --git a/src/applications/files/worker/FileDeletionWorker.php b/src/applications/files/worker/FileDeletionWorker.php
new file mode 100644
--- /dev/null
+++ b/src/applications/files/worker/FileDeletionWorker.php
@@ -0,0 +1,36 @@
+<?php
+
+final class FileDeletionWorker extends PhabricatorWorker {
+
+ private $file;
+
+ private function loadFile() {
+ if ($this->file) {
+ return $this->file;
+ }
+
+ $id = idx($this->getTaskData(), 'fileID');
+ if (!$id) {
+ throw new PhabricatorWorkerPermanentFailureException(
+ pht('No "%s" in task data.', 'fileID'));
+ }
+
+ $file = id(new PhabricatorFileQuery())
+ ->setViewer(PhabricatorUser::getOmnipotentUser())
+ ->withIDs(array($id))
+ ->executeOne();
+
+ if (!$file) {
+ throw new PhabricatorWorkerPermanentFailureException(
+ pht('File "%s" does not exist.', $id));
+ }
+
+ $this->file = $file;
+ return $file;
+ }
+
+ protected function doWork() {
+ $file = $this->loadFile();
+ $file->delete(); // Requiescat in pace
+ }
+}

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 12, 5:54 AM (3 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7721869
Default Alt Text
D15743.id37940.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility