-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
fix(files): Use DAV functions from library to fix invalid source links #42338
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ | |
| * @copyright Copyright (c) 2023 John Molakvoæ <[email protected]> | ||
| * | ||
| * @author John Molakvoæ <[email protected]> | ||
| * @author Ferdinand Thiessen <[email protected]> | ||
| * | ||
| * @license AGPL-3.0-or-later | ||
| * | ||
|
|
@@ -20,84 +21,19 @@ | |
| * | ||
| */ | ||
| import type { ContentsWithRoot } from '@nextcloud/files' | ||
| import type { FileStat, ResponseDataDetailed, DAVResultResponseProps } from 'webdav' | ||
| import type { FileStat, ResponseDataDetailed } from 'webdav' | ||
|
|
||
| import { Folder, Permission, getDavNameSpaces, getDavProperties } from '@nextcloud/files' | ||
| import { generateRemoteUrl } from '@nextcloud/router' | ||
| import { getCurrentUser } from '@nextcloud/auth' | ||
| import { Folder, Permission, davGetRecentSearch, davGetClient, davResultToNode, davRootPath, davRemoteURL } from '@nextcloud/files' | ||
|
|
||
| import { getClient, rootPath } from './WebdavClient' | ||
| import { resultToNode } from './Files' | ||
|
|
||
| const client = getClient(generateRemoteUrl('dav')) | ||
| const client = davGetClient() | ||
|
|
||
| const lastTwoWeeksTimestamp = Math.round((Date.now() / 1000) - (60 * 60 * 24 * 14)) | ||
| const searchPayload = `<?xml version="1.0" encoding="UTF-8"?> | ||
| <d:searchrequest ${getDavNameSpaces()} | ||
| xmlns:ns="https://github.com/icewind1991/SearchDAV/ns"> | ||
| <d:basicsearch> | ||
| <d:select> | ||
| <d:prop> | ||
| ${getDavProperties()} | ||
| </d:prop> | ||
| </d:select> | ||
| <d:from> | ||
| <d:scope> | ||
| <d:href>/files/${getCurrentUser()?.uid}/</d:href> | ||
| <d:depth>infinity</d:depth> | ||
| </d:scope> | ||
| </d:from> | ||
| <d:where> | ||
| <d:and> | ||
| <d:or> | ||
| <d:not> | ||
| <d:eq> | ||
| <d:prop> | ||
| <d:getcontenttype/> | ||
| </d:prop> | ||
| <d:literal>httpd/unix-directory</d:literal> | ||
| </d:eq> | ||
| </d:not> | ||
| <d:eq> | ||
| <d:prop> | ||
| <oc:size/> | ||
| </d:prop> | ||
| <d:literal>0</d:literal> | ||
| </d:eq> | ||
| </d:or> | ||
| <d:gt> | ||
| <d:prop> | ||
| <d:getlastmodified/> | ||
| </d:prop> | ||
| <d:literal>${lastTwoWeeksTimestamp}</d:literal> | ||
| </d:gt> | ||
| </d:and> | ||
| </d:where> | ||
| <d:orderby> | ||
| <d:order> | ||
| <d:prop> | ||
| <d:getlastmodified/> | ||
| </d:prop> | ||
| <d:descending/> | ||
| </d:order> | ||
| </d:orderby> | ||
| <d:limit> | ||
| <d:nresults>100</d:nresults> | ||
| <ns:firstresult>0</ns:firstresult> | ||
| </d:limit> | ||
| </d:basicsearch> | ||
| </d:searchrequest>` | ||
|
|
||
| interface ResponseProps extends DAVResultResponseProps { | ||
| permissions: string, | ||
| fileid: number, | ||
| size: number, | ||
| } | ||
|
|
||
| export const getContents = async (path = '/'): Promise<ContentsWithRoot> => { | ||
| const contentsResponse = await client.getDirectoryContents(path, { | ||
| details: true, | ||
| data: searchPayload, | ||
| data: davGetRecentSearch(lastTwoWeeksTimestamp), | ||
| headers: { | ||
| // Patched in WebdavClient.ts | ||
| method: 'SEARCH', | ||
|
|
@@ -112,11 +48,11 @@ export const getContents = async (path = '/'): Promise<ContentsWithRoot> => { | |
| return { | ||
| folder: new Folder({ | ||
| id: 0, | ||
| source: generateRemoteUrl('dav' + rootPath), | ||
| root: rootPath, | ||
| source: `${davRemoteURL}${davRootPath}`, | ||
| root: davRootPath, | ||
| owner: getCurrentUser()?.uid || null, | ||
| permissions: Permission.READ, | ||
| }), | ||
| contents: contents.map(resultToNode), | ||
| contents: contents.map((r) => davResultToNode(r)), | ||
| } | ||
| } | ||
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Large diffs are not rendered by default.
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.
Why not
contents: contents.map(davResultToNode)?(not a blocker, simply curious))
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.
Parameters do not match
maphas a signature ofelement: T, index: numberbutdavResultToNodehaselement: Result, root?: stringas it allows for different root path.