mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CHeck if file already exists during file creation 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Julius Härtl 2020-01-10 13:06:27 +01:00 committed by Roeland Jago Douma
parent edd957140a
commit ab4b9a6df5
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/private/DirectEditing/Manager.php
View File

@ -123,15 +123,21 @@ class Manager implements IManager {
public function create(string $path, string $editorId, string $creatorId, $templateId = null): string {
$userFolder = $this->rootFolder->getUserFolder($this->userId);
$file = $userFolder->newFile($path);
$editor = $this->getEditor($editorId);
$creators = $editor->getCreators();
foreach ($creators as $creator) {
if ($creator->getId() === $creatorId) {
$creator->create($file, $creatorId, $templateId);
return $this->createToken($editorId, $file, $path);
try {
$file = $userFolder->get($path);
throw new \RuntimeException('File already exists');
} catch (\OCP\Files\NotFoundException $e) {
$file = $userFolder->newFile($path);
$editor = $this->getEditor($editorId);
$creators = $editor->getCreators();
foreach ($creators as $creator) {
if ($creator->getId() === $creatorId) {
$creator->create($file, $creatorId, $templateId);
return $this->createToken($editorId, $file, $path);
}
}
}
throw new \RuntimeException('No creator found');
}

15
tests/lib/DirectEditing/ManagerTest.php
View File

@ -12,6 +12,7 @@ use OCP\DirectEditing\IEditor;
use OCP\DirectEditing\IToken;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\Files\NotFoundException;
use OCP\IDBConnection;
use OCP\IL10N;
use OCP\IUserSession;
@ -151,6 +152,10 @@ class ManagerTest extends TestCase {
$this->random->expects($this->once())
->method('generate')
->willReturn($expectedToken);
$this->userFolder
->method('get')
->with('/File.txt')
->willThrowException(new NotFoundException());
$this->userFolder->expects($this->once())
->method('newFile')
->willReturn($file);
@ -167,6 +172,10 @@ class ManagerTest extends TestCase {
$this->random->expects($this->once())
->method('generate')
->willReturn($expectedToken);
$this->userFolder
->method('get')
->with('/File.txt')
->willThrowException(new NotFoundException());
$this->userFolder->expects($this->once())
->method('newFile')
->willReturn($file);
@ -177,4 +186,10 @@ class ManagerTest extends TestCase {
$this->assertInstanceOf(NotFoundResponse::class, $secondResult);
}
public function testCreateFileAlreadyExists() {
$this->expectException(\RuntimeException::class);
$this->manager->create('/File.txt', 'testeditor', 'createEmpty');
}
}