echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Util: Consolidate FileFilters

Browse Source
This commit is contained in:
zzz
2018-03-05 13:16:04 +00:00
parent 28923825d9
commit 0eb04facec
12 changed files with 117 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
View File

@ -34,6 +34,7 @@ import net.i2p.data.Base64;
import net.i2p.data.DataHelper;
import net.i2p.update.*;
import net.i2p.util.ConcurrentHashSet;
import net.i2p.util.FileSuffixFilter;
import net.i2p.util.FileUtil;
import net.i2p.util.I2PAppThread;
import net.i2p.util.Log;
@ -2577,14 +2578,14 @@ public class SnarkManager implements CompleteListener, ClientApp {
*/
private boolean monitorTorrents(File dir) {
boolean rv = true;
String fileNames[] = dir.list(TorrentFilenameFilter.instance());
File files[] = dir.listFiles(new FileSuffixFilter(".torrent"));
List<String> foundNames = new ArrayList<String>(0);
if (fileNames != null) {
for (int i = 0; i < fileNames.length; i++) {
if (files != null) {
for (int i = 0; i < files.length; i++) {
try {
foundNames.add(new File(dir, fileNames[i]).getCanonicalPath());
foundNames.add(files[i].getCanonicalPath());
} catch (IOException ioe) {
_log.error("Error resolving '" + fileNames[i] + "' in '" + dir, ioe);
_log.error("Error resolving '" + files[i] + "' in '" + dir, ioe);
}
}
}
@ -2731,14 +2732,6 @@ public class SnarkManager implements CompleteListener, ClientApp {
saveConfig();
}
private static class TorrentFilenameFilter implements FilenameFilter {
private static final TorrentFilenameFilter _filter = new TorrentFilenameFilter();
public static TorrentFilenameFilter instance() { return _filter; }
public boolean accept(File dir, String name) {
return (name != null) && (name.endsWith(".torrent"));
}
}
/**
* If not connected, thread it, otherwise inline
* @throws RuntimeException via Snark.fatal()