ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: Avoid conflicts on deck attachments folder name

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2023-11-17 08:51:32 +01:00
parent 7ff46b9eb1
commit d7fe39ecb6
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Service/ConfigService.php
View File

@@ -230,4 +230,12 @@ class ConfigService {
return $this->config->getUserValue($userId ?? $this->getUserId(), 'deck', 'attachment_folder', '/Deck'); return $this->config->getUserValue($userId ?? $this->getUserId(), 'deck', 'attachment_folder', '/Deck');
} }
public function setAttachmentFolder(?string $userId = null, string $path): void {
if ($userId === null && $this->getUserId() === null) {
throw new NoPermissionException('Must be logged in get the attachment folder');
}
$this->config->setUserValue($userId ?? $this->getUserId(), 'deck', 'attachment_folder', $path);
}
} }

13
lib/Service/FilesAppService.php
View File

@@ -31,6 +31,7 @@ use OCA\Deck\Sharing\DeckShareProvider;
use OCA\Deck\StatusException; use OCA\Deck\StatusException;
use OCP\AppFramework\Http\StreamResponse; use OCP\AppFramework\Http\StreamResponse;
use OCP\Constants; use OCP\Constants;
use OCP\Files\Folder;
use OCP\Files\IMimeTypeDetector; use OCP\Files\IMimeTypeDetector;
use OCP\Files\IRootFolder; use OCP\Files\IRootFolder;
use OCP\Files\NotFoundException; use OCP\Files\NotFoundException;
@@ -186,10 +187,20 @@ class FilesAppService implements IAttachmentService, ICustomAttachmentService {
$userFolder = $this->rootFolder->getUserFolder($this->userId); $userFolder = $this->rootFolder->getUserFolder($this->userId);
try { try {
$folder = $userFolder->get($this->configService->getAttachmentFolder()); $folder = $userFolder->get($this->configService->getAttachmentFolder());
} catch (NotFoundException $e) { } catch (NotFoundException) {
$folder = $userFolder->newFolder($this->configService->getAttachmentFolder()); $folder = $userFolder->newFolder($this->configService->getAttachmentFolder());
} }
if ($folder->isShared()) {
$folderName = $userFolder->getNonExistingName($this->configService->getAttachmentFolder());
$folder = $userFolder->newFolder($folderName);
$this->configService->setAttachmentFolder($this->userId, $folderName);
}
if (!$folder instanceof Folder || $folder->isShared()) {
throw new NotFoundException('No target folder found');
}
$fileName = $folder->getNonExistingName($fileName); $fileName = $folder->getNonExistingName($fileName);
$target = $folder->newFile($fileName); $target = $folder->newFile($fileName);
$content = fopen($file['tmp_name'], 'rb'); $content = fopen($file['tmp_name'], 'rb');