From 640d920f8f8e0112544a478de3e7a906f79d451d Mon Sep 17 00:00:00 2001 From: Leo Yao <45076643+leoccyao@users.noreply.github.com> Date: Wed, 25 May 2022 10:55:11 -0400 Subject: [PATCH] Bugfix: pass DataManager to BarManager constructor Before this patch, the BarManager constructor created a new DataManager instance, leading to this.dataManager != this.barManager.dataManager. This led to effects such as daily counts not updating in some circumstances, while total counts did. --- src/main.ts | 18 +++++++++--------- src/status/manager.ts | 5 +++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main.ts b/src/main.ts index 7a40f63..de97080 100644 --- a/src/main.ts +++ b/src/main.ts @@ -28,21 +28,21 @@ export default class BetterWordCount extends Plugin { let statusBarEl = this.addStatusBarItem(); this.statusBar = new StatusBar(statusBarEl); + + this.dataManager = new DataManager( + this.app.vault, + this.app.metadataCache, + this.settings + ); + this.barManager = new BarManager( this.statusBar, this.settings, this.app.vault, - this.app.metadataCache + this.app.metadataCache, + this.dataManager ); - if (this.settings.collectStats) { - this.dataManager = new DataManager( - this.app.vault, - this.app.metadataCache, - this.settings - ); - } - this.registerEvent( this.app.workspace.on("active-leaf-change", this.activeLeafChange, this) ); diff --git a/src/status/manager.ts b/src/status/manager.ts index e438580..c3143df 100644 --- a/src/status/manager.ts +++ b/src/status/manager.ts @@ -25,13 +25,14 @@ export class BarManager { statusBar: StatusBar, settings: BetterWordCountSettings, vault: Vault, - metadataCache: MetadataCache + metadataCache: MetadataCache, + dataManager: DataManager ) { this.statusBar = statusBar; this.settings = settings; this.vault = vault; this.dataCollector = new DataCollector(vault, metadataCache, settings); - this.dataManager = new DataManager(vault, metadataCache, settings); + this.dataManager = dataManager; this.deboucer = debounce( (text: string) => this.updateStatusBar(text), 20,