From 732da03d72fb2e20d4c9b666a5d2c0709213d011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 2 Apr 2020 20:24:04 +0200
Subject: Use full list of supported filenames when obtaining the name to
 create
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/Controller/WorkspaceController.php | 9 ++-------
 lib/Service/WorkspaceService.php       | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/Controller/WorkspaceController.php b/lib/Controller/WorkspaceController.php
index a1d68f542..8e9f43685 100644
--- a/lib/Controller/WorkspaceController.php
+++ b/lib/Controller/WorkspaceController.php
@@ -85,11 +85,6 @@ class WorkspaceController extends OCSController {
 	/** @var IURLGenerator */
 	private $urlGenerator;
 
-	private const SUPPORTED_FILENAMES = [
-		'README.md',
-		'Readme.md',
-		'readme.md'
-	];
 	/** @var IEventDispatcher */
 	private $eventDispatcher;
 
@@ -184,7 +179,7 @@ class WorkspaceController extends OCSController {
 			if ($folder instanceof Folder) {
 				$file = $this->getFile($folder);
 				if ($file === null) {
-					$token = $this->directEditingManager->create($path . '/'. self::SUPPORTED_FILENAMES[0], Application::APP_NAME, 'textdocument');
+					$token = $this->directEditingManager->create($path . '/'. $this->workspaceService->getSupportedFilenames()[0], Application::APP_NAME, 'textdocument');
 				} else {
 					$token = $this->directEditingManager->open($path . '/'. $file->getName(), Application::APP_NAME);
 				}
@@ -201,7 +196,7 @@ class WorkspaceController extends OCSController {
 
 	private function getFile(Folder $folder) {
 		$file = null;
-		foreach (self::SUPPORTED_FILENAMES as $filename) {
+		foreach ($this->workspaceService->getSupportedFilenames() as $filename) {
 			if ($folder->nodeExists($filename)) {
 				$file = $folder->get($filename);
 				continue;
diff --git a/lib/Service/WorkspaceService.php b/lib/Service/WorkspaceService.php
index 14b4bef90..143d02631 100644
--- a/lib/Service/WorkspaceService.php
+++ b/lib/Service/WorkspaceService.php
@@ -37,7 +37,7 @@ class WorkspaceService {
 		return $file;
 	}
 
-	private function getSupportedFilenames() {
+	public function getSupportedFilenames() {
 		return array_merge([
 			$this->l10n->t('Readme') . '.md'
 		], self::SUPPORTED_STATIC_FILENAMES);
-- 
cgit v1.2.3