fix: default extension in direct editing

Signed-off-by: Luka Trovic <[email protected]>

Author: luka-nextcloud

l10n/ga.js

@@ -122,7 +122,6 @@ OC.L10N.register(
     "Save changes" : "Sabháil na hathruithe",
     "Cancel" : "Cealaigh",
     "URL" : "URL",
-    "Attachments cannot be created or uploaded because this file is shared from another cloud." : "Ní féidir ceangaltáin a chruthú ná a uaslódáil mar go bhfuil an comhad seo roinnte ó scamall eile.",
     "Upload from computer" : "Íosluchtaigh ó ríomhaire",
     "Insert from Files" : "Ionsáigh ó Chomhaid",
     "Formatting help" : "Ionsáigh ó Chomhaid",
@@ -150,7 +149,6 @@ OC.L10N.register(
     "No command found" : "Níor aimsíodh aon ordú",
     "No user found" : "Níor aimsíodh aon úsáideoir",
     "No suggestion found" : "Níor aimsíodh aon mholadh",
-    "Uploading attachments is disabled because the file is shared from another cloud." : "Tá uaslódáil ceangaltán díchumasaithe mar go bhfuil an comhad roinnte ó scamall eile.",
     "Upload" : "Uaslódáil",
     "Insert Table" : "Ionsáigh Tábla",
     "Smart Picker" : "Roghnóir Cliste",

l10n/ga.json

@@ -120,7 +120,6 @@
     "Save changes" : "Sabháil na hathruithe",
     "Cancel" : "Cealaigh",
     "URL" : "URL",
-    "Attachments cannot be created or uploaded because this file is shared from another cloud." : "Ní féidir ceangaltáin a chruthú ná a uaslódáil mar go bhfuil an comhad seo roinnte ó scamall eile.",
     "Upload from computer" : "Íosluchtaigh ó ríomhaire",
     "Insert from Files" : "Ionsáigh ó Chomhaid",
     "Formatting help" : "Ionsáigh ó Chomhaid",
@@ -148,7 +147,6 @@
     "No command found" : "Níor aimsíodh aon ordú",
     "No user found" : "Níor aimsíodh aon úsáideoir",
     "No suggestion found" : "Níor aimsíodh aon mholadh",
-    "Uploading attachments is disabled because the file is shared from another cloud." : "Tá uaslódáil ceangaltán díchumasaithe mar go bhfuil an comhad roinnte ó scamall eile.",
     "Upload" : "Uaslódáil",
     "Insert Table" : "Ionsáigh Tábla",
     "Smart Picker" : "Roghnóir Cliste",

lib/DirectEditing/TextDirectEditor.php

@@ -17,6 +17,7 @@
 use OCP\Files\InvalidPathException;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
+use OCP\IAppConfig;
 use OCP\IL10N;
 use OCP\Util;
 
@@ -31,10 +32,16 @@ class TextDirectEditor implements IEditor {
 	/** @var ApiService */
 	private $apiService;
 
-	public function __construct(IL10N $l10n, InitialStateProvider $initialStateProvider, ApiService $apiService) {
+	/**
+	 * @var IAppConfig
+	 */
+	private $appConfig;
+
+	public function __construct(IL10N $l10n, InitialStateProvider $initialStateProvider, ApiService $apiService, IAppConfig $appConfig) {
 		$this->l10n = $l10n;
 		$this->initialStateProvider = $initialStateProvider;
 		$this->apiService = $apiService;
+		$this->appConfig = $appConfig;
 	}
 
 	/**
@@ -109,7 +116,7 @@ public function getMimetypesOptional(): array {
 	 */
 	public function getCreators(): array {
 		return [
-			new TextDocumentCreator($this->l10n),
+			new TextDocumentCreator($this->l10n, $this->appConfig),
 		];
 	}
 

lib/DirectEditing/TextDocumentCreator.php

@@ -7,6 +7,7 @@
 namespace OCA\Text\DirectEditing;
 
 use OCP\DirectEditing\ACreateEmpty;
+use OCP\IAppConfig;
 use OCP\IL10N;
 
 class TextDocumentCreator extends ACreateEmpty {
@@ -17,8 +18,14 @@ class TextDocumentCreator extends ACreateEmpty {
 	 */
 	private $l10n;
 
-	public function __construct(IL10N $l10n) {
+	/**
+	 * @var IAppConfig
+	 */
+	private $appConfig;
+
+	public function __construct(IL10N $l10n, IAppConfig $appConfig) {
 		$this->l10n = $l10n;
+		$this->appConfig = $appConfig;
 	}
 
 	public function getId(): string {
@@ -30,10 +37,16 @@ public function getName(): string {
 	}
 
 	public function getExtension(): string {
-		return 'md';
+		return $this->appConfig->getValueString('text', 'default_file_extension', 'md');
 	}
 
 	public function getMimetype(): string {
-		return 'text/markdown';
+		switch ($this->getExtension()) {
+			case 'txt':
+				return 'text/plain';
+			case 'md':
+			default:
+				return 'text/markdown';
+		}
 	}
 }

tests/unit/DirectEditing/TextDocumentCreatorTest.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace OCA\Text\Tests;
+
+use OCA\Text\DirectEditing\TextDocumentCreator;
+use OCP\IAppConfig;
+use OCP\IL10N;
+
+class TextDocumentCreatorTest extends \PHPUnit\Framework\TestCase {
+	private TextDocumentCreator $textDocumentCreator;
+
+	private IL10N $l10n;
+
+	private IAppConfig $appConfig;
+
+	protected function setUp(): void {
+		$this->l10n = $this->createMock(IL10N::class);
+		$this->appConfig = $this->createMock(IAppConfig::class);
+		$this->textDocumentCreator = new TextDocumentCreator($this->l10n, $this->appConfig);
+	}
+
+	public function testGetId(): void {
+		$this->assertEquals('textdocument', $this->textDocumentCreator->getId());
+	}
+
+	public function testGetName(): void {
+		$this->l10n->expects($this->once())
+			->method('t')
+			->with('text document')
+			->willReturn('text document');
+		$this->assertEquals('text document', $this->textDocumentCreator->getName());
+	}
+
+	public function testGetDefaultExtension(): void {
+		$this->appConfig->expects($this->once())
+			->method('getValueString')
+			->with('text', 'default_file_extension', 'md')
+			->willReturn('md');
+		$this->assertEquals('md', $this->textDocumentCreator->getExtension());
+	}
+
+	public function testGetExtensionFromConfig(): void {
+		$this->appConfig->expects($this->once())
+			->method('getValueString')
+			->with('text', 'default_file_extension', 'md')
+			->willReturn('txt');
+
+		$this->assertEquals('txt', $this->textDocumentCreator->getExtension());
+	}
+
+	public function testGetDefaultMimetype(): void {
+		$this->assertEquals('text/markdown', $this->textDocumentCreator->getMimetype());
+	}
+
+	public function testGetMimetypeFromConfig(): void {
+		$this->appConfig->expects($this->once())
+			->method('getValueString')
+			->with('text', 'default_file_extension', 'md')
+			->willReturn('txt');
+
+		$this->assertEquals('text/plain', $this->textDocumentCreator->getMimetype());
+	}
+}