X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/53b67429ea8c97b83602cec3446a10e0b6b7ff5e..e4bc3bdadc47c01e88dd1de94a4666d3753ee90e:/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 38be5f94..afdd3cbe 100644 --- a/src/com/owncloud/android/operations/UploadFileOperation.java +++ b/src/com/owncloud/android/operations/UploadFileOperation.java @@ -20,11 +20,15 @@ package com.owncloud.android.operations; import java.io.File; import java.io.IOException; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.atomic.AtomicBoolean; import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.methods.PutMethod; import org.apache.http.HttpStatus; +import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.operations.RemoteOperation; import com.owncloud.android.operations.RemoteOperationResult; @@ -32,8 +36,8 @@ 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; -import android.webkit.MimeTypeMap; /** * Remote operation performing the upload of a file to an ownCloud server @@ -42,70 +46,94 @@ import android.webkit.MimeTypeMap; */ public class UploadFileOperation extends RemoteOperation { - private static final String TAG = UploadFileOperation.class.getCanonicalName(); + private static final String TAG = UploadFileOperation.class.getSimpleName(); - private String mLocalPath = null; + private Account mAccount; + private OCFile mFile; + private OCFile mOldFile; private String mRemotePath = null; - private String mMimeType = null; private boolean mIsInstant = false; + private boolean mRemoteFolderToBeCreated = false; private boolean mForceOverwrite = false; - private OnDatatransferProgressListener mDataTransferListener = null; + private boolean mWasRenamed = false; + PutMethod mPutMethod = null; + private Set mDataTransferListeners = new HashSet(); + private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false); - public String getLocalPath() { - return mLocalPath; + public UploadFileOperation( Account account, + OCFile file, + boolean isInstant, + boolean forceOverwrite) { + 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()); + } + + mAccount = account; + mFile = file; + mRemotePath = file.getRemotePath(); + mIsInstant = isInstant; + mForceOverwrite = forceOverwrite; + } + + + public Account getAccount() { + return mAccount; + } + + public OCFile getFile() { + return mFile; + } + + public OCFile getOldFile() { + return mOldFile; + } + + public String getStoragePath() { + return mFile.getStoragePath(); } public String getRemotePath() { - return mRemotePath; + return mFile.getRemotePath(); } public String getMimeType() { - return mMimeType; + return mFile.getMimetype(); } - public boolean isInstant() { return mIsInstant; } + + public boolean isRemoteFolderToBeCreated() { + return mRemoteFolderToBeCreated; + } - + public void setRemoteFolderToBeCreated() { + mRemoteFolderToBeCreated = true; + } + public boolean getForceOverwrite() { return mForceOverwrite; } - - public OnDatatransferProgressListener getDataTransferListener() { - return mDataTransferListener ; + public boolean wasRenamed() { + return mWasRenamed; } - - public UploadFileOperation( String localPath, - String remotePath, - String mimeType, - boolean isInstant, - boolean forceOverwrite, - OnDatatransferProgressListener dataTransferProgressListener) { - mLocalPath = localPath; - mRemotePath = remotePath; - mMimeType = mimeType; - if (mMimeType == null) { - try { - mMimeType = MimeTypeMap.getSingleton() - .getMimeTypeFromExtension( - localPath.substring(localPath.lastIndexOf('.') + 1)); - } catch (IndexOutOfBoundsException e) { - Log.e(TAG, "Trying to find out MIME type of a file without extension: " + localPath); - } - } - if (mMimeType == null) { - mMimeType = "application/octet-stream"; - } - mIsInstant = isInstant; - mForceOverwrite = forceOverwrite; - mDataTransferListener = dataTransferProgressListener; + public Set getDataTransferListeners() { + return mDataTransferListeners; } + public void addDatatransferProgressListener (OnDatatransferProgressListener listener) { + mDataTransferListeners.add(listener); + } + + @Override protected RemoteOperationResult run(WebdavClient client) { RemoteOperationResult result = null; @@ -113,44 +141,75 @@ public class UploadFileOperation extends RemoteOperation { try { /// rename the file to upload, if necessary if (!mForceOverwrite) { - mRemotePath = getAvailableRemotePath(client, mRemotePath); + String remotePath = getAvailableRemotePath(client, mRemotePath); + mWasRenamed = !remotePath.equals(mRemotePath); + if (mWasRenamed) { + createNewOCFile(remotePath); + } } /// perform the upload nameCheckPassed = true; + synchronized(mCancellationRequested) { + if (mCancellationRequested.get()) { + throw new OperationCancelledException(); + } else { + mPutMethod = new PutMethod(client.getBaseUri() + WebdavUtils.encodePath(mRemotePath)); + } + } int status = uploadFile(client); result = new RemoteOperationResult(isSuccess(status), status); - Log.i(TAG, "Upload of " + mLocalPath + " to " + mRemotePath + ": " + result.getLogMessage()); - + Log.i(TAG, "Upload of " + mFile.getStoragePath() + " to " + mRemotePath + ": " + result.getLogMessage()); + } catch (Exception e) { - result = new RemoteOperationResult(e); - Log.e(TAG, "Upload of " + mLocalPath + " to " + mRemotePath + ": " + result.getLogMessage() + (nameCheckPassed?"":" (while checking file existence in server)"), e); - + // TODO something cleaner + if (mCancellationRequested.get()) { + result = new RemoteOperationResult(new OperationCancelledException()); + } else { + result = new RemoteOperationResult(e); + } + Log.e(TAG, "Upload of " + mFile.getStoragePath() + " to " + mRemotePath + ": " + result.getLogMessage() + (nameCheckPassed?"":" (while checking file existence in server)"), result.getException()); } return result; } + private void createNewOCFile(String newRemotePath) { + // a new OCFile instance must be created for a new remote path + OCFile newFile = new OCFile(newRemotePath); + newFile.setCreationTimestamp(mFile.getCreationTimestamp()); + newFile.setFileLength(mFile.getFileLength()); + newFile.setMimetype(mFile.getMimetype()); + newFile.setModificationTimestamp(mFile.getModificationTimestamp()); + // newFile.setEtag(mFile.getEtag()) + newFile.setKeepInSync(mFile.keepInSync()); + newFile.setLastSyncDateForProperties(mFile.getLastSyncDateForProperties()); + newFile.setLastSyncDateForData(mFile.getLastSyncDateForData()); + newFile.setStoragePath(mFile.getStoragePath()); + newFile.setParentId(mFile.getParentId()); + mOldFile = mFile; + 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 { + protected int uploadFile(WebdavClient client) throws HttpException, IOException, OperationCancelledException { int status = -1; - PutMethod put = new PutMethod(client.getBaseUri() + WebdavUtils.encodePath(mRemotePath)); - try { - File f = new File(mLocalPath); - FileRequestEntity entity = new FileRequestEntity(f, mMimeType); - entity.setOnDatatransferProgressListener(mDataTransferListener); - put.setRequestEntity(entity); - status = client.executeMethod(put); - client.exhaustResponse(put.getResponseBodyAsStream()); + File f = new File(mFile.getStoragePath()); + FileRequestEntity entity = new FileRequestEntity(f, getMimeType()); + entity.addOnDatatransferProgressListeners(mDataTransferListeners); + mPutMethod.setRequestEntity(entity); + status = client.executeMethod(mPutMethod); + client.exhaustResponse(mPutMethod.getResponseBodyAsStream()); } finally { - put.releaseConnection(); // let the connection available for other methods + mPutMethod.releaseConnection(); // let the connection available for other methods } return status; } @@ -192,4 +251,14 @@ public class UploadFileOperation extends RemoteOperation { } } + + public void cancel() { + synchronized(mCancellationRequested) { + mCancellationRequested.set(true); + if (mPutMethod != null) + mPutMethod.abort(); + } + } + + }