self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

iOS: Fixes #10396: Fix Dropbox sync for large file collections (#10411)

Browse Source
This commit is contained in:
Henry Heino 2024-05-08 06:25:06 -07:00 committed by GitHub
parent a3dc9c2721
commit 3042e615ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/lib/file-api-driver-dropbox.js
View File

@ -1,6 +1,9 @@
const time = require('./time').default; const time = require('./time').default;
const shim = require('./shim').default; const shim = require('./shim').default;
const JoplinError = require('./JoplinError').default; const JoplinError = require('./JoplinError').default;
const Logger = require('@joplin/utils/Logger').default;
const logger = Logger.create('file-api-driver-dropbox');
class FileApiDriverDropbox { class FileApiDriverDropbox {
constructor(api) { constructor(api) {
@ -97,14 +100,14 @@ class FileApiDriverDropbox {
} }
} }
async list(path) { async list(path, options) {
let response = await this.api().exec('POST', 'files/list_folder', { let response = await this.api().exec('POST', 'files/list_folder', {
path: this.makePath_(path), path: this.makePath_(path),
}); });
let output = this.metadataToStats_(response.entries); let output = this.metadataToStats_(response.entries);
while (response.has_more) { while (response.has_more && !options?.firstPageOnly) {
response = await this.api().exec('POST', 'files/list_folder/continue', { response = await this.api().exec('POST', 'files/list_folder/continue', {
cursor: response.cursor, cursor: response.cursor,
}); });
@ -114,7 +117,7 @@ class FileApiDriverDropbox {
return { return {
items: output, items: output,
hasMore: false, hasMore: !!response.has_more,
context: { cursor: response.cursor }, context: { cursor: response.cursor },
}; };
} }
@ -148,7 +151,8 @@ class FileApiDriverDropbox {
} else { } else {
try { try {
response = await fetchPath('GET', path); response = await fetchPath('GET', path);
} catch (_error) { } catch (error) {
logger.warn('Request to files/download failed. Retrying with workaround. Error: ', error);
// May 2024: Sending a GET request to files/download sometimes fails // May 2024: Sending a GET request to files/download sometimes fails
// until another file is requested. Because POST requests with empty bodies don't work on iOS, // until another file is requested. Because POST requests with empty bodies don't work on iOS,
// we send a request for a different file, then re-request the original. // we send a request for a different file, then re-request the original.
@ -156,7 +160,7 @@ class FileApiDriverDropbox {
// See https://github.com/laurent22/joplin/issues/10396 // See https://github.com/laurent22/joplin/issues/10396
// This workaround requires that the file we request exist. // This workaround requires that the file we request exist.
const { items } = await this.list(); const { items } = await this.list('', { firstPageOnly: true });
const files = items.filter(item => !item.isDir && item.path !== path); const files = items.filter(item => !item.isDir && item.path !== path);
if (files.length > 0) { if (files.length > 0) {