sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use a better regex for removing invalid characters from filenames

Browse Source 
Fixes atlas exports remove international characters from filenames

Fixes #18291
This commit is contained in:
Nyall Dawson 2018-03-03 16:09:06 +10:00
parent 847683b500
commit 8543a91264
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/qgsfileutils.cpp
View File

@ -86,7 +86,7 @@ QString QgsFileUtils::addExtensionFromFilter( const QString &fileName, const QSt
QString QgsFileUtils::stringToSafeFilename( const QString &string )
{
QRegularExpression rx( "[^\\w\\-. ]" );
QRegularExpression rx( "[/\\\\\\?%\\*\\:\\|\"<>]" );
QString s = string;
s.replace( rx, QStringLiteral( "_" ) );
return s;

4
tests/src/python/test_qgsfileutils.py
View File

@ -58,8 +58,8 @@ class TestQgsFileUtils(unittest.TestCase):
def testStringToSafeFilename(self):
self.assertEqual(QgsFileUtils.stringToSafeFilename('my FiLe v2.0_new.tif'), 'my FiLe v2.0_new.tif')
self.assertEqual(
QgsFileUtils.stringToSafeFilename('rendered map_final? rev (12-03-1017)_real@#$&*#%&*$!!@$%^&(*(.tif'),
'rendered map_final_ rev _12-03-1017__real____________________.tif')
QgsFileUtils.stringToSafeFilename('rendered map_final? rev (12-03-1017)_real/\\?%*:|"<>.tif'),
'rendered map_final_ rev (12-03-1017)_real__________.tif')
if __name__ == '__main__':