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

Commit

Permalink
Refactoring FileUtils
Browse files Browse the repository at this point in the history
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
  • Loading branch information
miurahr committed Mar 17, 2022
1 parent c88578f commit 2cdd5fa
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 54 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@
import io.github.eb4j.ebview.data.IDictionary;
import io.github.eb4j.ebview.dictionary.oxford.OxfordDriver;
import io.github.eb4j.ebview.utils.Stemmer;
import io.github.eb4j.ebview.utils.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -60,6 +61,43 @@ public DictionariesManager() {
stemmer = new Stemmer();
}

/**
* Find files in subdirectories.
*
* @param dir
* directory to start find
* @return list of filtered found files
*/
private static List<File> findFiles(final File dir) {
final List<File> result = new ArrayList<>();
Set<String> knownDirs = new HashSet<>();
findFiles(dir, result, knownDirs);
return result;
}

private static void findFiles(final File dir, final List<File> result, final Set<String> knownDirs) {
String currDir;
try {
// check for recursive
currDir = dir.getCanonicalPath();
if (!knownDirs.add(currDir)) {
return;
}
} catch (IOException ex) {
return;
}
File[] list = dir.listFiles();
if (list != null) {
for (File f : list) {
if (f.isDirectory()) {
findFiles(f, result, knownDirs);
} else {
result.add(f);
}
}
}
}

public void closeDictionaries() {
synchronized (this) {
dictionaries.stream().forEach(this::closeDict);
Expand All @@ -85,7 +123,7 @@ public List<String> getDictionaryNames() {
* @param dictionaryDirectory directory where dictionary stored.
*/
public void loadDictionaries(final File dictionaryDirectory) {
List<File> listFiles = FileUtils.findFiles(dictionaryDirectory);
List<File> listFiles = findFiles(dictionaryDirectory);
for (File f : listFiles) {
try {
loadDictionary(f);
Expand Down
52 changes: 0 additions & 52 deletions src/main/java/io/github/eb4j/ebview/utils/FileUtils.java

This file was deleted.

0 comments on commit 2cdd5fa

Please sign in to comment.