self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

All: Various changes to get filesystem target to work on mobile

Browse Source
This commit is contained in:
Laurent Cozic
2018-01-17 21:01:41 +00:00
parent c16ea6b237
commit 9efbf74b6f
6 changed files with 86 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ReactNativeClient/lib/file-api-driver-local.js
View File

@ -1,6 +1,3 @@
const fs = require('fs-extra');
const { promiseChain } = require('lib/promise-utils.js');
const moment = require('moment');
const BaseItem = require('lib/models/BaseItem.js');
const { time } = require('lib/time-utils.js');
@ -19,8 +16,9 @@ const { time } = require('lib/time-utils.js');
class FileApiDriverLocal {
fsErrorToJsError_(error) {
fsErrorToJsError_(error, path = null) {
let msg = error.toString();
if (path !== null) msg += '. Path: ' + path;
let output = new Error(msg);
if (error.code) output.code = error.code;
return output;
@ -34,9 +32,9 @@ class FileApiDriverLocal {
async stat(path) {
try {
const s = await this.fsDriver().stat(path);
if (!s) return null;
return this.metadataFromStat_(s);
} catch (error) {
if (error.code == 'ENOENT') return null;
throw this.fsErrorToJsError_(error);
}
}
@ -106,7 +104,7 @@ class FileApiDriverLocal {
items: output,
};
} catch(error) {
throw this.fsErrorToJsError_(error);
throw this.fsErrorToJsError_(error, path);
}
}
@ -121,7 +119,7 @@ class FileApiDriverLocal {
context: null,
};
} catch(error) {
throw this.fsErrorToJsError_(error);
throw this.fsErrorToJsError_(error, path);
}
}
@ -138,19 +136,20 @@ class FileApiDriverLocal {
}
} catch (error) {
if (error.code == 'ENOENT') return null;
throw this.fsErrorToJsError_(error);
throw this.fsErrorToJsError_(error, path);
}
return output;
}
async mkdir(path) {
console.info('EXISTST ' + path, await this.fsDriver().exists(path));
if (await this.fsDriver().exists(path)) return;
try {
await this.fsDriver().mkdir(path);
} catch (error) {
throw this.fsErrorToJsError_(error);
throw this.fsErrorToJsError_(error, path);
}
// return new Promise((resolve, reject) => {
@ -182,7 +181,7 @@ class FileApiDriverLocal {
await this.fsDriver().writeFile(path, content, 'utf8');
} catch (error) {
throw this.fsErrorToJsError_(error);
throw this.fsErrorToJsError_(error, path);
}
// if (!options) options = {};
@ -204,7 +203,7 @@ class FileApiDriverLocal {
try {
await this.fsDriver().unlink(path);
} catch (error) {
throw this.fsErrorToJsError_(error);
throw this.fsErrorToJsError_(error, path);
}
// return new Promise((resolve, reject) => {
@ -224,7 +223,11 @@ class FileApiDriverLocal {
}
async move(oldPath, newPath) {
return this.fsDriver().move(oldPath, newPath);
try {
await this.fsDriver().move(oldPath, newPath);
} catch (error) {
throw this.fsErrorToJsError_(error, path);
}
// let lastError = null;