mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-20 09:36:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed irregular quoting

Browse Source
This commit is contained in:
JaniruTEC
2020-11-17 22:41:41 +01:00
parent c19c3754c6
commit d9c5d76417
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
View File

@@ -60,27 +60,34 @@ public class FuseVolume extends AbstractVolume {
List<String> strings = new ArrayList<>();
List<MatchResult> results = pattern.matcher(str).results().collect(Collectors.toList());
for (int i = 0; i < results.size(); i++) {
MatchResult current = results.get(i);
String current = group(results.get(i), false);
MatchResult next = i + 1 < results.size() ? results.get(i + 1) : null;
if (getSpecialString(next) != null && current.group().endsWith("=")) {
if (group(next, true) != null && current.endsWith("=")) {
//"next" is a quoted elements and "current" is missing it's argument
//--> "next" must be joined with "current" and is skipped in the regular iteration
strings.add(current.group() + getSpecialString(next));
strings.add(current + group(next, true));
i++;
} else {
//"next" is a normal unquoted string/is not missing from "current"
//--> Add "current" and advance
strings.add(current.group());
strings.add(current);
}
}
return strings.toArray(new String[0]);
}
private String getSpecialString(MatchResult result) {
private String group(MatchResult result, boolean onlyMatchQuoted) {
if (result == null) {
return null;
}
return result.group(1) != null ? result.group(1) : result.group(2);
if (result.group(1) != null) {
return result.group(1);
}
if (result.group(2) != null || onlyMatchQuoted) {
return result.group(2);
}
return result.group();
}
@Override