self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

All: Fixes #632: Handle restricted_content error in Dropbox

Browse Source
This commit is contained in:
Laurent Cozic
2018-06-18 08:47:51 +01:00
parent 44f9b35d93
commit a8b58aaec3
2 changed files with 53 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReactNativeClient/lib/file-api-driver-dropbox.js
View File

@@ -133,6 +133,8 @@ class FileApiDriverDropbox {
} catch (error) { } catch (error) {
if (this.hasErrorCode_(error, 'not_found')) { if (this.hasErrorCode_(error, 'not_found')) {
return null; return null;
} else if (this.hasErrorCode_(error, 'restricted_content')) {
throw new JoplinError('Cannot download because content is restricted by Dropbox', 'rejectedByTarget');
} else { } else {
throw error; throw error;
} }

31
ReactNativeClient/lib/synchronizer.js
View File

@@ -266,7 +266,17 @@ class Synchronizer {
// could be done using the file timestamp and the potentially unnecessary content loading could be skipped. // could be done using the file timestamp and the potentially unnecessary content loading could be skipped.
// OneDrive does not appear to have accurate timestamps as lastModifiedDateTime would occasionally be // OneDrive does not appear to have accurate timestamps as lastModifiedDateTime would occasionally be
// a few seconds ahead of what it was set with setTimestamp() // a few seconds ahead of what it was set with setTimestamp()
try {
remoteContent = await this.api().get(path); remoteContent = await this.api().get(path);
} catch (error) {
if (error.code === 'rejectedByTarget') {
this.progressReport_.errors.push(error);
this.logger().warn('Rejected by target: ' + path + ': ' + error.message);
continue;
} else {
throw error;
}
}
if (!remoteContent) throw new Error("Got metadata for path but could not fetch content: " + path); if (!remoteContent) throw new Error("Got metadata for path but could not fetch content: " + path);
remoteContent = await BaseItem.unserialize(remoteContent); remoteContent = await BaseItem.unserialize(remoteContent);
@@ -485,6 +495,8 @@ class Synchronizer {
let local = await BaseItem.loadItemByPath(path); let local = await BaseItem.loadItemByPath(path);
let ItemClass = null; let ItemClass = null;
let content = null; let content = null;
try {
if (!local) { if (!local) {
if (remote.isDeleted !== true) { if (remote.isDeleted !== true) {
action = "createLocal"; action = "createLocal";
@@ -506,6 +518,15 @@ class Synchronizer {
} }
} }
} }
} catch (error) {
if (error.code === 'rejectedByTarget') {
this.progressReport_.errors.push(error);
this.logger().warn('Rejected by target: ' + path + ': ' + error.message);
action = null;
} else {
throw error;
}
}
if (!action) continue; if (!action) continue;
@@ -536,7 +557,17 @@ class Synchronizer {
if (content.type_ == BaseModel.TYPE_RESOURCE && action == "createLocal") { if (content.type_ == BaseModel.TYPE_RESOURCE && action == "createLocal") {
let localResourceContentPath = Resource.fullPath(content); let localResourceContentPath = Resource.fullPath(content);
let remoteResourceContentPath = this.resourceDirName_ + "/" + content.id; let remoteResourceContentPath = this.resourceDirName_ + "/" + content.id;
try {
await this.api().get(remoteResourceContentPath, { path: localResourceContentPath, target: "file" }); await this.api().get(remoteResourceContentPath, { path: localResourceContentPath, target: "file" });
} catch (error) {
if (error.code === 'rejectedByTarget') {
this.progressReport_.errors.push(error);
this.logger().warn('Rejected by target: ' + path + ': ' + error.message);
continue;
} else {
throw error;
}
}
} }
await ItemClass.save(content, options); await ItemClass.save(content, options);