lucastucious/better-word-count
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'hotfix/0.7.1' into develop

Browse source
This commit is contained in:
Luke Leppan 2021-07-11 13:19:09 +02:00
commit 5ab0b76dd9
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/constants.ts
View file

@ -2,10 +2,12 @@ export const VIEW_TYPE_STATS = "vault-stats";
export const STATS_FILE = ".vault-stats";
export const STATS_ICON = `<g transform="matrix(0.95,0,0,0.95,2.5,2.5)"><path fill="currentColor" stroke="currentColor" d="M3.77,100L22.421,100C24.503,100 26.19,98.013 26.19,95.561L26.19,34.813C26.19,32.361 24.503,30.374 22.421,30.374L3.77,30.374C1.688,30.374 -0,32.361 -0,34.813L-0,95.561C-0,98.013 1.688,100 3.77,100ZM40.675,100L59.325,100C61.408,100 63.095,98.013 63.095,95.561L63.095,4.439C63.095,1.987 61.408,-0 59.325,-0L40.675,-0C38.592,-0 36.905,1.987 36.905,4.439L36.905,95.561C36.905,98.013 38.592,100 40.675,100ZM77.579,100L96.23,100C98.312,100 100,98.013 100,95.561L100,46.495C100,44.043 98.312,42.056 96.23,42.056L77.579,42.056C75.497,42.056 73.81,44.043 73.81,46.495L73.81,95.561C73.81,98.013 75.497,100 77.579,100Z" style="fill:none;fill-rule:nonzero;stroke-width:8px;"/></g>`;
export const STATS_ICON_NAME = "stats-graph";
export const MATCH_COMMENT = new RegExp(
export const MATCH_HTML_COMMENT = new RegExp(
"<!--[\\s\\S]*?(?:-->)?" +
"<!---+>?" +
"|<!(?![dD][oO][cC][tT][yY][pP][eE]|\\[CDATA\\[)[^>]*>?" +
"|<[?][^>]*>?",
"g"
);
export const MATCH_COMMENT = new RegExp("%%[^%%]+%%", "g");
export const MATCH_PARAGRAPH = new RegExp("\n([^\n]+)\n", "g");

4
src/data/stats.ts
View file

@ -1,4 +1,4 @@
import { MATCH_COMMENT } from "src/constants";
import { MATCH_HTML_COMMENT, MATCH_COMMENT } from "src/constants";
export function getWordCount(text: string): number {
const spaceDelimitedChars =
@ -37,5 +37,5 @@ export function getSentenceCount(text: string): number {
}
export function cleanComments(text: string): string {
return text.replace(MATCH_COMMENT, "");
return text.replace(MATCH_COMMENT, "").replace(MATCH_HTML_COMMENT, "");
}

5
src/status/manager.ts
View file

@ -35,7 +35,10 @@ export class BarManager {
async updateStatusBar(text: string): Promise<void> {
let newText = "";
const expression: Expression = parse(this.settings.statusBarQuery);
if (this.settings.collectStats) this.dataManager.updateTodayCounts();
if (this.settings.collectStats) {
this.dataManager.updateToday();
this.dataManager.updateTodayCounts();
}
const todayCounts: TodayCounts = this.settings.collectStats
? this.dataManager.getTodayCounts()
: { words: 0, characters: 0, sentences: 0 };