self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-12-02 22:49:09 +02:00
Code Issues Releases Activity

All: Resolves #173: Upload attachments > 4 MB when using OneDrive (#3195)

Browse Source
This commit is contained in:
TheOnlyTrueJonathanHeard
2020-06-03 15:29:47 +02:00
committed by GitHub
parent b2318b1f9f
commit cfe1911723
4 changed files with 82 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ReactNativeClient/lib/file-api-driver-onedrive.js
View File

@@ -1,5 +1,6 @@
const moment = require('moment');
const { dirname, basename } = require('lib/path-utils.js');
const { shim } = require('lib/shim.js');
class FileApiDriverOneDrive {
constructor(api) {
@@ -129,19 +130,14 @@ class FileApiDriverOneDrive {
let response = null;
try {
if (options.source == 'file') {
response = await this.api_.exec('PUT', `${this.makePath_(path)}:/content`, null, null, options);
} else {
options.headers = { 'Content-Type': 'text/plain' };
response = await this.api_.exec('PUT', `${this.makePath_(path)}:/content`, null, content, options);
}
} catch (error) {
if (error && error.code === 'BadRequest' && error.message === 'Maximum request length exceeded.') {
error.code = 'rejectedByTarget';
error.message = 'Resource exceeds OneDrive max file size (4MB)';
}
throw error;
if (options.source == 'file') {
// We need to check the file size as files > 4 MBs are uploaded in a different way than files < 4 MB (see https://docs.microsoft.com/de-de/onedrive/developer/rest-api/concepts/upload?view=odsp-graph-online)
const fileSize = (await shim.fsDriver().stat(options.path)).size;
path = fileSize < 4 * 1024 * 1024 ? `${this.makePath_(path)}:/content` : `${this.makePath_(path)}:/createUploadSession`;
response = await this.api_.exec('PUT', path, null, null, options);
} else {
options.headers = { 'Content-Type': 'text/plain' };
response = await this.api_.exec('PUT', `${this.makePath_(path)}:/content`, null, content, options);
}
return response;