self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-09-16 08:56:40 +02:00
Code Issues Releases Activity

Fixed synchronization issue

Browse Source
This commit is contained in:
Laurent Cozic
2017-10-21 19:07:56 +01:00
parent cc92c29913
commit 6e49aa45c0
5 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CliClient/install.sh
View File

@@ -3,8 +3,5 @@
CLIENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" CLIENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
"$CLIENT_DIR/publish.sh" "$CLIENT_DIR/publish.sh"
npm update -g joplin cd ~/bin/yarn/
yarn upgrade joplin
# npm version patch
# $CLIENT_DIR/build.sh
# sudo rsync -aP "$CLIENT_DIR/build/" "/usr/lib/node_modules/joplin/"

20
CliClient/package.json
View File

@@ -1,16 +1,30 @@
{ {
"name": "joplin", "name": "joplin",
"description": "CLI client for Joplin", "description": "Joplin CLI Client",
"license": "MIT", "license": "MIT",
"author": "Laurent Cozic",
"bugs": {
"url": "https://github.com/laurent22/joplin/issues"
},
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/laurent22/joplin" "url": "https://github.com/laurent22/joplin"
}, },
"url": "git://github.com/laurent22/joplin.git", "copyright": {
"version": "0.10.43", "title": "Joplin CLI",
"years": [
2016,
2017
],
"owner": "Laurent Cozic"
},
"version": "0.10.44",
"bin": { "bin": {
"joplin": "./main.js" "joplin": "./main.js"
}, },
"engines": {
"node": ">=8.7.0"
},
"dependencies": { "dependencies": {
"app-module-path": "^2.2.0", "app-module-path": "^2.2.0",
"babel-plugin-transform-runtime": "^6.23.0", "babel-plugin-transform-runtime": "^6.23.0",

2
CliClient/tests/synchronizer.js
View File

@@ -321,7 +321,7 @@ describe('Synchronizer', function() {
let note = await Note.save({ title: "note1", parent_id: folder1.id }); let note = await Note.save({ title: "note1", parent_id: folder1.id });
await synchronizer().start(); await synchronizer().start();
let items = await allItems(); let items = await allItems();
expect(items.length).toBe(1); expect(items.length).toBe(1);
expect(items[0].title).toBe('note1'); expect(items[0].title).toBe('note1');
expect(items[0].is_conflict).toBe(1); expect(items[0].is_conflict).toBe(1);

1
CliClient/tests/test-utils.js
View File

@@ -106,6 +106,7 @@ function setupDatabase(id = null) {
// Don't care if the file doesn't exist // Don't care if the file doesn't exist
}).then(() => { }).then(() => {
databases_[id] = new JoplinDatabase(new DatabaseDriverNode()); databases_[id] = new JoplinDatabase(new DatabaseDriverNode());
// databases_[id].setLogger(logger);
return databases_[id].open({ name: filePath }).then(() => { return databases_[id].open({ name: filePath }).then(() => {
BaseModel.db_ = databases_[id]; BaseModel.db_ = databases_[id];
return setupDatabase(id); return setupDatabase(id);

6
ReactNativeClient/lib/models/folder.js
View File

@@ -77,12 +77,6 @@ class Folder extends BaseItem {
}); });
} }
static batchDelete(ids, options = null) {
for (let i = 0; i < ids.length; i++) {
this.delete(ids[i], options);
}
}
static conflictFolderTitle() { static conflictFolderTitle() {
return _('Conflicts'); return _('Conflicts');
} }