-
Notifications
You must be signed in to change notification settings - Fork 118
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use FileCreatedFromTemplateEvent to inject the already existing empty templates #1377
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d491bfa
Use FileCreatedFromTemplateEvent to inject the already existing empty…
juliusknorr b3857a4
Remove unneeded debug output
juliusknorr b21704e
Update psalm checks
juliusknorr 013663a
Add composer platform config
juliusknorr b15c6be
Fix public link file creation
juliusknorr 5a95699
Add controller description and fix typings
juliusknorr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
<?php | ||
/** | ||
* @copyright Copyright (c) 2019, Roeland Jago Douma <[email protected]> | ||
* | ||
* @author Roeland Jago Douma <[email protected]> | ||
* | ||
* @license GNU AGPL version 3 or any later version | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as | ||
* published by the Free Software Foundation, either version 3 of the | ||
* License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
*/ | ||
|
||
namespace OCA\Richdocuments\Backgroundjobs; | ||
|
||
use OC\BackgroundJob\TimedJob; | ||
use OCA\Richdocuments\Service\CapabilitiesService; | ||
use OCP\DB\QueryBuilder\IQueryBuilder; | ||
use OCP\IDBConnection; | ||
|
||
class Cleanup extends TimedJob { | ||
|
||
/** @var IDBConnection */ | ||
private $db; | ||
|
||
public function __construct(IDBConnection $db) { | ||
$this->db = $db; | ||
|
||
$this->setInterval(60*60); | ||
} | ||
|
||
protected function run($argument) { | ||
// Expire template mappings for file creation | ||
$query = $this->db->getQueryBuilder(); | ||
$query->delete('richdocuments_template') | ||
->where($query->expr()->lte('timestamp', $query->createNamedParameter(time() - 60, IQueryBuilder::PARAM_INT))); | ||
$query->executeStatement(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,145 @@ | ||
<?php | ||
/* | ||
* @copyright Copyright (c) 2021 Julius Härtl <[email protected]> | ||
* | ||
* @author Julius Härtl <[email protected]> | ||
* | ||
* @license GNU AGPL version 3 or any later version | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as | ||
* published by the Free Software Foundation, either version 3 of the | ||
* License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
*/ | ||
|
||
declare(strict_types=1); | ||
|
||
namespace OCA\Richdocuments\Controller; | ||
|
||
use Exception; | ||
use OCA\Richdocuments\AppInfo\Application; | ||
use OCA\Richdocuments\Helper; | ||
use OCA\Richdocuments\TemplateManager; | ||
use OCP\AppFramework\Http; | ||
use OCP\AppFramework\Http\JSONResponse; | ||
use OCP\Files\Folder; | ||
use OCP\Files\IRootFolder; | ||
use OCP\IL10N; | ||
use OCP\IRequest; | ||
use OCP\Share\IManager; | ||
use Psr\Log\LoggerInterface; | ||
use Throwable; | ||
|
||
class DocumentAPIController extends \OCP\AppFramework\OCSController { | ||
|
||
private $rootFolder; | ||
private $shareManager; | ||
private $templateManager; | ||
private $l10n; | ||
private $logger; | ||
private $userId; | ||
|
||
public function __construct(IRequest $request, IRootFolder $rootFolder, IManager $shareManager, TemplateManager $templateManager, IL10N $l10n, LoggerInterface $logger, $userId) { | ||
parent::__construct(Application::APPNAME, $request); | ||
$this->rootFolder = $rootFolder; | ||
$this->shareManager = $shareManager; | ||
$this->templateManager = $templateManager; | ||
$this->l10n = $l10n; | ||
$this->logger = $logger; | ||
$this->userId = $userId; | ||
} | ||
|
||
/** | ||
* Create a file from a public share link of a folder | ||
* | ||
* As the server template API for file creation is not available there, we need a dedicated API | ||
* in order to properly create files as public page visitors. This is being called in the new file | ||
* actions in src/view/NewFileMenu.js | ||
* | ||
* @NoAdminRequired | ||
* @PublicPage | ||
*/ | ||
public function create(string $mimeType, string $fileName, string $directoryPath = '/', string $shareToken = null): JSONResponse { | ||
try { | ||
if ($shareToken !== null) { | ||
$share = $this->shareManager->getShareByToken($shareToken); | ||
} | ||
|
||
$rootFolder = $shareToken !== null ? $share->getNode() : $this->rootFolder->getUserFolder($this->userId); | ||
$folder = $rootFolder->get($directoryPath); | ||
|
||
if (!($folder instanceof Folder)) { | ||
throw new Exception('Node is not a folder'); | ||
} | ||
} catch (Throwable $e) { | ||
$this->logger->error('Failed to create document', ['exception' => $e]); | ||
return new JSONResponse([ | ||
'status' => 'error', | ||
'message' => $this->l10n->t('Cannot create document') | ||
], Http::STATUS_BAD_REQUEST); | ||
} | ||
|
||
$basename = $this->l10n->t('New Document.odt'); | ||
switch ($mimeType) { | ||
case 'application/vnd.oasis.opendocument.spreadsheet': | ||
$basename = $this->l10n->t('New Spreadsheet.ods'); | ||
break; | ||
case 'application/vnd.oasis.opendocument.presentation': | ||
$basename = $this->l10n->t('New Presentation.odp'); | ||
break; | ||
case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': | ||
$basename = $this->l10n->t('New Document.docx'); | ||
break; | ||
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': | ||
$basename = $this->l10n->t('New Spreadsheet.xlsx'); | ||
break; | ||
case 'application/vnd.openxmlformats-officedocument.presentationml.presentation': | ||
$basename = $this->l10n->t('New Presentation.pptx'); | ||
break; | ||
default: | ||
break; | ||
} | ||
|
||
if (!$fileName) { | ||
$fileName = Helper::getNewFileName($folder, $basename); | ||
} | ||
|
||
if ($folder->nodeExists($fileName)) { | ||
return new JSONResponse([ | ||
'status' => 'error', | ||
'message' => $this->l10n->t('File already exists') | ||
], Http::STATUS_BAD_REQUEST); | ||
} | ||
|
||
try { | ||
$file = $folder->newFile($fileName); | ||
$templateType = $this->templateManager->getTemplateTypeForExtension(pathinfo($fileName, PATHINFO_EXTENSION)); | ||
$empty = $this->templateManager->getEmpty($templateType); | ||
$templateFile = array_shift($empty); | ||
$file->putContent($this->templateManager->getEmptyFileContent($file->getExtension())); | ||
if ($this->templateManager->isSupportedTemplateSource($templateFile->getExtension())) { | ||
// Only use TemplateSource if supported filetype | ||
$this->templateManager->setTemplateSource($file->getId(), $templateFile->getId()); | ||
} | ||
} catch (Exception $e) { | ||
$this->logger->error('Failed to create file from template', ['exception' => $e]); | ||
return new JSONResponse([ | ||
'status' => 'error', | ||
'message' => $this->l10n->t('Not allowed to create document') | ||
], Http::STATUS_BAD_REQUEST); | ||
} | ||
return new JSONResponse([ | ||
'status' => 'success', | ||
'data' => \OCA\Files\Helper::formatFileInfo($file->getFileInfo()) | ||
]); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lets maybe reconsider the cleanup here in case a file is for some reason not opened properly and then retried after 1 hour.