Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(dav): Make getFavoriteNodes cancelable #923

Merged
merged 1 commit into from
Apr 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions lib/dav/dav.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import { davGetFavoritesReport } from './davProperties'
import { getCurrentUser, getRequestToken, onRequestTokenUpdate } from '@nextcloud/auth'
import { generateRemoteUrl } from '@nextcloud/router'
import { createClient, getPatcher } from 'webdav'
import { CancelablePromise } from 'cancelable-promise'

/**
* Nextcloud DAV result response
Expand Down Expand Up @@ -119,20 +120,30 @@ export const davGetClient = function(remoteURL = davRemoteURL, headers: Record<s
* const favorites = await getFavoriteNodes(client, '/', davRootPath)
* ```
*/
export const getFavoriteNodes = async (davClient: WebDAVClient, path = '/', davRoot = davRootPath) => {
const contentsResponse = await davClient.getDirectoryContents(`${davRoot}${path}`, {
details: true,
data: davGetFavoritesReport(),
headers: {
// see davGetClient for patched webdav client
method: 'REPORT',
},
includeSelf: true,
}) as ResponseDataDetailed<FileStat[]>

return contentsResponse.data
.filter(node => node.filename !== path) // exclude current dir
.map((result) => davResultToNode(result, davRoot))
export const getFavoriteNodes = (davClient: WebDAVClient, path = '/', davRoot = davRootPath): CancelablePromise<Node[]> => {
const controller = new AbortController()
return new CancelablePromise(async (resolve, reject, onCancel) => {
onCancel(() => controller.abort())
try {
const contentsResponse = await davClient.getDirectoryContents(`${davRoot}${path}`, {
signal: controller.signal,
details: true,
data: davGetFavoritesReport(),
headers: {
// see davGetClient for patched webdav client
method: 'REPORT',
},
includeSelf: true,
}) as ResponseDataDetailed<FileStat[]>

const nodes = contentsResponse.data
.filter(node => node.filename !== path) // exclude current dir
.map((result) => davResultToNode(result, davRoot))
resolve(nodes)
} catch (error) {
reject(error)
}
})
}

/**
Expand Down
6 changes: 6 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"@nextcloud/logger": "^2.7.0",
"@nextcloud/paths": "^2.1.0",
"@nextcloud/router": "^3.0.0",
"cancelable-promise": "^4.3.1",
"is-svg": "^5.0.0",
"webdav": "^5.5.0"
}
Expand Down
Loading