Stop trimming directory names on Linux

Bionus · Aug 22, 2020 · e57c37f · e57c37f
1 parent deb2bc3
commit e57c37f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/gui/src/settings/condition-window.cpp b/src/gui/src/settings/condition-window.cpp
@@ -16,7 +16,7 @@ ConditionWindow::~ConditionWindow()
 
 void ConditionWindow::accept()
 {
-	const QString dir = fixFilename("", ui->lineFolder->text())
+	const QString dir = fixFilename("", ui->lineFolder->text());
 	emit validated(ui->lineCondition->text(), ui->lineFilename->text(), dir);
 	close();
 }
diff --git a/src/gui/src/utils/empty-dirs-fix/empty-dirs-fix-1.cpp b/src/gui/src/utils/empty-dirs-fix/empty-dirs-fix-1.cpp
@@ -4,6 +4,7 @@
 #include <QSettings>
 #include <QStringList>
 #include <ui_empty-dirs-fix-1.h>
+#include "functions.h"
 #include "models/profile.h"
 #include "utils/empty-dirs-fix/empty-dirs-fix-2.h"
 

diff --git a/src/lib/src/functions.cpp b/src/lib/src/functions.cpp
@@ -546,10 +546,7 @@ QString fixFilenameLinux(const QString &fn, const QString &path, int maxLength,
 
 	// Fix directories
 	for (QString &part : parts) {
-		// A part cannot start or finish with a space
-		part = part.trimmed();
-
-		// Trim part
+		// Max length
 		if (part.length() > 255) {
 			part = part.left(255).trimmed();
 		}
@@ -597,7 +594,7 @@ QString fixFilenameWindows(const QString &fn, const QString &path, int maxLength
 	// Fix parameters
 	const QString sep = QStringLiteral("\\");
 	maxLength = maxLength == 0 ? MAX_PATH : maxLength;
-	QString filename = path + fn;
+	QString filename = (path + fn).trimmed();
 
 	// Drive
 	QString drive;

diff --git a/src/tests/src/functions-test.cpp b/src/tests/src/functions-test.cpp
@@ -90,6 +90,9 @@ TEST_CASE("Functions")
 		SECTION("Windows")
 		{
 			assertFixFilename(0, "", "C:\\test\\image.jpg", "C:\\test\\image.jpg");
+			assertFixFilename(0, "", "C:\\test", "C:\\test");
+			assertFixFilename(0, "", "C:\\test\\", "C:\\test\\");
+			assertFixFilename(0, "", " C:\\test\\ ", "C:\\test\\");
 			assertFixFilename(0, "image.jpg", "C:\\test\\", "image.jpg");
 			assertFixFilename(0, "image", "C:\\test\\", "image");
 			assertFixFilename(0, "folder\\image.jpg", "C:\\test\\", "folder\\image.jpg");
@@ -99,6 +102,9 @@ TEST_CASE("Functions")
 		SECTION("Linux")
 		{
 			assertFixFilename(1, "", "/home/test/image.jpg", "/home/test/image.jpg");
+			assertFixFilename(1, "", "/home/test", "/home/test");
+			assertFixFilename(1, "", "/home/test/", "/home/test/");
+			assertFixFilename(1, "", "/home/test/ ", "/home/test/ ");
 			assertFixFilename(1, "image.jpg", "/home/test/", "image.jpg");
 			assertFixFilename(1, "image", "/home/test/", "image");
 			assertFixFilename(1, "folder/image.jpg", "/home/test/", "folder/image.jpg");