Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for searching files #350

Merged
merged 1 commit into from
Mar 17, 2021
+10 −1
Merged

Fix for searching files #350

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/com/crowdin/cli/properties/helper/FileHelper.java
View file
Original file line number Diff line number Diff line change
@@ -53,6 +53,10 @@ public class FileHelper {

private static final String ESCAPE_ASTERISK_PLACEHOLDER = "{ESCAPE_ASTERISK}";

private static final String PLUS = "+";

private static final String ESCAPE_PLUS = "\\+";

private final String basePath;

public FileHelper(String basePath) {
@@ -127,6 +131,8 @@ private String translateToRegex(String node) {
.replace(ESCAPE_QUESTION, ESCAPE_QUESTION_PLACEHOLDER)
.replace(QUESTION_MARK, DOT)
.replace(ESCAPE_QUESTION_PLACEHOLDER, ESCAPE_QUESTION);
node = node
.replace(PLUS, ESCAPE_PLUS);
node = node
.replace(ESCAPE_ASTERISK, ESCAPE_ASTERISK_PLACEHOLDER)
.replace(ASTERISK, DOT_PLUS)
5 changes: 4 additions & 1 deletion src/test/java/com/crowdin/cli/properties/helper/FileHelperTest.java
View file
Original file line number Diff line number Diff line change
@@ -41,6 +41,8 @@ public class FileHelperTest {
private static String f2 = Utils.normalizePath("f2/");
private static String f21 = Utils.normalizePath("f2/in1/");

private static String fintlicu = Utils.normalizePath("f+intl-icu.en.yaml");

private static String projectRoot = Utils.normalizePath("");

private static List<String> allFiles = Arrays.asList(a, ax, f1a, f1ax, f11a, f11ax, f2a, f2ax, f21a, f21ax);
@@ -111,7 +113,8 @@ static Stream<Arguments> testGetFiles() {
arguments(allFiles, Utils.normalizePath("?.*"), Arrays.asList(a, ax)),
arguments(allFiles, Utils.normalizePath("*"), Arrays.asList(a, ax, f1, f2)),
arguments(allFiles, Utils.normalizePath("f3/**/*"), Collections.EMPTY_LIST),
arguments(allFiles, Utils.normalizePath("/f1/**"), Arrays.asList(f1, f11))
arguments(allFiles, Utils.normalizePath("/f1/**"), Arrays.asList(f1, f11)),
arguments(Collections.singletonList(fintlicu), fintlicu, Arrays.asList(fintlicu))
);
}