Changeset 10267

Timestamp:

2005-07-22T16:40:13+12:00 (19 years ago)

Author:

mdewsnip

Message:

Added some more general zip functions -- eventually the old ones will be deprecated.

File:

• trunk/gli/src/org/greenstone/gatherer/util/ZipTools.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/util/ZipTools.java

@@ -38 +38 @@
 public class ZipTools
 {
-    static protected String unixStylePath(String path)
+    static public void unzipFile(String zip_file_path, String base_directory_path)
+    {
+    try {
+        ZipFile zip_file = new ZipFile(new File(zip_file_path), ZipFile.OPEN_READ);
+        
+        Enumeration e = zip_file.entries(); 
+        while (e.hasMoreElements()) {
+        ZipEntry zip_entry = (ZipEntry) e.nextElement();
+        File zip_entry_file = new File(base_directory_path + zip_entry.getName());
+        DebugStream.println("    Unzipping: " + zip_entry_file.getAbsolutePath());
+
+        // Directory case
+        if (zip_entry.isDirectory()) {
+            // Create named directory, if it doesn't already exist
+            if (!zip_entry_file.exists() && !zip_entry_file.mkdirs()) {
+            System.err.println("Error: unable to create directory " + zip_entry_file);
+            }
+        }
+
+        // File case
+        else {
+            // Write out file to disk
+
+            // Make sure it's parent directory exists.
+            File dir = new File(zip_entry_file.getParent());
+            dir.mkdirs();
+
+            // Set up input stream
+            InputStream zis = zip_file.getInputStream(zip_entry); 
+            BufferedInputStream bzis = new BufferedInputStream(zis); 
+            DataInputStream dbzis = new DataInputStream(bzis);
+
+            // Set up output stream
+            FileOutputStream fzos = new FileOutputStream(zip_entry_file);
+            BufferedOutputStream bfzos = new BufferedOutputStream(fzos);
+
+            byte[] buf = new byte[1024];
+            int len;
+            while ((len = dbzis.read(buf)) >= 0) {
+            bfzos.write(buf,0,len);
+            }
+
+            dbzis.close();
+            bzis.close();
+            zis.close();
+
+            bfzos.close();
+            fzos.close();
+        }
+        }
+
+        zip_file.close();
+    } 
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
+    }
+    }
+
+
+    static public void zipFiles(String zip_file_path, String base_directory_path, String[] relative_file_paths)
+    {
+    try {
+        ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zip_file_path));
+        ZipFilter null_zip_filter = new NullZipFilter();
+
+        // Add each file/directory in turn to the zip file
+        for (int i = 0; i < relative_file_paths.length; i++) {
+        String relative_file_path = relative_file_paths[i];
+        addFileToZip(zos, base_directory_path, relative_file_path, null_zip_filter);
+        }
+
+        zos.close();
+    }
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
+    }
+    }
+
+
+    static public void addFileToZip(ZipOutputStream zos, String base_directory_path, String relative_file_path, ZipFilter zip_filter)
+    {
+    File file = new File(base_directory_path + File.separator + relative_file_path);
+
+    // Check that the file/directory exists
+    if (!file.exists()) {
+        System.err.println("File " + file + " does not exist!");
+        return;
+    }
+
+    try {
+        // Directory case
+        if (file.isDirectory()) {
+        // Add a zip entry for this directory
+        zos.putNextEntry(new ZipEntry(relative_file_path + File.separator));
+
+        // Apply recursively to each of the children of the directory
+        File[] child_files = file.listFiles();
+        for (int i = 0; i < child_files.length; i++) {
+            addFileToZip(zos, base_directory_path, relative_file_path + File.separator + child_files[i].getName(), zip_filter);
+        }
+        }
+
+        // File case
+        else {
+        // Add a zip entry for this file
+        if (zip_filter.shouldIncludeFile(relative_file_path)) {
+            zos.putNextEntry(new ZipEntry(relative_file_path));
+
+            if (zip_filter.shouldIncludeFileContent(relative_file_path)) {
+            BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
+            byte[] data = new byte[1024];
+            int bytes_read;
+            while ((bytes_read = bis.read(data, 0, 1024)) > -1) {
+                zos.write(data, 0, bytes_read);
+            }
+            bis.close();
+            }
+        }
+        }
+    }
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
+    }
+    }
+
+
+    public interface ZipFilter
+    {
+    public boolean shouldIncludeFile(String relative_file_path);
+
+    public boolean shouldIncludeFileContent(String relative_file_path);
+    }
+
+
+    static public class NullZipFilter
+    implements ZipFilter
+    {
+    public boolean shouldIncludeFile(String relative_file_path)
+    {
+        // All files are included
+        return true;
+    }
+
+
+    public boolean shouldIncludeFileContent(String relative_file_path)
+    {
+        // Content for all files is included
+        return true;
+    }
+    }
+
+
+    // ----------------------------------------------------------------------------------------------------
+
+
+    static private String unixStylePath(String path)
     {
     String unix_path = path.replace('\\','/');
@@ -61 +216 @@
      * @see zipup(String, String, String, GShell, String, String)
      */
-    static protected boolean zipFunc(ZipOutputStream zos, String file_path, int prefix_strip, GShell source, boolean encountered_file, String accept_expr, String reject_expr) 
+    static private boolean zipFunc(ZipOutputStream zos, String file_path, int prefix_strip, GShell source, boolean encountered_file, String accept_expr, String reject_expr) 
     {
     String new_file_path = file_path;
@@ -158 +313 @@
      * @see zipFunc(ZipOutputStream, String, int, GShell, boolean, String, String) 
      */
-    static protected boolean dirFunc (ZipOutputStream zos, String dir_name, int prefix_strip, GShell source, boolean encountered_file, String accept_expr, String reject_expr) 
+    static private boolean dirFunc (ZipOutputStream zos, String dir_name, int prefix_strip, GShell source, boolean encountered_file, String accept_expr, String reject_expr) 
     {
     File dirObj = new File(dir_name);
@@ -278 +433 @@
     return encountered_file;
     } 
-    
+
+
     /**
      * Method to unzip a zip file associated with a particular collection.