Skip to content
This repository has been archived by the owner on Jul 26, 2022. It is now read-only.

Commit

Permalink
Clean code-ify
Browse files Browse the repository at this point in the history
  • Loading branch information
binwiederhier committed Mar 29, 2015
1 parent 31284f3 commit a70a268
Showing 1 changed file with 22 additions and 16 deletions.
38 changes: 22 additions & 16 deletions syncany-lib/src/main/java/org/syncany/config/IgnoredFiles.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
*/
public class IgnoredFiles {
private static final Logger logger = Logger.getLogger(ConfigHelper.class.getSimpleName());

private Set<String> ignorePatterns;
private Set<String> ignorePaths;
private File ignoreFile;
Expand Down Expand Up @@ -73,24 +74,13 @@ public void loadPatterns() {
Scanner scanner = new Scanner(ignoreFile);

while (scanner.hasNextLine()) {
String ignorePattern = scanner.nextLine();

if (!ignorePattern.isEmpty()) {
if (ignorePattern.startsWith("regex:")) {
// Chop off regex: indicator
ignorePatterns.add(ignorePattern.substring(6));
}
else {
if (ignorePattern.contains("*") || ignorePattern.contains("?")) {
// wildcards handling, converting them to regexps
ignorePatterns.add(convertWildcardsToRegexp(ignorePattern));
}
else {
ignorePaths.add(ignorePattern);
}
}
String ignorePatternLine = scanner.nextLine().trim();

if (!ignorePatternLine.isEmpty()) {
parseIgnoreFileLine(ignorePatternLine);
}
}

scanner.close();
}
catch (FileNotFoundException e) {
Expand All @@ -104,6 +94,22 @@ public void loadPatterns() {
}
}

private void parseIgnoreFileLine(String ignorePattern) {
if (ignorePattern.startsWith("regex:")) {
// Chop off regex: indicator
ignorePatterns.add(ignorePattern.substring(6));
}
else {
if (ignorePattern.contains("*") || ignorePattern.contains("?")) {
// wildcards handling, converting them to regexps
ignorePatterns.add(convertWildcardsToRegexp(ignorePattern));
}
else {
ignorePaths.add(ignorePattern);
}
}
}

private static String convertWildcardsToRegexp(String in) {
StringBuilder out = new StringBuilder("^");

Expand Down

0 comments on commit a70a268

Please sign in to comment.