X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/fd9086a8833c8ec7df08f6b3d5a3ce8b4c26864e..e1245bbda7894e1a3028d2b54a6918e4bdd46ae2:/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 0cee73b8..80a3463b 100644 --- a/src/com/owncloud/android/operations/UploadFileOperation.java +++ b/src/com/owncloud/android/operations/UploadFileOperation.java @@ -1,10 +1,9 @@ /* 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -30,20 +29,25 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.methods.PutMethod; +import org.apache.commons.httpclient.methods.RequestEntity; import org.apache.http.HttpStatus; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.operations.RemoteOperation; -import com.owncloud.android.operations.RemoteOperationResult; -import com.owncloud.android.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.files.services.FileUploader; +import com.owncloud.android.oc_framework.network.ProgressiveDataTransferer; +import com.owncloud.android.oc_framework.network.webdav.FileRequestEntity; +import com.owncloud.android.oc_framework.network.webdav.OnDatatransferProgressListener; +import com.owncloud.android.oc_framework.network.webdav.WebdavClient; +import com.owncloud.android.oc_framework.network.webdav.WebdavUtils; +import com.owncloud.android.oc_framework.operations.OperationCancelledException; +import com.owncloud.android.oc_framework.operations.RemoteOperation; +import com.owncloud.android.oc_framework.operations.RemoteOperationResult; +import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.utils.Log_OC; -import eu.alefzero.webdav.FileRequestEntity; -import eu.alefzero.webdav.OnDatatransferProgressListener; -import eu.alefzero.webdav.WebdavClient; -import eu.alefzero.webdav.WebdavUtils; import android.accounts.Account; -import android.util.Log; + /** * Remote operation performing the upload of a file to an ownCloud server @@ -51,7 +55,7 @@ import android.util.Log; * @author David A. Velasco */ public class UploadFileOperation extends RemoteOperation { - + private static final String TAG = UploadFileOperation.class.getSimpleName(); private Account mAccount; @@ -61,59 +65,75 @@ public class UploadFileOperation extends RemoteOperation { 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 String mOriginalFileName = null; + private String mOriginalStoragePath = null; PutMethod mPutMethod = null; private Set mDataTransferListeners = new HashSet(); private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false); + protected RequestEntity mEntity = null; + public UploadFileOperation( Account account, 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) throw new IllegalArgumentException("Illegal NULL file in UploadFileOperation creation"); - if (file.getStoragePath() == null || file.getStoragePath().length() <= 0 || !(new File(file.getStoragePath()).exists())) { - throw new IllegalArgumentException("Illegal file in UploadFileOperation; storage path invalid or file not found: " + file.getStoragePath()); + if (file.getStoragePath() == null || file.getStoragePath().length() <= 0 + || !(new File(file.getStoragePath()).exists())) { + throw new IllegalArgumentException( + "Illegal file in UploadFileOperation; storage path invalid or file not found: " + + file.getStoragePath()); } - + mAccount = account; mFile = file; mRemotePath = file.getRemotePath(); mIsInstant = isInstant; mForceOverwrite = forceOverwrite; - mMoveLocalFile = moveLocalFile; + mLocalBehaviour = localBehaviour; + mOriginalStoragePath = mFile.getStoragePath(); + mOriginalFileName = mFile.getFileName(); } - public Account getAccount() { return mAccount; } - + + public String getFileName() { + return mOriginalFileName; + } + public OCFile getFile() { return mFile; } - + public OCFile getOldFile() { - return mOldFile; + return mOldFile; } - + + public String getOriginalStoragePath() { + return mOriginalStoragePath; + } + public String getStoragePath() { return mFile.getStoragePath(); } public String getRemotePath() { - return mFile.getRemotePath(); + return mFile.getRemotePath(); } public String getMimeType() { return mFile.getMimetype(); } - + public boolean isInstant() { return mIsInstant; } @@ -121,7 +141,7 @@ public class UploadFileOperation extends RemoteOperation { public boolean isRemoteFolderToBeCreated() { return mRemoteFolderToBeCreated; } - + public void setRemoteFolderToBeCreated() { mRemoteFolderToBeCreated = true; } @@ -129,71 +149,119 @@ public class UploadFileOperation extends RemoteOperation { public boolean getForceOverwrite() { return mForceOverwrite; } - + public boolean wasRenamed() { return mWasRenamed; } - + public Set getDataTransferListeners() { return mDataTransferListeners; } public void addDatatransferProgressListener (OnDatatransferProgressListener listener) { - mDataTransferListeners.add(listener); + synchronized (mDataTransferListeners) { + mDataTransferListeners.add(listener); + } + if (mEntity != null) { + ((ProgressiveDataTransferer)mEntity).addDatatransferProgressListener(listener); + } } + public void removeDatatransferProgressListener(OnDatatransferProgressListener listener) { + synchronized (mDataTransferListeners) { + mDataTransferListeners.remove(listener); + } + if (mEntity != null) { + ((ProgressiveDataTransferer)mEntity).removeDatatransferProgressListener(listener); + } + } @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 + // / rename the file to upload, if necessary if (!mForceOverwrite) { String remotePath = getAvailableRemotePath(client, mRemotePath); mWasRenamed = !remotePath.equals(mRemotePath); if (mWasRenamed) { - createNewOCFile(remotePath); + createNewOCFile(remotePath); } } 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; - - } 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); + + 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 (!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){ + 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_OC.d(TAG, "Weird exception while closing input stream for " + mOriginalStoragePath + " (ignoring)", e); + } + try { + if (out != null) + out.close(); + } catch (Exception e) { + Log_OC.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; - - /// perform the upload - synchronized(mCancellationRequested) { + + // / perform the upload + synchronized (mCancellationRequested) { if (mCancellationRequested.get()) { throw new OperationCancelledException(); } else { @@ -201,63 +269,77 @@ public class UploadFileOperation extends RemoteOperation { } } int status = uploadFile(client); - - - /// move local temporal file or original file to its corresponding location in the ownCloud local folder + + // / 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 very 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, (mPutMethod != null ? mPutMethod.getResponseHeaders() : null)); + } catch (Exception e) { + // TODO something cleaner with cancellations if (mCancellationRequested.get()) { result = new RemoteOperationResult(new OperationCancelledException()); } else { result = new RemoteOperationResult(e); } - - + } finally { if (temporalFile != null && !originalFile.equals(temporalFile)) { temporalFile.delete(); } if (result.isSuccess()) { - Log.i(TAG, "Upload of " + originalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage()); - + Log_OC.i(TAG, "Upload of " + mOriginalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage()); } else { if (result.getException() != null) { String complement = ""; if (!nameCheckPassed) { complement = " (while checking file existence in server)"; } else if (!localCopyPassed) { - complement = " (while copying local file to " + FileStorageUtils.getSavePath(mAccount.name) + ")"; + complement = " (while copying local file to " + FileStorageUtils.getSavePath(mAccount.name) + + ")"; } - Log.e(TAG, "Upload of " + originalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage() + complement, result.getException()); + Log_OC.e(TAG, "Upload of " + mOriginalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage() + complement, result.getException()); } else { - Log.e(TAG, "Upload of " + originalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage()); + Log_OC.e(TAG, "Upload of " + mOriginalStoragePath + " to " + mRemotePath + ": " + result.getLogMessage()); } } } - + return result; } - private void createNewOCFile(String newRemotePath) { // a new OCFile instance must be created for a new remote path OCFile newFile = new OCFile(newRemotePath); @@ -265,6 +347,7 @@ public class UploadFileOperation extends RemoteOperation { 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()); @@ -275,31 +358,32 @@ public class UploadFileOperation extends RemoteOperation { mFile = newFile; } - public boolean isSuccess(int status) { return ((status == HttpStatus.SC_OK || status == HttpStatus.SC_CREATED || status == HttpStatus.SC_NO_CONTENT)); } - - + protected int uploadFile(WebdavClient client) throws HttpException, IOException, OperationCancelledException { int status = -1; try { File f = new File(mFile.getStoragePath()); - FileRequestEntity entity = new FileRequestEntity(f, getMimeType()); - entity.addOnDatatransferProgressListeners(mDataTransferListeners); - mPutMethod.setRequestEntity(entity); + mEntity = new FileRequestEntity(f, getMimeType()); + synchronized (mDataTransferListeners) { + ((ProgressiveDataTransferer)mEntity).addDatatransferProgressListeners(mDataTransferListeners); + } + mPutMethod.setRequestEntity(mEntity); status = client.executeMethod(mPutMethod); client.exhaustResponse(mPutMethod.getResponseBodyAsStream()); - + } finally { - mPutMethod.releaseConnection(); // let the connection available for other methods + mPutMethod.releaseConnection(); // let the connection available for + // other methods } return status; } - + /** - * Checks if remotePath does not exist in the server and returns it, or adds a suffix to it in order to avoid the server - * file is overwritten. + * Checks if remotePath does not exist in the server and returns it, or adds + * a suffix to it in order to avoid the server file is overwritten. * * @param string * @return @@ -309,12 +393,12 @@ public class UploadFileOperation extends RemoteOperation { if (!check) { return remotePath; } - + int pos = remotePath.lastIndexOf("."); String suffix = ""; String extension = ""; if (pos >= 0) { - extension = remotePath.substring(pos+1); + extension = remotePath.substring(pos + 1); remotePath = remotePath.substring(0, pos); } int count = 2; @@ -327,21 +411,19 @@ public class UploadFileOperation extends RemoteOperation { count++; } while (check); - if (pos >=0) { + if (pos >= 0) { return remotePath + suffix + "." + extension; } else { return remotePath + suffix; } } - public void cancel() { - synchronized(mCancellationRequested) { + synchronized (mCancellationRequested) { mCancellationRequested.set(true); if (mPutMethod != null) mPutMethod.abort(); } } - }