do not ignore paths containing 2 "#" characters

those path may be in use on Windows and are legitimate

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/src/gui/ignorelisttablewidget.cpp b/src/gui/ignorelisttablewidget.cpp
index 8e93630a721f41506334d469d0aa1fd9ad5d667a..f6dd7347fe14ba92eac10f044bb127f6cd288e1b 100644 (file)
--- a/src/gui/ignorelisttablewidget.cpp
+++ b/src/gui/ignorelisttablewidget.cpp
@@ -127,6 +127,9 @@ void IgnoreListTableWidget::readIgnoreFile(const QString &file, bool readOnly)
         while (!ignores.atEnd()) {
             QString line = QString::fromUtf8(ignores.readLine());
             line.chop(1);
+            if (line == QStringLiteral("\\#*#")) {
+                continue;
+            }
             if (!line.isEmpty() && !line.startsWith("#")) {
                 bool deletable = false;
                 if (line.startsWith(']')) {

diff --git a/sync-exclude.lst b/sync-exclude.lst
index a238434cd3b57ec6fb900e3427acbdf8af4ada2f..2f0223eb9e7ed53c42f26bb938d620b7e914fd0e 100644 (file)
--- a/sync-exclude.lst
+++ b/sync-exclude.lst
@@ -49,6 +49,5 @@ System Volume Information
 
 My Saved Places.
 
-\#*#
 
 *.sb-*

diff --git a/test/testexcludedfiles.cpp b/test/testexcludedfiles.cpp
index a6ff3885557515a2df29c8708e8a42ff4ba69171..ea525748447bfae823adace76a13c5844a7032cb 100644 (file)
--- a/test/testexcludedfiles.cpp
+++ b/test/testexcludedfiles.cpp
@@ -94,8 +94,6 @@ private slots:
         QVERIFY(excluded.isExcluded("/a/foo_conflict-bar", "/a", keepHidden));
         QVERIFY(excluded.isExcluded("/a/foo (conflicted copy bar)", "/a", keepHidden));
         QVERIFY(excluded.isExcluded("/a/.b", "/a", excludeHidden));
-
-        QVERIFY(excluded.isExcluded("/a/#b#", "/a", keepHidden));
     }
 
     void check_csync_exclude_add()