FileFormat: Avoid second dot when appending extension

OpenOrienteering · Nov 16, 2020 · 8c1e9ee · 8c1e9ee
1 parent 4eb2080
commit 8c1e9ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/fileformats/file_format.cpp b/src/fileformats/file_format.cpp
@@ -99,7 +99,11 @@ QString FileFormat::fixupExtension(QString filepath) const
 			        && filepath.midRef(filepath.length() - extension.length() - 1, 1) == QLatin1String(".");
 		});
 		if (!has_extension)
-			filepath += QLatin1Char('.') + primaryExtension();
+		{
+			if (!filepath.endsWith(QLatin1Char('.')))
+				filepath.append(QLatin1Char('.'));
+			filepath.append(primaryExtension());
+		}
 
 		// Ensure that the file name matches the format.
 		Q_ASSERT(extensions.contains(QFileInfo(filepath).suffix()));

diff --git a/test/file_format_t.cpp b/test/file_format_t.cpp
@@ -564,7 +564,7 @@ void FileFormatTest::fixupExtensionTest_data()
 
 	QTest::newRow("file.omap")   << QByteArray("XML") << QStringLiteral("file.omap");
 	QTest::newRow("file")        << QByteArray("XML") << QStringLiteral("file.omap");
-	QTest::newRow("file.")       << QByteArray("XML") << QStringLiteral("file..omap");
+	QTest::newRow("file.")       << QByteArray("XML") << QStringLiteral("file.omap");
 	QTest::newRow("file_omap")   << QByteArray("XML") << QStringLiteral("file_omap.omap");
 	QTest::newRow("file.xmap")   << QByteArray("XML") << QStringLiteral("file.xmap");
 	QTest::newRow("f.omap.zip")  << QByteArray("XML") << QStringLiteral("f.omap.zip.omap");