Changeset 11079

Timestamp:

2006-01-23T11:30:45+13:00 (18 years ago)

Author:

mdewsnip

Message:

Added an "overwrite" parameter to copyFile to cause it to overwrite the target file instead of throwing an exception.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/GeneralManager.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (1 diff)
• collection/LegacyCollectionImporter.java (modified) (1 diff)
• file/FileQueue.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java

@@ -473 +473 @@
             try {
                 File collection_image_file = new File(images_folder, file.getName());
-                Gatherer.f_man.getQueue().copyFile(file, collection_image_file, null);
+                Gatherer.f_man.getQueue().copyFile(file, collection_image_file, false, null);
 
                 // If we're using a remote Greenstone server, upload the image

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -742 +742 @@
     if (!metadata_set_file.exists()) {
         try {
-        Gatherer.f_man.getQueue().copyFile(external_metadata_set_file, metadata_set_file, null);
+        Gatherer.f_man.getQueue().copyFile(external_metadata_set_file, metadata_set_file, false, null);
 
         // If we're using a remote Greenstone server, upload the metadata file

trunk/gli/src/org/greenstone/gatherer/collection/LegacyCollectionImporter.java

@@ -53 +53 @@
         try {
         backup_dir.mkdirs();
-        Gatherer.f_man.getQueue().copyFile(metadata_xml_file_file, new_metadata_xml_file_file, null);
+        Gatherer.f_man.getQueue().copyFile(metadata_xml_file_file, new_metadata_xml_file_file, false, null);
         if (!new_metadata_xml_file_file.exists()) {
             throw new Exception("");

trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

@@ -336 +336 @@
                     // copy the file. If anything goes wrong the copy file should throw the appropriate exception. No matter what exception is thrown (bar an IOException) we display some message, perhaps take some action, then cancel the remainder of the pending file jobs. No point in being told your out of hard drive space for each one of six thousand files eh?
                     try {
-                    copyFile(source_file, target_file, progress);
+                    copyFile(source_file, target_file, false, progress);
                     }
                     // If we can't find the source file, then the most likely reason is that the file system has changed since the last time it was mapped. Warn the user that the requested file can't be found, then force a refresh of the source folder involved.
@@ -599 +599 @@
         copyDirectoryContents(f, new_file, progress);
         } else if (f.isFile()) {
-        copyFile(f, new_file, progress);
+        copyFile(f, new_file, false, progress);
         }
     }
@@ -610 +610 @@
      * @see org.greenstone.gatherer.Gatherer
      */
-    public void copyFile(File source, File destination, GProgressBar progress)
-    throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, ReadNotPermittedException, UnknownFileErrorException, WriteNotPermittedException {
-    if(source.isDirectory()) {
+    public void copyFile(File source, File destination, boolean overwrite, GProgressBar progress)
+    throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, ReadNotPermittedException, UnknownFileErrorException, WriteNotPermittedException
+    {
+    if (source.isDirectory()) {
         destination.mkdirs();
-    }
-    else {
-        // Check if the origin file exists.
-        if (!source.exists()) {
-        DebugStream.println("Couldn't find the source file.");
-        throw(new FileNotFoundException());
-        }
-
-        // Make sure the destination file does not exist.
-        if (destination.exists()) {
-        throw(new FileAlreadyExistsException());
-        }
-
-        // Open an input stream to the source file
-        FileInputStream f_in = null;
+        return;
+    }
+
+    // Check if the origin file exists.
+    if (!source.exists()) {
+        DebugStream.println("Couldn't find the source file.");
+        throw new FileNotFoundException();
+    }
+
+    // Make sure the destination file does not exist.
+    if (destination.exists() && !overwrite) {
+        throw new FileAlreadyExistsException();
+    }
+
+    // Open an input stream to the source file
+    FileInputStream f_in = null;
+    try {
+        f_in = new FileInputStream(source);
+    }
+    catch (FileNotFoundException exception) {
+        // A FileNotFoundException translates into a ReadNotPermittedException in this case
+        throw new ReadNotPermittedException(exception.toString());      
+    }
+
+    // Create an necessary directories for the target file
+    File dirs = destination.getParentFile();
+    dirs.mkdirs();
+
+    // Open an output stream to the target file
+    FileOutputStream f_out = null;
+    try {
+        f_out = new FileOutputStream(destination);
+    }
+    catch (FileNotFoundException exception) {
+        // A FileNotFoundException translates into a WriteNotPermittedException in this case
+        throw new WriteNotPermittedException(exception.toString());
+    }
+
+    // Copy the file
+    byte data[] = new byte[Utility.BUFFER_SIZE];
+    int data_size = 0;
+    while ((data_size = f_in.read(data, 0, Utility.BUFFER_SIZE)) != -1 && !cancel_action) {
+        long destination_size = destination.length();
         try {
-        f_in = new FileInputStream(source);
-        }
-        catch (FileNotFoundException exception) {
-        // A FileNotFoundException translates into a ReadNotPermittedException in this case
-        throw new ReadNotPermittedException(exception.toString());      
-        }
-
-        // Create an necessary directories for the target file
-        File dirs = destination.getParentFile();
-        dirs.mkdirs();
-
-        // Open an output stream to the target file
-        FileOutputStream f_out = null;
-        try {
-        f_out = new FileOutputStream(destination);
-        }
-        catch (FileNotFoundException exception) {
-        // A FileNotFoundException translates into a WriteNotPermittedException in this case
-        throw new WriteNotPermittedException(exception.toString());
-        }
-
-        // Copy the file
-        byte data[] = new byte[Utility.BUFFER_SIZE];
-        int data_size = 0;
-        while((data_size = f_in.read(data, 0, Utility.BUFFER_SIZE)) != -1 && !cancel_action) {
-        long destination_size = destination.length();
-        try {
-            f_out.write(data, 0, data_size);
+        f_out.write(data, 0, data_size);
+        }
+        // If an IO exception occurs, we can do some maths to determine if the number of bytes written to the file was less than expected. If so we assume a InsufficientSpace exception. If not we just throw the exception again.
+        catch (IOException io_exception) {
+        if (destination_size + (long) data_size > destination.length()) {
+            // Determine the difference (which I guess is in bytes).
+            long difference = (destination_size + (long) data_size) - destination.length();
+            // Transform that into a human readable string.
+            String message = Utility.formatFileLength(difference);
+            throw new InsufficientSpaceException(message);
         }
-        // If an IO exception occurs, we can do some maths to determine if the number of bytes written to the file was less than expected. If so we assume a InsufficientSpace exception. If not we just throw the exception again.
-        catch (IOException io_exception) {
-            if(destination_size + (long) data_size > destination.length()) {
-            // Determine the difference (which I guess is in bytes).
-            long difference = (destination_size + (long) data_size) - destination.length();
-            // Transform that into a human readable string.
-            String message = Utility.formatFileLength(difference);
-            throw(new InsufficientSpaceException(message));
-            }
-            else {
-            throw(io_exception);
-            }
+        else {
+            throw(io_exception);
         }
-        if(progress != null) {
-            progress.addValue(data_size);
-        }
-        }
-        // Flush and close the streams to ensure all bytes are written.
-        f_in.close();
-        f_out.close();
-        // We have now, in theory, produced an exact copy of the source file. Check this by comparing sizes.
-        if(!destination.exists() || (!cancel_action && source.length() != destination.length())) {
-        throw(new UnknownFileErrorException());
-        }
-        // If we were cancelled, ensure that none of the destination file exists.
-        if(cancel_action) {
-        destination.delete();
-        }
+        }
+        if (progress != null) {
+        progress.addValue(data_size);
+        }
+    }
+
+    // Flush and close the streams to ensure all bytes are written.
+    f_in.close();
+    f_out.close();
+
+    // We have now, in theory, produced an exact copy of the source file. Check this by comparing sizes.
+    if(!destination.exists() || (!cancel_action && source.length() != destination.length())) {
+        throw new UnknownFileErrorException();
+    }
+
+    // If we were cancelled, ensure that none of the destination file exists.
+    if (cancel_action) {
+        destination.delete();
     }
     }