This repository has been archived by the owner on Mar 19, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 149
[New arch] Fetch list of files #335
Merged
abelgardep
merged 4 commits into
new_arch/synchronization
from
new_arch/fetch_list_files
Jul 28, 2020
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
137b417
Merge pull request #331 from owncloud/fix/refresh_basic_credentials
abelgardep 37a9788
Migrate ReadRemoteFolderOperation to kotlin and add it to FileService
abelgardep afb064c
Add owner field to remote file
abelgardep ea1f4ec
Apply CR suggestions
abelgardep File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
128 changes: 0 additions & 128 deletions
128
...ary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java
This file was deleted.
Oops, something went wrong.
102 changes: 102 additions & 0 deletions
102
...brary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
/* ownCloud Android Library is available under MIT license | ||
* Copyright (C) 2020 ownCloud GmbH. | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | ||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | ||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
* THE SOFTWARE. | ||
* | ||
*/ | ||
package com.owncloud.android.lib.resources.files | ||
|
||
import com.owncloud.android.lib.common.OwnCloudClient | ||
import com.owncloud.android.lib.common.accounts.AccountUtils | ||
import com.owncloud.android.lib.common.http.HttpConstants | ||
import com.owncloud.android.lib.common.http.methods.webdav.DavConstants | ||
import com.owncloud.android.lib.common.http.methods.webdav.DavUtils | ||
import com.owncloud.android.lib.common.http.methods.webdav.PropfindMethod | ||
import com.owncloud.android.lib.common.network.WebdavUtils | ||
import com.owncloud.android.lib.common.operations.RemoteOperation | ||
import com.owncloud.android.lib.common.operations.RemoteOperationResult | ||
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode | ||
import timber.log.Timber | ||
import java.net.URL | ||
import java.util.ArrayList | ||
|
||
/** | ||
* Remote operation performing the read of remote file or folder in the ownCloud server. | ||
* | ||
* @author David A. Velasco | ||
* @author masensio | ||
* @author David González Verdugo | ||
*/ | ||
class ReadRemoteFolderOperation( | ||
val remotePath: String | ||
) : RemoteOperation<ArrayList<RemoteFile>>() { | ||
|
||
/** | ||
* Performs the read operation. | ||
* | ||
* @param client Client object to communicate with the remote ownCloud server. | ||
*/ | ||
override fun run(client: OwnCloudClient): RemoteOperationResult<ArrayList<RemoteFile>> { | ||
try { | ||
val propfindMethod = PropfindMethod( | ||
URL(client.userFilesWebDavUri.toString() + WebdavUtils.encodePath(remotePath)), | ||
DavConstants.DEPTH_1, | ||
DavUtils.getAllPropset() | ||
) | ||
client.setFollowRedirects(true) | ||
|
||
val status = client.executeHttpMethod(propfindMethod) | ||
|
||
if (isSuccess(status)) { | ||
val mFolderAndFiles = ArrayList<RemoteFile>() | ||
|
||
// parse data from remote folder | ||
val remoteFolder = RemoteFile(propfindMethod.root, AccountUtils.getUserId(mAccount, mContext)).apply { | ||
owner = mAccount.name | ||
} | ||
mFolderAndFiles.add(remoteFolder) | ||
|
||
// loop to update every child | ||
propfindMethod.members.forEach { resource -> | ||
val file = RemoteFile(resource, AccountUtils.getUserId(mAccount, mContext)) | ||
file.owner = mAccount.name | ||
mFolderAndFiles.add(file) | ||
} | ||
|
||
// Result of the operation | ||
return RemoteOperationResult<ArrayList<RemoteFile>>(ResultCode.OK).apply { | ||
data = mFolderAndFiles | ||
Timber.i("Synchronized $remotePath with ${mFolderAndFiles.size} files. ${this.logMessage}") | ||
} | ||
} else { // synchronization failed | ||
return RemoteOperationResult<ArrayList<RemoteFile>>(propfindMethod).also { | ||
Timber.w("Synchronized $remotePath ${it.logMessage}") | ||
} | ||
} | ||
} catch (e: Exception) { | ||
return RemoteOperationResult<ArrayList<RemoteFile>>(e).also { | ||
Timber.e(it.exception, "Synchronized $remotePath") | ||
} | ||
} | ||
} | ||
|
||
private fun isSuccess(status: Int): Boolean = | ||
status == HttpConstants.HTTP_MULTI_STATUS || status == HttpConstants.HTTP_OK | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -85,6 +85,7 @@ public RemoteFile[] newArray(int size) { | |
private BigDecimal mQuotaUsedBytes; | ||
private BigDecimal mQuotaAvailableBytes; | ||
private String mPrivateLink; | ||
private String mOwner; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I guess this is needed because the account name and user name is not always the same, right? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not at all, i just want to have it earlier. Previously it was included in FileDataStorageManager, and i think it is easier to handle it here, so localdatasource won't need to ask the current account to add this attribute. |
||
|
||
public RemoteFile() { | ||
resetData(); | ||
|
@@ -257,6 +258,14 @@ public void setPrivateLink(String privateLink) { | |
mPrivateLink = privateLink; | ||
} | ||
|
||
public String getOwner() { | ||
return mOwner; | ||
} | ||
|
||
public void setOwner(String owner) { | ||
mOwner = owner; | ||
} | ||
|
||
/** | ||
* Used internally. Reset all file properties | ||
*/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand your point of view and it is less verbose, but i think we lose readability using it that way.