ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Cleanup of comments

Browse source
This commit is contained in:
Ziver Koc 2020-11-10 18:27:12 +01:00
parent 2e88f02ed5
commit f7b9a08e43
1 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/zutil/io/file/FileSearcher.java
View file

@ -25,16 +25,22 @@
package zutil.io.file; package zutil.io.file;
import zutil.io.InputStreamCloser; import zutil.io.InputStreamCloser;
import zutil.log.LogUtil;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.*; import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
import java.util.zip.ZipInputStream;
public class FileSearcher implements Iterable<FileSearcher.FileSearchItem>{ public class FileSearcher implements Iterable<FileSearcher.FileSearchItem>{
private static final Logger logger = LogUtil.getLogger();
// Constants // Constants
private static final List<String> compressedFileExtensions = Arrays.asList( private static final List<String> compressedFileExtensions = Arrays.asList(
"jar", "zip"); "jar", "zip");
@ -143,7 +149,11 @@ public class FileSearcher implements Iterable<FileSearcher.FileSearchItem>{
// Find the next file // Find the next file
for(; index <fileList.size(); index++){ for(; index <fileList.size(); index++){
FileSearchItem file = fileList.get(index); FileSearchItem file = fileList.get(index);
//#### FOLDERS
// ----------------------------------------------
// Folders
// ----------------------------------------------
if(recursive && file.isDirectory()){ if(recursive && file.isDirectory()){
addFiles(file, file.listFiles()); addFiles(file, file.listFiles());
if(searchFolders) { if(searchFolders) {
@ -153,11 +163,22 @@ public class FileSearcher implements Iterable<FileSearcher.FileSearchItem>{
break; break;
} }
} }
//#### COMPRESSED FILES
// ----------------------------------------------
// Compressed Files
// ----------------------------------------------
else if(searchCompressedFiles && file.isFile() && else if(searchCompressedFiles && file.isFile() &&
compressedFileExtensions.contains( compressedFileExtensions.contains(
FileUtil.getFileExtension(file.getName()).toLowerCase())){ FileUtil.getFileExtension(file.getName()).toLowerCase())){
try { try {
/*ZipInputStream zipInputStream = new ZipInputStream(new FileInputStream(file.getPath()));
ZipEntry entry;
while ((entry = zipInputStream.getNextEntry()) != null) {
fileList.add(new FileSearchZipItem(file.getPath(), entry));
}*/
ZipFile zipFile = new ZipFile(file.getPath()); ZipFile zipFile = new ZipFile(file.getPath());
Enumeration<? extends ZipEntry> e = zipFile.entries(); Enumeration<? extends ZipEntry> e = zipFile.entries();
while(e.hasMoreElements()){ while(e.hasMoreElements()){
@ -166,10 +187,14 @@ public class FileSearcher implements Iterable<FileSearcher.FileSearchItem>{
} }
zipFile.close(); zipFile.close();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); logger.log(Level.WARNING, "Unable to traverse file: " + file.getPath(), e);
} }
} }
//#### REGULAR FILES
// ----------------------------------------------
// Regular Files
// ----------------------------------------------
else if(searchFiles && file.isFile()){ else if(searchFiles && file.isFile()){
if(extension == null && fileName == null) // Should we match all files if(extension == null && fileName == null) // Should we match all files
break; break;