Merge pull request #10201 from nextcloud/smb-rename-invalidargument-retry-13
[13] also retry rename operation on InvalidArgumentException
This commit is contained in:
commit
2639533422
|
@ -38,6 +38,7 @@ use Icewind\SMB\Exception\AlreadyExistsException;
|
|||
use Icewind\SMB\Exception\ConnectException;
|
||||
use Icewind\SMB\Exception\Exception;
|
||||
use Icewind\SMB\Exception\ForbiddenException;
|
||||
use Icewind\SMB\Exception\InvalidArgumentException;
|
||||
use Icewind\SMB\Exception\NotFoundException;
|
||||
use Icewind\SMB\IFileInfo;
|
||||
use Icewind\SMB\NativeServer;
|
||||
|
@ -52,6 +53,7 @@ use OCP\Files\Notify\IChange;
|
|||
use OCP\Files\Notify\IRenameChange;
|
||||
use OCP\Files\Storage\INotifyStorage;
|
||||
use OCP\Files\StorageNotAvailableException;
|
||||
use OCP\ILogger;
|
||||
use OCP\Util;
|
||||
|
||||
class SMB extends Common implements INotifyStorage {
|
||||
|
@ -195,7 +197,7 @@ class SMB extends Common implements INotifyStorage {
|
|||
* @param string $target the new name of the path
|
||||
* @return bool true if the rename is successful, false otherwise
|
||||
*/
|
||||
public function rename($source, $target) {
|
||||
public function rename($source, $target, $retry = true) {
|
||||
if ($this->isRootDir($source) || $this->isRootDir($target)) {
|
||||
return false;
|
||||
}
|
||||
|
@ -205,8 +207,21 @@ class SMB extends Common implements INotifyStorage {
|
|||
try {
|
||||
$result = $this->share->rename($absoluteSource, $absoluteTarget);
|
||||
} catch (AlreadyExistsException $e) {
|
||||
$this->remove($target);
|
||||
$result = $this->share->rename($absoluteSource, $absoluteTarget);
|
||||
if ($retry) {
|
||||
$this->remove($target);
|
||||
$result = $this->share->rename($absoluteSource, $absoluteTarget, false);
|
||||
} else {
|
||||
\OC::$server->getLogger()->logException($e, ['level' => ILogger::WARN]);
|
||||
return false;
|
||||
}
|
||||
} catch (InvalidArgumentException $e) {
|
||||
if ($retry) {
|
||||
$this->remove($target);
|
||||
$result = $this->share->rename($absoluteSource, $absoluteTarget, false);
|
||||
} else {
|
||||
\OC::$server->getLogger()->logException($e, ['level' => ILogger::WARN]);
|
||||
return false;
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
\OC::$server->getLogger()->logException($e, ['level' => Util::WARN]);
|
||||
return false;
|
||||
|
|
Loading…
Reference in New Issue