From fe838de4f7c01710e8e61101572dc4ae99aaf3f1 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Wed, 3 Oct 2018 18:24:42 +0200 Subject: [PATCH 1/6] Add FileName to Workflow engine Signed-off-by: Daniel Kesselberg --- apps/workflowengine/js/filenameplugin.js | 78 +++++++++++++++++++ .../lib/AppInfo/Application.php | 1 + apps/workflowengine/lib/Check/FileName.php | 74 ++++++++++++++++++ 3 files changed, 153 insertions(+) create mode 100644 apps/workflowengine/js/filenameplugin.js create mode 100644 apps/workflowengine/lib/Check/FileName.php diff --git a/apps/workflowengine/js/filenameplugin.js b/apps/workflowengine/js/filenameplugin.js new file mode 100644 index 0000000000..cc95f78abd --- /dev/null +++ b/apps/workflowengine/js/filenameplugin.js @@ -0,0 +1,78 @@ +/** + * @copyright Copyright (c) 2018 Daniel Kesselberg + * + * @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 . + * + */ + +(function () { + + OCA.WorkflowEngine = OCA.WorkflowEngine || {}; + OCA.WorkflowEngine.Plugins = OCA.WorkflowEngine.Plugins || {}; + + OCA.WorkflowEngine.Plugins.FileNamePlugin = { + getCheck: function () { + return { + 'class': 'OCA\\WorkflowEngine\\Check\\FileName', + 'name': t('workflowengine', 'File Name'), + 'operators': [ + {'operator': 'is', 'name': t('workflowengine', 'is')}, + {'operator': '!is', 'name': t('workflowengine', 'is not')}, + { + 'operator': 'matches', + 'name': t('workflowengine', 'matches') + }, + { + 'operator': '!matches', + 'name': t('workflowengine', 'does not match') + } + ] + }; + }, + render: function (element, check) { + if (check['class'] !== 'OCA\\WorkflowEngine\\Check\\FileName') { + return; + } + + var placeholder = 'text/plain'; + if (check['operator'] === 'matches' || check['operator'] === '!matches') { + placeholder = '/^dummy-.+$/i'; + + if (this._validateRegex(check['value'])) { + $(element).removeClass('invalid-input'); + } else { + $(element).addClass('invalid-input'); + } + } + + $(element).css('width', '250px') + .attr('placeholder', placeholder) + .attr('title', t('workflowengine', 'Example: {placeholder}', {placeholder: placeholder})) + .addClass('has-tooltip') + .tooltip({ + placement: 'bottom' + }); + }, + + _validateRegex: function (string) { + var regexRegex = /^\/(.*)\/([gui]{0,3})$/, + result = regexRegex.exec(string); + return result !== null; + } + }; +})(); + +OC.Plugins.register('OCA.WorkflowEngine.CheckPlugins', OCA.WorkflowEngine.Plugins.FileNamePlugin); diff --git a/apps/workflowengine/lib/AppInfo/Application.php b/apps/workflowengine/lib/AppInfo/Application.php index 8032112e86..89d342400c 100644 --- a/apps/workflowengine/lib/AppInfo/Application.php +++ b/apps/workflowengine/lib/AppInfo/Application.php @@ -67,6 +67,7 @@ class Application extends \OCP\AppFramework\App { // Check plugins 'filemimetypeplugin', + 'filenameplugin', 'filesizeplugin', 'filesystemtagsplugin', 'requestremoteaddressplugin', diff --git a/apps/workflowengine/lib/Check/FileName.php b/apps/workflowengine/lib/Check/FileName.php new file mode 100644 index 0000000000..2d8cf9ca91 --- /dev/null +++ b/apps/workflowengine/lib/Check/FileName.php @@ -0,0 +1,74 @@ + + * + * @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 . + * + */ + +namespace OCA\WorkflowEngine\Check; + + +use OCP\Files\IMimeTypeDetector; +use OCP\Files\Storage\IStorage; +use OCP\IL10N; +use OCP\IRequest; + +class FileName extends AbstractStringCheck { + + /** @var IRequest */ + protected $request; + + /** @var IStorage */ + protected $storage; + + /** @var string */ + protected $path; + + /** + * @param IL10N $l + * @param IRequest $request + */ + public function __construct(IL10N $l, IRequest $request) { + parent::__construct($l); + $this->request = $request; + } + + /** + * @param IStorage $storage + * @param string $path + */ + public function setFileInfo(IStorage $storage, $path) { + $this->storage = $storage; + $this->path = $path; + } + + /** + * @return string + */ + protected function getActualValue() { + return mb_strtolower(basename($this->path)); + } + + /** + * @param string $operator + * @param string $value + * @return bool + */ + public function executeCheck($operator, $value) { + return parent::executeCheck($operator, mb_strtolower($value)); + } +} From 072162794346b1539dff58e4e3a3ef1bc8c18dc7 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Wed, 3 Oct 2018 20:26:00 +0200 Subject: [PATCH 2/6] Make code strict Signed-off-by: Daniel Kesselberg --- apps/workflowengine/lib/Check/FileName.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/workflowengine/lib/Check/FileName.php b/apps/workflowengine/lib/Check/FileName.php index 2d8cf9ca91..e1e2c5f0f2 100644 --- a/apps/workflowengine/lib/Check/FileName.php +++ b/apps/workflowengine/lib/Check/FileName.php @@ -1,4 +1,5 @@ * @@ -59,7 +60,7 @@ class FileName extends AbstractStringCheck { /** * @return string */ - protected function getActualValue() { + protected function getActualValue(): string { return mb_strtolower(basename($this->path)); } @@ -68,7 +69,7 @@ class FileName extends AbstractStringCheck { * @param string $value * @return bool */ - public function executeCheck($operator, $value) { + public function executeCheck($operator, $value): bool { return parent::executeCheck($operator, mb_strtolower($value)); } } From 4c4f50ee2d03e51fc5beaae470381d4a32dff620 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Thu, 4 Oct 2018 14:23:45 +0200 Subject: [PATCH 3/6] Remove unused import Signed-off-by: Daniel Kesselberg --- apps/workflowengine/lib/Check/FileName.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/workflowengine/lib/Check/FileName.php b/apps/workflowengine/lib/Check/FileName.php index e1e2c5f0f2..e335e31c3e 100644 --- a/apps/workflowengine/lib/Check/FileName.php +++ b/apps/workflowengine/lib/Check/FileName.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace OCA\WorkflowEngine\Check; - -use OCP\Files\IMimeTypeDetector; use OCP\Files\Storage\IStorage; use OCP\IL10N; use OCP\IRequest; From 37ae5cb1009ca92a8e55f8ac7146eeef10c6c9fc Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Thu, 4 Oct 2018 17:59:29 +0200 Subject: [PATCH 4/6] Change placeholder Signed-off-by: Daniel Kesselberg --- apps/workflowengine/js/filenameplugin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/workflowengine/js/filenameplugin.js b/apps/workflowengine/js/filenameplugin.js index cc95f78abd..c493bb3bf6 100644 --- a/apps/workflowengine/js/filenameplugin.js +++ b/apps/workflowengine/js/filenameplugin.js @@ -47,7 +47,7 @@ return; } - var placeholder = 'text/plain'; + var placeholder = 'dummy.jpg'; if (check['operator'] === 'matches' || check['operator'] === '!matches') { placeholder = '/^dummy-.+$/i'; @@ -75,4 +75,4 @@ }; })(); -OC.Plugins.register('OCA.WorkflowEngine.CheckPlugins', OCA.WorkflowEngine.Plugins.FileNamePlugin); +OC.Plugins.register('OCA.WorkflowEngine.CheckPlugins', OCA.WorkflowEngine.Plugins.FileNamePlugin); \ No newline at end of file From 28fc7b50610dfc238d0deb065d8d90a3fd56969e Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Fri, 5 Oct 2018 17:54:48 +0200 Subject: [PATCH 5/6] Ignore case for is and !is Signed-off-by: Daniel Kesselberg --- apps/workflowengine/lib/Check/FileName.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/workflowengine/lib/Check/FileName.php b/apps/workflowengine/lib/Check/FileName.php index e335e31c3e..c6afbf7afa 100644 --- a/apps/workflowengine/lib/Check/FileName.php +++ b/apps/workflowengine/lib/Check/FileName.php @@ -59,15 +59,20 @@ class FileName extends AbstractStringCheck { * @return string */ protected function getActualValue(): string { - return mb_strtolower(basename($this->path)); + return basename($this->path); } /** * @param string $operator - * @param string $value + * @param string $checkValue + * @param string $actualValue * @return bool */ - public function executeCheck($operator, $value): bool { - return parent::executeCheck($operator, mb_strtolower($value)); + protected function executeStringCheck($operator, $checkValue, $actualValue): bool { + if ($operator === 'is' || $operator === '!is') { + $checkValue = mb_strtolower($checkValue); + $actualValue = mb_strtolower($actualValue); + } + return parent::executeStringCheck($operator, $checkValue, $actualValue); } } From be5e992021791ba4c93953d3478adf623c2777df Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Mon, 8 Oct 2018 13:02:12 +0200 Subject: [PATCH 6/6] Fix typo Signed-off-by: Daniel Kesselberg --- apps/workflowengine/js/filenameplugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/workflowengine/js/filenameplugin.js b/apps/workflowengine/js/filenameplugin.js index c493bb3bf6..7d8018c29c 100644 --- a/apps/workflowengine/js/filenameplugin.js +++ b/apps/workflowengine/js/filenameplugin.js @@ -27,7 +27,7 @@ getCheck: function () { return { 'class': 'OCA\\WorkflowEngine\\Check\\FileName', - 'name': t('workflowengine', 'File Name'), + 'name': t('workflowengine', 'File name'), 'operators': [ {'operator': 'is', 'name': t('workflowengine', 'is')}, {'operator': '!is', 'name': t('workflowengine', 'is not')},