Merge pull request #605 from couchbase/feature/issue_604_incompatible_attachment_path

Fixed #604 - incompatible attachment path

Author: pasin

src/main/java/com/couchbase/lite/BlobStore.java

@@ -56,7 +56,9 @@ public BlobStore(String path, boolean autoMigrate) {
         this.path = path;
         File directory = new File(path);
 
-        directory.mkdirs();
+        if (!directory.exists()) {
+            directory.mkdirs();
+        }
         if (!directory.isDirectory()) {
             throw new IllegalStateException(String.format("Unable to create directory for: %s", directory));
         }
@@ -375,7 +377,9 @@ public File tempDir() {
         File directory = new File(path);
         File tempDirectory = new File(directory, "temp_attachments");
 
-        tempDirectory.mkdirs();
+        if (!tempDirectory.exists()) {
+            tempDirectory.mkdirs();
+        }
         if (!tempDirectory.isDirectory()) {
             throw new IllegalStateException(String.format("Unable to create directory for: %s", tempDirectory));
         }

src/main/java/com/couchbase/lite/Database.java

@@ -894,6 +894,20 @@ public boolean exists() {
      */
     @InterfaceAudience.Private
     public String getAttachmentStorePath() {
+        String attachmentStorePath = path;
+        int lastDotPosition = attachmentStorePath.lastIndexOf('.');
+        if( lastDotPosition > 0 ) {
+            attachmentStorePath = attachmentStorePath.substring(0, lastDotPosition);
+        }
+        attachmentStorePath = attachmentStorePath + " attachments";
+        return attachmentStorePath;
+    }
+
+    /**
+     * @exclude
+     */
+    @InterfaceAudience.Private
+    private String getObsoletedAttachmentStorePath() {
         String attachmentStorePath = path;
         int lastDotPosition = attachmentStorePath.lastIndexOf('.');
         if( lastDotPosition > 0 ) {
@@ -903,6 +917,19 @@ public String getAttachmentStorePath() {
         return attachmentStorePath;
     }
 
+    /**
+     * @exclude
+     */
+    @InterfaceAudience.Private
+    private String getObsoletedAttachmentStoreParentPath() {
+        String attachmentStorePath = path;
+        int lastDotPosition = attachmentStorePath.lastIndexOf('.');
+        if( lastDotPosition > 0 ) {
+            attachmentStorePath = attachmentStorePath.substring(0, lastDotPosition);
+        }
+        return attachmentStorePath;
+    }
+
     /**
      * @exclude
      */
@@ -1187,6 +1214,28 @@ public synchronized boolean open() {
             optimizeSQLIndexes(); // runs ANALYZE query
         }
 
+        // NOTE: Migrate attachment directory path if necessary
+        // https://github.com/couchbase/couchbase-lite-java-core/issues/604
+        File obsoletedAttachmentStorePath = new File(getObsoletedAttachmentStorePath());
+        if (obsoletedAttachmentStorePath != null && obsoletedAttachmentStorePath.exists() && obsoletedAttachmentStorePath.isDirectory()) {
+            File attachmentStorePath = new File(getAttachmentStorePath());
+            if (attachmentStorePath != null && !attachmentStorePath.exists()) {
+                boolean success = obsoletedAttachmentStorePath.renameTo(attachmentStorePath);
+                if (!success) {
+                    Log.e(Database.TAG, "Could not rename attachment store path");
+                    database.close();
+                    return false;
+                }
+            }
+
+        }
+        // NOTE: obsoleted directory is /files/<database name>/attachments/xxxx
+        //       Needs to delete /files/<database name>/ too
+        File obsoletedAttachmentStoreParentPath = new File(getObsoletedAttachmentStoreParentPath());
+        if (obsoletedAttachmentStoreParentPath != null && obsoletedAttachmentStoreParentPath.exists()) {
+            obsoletedAttachmentStoreParentPath.delete();
+        }
+
         try {
             if(isBlobstoreMigrated() || !manager.isAutoMigrateBlobStoreFilename()){
                 attachments = new BlobStore(getAttachmentStorePath(), false);

src/main/java/com/couchbase/lite/Manager.java

@@ -130,7 +130,9 @@ public Manager(Context context, ManagerOptions options) throws IOException {
         this.databases = new HashMap<String, Database>();
         this.replications = new ArrayList<Replication>();
 
-        directoryFile.mkdirs();
+        if (!directoryFile.exists()) {
+            directoryFile.mkdirs();
+        }
         if (!directoryFile.isDirectory()) {
             throw new IOException(String.format("Unable to create directory for: %s", directoryFile));
         }
@@ -289,7 +291,9 @@ private void replaceDatabase(String databaseName, InputStream databaseStream, It
             StreamUtils.copyStream(databaseStream, destStream);
             File attachmentsFile = new File(dstAttachmentsPath);
             FileDirUtils.deleteRecursive(attachmentsFile);
-            attachmentsFile.mkdirs();
+            if (!attachmentsFile.exists()) {
+                attachmentsFile.mkdirs();
+            }
             if (attachmentStreams != null) {
                 StreamUtils.copyStreamsToFolder(attachmentStreams, attachmentsFile);
             }