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>
This commit is contained in:
Matthieu Gallien 2024-09-09 10:39:47 +02:00
parent 13425f4709
commit f33674e679
3 changed files with 3 additions and 3 deletions

View file

@ -127,6 +127,9 @@ void IgnoreListTableWidget::readIgnoreFile(const QString &file, bool readOnly)
while (!ignores.atEnd()) { while (!ignores.atEnd()) {
QString line = QString::fromUtf8(ignores.readLine()); QString line = QString::fromUtf8(ignores.readLine());
line.chop(1); line.chop(1);
if (line == QStringLiteral("\\#*#")) {
continue;
}
if (!line.isEmpty() && !line.startsWith("#")) { if (!line.isEmpty() && !line.startsWith("#")) {
bool deletable = false; bool deletable = false;
if (line.startsWith(']')) { if (line.startsWith(']')) {

View file

@ -49,6 +49,5 @@ System Volume Information
My Saved Places. My Saved Places.
\#*#
*.sb-* *.sb-*

View file

@ -94,8 +94,6 @@ private slots:
QVERIFY(excluded.isExcluded("/a/foo_conflict-bar", "/a", keepHidden)); QVERIFY(excluded.isExcluded("/a/foo_conflict-bar", "/a", keepHidden));
QVERIFY(excluded.isExcluded("/a/foo (conflicted copy 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", excludeHidden));
QVERIFY(excluded.isExcluded("/a/#b#", "/a", keepHidden));
} }
void check_csync_exclude_add() void check_csync_exclude_add()