Test without suffix

qgis · Jan 17, 2023 · 35b3cb6 · 35b3cb6
1 parent 24703f7
commit 35b3cb6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/core/qgsfileutils.cpp b/src/core/qgsfileutils.cpp
@@ -539,7 +539,7 @@ QString QgsFileUtils::uniquePath( const QString &path )
 
   QFileInfo info { path };
   const QString suffix { info.completeSuffix() };
-  const QString pathPattern { QString( suffix.length() > 0 ? path.chopped( suffix.length() + 1 ) : path ).append( QStringLiteral( "_%1." ) ).append( suffix ) };
+  const QString pathPattern { QString( suffix.isEmpty() ? path : path.chopped( suffix.length() + 1 ) ).append( suffix.isEmpty() ? QStringLiteral( "_%1" ) : QStringLiteral( "_%1." ) ).append( suffix ) };
   int i { 2 };
   QString uniquePath { pathPattern.arg( i ) };
   while ( QFileInfo::exists( uniquePath ) )

diff --git a/tests/src/python/test_qgsfileutils.py b/tests/src/python/test_qgsfileutils.py
@@ -330,6 +330,11 @@ def testUniquePath(self):
         self.assertEqual(QgsFileUtils.uniquePath(os.path.join(temp_path, 'test.txt')), os.path.join(temp_path, 'test_3.txt'))
         self.assertEqual(QgsFileUtils.uniquePath(os.path.join(temp_path, 'test_1.txt')), os.path.join(temp_path, 'test_1.txt'))
 
+        with open(os.path.join(temp_path, 'test'), 'w+') as f:
+            f.close()
+
+        self.assertEqual(QgsFileUtils.uniquePath(os.path.join(temp_path, 'test')), os.path.join(temp_path, 'test_2'))
+
 
 if __name__ == '__main__':
     unittest.main()