added support for war archive
This commit is contained in:
parent
5a12aae30a
commit
26d2f339fe
@ -793,14 +793,14 @@ public class FileOperations {
|
|||||||
private static boolean isArchiveFile(File f) {
|
private static boolean isArchiveFile(File f) {
|
||||||
if (f == null) return false;
|
if (f == null) return false;
|
||||||
String n = f.getName().toLowerCase();
|
String n = f.getName().toLowerCase();
|
||||||
return n.endsWith(".zip") || n.endsWith(".jar") || n.endsWith(".tar") || n.endsWith(".tar.gz") || n.endsWith(".tgz") || n.endsWith(".7z") || n.endsWith(".rar");
|
return n.endsWith(".war") || n.endsWith(".zip") || n.endsWith(".jar") || n.endsWith(".tar") || n.endsWith(".tar.gz") || n.endsWith(".tgz") || n.endsWith(".7z") || n.endsWith(".rar");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void searchInArchiveCombined(File archive, String patternLower, Pattern filenameRegex, Pattern contentPattern, SearchCallback callback) {
|
private static void searchInArchiveCombined(File archive, String patternLower, Pattern filenameRegex, Pattern contentPattern, SearchCallback callback) {
|
||||||
if (callback != null && callback.isCancelled()) return;
|
if (callback != null && callback.isCancelled()) return;
|
||||||
String name = archive.getName().toLowerCase();
|
String name = archive.getName().toLowerCase();
|
||||||
try {
|
try {
|
||||||
if (name.endsWith(".zip") || name.endsWith(".jar")) {
|
if (name.endsWith(".zip") || name.endsWith(".jar") || name.endsWith(".war")) {
|
||||||
try (ZipInputStream zis = new ZipInputStream(new FileInputStream(archive))) {
|
try (ZipInputStream zis = new ZipInputStream(new FileInputStream(archive))) {
|
||||||
ZipEntry entry;
|
ZipEntry entry;
|
||||||
while ((entry = zis.getNextEntry()) != null) {
|
while ((entry = zis.getNextEntry()) != null) {
|
||||||
|
|||||||
@ -1244,7 +1244,7 @@ public class FilePanelTab extends JPanel {
|
|||||||
private boolean isArchiveFile(File f) {
|
private boolean isArchiveFile(File f) {
|
||||||
if (f == null) return false;
|
if (f == null) return false;
|
||||||
String n = f.getName().toLowerCase();
|
String n = f.getName().toLowerCase();
|
||||||
return n.endsWith(".zip") || n.endsWith(".jar") || n.endsWith(".tar") || n.endsWith(".tar.gz") || n.endsWith(".tgz") || n.endsWith(".7z") || n.endsWith(".rar");
|
return n.endsWith(".war") || n.endsWith(".zip") || n.endsWith(".jar") || n.endsWith(".tar") || n.endsWith(".tar.gz") || n.endsWith(".tgz") || n.endsWith(".7z") || n.endsWith(".rar");
|
||||||
}
|
}
|
||||||
|
|
||||||
private Path extractArchiveToTemp(File archive) {
|
private Path extractArchiveToTemp(File archive) {
|
||||||
@ -1253,7 +1253,7 @@ public class FilePanelTab extends JPanel {
|
|||||||
try {
|
try {
|
||||||
Path tempDir = Files.createTempDirectory("kfmanager-archive-");
|
Path tempDir = Files.createTempDirectory("kfmanager-archive-");
|
||||||
|
|
||||||
if (name.endsWith(".zip") || name.endsWith(".jar")) {
|
if (name.endsWith(".zip") || name.endsWith(".jar") || name.endsWith(".war")) {
|
||||||
extractZip(archive, tempDir);
|
extractZip(archive, tempDir);
|
||||||
} else if (name.endsWith(".tar.gz") || name.endsWith(".tgz")) {
|
} else if (name.endsWith(".tar.gz") || name.endsWith(".tgz")) {
|
||||||
extractTarGz(archive, tempDir);
|
extractTarGz(archive, tempDir);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user