Page MenuHomePhabricator
Files F15463640

D12061.id.diff
No OneTemporary
Actions

D12061.id.diff
View Options

diff --git a/src/workflow/ArcanistUploadWorkflow.php b/src/workflow/ArcanistUploadWorkflow.php
--- a/src/workflow/ArcanistUploadWorkflow.php
+++ b/src/workflow/ArcanistUploadWorkflow.php
@@ -55,24 +55,74 @@
$results = array();
foreach ($this->paths as $path) {
+ $path = Filesystem::resolvePath($path);
+
$name = basename($path);
- $this->writeStatusMessage(pht("Uploading '%s'...", $name)."\n");
+ $this->writeStatus(pht("Uploading '%s'...", $name));
+
+ $hash = @sha1_file($path);
+ if (!$hash) {
+ throw new Exception(pht('Unable to read file "%s"!', $path));
+ }
+ $length = filesize($path);
+ $phid = null;
try {
- $data = Filesystem::readFile($path);
- } catch (FilesystemException $ex) {
- $this->writeStatusMessage(
- pht('Unable to upload file: %s.', $ex->getMessage())."\n");
- $results[$path] = null;
- continue;
+ $result = $conduit->callMethodSynchronous(
+ 'file.allocate',
+ array(
+ 'name' => $name,
+ 'contentLength' => $length,
+ 'contentHash' => $hash,
+
+ // TODO: Remove this once this feature is good to go. For now,
+ // this is helpful for testing.
+ // 'forceChunking' => true,
+ ));
+
+ $phid = $result['filePHID'];
+ if (!$result['upload']) {
+ if (!$phid) {
+ $this->writeStatus(
+ pht(
+ 'Unable to upload file "%s": the server refused to accept '.
+ 'it. This usually means it is too large.',
+ $name));
+ continue;
+ }
+ // Otherwise, the server completed the upload by referencing known
+ // file data.
+ } else {
+ if ($phid) {
+ $this->uploadChunks($phid, $path);
+ } else {
+ // This is a small file that doesn't need to be uploaded in
+ // chunks, so continue normally.
+ }
+ }
+ } catch (Exception $ex) {
+ $this->writeStatus(
+ pht('Unable to use allocate method, trying older upload method.'));
+ }
+
+ if (!$phid) {
+ try {
+ $data = Filesystem::readFile($path);
+ } catch (FilesystemException $ex) {
+ $this->writeStatus(
+ pht('Unable to read file "%s".', $ex->getMessage()));
+ $results[$path] = null;
+ continue;
+ }
+
+ $phid = $conduit->callMethodSynchronous(
+ 'file.upload',
+ array(
+ 'data_base64' => base64_encode($data),
+ 'name' => $name,
+ ));
}
- $phid = $conduit->callMethodSynchronous(
- 'file.upload',
- array(
- 'data_base64' => base64_encode($data),
- 'name' => $name,
- ));
$info = $conduit->callMethodSynchronous(
'file.info',
array(
@@ -90,10 +140,85 @@
if ($this->json) {
echo json_encode($results)."\n";
} else {
- $this->writeStatusMessage(pht('Done.')."\n");
+ $this->writeStatus(pht('Done.'));
}
return 0;
}
+ private function writeStatus($line) {
+ $this->writeStatusMessage($line."\n");
+ }
+
+ private function uploadChunks($file_phid, $path) {
+ $conduit = $this->getConduit();
+
+ $f = @fopen($path, 'rb');
+ if (!$f) {
+ throw new Exception(pht('Unable to open file "%s"', $path));
+ }
+
+ $this->writeStatus(pht('Beginning chunked upload of large file...'));
+ $chunks = $conduit->callMethodSynchronous(
+ 'file.querychunks',
+ array(
+ 'filePHID' => $file_phid,
+ ));
+
+ $remaining = array();
+ foreach ($chunks as $chunk) {
+ if (!$chunk['complete']) {
+ $remaining[] = $chunk;
+ }
+ }
+
+ $done = (count($chunks) - count($remaining));
+
+ if ($done) {
+ $this->writeStatus(
+ pht(
+ 'Resuming upload (%d of %d chunks remain).',
+ new PhutilNumber(count($remaining)),
+ new PhutilNumber(count($chunks))));
+ } else {
+ $this->writeStatus(
+ pht(
+ 'Uploading chunks (%d chunks to upload).',
+ new PhutilNumber(count($remaining))));
+ }
+
+ $progress = new PhutilConsoleProgressBar();
+ $progress->setTotal(count($chunks));
+
+ for ($ii = 0; $ii < $done; $ii++) {
+ $progress->update(1);
+ }
+
+ // TODO: We could do these in parallel to improve upload performance.
+ foreach ($remaining as $chunk) {
+ $offset = $chunk['byteStart'];
+
+ $ok = fseek($f, $offset);
+ if ($ok !== 0) {
+ throw new Exception(pht('Failed to fseek()!'));
+ }
+
+ $data = fread($f, $chunk['byteEnd'] - $chunk['byteStart']);
+ if ($data === false) {
+ throw new Exception(pht('Failed to fread()!'));
+ }
+
+ $conduit->callMethodSynchronous(
+ 'file.uploadchunk',
+ array(
+ 'filePHID' => $file_phid,
+ 'byteStart' => $offset,
+ 'dataEncoding' => 'base64',
+ 'data' => base64_encode($data),
+ ));
+
+ $progress->update(1);
+ }
+ }
+
}

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 3, 1:46 AM (2 d, 13 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7389953
Default Alt Text
D12061.id.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility