self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00
Code Issues Releases Activity

Cli: Fixed "sync" command when calling it in non-interactive mode

Browse Source
This commit is contained in:
Laurent Cozic
2023-02-26 12:11:48 +00:00
parent bc8c61748a
commit d157b9cfc7
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/app-cli/app/command-sync.ts
View File

@ -9,11 +9,11 @@ import { appTypeToLockType } from '@joplin/lib/services/synchronizer/LockHandler
const BaseCommand = require('./base-command').default;
const { app } = require('./app.js');
const { OneDriveApiNodeUtils } = require('@joplin/lib/onedrive-api-node-utils.js');
const { reg } = require('@joplin/lib/registry.js');
import { reg } from '@joplin/lib/registry';
const { cliUtils } = require('./cli-utils.js');
const md5 = require('md5');
const locker = require('proper-lockfile');
const fs = require('fs-extra');
import * as locker from 'proper-lockfile';
import { pathExists, writeFile } from 'fs-extra';
class Command extends BaseCommand {
@ -37,21 +37,12 @@ class Command extends BaseCommand {
];
}
static async lockFile(filePath: string): Promise<Function> {
private static async lockFile(filePath: string) {
return locker.lock(filePath, { stale: 1000 * 60 * 5 });
}
static isLocked(filePath: string) {
return new Promise((resolve, reject) => {
locker.check(filePath, (error: any, isLocked: boolean) => {
if (error) {
reject(error);
return;
}
resolve(isLocked);
});
});
private static async isLocked(filePath: string) {
return locker.check(filePath);
}
async doAuth() {
@ -114,7 +105,7 @@ class Command extends BaseCommand {
// Lock is unique per profile/database
const lockFilePath = `${require('os').tmpdir()}/synclock_${md5(escape(Setting.value('profileDir')))}`; // https://github.com/pvorb/node-md5/issues/41
if (!(await fs.pathExists(lockFilePath))) await fs.writeFile(lockFilePath, 'synclock');
if (!(await pathExists(lockFilePath))) await writeFile(lockFilePath, 'synclock');
const useLock = args.options.useLock !== 0;