diff --git a/src/features/ConfigSync/CmdConfigSync.ts b/src/features/ConfigSync/CmdConfigSync.ts index 8007e57..bb8da26 100644 --- a/src/features/ConfigSync/CmdConfigSync.ts +++ b/src/features/ConfigSync/CmdConfigSync.ts @@ -45,7 +45,7 @@ import { } from "../../lib/src/common/utils.ts"; import { digestHash } from "../../lib/src/string_and_binary/hash.ts"; import { arrayBufferToBase64, decodeBinary, readString } from "../../lib/src/string_and_binary/convert.ts"; -import { serialized, shareRunningResult } from "../../lib/src/concurrency/lock.ts"; +import { serialized, shareRunningResult } from "octagonal-wheels/concurrency/lock"; import { LiveSyncCommands } from "../LiveSyncCommands.ts"; import { stripAllPrefixes } from "../../lib/src/string_and_binary/path.ts"; import { @@ -62,7 +62,7 @@ import { scheduleTask, } from "../../common/utils.ts"; import { JsonResolveModal } from "../HiddenFileCommon/JsonResolveModal.ts"; -import { QueueProcessor } from "../../lib/src/concurrency/processor.ts"; +import { QueueProcessor } from "octagonal-wheels/concurrency/processor"; import { pluginScanningCount } from "../../lib/src/mock_and_interop/stores.ts"; import type ObsidianLiveSyncPlugin from "../../main.ts"; import { base64ToArrayBuffer, base64ToString } from "octagonal-wheels/binary/base64"; diff --git a/src/features/HiddenFileSync/CmdHiddenFileSync.ts b/src/features/HiddenFileSync/CmdHiddenFileSync.ts index 23d3ef8..8fdd217 100644 --- a/src/features/HiddenFileSync/CmdHiddenFileSync.ts +++ b/src/features/HiddenFileSync/CmdHiddenFileSync.ts @@ -45,11 +45,11 @@ import { BASE_IS_NEW, EVEN, } from "../../common/utils.ts"; -import { serialized, skipIfDuplicated } from "../../lib/src/concurrency/lock.ts"; +import { serialized, skipIfDuplicated } from "octagonal-wheels/concurrency/lock"; import { JsonResolveModal } from "../HiddenFileCommon/JsonResolveModal.ts"; import { LiveSyncCommands } from "../LiveSyncCommands.ts"; import { addPrefix, stripAllPrefixes } from "../../lib/src/string_and_binary/path.ts"; -import { QueueProcessor } from "../../lib/src/concurrency/processor.ts"; +import { QueueProcessor } from "octagonal-wheels/concurrency/processor"; import { hiddenFilesEventCount, hiddenFilesProcessingCount } from "../../lib/src/mock_and_interop/stores.ts"; import type { IObsidianModule } from "../../modules/AbstractObsidianModule.ts"; import { EVENT_SETTING_SAVED, eventHub } from "../../common/events.ts"; @@ -1765,10 +1765,7 @@ ${messageFetch}${messageOverwrite}${messageMerge} continue L1; } } - if ( - ignoreFilter && - ignoreFilter.some((e) => (e.pattern.startsWith("/") || e.pattern.startsWith("\\/")) && e.test(v)) - ) { + if (ignoreFilter && ignoreFilter.some((e) => e.test(v))) { continue L1; } if (await this.plugin.$$isIgnoredByIgnoreFiles(v)) { diff --git a/src/modules/features/ModuleLog.ts b/src/modules/features/ModuleLog.ts index f4bb1f5..3150590 100644 --- a/src/modules/features/ModuleLog.ts +++ b/src/modules/features/ModuleLog.ts @@ -370,7 +370,7 @@ export class ModuleLog extends AbstractObsidianModule implements IObsidianModule if (level == LOG_LEVEL_DEBUG && !showDebugLog) { return; } - if (level < LOG_LEVEL_INFO && this.settings && this.settings.lessInformationInLog) { + if (level <= LOG_LEVEL_INFO && this.settings && this.settings.lessInformationInLog) { return; } if (this.settings && !this.settings.showVerboseLog && level == LOG_LEVEL_VERBOSE) {