Updating translation files...

[pub/Android/ownCloud.git] / src / com / owncloud / android / operations / UploadFileOperation.java

diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java
index 0cee73b..2824b6d 100644 (file)
--- a/src/com/owncloud/android/operations/UploadFileOperation.java
+++ b/src/com/owncloud/android/operations/UploadFileOperation.java
@@ -1,9 +1,9 @@
 /* ownCloud Android client application
 /* ownCloud Android client application

- *   Copyright (C) 2012 Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.

  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

- *   the Free Software Foundation, either version 3 of the License, or
+ *   the Free Software Foundation, either version 2 of the License, or

  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,


@@ -33,6 +33,7 @@ import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.http.HttpStatus;
 
 import com.owncloud.android.datamodel.OCFile;
 import org.apache.http.HttpStatus;
 
 import com.owncloud.android.datamodel.OCFile;

+import com.owncloud.android.files.services.FileUploader;

 import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;


@@ -61,8 +62,10 @@ public class UploadFileOperation extends RemoteOperation {
     private boolean mIsInstant = false;
     private boolean mRemoteFolderToBeCreated = false;
     private boolean mForceOverwrite = false;
     private boolean mIsInstant = false;
     private boolean mRemoteFolderToBeCreated = false;
     private boolean mForceOverwrite = false;

-    private boolean mMoveLocalFile = false;
+    private int mLocalBehaviour = FileUploader.LOCAL_BEHAVIOUR_COPY;

     private boolean mWasRenamed = false;
     private boolean mWasRenamed = false;

+    private String mOriginalFileName = null;
+    private String mOriginalStoragePath = null;

     PutMethod mPutMethod = null;
     private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
     private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
     PutMethod mPutMethod = null;
     private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
     private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);


@@ -72,7 +75,7 @@ public class UploadFileOperation extends RemoteOperation {
                                 OCFile file,
                                 boolean isInstant, 
                                 boolean forceOverwrite,
                                 OCFile file,
                                 boolean isInstant, 
                                 boolean forceOverwrite,

-                                boolean moveLocalFile) {
+                                int localBehaviour) {

         if (account == null)
             throw new IllegalArgumentException("Illegal NULL account in UploadFileOperation creation");
         if (file == null)
         if (account == null)
             throw new IllegalArgumentException("Illegal NULL account in UploadFileOperation creation");
         if (file == null)


@@ -86,7 +89,9 @@ public class UploadFileOperation extends RemoteOperation {
         mRemotePath = file.getRemotePath();
         mIsInstant = isInstant;
         mForceOverwrite = forceOverwrite;
         mRemotePath = file.getRemotePath();
         mIsInstant = isInstant;
         mForceOverwrite = forceOverwrite;

-        mMoveLocalFile = moveLocalFile;
+        mLocalBehaviour = localBehaviour;
+        mOriginalStoragePath = mFile.getStoragePath();
+        mOriginalFileName = mFile.getFileName();

     }
 
 
     }
 
 


@@ -94,6 +99,10 @@ public class UploadFileOperation extends RemoteOperation {
         return mAccount;
     }
     
         return mAccount;
     }
     

+    public String getFileName() {
+        return mOriginalFileName;
+    }
+    

     public OCFile getFile() {
         return mFile;
     }
     public OCFile getFile() {
         return mFile;
     }


@@ -102,6 +111,10 @@ public class UploadFileOperation extends RemoteOperation {
         return mOldFile; 
     }
     
         return mOldFile; 
     }
     

+    public String getOriginalStoragePath() {
+        return mOriginalStoragePath;
+    }
+    

     public String getStoragePath() {
         return mFile.getStoragePath();
     }
     public String getStoragePath() {
         return mFile.getStoragePath();
     }


@@ -142,13 +155,11 @@ public class UploadFileOperation extends RemoteOperation {
         mDataTransferListeners.add(listener);
     }
     
         mDataTransferListeners.add(listener);
     }
     

-

     @Override
     protected RemoteOperationResult run(WebdavClient client) {
         RemoteOperationResult result = null;
         boolean localCopyPassed = false, nameCheckPassed = false;
     @Override
     protected RemoteOperationResult run(WebdavClient client) {
         RemoteOperationResult result = null;
         boolean localCopyPassed = false, nameCheckPassed = false;

-        File temporalFile = null, originalFile = null;
-        String originalStoragePath = mFile.getStoragePath();
+        File temporalFile = null, originalFile = new File(mOriginalStoragePath), expectedFile = null;

         try {
             /// rename the file to upload, if necessary
             if (!mForceOverwrite) {
         try {
             /// rename the file to upload, if necessary
             if (!mForceOverwrite) {


@@ -160,35 +171,59 @@ public class UploadFileOperation extends RemoteOperation {
             }
             nameCheckPassed = true;
         
             }
             nameCheckPassed = true;
         

-            /// check location of local file, and copy to a temporal file to upload it if not in its corresponding directory
-            String targetLocalPath =  FileStorageUtils.getDefaultSavePathFor(mAccount.name, mFile);            
-            if (!originalStoragePath.equals(targetLocalPath)) {  
-                File ocLocalFolder = new File(FileStorageUtils.getSavePath(mAccount.name));
-                originalFile = new File(originalStoragePath);
-                if (!mMoveLocalFile) {
-                    // the file must be copied to the ownCloud local folder
-                    
-                    if (ocLocalFolder.getUsableSpace() < originalFile.length()) {
-                        result = new RemoteOperationResult(ResultCode.LOCAL_STORAGE_FULL);
-                        return result;
+            String expectedPath = FileStorageUtils.getDefaultSavePathFor(mAccount.name, mFile);  /// not before getAvailableRemotePath() !!!
+            expectedFile = new File(expectedPath);
+            
+            /// check location of local file; if not the expected, copy to a temporal file before upload (if COPY is the expected behaviour)
+            if (!mOriginalStoragePath.equals(expectedPath) && mLocalBehaviour == FileUploader.LOCAL_BEHAVIOUR_COPY) {
+
+                if (FileStorageUtils.getUsableSpace(mAccount.name) < originalFile.length()) {
+                    result = new RemoteOperationResult(ResultCode.LOCAL_STORAGE_FULL);
+                    return result;  // error condition when the file should be copied

                         
                         

-                    } else {
-                        String temporalPath = FileStorageUtils.getTemporalPath(mAccount.name) + mFile.getRemotePath();
-                        mFile.setStoragePath(temporalPath);
-                        temporalFile = new File(temporalPath);
-                        if (!originalStoragePath.equals(temporalPath)) {   // preventing weird but possible situation
-                            InputStream in = new FileInputStream(originalFile);
-                            OutputStream out = new FileOutputStream(temporalFile);
+                } else {
+                    String temporalPath = FileStorageUtils.getTemporalPath(mAccount.name) + mFile.getRemotePath();
+                    mFile.setStoragePath(temporalPath);
+                    temporalFile = new File(temporalPath);
+                    if (!mOriginalStoragePath.equals(temporalPath)) {   // preventing weird but possible situation
+                        InputStream in = null;
+                        OutputStream out = null;
+                        try {
+                            File temporalParent = temporalFile.getParentFile();
+                            temporalParent.mkdirs();
+                            if (!temporalParent.isDirectory()) {
+                                throw new IOException("Unexpected error: parent directory could not be created");
+                            }
+                            temporalFile.createNewFile();
+                            if (!temporalFile.isFile()) {
+                                throw new IOException("Unexpected error: target file could not be created");
+                            }                    
+                            in = new FileInputStream(originalFile);
+                            out = new FileOutputStream(temporalFile);

                             byte[] buf = new byte[1024];
                             int len;
                             while ((len = in.read(buf)) > 0){
                                 out.write(buf, 0, len);
                             }
                             byte[] buf = new byte[1024];
                             int len;
                             while ((len = in.read(buf)) > 0){
                                 out.write(buf, 0, len);
                             }

-                            in.close();
-                            out.close();
+                            
+                        } catch (Exception e) {
+                            result = new RemoteOperationResult(ResultCode.LOCAL_STORAGE_NOT_COPIED);
+                            return result;
+                            
+                        } finally {
+                            try {
+                                if (in != null) in.close();
+                            } catch (Exception e) {
+                                Log.d(TAG, "Weird exception while closing input stream for " + mOriginalStoragePath + " (ignoring)", e);
+                            }
+                            try {
+                                if (out != null) out.close();
+                            } catch (Exception e) {
+                                Log.d(TAG, "Weird exception while closing output stream for " + expectedPath + " (ignoring)", e);
+                            }

                         }
                     }
                         }
                     }

-                }   // else - the file will be MOVED to the corresponding directory AFTER the upload finishes
+                }

             }
             localCopyPassed = true;
             
             }
             localCopyPassed = true;
             


@@ -205,26 +240,36 @@ public class UploadFileOperation extends RemoteOperation {
             
             /// move local temporal file or original file to its corresponding location in the ownCloud local folder
             if (isSuccess(status)) {
             
             /// move local temporal file or original file to its corresponding location in the ownCloud local folder
             if (isSuccess(status)) {

-                File fileToMove = null;
-                if (temporalFile != null) { 
-                    fileToMove = temporalFile;
-                } else if (originalFile != null) {
-                    fileToMove = originalFile;
-                }
-                if (fileToMove != null) {
-                    mFile.setStoragePath(FileStorageUtils.getDefaultSavePathFor(mAccount.name, mFile));
-                    File finalFile = new File(mFile.getStoragePath());
-                    if (!fileToMove.renameTo(finalFile)) {
-                        result = new RemoteOperationResult(ResultCode.LOCAL_STORAGE_NOT_MOVED);
+                if (mLocalBehaviour == FileUploader.LOCAL_BEHAVIOUR_FORGET) {
+                    mFile.setStoragePath(null);
+                    
+                } else {
+                    mFile.setStoragePath(expectedPath);
+                    File fileToMove = null;
+                    if (temporalFile != null) {             // FileUploader.LOCAL_BEHAVIOUR_COPY ; see where temporalFile was set
+                        fileToMove = temporalFile;
+                    } else {                                // FileUploader.LOCAL_BEHAVIOUR_MOVE
+                        fileToMove = originalFile;

                     }
                     }

-                }
+                    if (!expectedFile.equals(fileToMove)) {
+                        File expectedFolder = expectedFile.getParentFile();
+                        expectedFolder.mkdirs();
+                        if (!expectedFolder.isDirectory() || !fileToMove.renameTo(expectedFile)) {
+                            mFile.setStoragePath(null); // forget the local file
+                            // by now, treat this as a success; the file was uploaded; the user won't like that the local file is not linked, but this should be a veeery rare fail;
+                            // the best option could be show a warning message (but not a fail)
+                            //result = new RemoteOperationResult(ResultCode.LOCAL_STORAGE_NOT_MOVED);
+                            //return result;
+                        }
+                    }
+                } 

             }
             
             }
             

-            if (result == null)
-                result = new RemoteOperationResult(isSuccess(status), status);
+            result = new RemoteOperationResult(isSuccess(status), status);

             
             
         } catch (Exception e) {
             
             
         } catch (Exception e) {

+            // TODO something cleaner with cancellations

             if (mCancellationRequested.get()) {
                 result = new RemoteOperationResult(new OperationCancelledException());
             } else {
             if (mCancellationRequested.get()) {
                 result = new RemoteOperationResult(new OperationCancelledException());
             } else {


@@ -237,7 +282,7 @@ public class UploadFileOperation extends RemoteOperation {
                 temporalFile.delete();
             }
             if (result.isSuccess()) {
                 temporalFile.delete();
             }
             if (result.isSuccess()) {

-                Log.i(TAG, "Upload of " + originalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage());
+                Log.i(TAG, "Upload of " + mOriginalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage());

                     
             } else {
                 if (result.getException() != null) {
                     
             } else {
                 if (result.getException() != null) {


@@ -247,9 +292,9 @@ public class UploadFileOperation extends RemoteOperation {
                     } else if (!localCopyPassed) {
                         complement = " (while copying local file to " + FileStorageUtils.getSavePath(mAccount.name) + ")";
                     }
                     } else if (!localCopyPassed) {
                         complement = " (while copying local file to " + FileStorageUtils.getSavePath(mAccount.name) + ")";
                     }

-                    Log.e(TAG, "Upload of " + originalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage() + complement, result.getException());
+                    Log.e(TAG, "Upload of " + mOriginalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage() + complement, result.getException());

                 } else {
                 } else {

-                    Log.e(TAG, "Upload of " + originalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage());
+                    Log.e(TAG, "Upload of " + mOriginalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage());

                 }
             }
         }
                 }
             }
         }


@@ -265,6 +310,7 @@ public class UploadFileOperation extends RemoteOperation {
         newFile.setFileLength(mFile.getFileLength());
         newFile.setMimetype(mFile.getMimetype());
         newFile.setModificationTimestamp(mFile.getModificationTimestamp());
         newFile.setFileLength(mFile.getFileLength());
         newFile.setMimetype(mFile.getMimetype());
         newFile.setModificationTimestamp(mFile.getModificationTimestamp());

+        newFile.setModificationTimestampAtLastSyncForData(mFile.getModificationTimestampAtLastSyncForData());

         // newFile.setEtag(mFile.getEtag())
         newFile.setKeepInSync(mFile.keepInSync());
         newFile.setLastSyncDateForProperties(mFile.getLastSyncDateForProperties());
         // newFile.setEtag(mFile.getEtag())
         newFile.setKeepInSync(mFile.keepInSync());
         newFile.setLastSyncDateForProperties(mFile.getLastSyncDateForProperties());