mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-10 08:52:39 +01:00
Remove some old code handling the absence of the file.uploadhash
Conduit method
Summary: The `file.uploadhash` method was added a long time ago (in D4899). It should be safe to assume that this method exists on most installs. Test Plan: N/A Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: epriestley Differential Revision: https://secure.phabricator.com/D11118
This commit is contained in:
parent
f8be9d7737
commit
f86a70f411
1 changed files with 26 additions and 38 deletions
|
@ -2504,47 +2504,35 @@ EOTEXT
|
|||
|
||||
echo pht('Uploading %d files...', count($need_upload))."\n";
|
||||
|
||||
// Now we're ready to upload the actual file data. If possible, we'll just
|
||||
// transmit a hash of the file instead of the actual file data. If the data
|
||||
// already exists, Phabricator can share storage. Check if we can use
|
||||
// "file.uploadhash" yet (i.e., if the server is up to date enough).
|
||||
// TODO: Drop this check once we bump the protocol version.
|
||||
$conduit_methods = $this->getConduit()->callMethodSynchronous(
|
||||
'conduit.query',
|
||||
array());
|
||||
$can_use_hash_upload = isset($conduit_methods['file.uploadhash']);
|
||||
$hash_futures = array();
|
||||
foreach ($need_upload as $key => $spec) {
|
||||
$hash_futures[$key] = $this->getConduit()->callMethod(
|
||||
'file.uploadhash',
|
||||
array(
|
||||
'name' => $spec['name'],
|
||||
'hash' => sha1($spec['data']),
|
||||
));
|
||||
}
|
||||
|
||||
if ($can_use_hash_upload) {
|
||||
$hash_futures = array();
|
||||
foreach ($need_upload as $key => $spec) {
|
||||
$hash_futures[$key] = $this->getConduit()->callMethod(
|
||||
'file.uploadhash',
|
||||
array(
|
||||
'name' => $spec['name'],
|
||||
'hash' => sha1($spec['data']),
|
||||
));
|
||||
$futures = id(new FutureIterator($hash_futures))
|
||||
->limit(8);
|
||||
foreach ($futures as $key => $future) {
|
||||
$type = $need_upload[$key]['type'];
|
||||
$change = $need_upload[$key]['change'];
|
||||
$name = $need_upload[$key]['name'];
|
||||
|
||||
$phid = null;
|
||||
try {
|
||||
$phid = $future->resolve();
|
||||
} catch (Exception $e) {
|
||||
// Just try uploading normally if the hash upload failed.
|
||||
continue;
|
||||
}
|
||||
|
||||
$futures = id(new FutureIterator($hash_futures))
|
||||
->limit(8);
|
||||
foreach ($futures as $key => $future) {
|
||||
$type = $need_upload[$key]['type'];
|
||||
$change = $need_upload[$key]['change'];
|
||||
$name = $need_upload[$key]['name'];
|
||||
|
||||
$phid = null;
|
||||
try {
|
||||
$phid = $future->resolve();
|
||||
} catch (Exception $e) {
|
||||
// Just try uploading normally if the hash upload failed.
|
||||
continue;
|
||||
}
|
||||
|
||||
if ($phid) {
|
||||
$change->setMetadata("{$type}:binary-phid", $phid);
|
||||
unset($need_upload[$key]);
|
||||
echo pht("Uploaded '%s' (%s).", $name, $type)."\n";
|
||||
}
|
||||
if ($phid) {
|
||||
$change->setMetadata("{$type}:binary-phid", $phid);
|
||||
unset($need_upload[$key]);
|
||||
echo pht("Uploaded '%s' (%s).", $name, $type)."\n";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue