flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Migrate RenameRemoteFileOperation to kotlin. Second step to keep git history

Browse Source
This commit is contained in:
Abel García de Prada 2021-05-11 11:24:27 +02:00 committed by Abel García de Prada
parent 19710f9975
commit e68d3a6112
1 changed files with 64 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.kt
View File

@ -1,5 +1,5 @@
/* ownCloud Android Library is available under MIT license /* ownCloud Android Library is available under MIT license
* Copyright (C) 2019 ownCloud GmbH. * Copyright (C) 2021 ownCloud GmbH.
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -22,20 +22,20 @@
* *
*/ */
package com.owncloud.android.lib.resources.files; package com.owncloud.android.lib.resources.files
import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.OwnCloudClient
import com.owncloud.android.lib.common.http.HttpConstants; import com.owncloud.android.lib.common.http.HttpConstants
import com.owncloud.android.lib.common.http.methods.webdav.MoveMethod; import com.owncloud.android.lib.common.http.methods.webdav.MoveMethod
import com.owncloud.android.lib.common.network.WebdavUtils; import com.owncloud.android.lib.common.network.WebdavUtils
import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperation
import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode
import timber.log.Timber; import com.owncloud.android.lib.common.utils.isOneOf
import timber.log.Timber
import java.io.File; import java.io.File
import java.net.URL; import java.net.URL
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit
/** /**
* Remote operation performing the rename of a remote file or folder in the ownCloud server. * Remote operation performing the rename of a remote file or folder in the ownCloud server.
@ -43,77 +43,58 @@ import java.util.concurrent.TimeUnit;
* @author David A. Velasco * @author David A. Velasco
* @author masensio * @author masensio
*/ */
public class RenameRemoteFileOperation extends RemoteOperation { class RenameRemoteFileOperation(
private val oldName: String,
private val oldRemotePath: String,
private val newName: String,
isFolder: Boolean,
) : RemoteOperation<Unit>() {
private static final int RENAME_READ_TIMEOUT = 600000; private var newRemotePath: String? = null
private static final int RENAME_CONNECTION_TIMEOUT = 5000;
private String mOldName; init {
private String mOldRemotePath; var parent = (File(oldRemotePath)).parent!!
private String mNewName; parent = if (parent.endsWith(File.separator)) parent else parent + File.separator
private String mNewRemotePath; newRemotePath = parent + newName
/**
* Constructor
*
* @param oldName Old name of the file.
* @param oldRemotePath Old remote path of the file.
* @param newName New name to set as the name of file.
* @param isFolder 'true' for folder and 'false' for files
*/
public RenameRemoteFileOperation(String oldName, String oldRemotePath, String newName,
boolean isFolder) {
mOldName = oldName;
mOldRemotePath = oldRemotePath;
mNewName = newName;
String parent = (new File(mOldRemotePath)).getParent();
parent = (parent.endsWith(File.separator)) ? parent : parent + File.separator;
mNewRemotePath = parent + mNewName;
if (isFolder) { if (isFolder) {
mNewRemotePath += File.separator; newRemotePath.plus(File.separator)
} }
} }
/** override fun run(client: OwnCloudClient): RemoteOperationResult<Unit> {
* Performs the rename operation. var result: RemoteOperationResult<Unit>
*
* @param client Client object to communicate with the remote ownCloud server.
*/
@Override
protected RemoteOperationResult run(OwnCloudClient client) {
try { try {
if (mNewName.equals(mOldName)) { if (newName == oldName) {
return new RemoteOperationResult<>(ResultCode.OK); return RemoteOperationResult<Unit>(ResultCode.OK)
} }
if (targetPathIsUsed(client)) { if (targetPathIsUsed(client)) {
return new RemoteOperationResult<>(ResultCode.INVALID_OVERWRITE); return RemoteOperationResult<Unit>(ResultCode.INVALID_OVERWRITE)
} }
final MoveMethod move = new MoveMethod( val moveMethod: MoveMethod = MoveMethod(
new URL(client.getUserFilesWebDavUri() + url = URL(client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(oldRemotePath)),
WebdavUtils.encodePath(mOldRemotePath)), destinationUrl = client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(newRemotePath),
client.getUserFilesWebDavUri() + WebdavUtils.encodePath(mNewRemotePath), false); forceOverride = false
).apply {
setReadTimeout(RENAME_READ_TIMEOUT, TimeUnit.MILLISECONDS)
setConnectionTimeout(RENAME_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
}
val status = client.executeHttpMethod(moveMethod)
move.setReadTimeout(RENAME_READ_TIMEOUT, TimeUnit.SECONDS); result = if (isSuccess(status)) {
move.setConnectionTimeout(RENAME_READ_TIMEOUT, TimeUnit.SECONDS); RemoteOperationResult<Unit>(ResultCode.OK)
} else {
RemoteOperationResult<Unit>(moveMethod)
}
final int status = client.executeHttpMethod(move); Timber.i("Rename $oldRemotePath to $newRemotePath: ${result.logMessage}")
final RemoteOperationResult result = client.exhaustResponse(moveMethod.getResponseBodyAsStream())
(status == HttpConstants.HTTP_CREATED || status == HttpConstants.HTTP_NO_CONTENT) return result
? new RemoteOperationResult<>(ResultCode.OK) } catch (exception: Exception) {
: new RemoteOperationResult<>(move); result = RemoteOperationResult<Unit>(exception)
Timber.e(exception, "Rename $oldRemotePath to $newName: ${result.logMessage}")
Timber.i("Rename " + mOldRemotePath + " to " + mNewRemotePath + ": " + result.getLogMessage()); return result
client.exhaustResponse(move.getResponseBodyAsStream());
return result;
} catch (Exception e) {
final RemoteOperationResult result = new RemoteOperationResult<>(e);
Timber.e(e,
"Rename " + mOldRemotePath + " to " + ((mNewRemotePath == null) ? mNewName : mNewRemotePath) + ":" +
" " + result.getLogMessage());
return result;
} }
} }
@ -122,10 +103,16 @@ public class RenameRemoteFileOperation extends RemoteOperation {
* *
* @return 'True' if the target path is already used by an existing file. * @return 'True' if the target path is already used by an existing file.
*/ */
private boolean targetPathIsUsed(OwnCloudClient client) { private fun targetPathIsUsed(client: OwnCloudClient): Boolean {
CheckPathExistenceRemoteOperation checkPathExistenceRemoteOperation = val checkPathExistenceRemoteOperation = CheckPathExistenceRemoteOperation(newRemotePath, false)
new CheckPathExistenceRemoteOperation(mNewRemotePath, false); val exists = checkPathExistenceRemoteOperation.execute(client)
RemoteOperationResult exists = checkPathExistenceRemoteOperation.execute(client); return exists.isSuccess
return exists.isSuccess();
} }
}
private fun isSuccess(status: Int) = status.isOneOf(HttpConstants.HTTP_CREATED, HttpConstants.HTTP_NO_CONTENT)
companion object {
private const val RENAME_READ_TIMEOUT = 10_000L
private const val RENAME_CONNECTION_TIMEOUT = 5_000L
}
}