Skip to content

Commit

Permalink
Merge pull request #19 from saertna/refactoring
Browse files Browse the repository at this point in the history 
refactoring
  • Loading branch information
@saertna
saertna authored Sep 24, 2023
2 parents 287bc7b + 8752c21 commit 5d13470
Show file tree
Hide file tree
Showing 17 changed files with 2,154 additions and 3,763 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ data.json

# Exclude macOS Finder (System Explorer) View States
.DS_Store
/cp-js2cortex.bat
964 changes: 470 additions & 494 deletions coverage/clover.xml
View file

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions coverage/coverage-final.json
View file

Large diffs are not rendered by default.

62 changes: 4 additions & 58 deletions coverage/lcov-report/badges.ts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,26 +175,7 @@ <h1><a href="index.html">All files</a> badges.ts</h1>
<a name='L110'></a><a href='#L110'>110</a>
<a name='L111'></a><a href='#L111'>111</a>
<a name='L112'></a><a href='#L112'>112</a>
<a name='L113'></a><a href='#L113'>113</a>
<a name='L114'></a><a href='#L114'>114</a>
<a name='L115'></a><a href='#L115'>115</a>
<a name='L116'></a><a href='#L116'>116</a>
<a name='L117'></a><a href='#L117'>117</a>
<a name='L118'></a><a href='#L118'>118</a>
<a name='L119'></a><a href='#L119'>119</a>
<a name='L120'></a><a href='#L120'>120</a>
<a name='L121'></a><a href='#L121'>121</a>
<a name='L122'></a><a href='#L122'>122</a>
<a name='L123'></a><a href='#L123'>123</a>
<a name='L124'></a><a href='#L124'>124</a>
<a name='L125'></a><a href='#L125'>125</a>
<a name='L126'></a><a href='#L126'>126</a>
<a name='L127'></a><a href='#L127'>127</a>
<a name='L128'></a><a href='#L128'>128</a>
<a name='L129'></a><a href='#L129'>129</a>
<a name='L130'></a><a href='#L130'>130</a>
<a name='L131'></a><a href='#L131'>131</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<a name='L113'></a><a href='#L113'>113</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -236,15 +217,6 @@ <h1><a href="index.html">All files</a> badges.ts</h1>
<span class="cline-any cline-yes">3x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">3x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -277,14 +249,6 @@ <h1><a href="index.html">All files</a> badges.ts</h1>
<span class="cline-any cline-yes">5x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">5x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -323,16 +287,15 @@ <h1><a href="index.html">All files</a> badges.ts</h1>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { Notice } from 'obsidian';
export interface Badge {
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">export interface Badge {
name: string;
description: string;
level: string;
}
&nbsp;
export function checkIfReceiveABadge(levelOld: number, levelNew: number): boolean {
const badgeLevels: number[] = [5, 10, 20, 27, 35, 42, 50, 60, 75, 82, 90, 100];
let receiveBadge: boolean = false
let receiveBadge = false
for (let i=0; i &lt; badgeLevels.length; i++){
if (levelOld &lt; badgeLevels[i] &amp;&amp; levelNew &gt;= badgeLevels[i]){
receiveBadge = true
Expand Down Expand Up @@ -366,15 +329,6 @@ <h1><a href="index.html">All files</a> badges.ts</h1>
break;
}
}
/*
if(!inform){
if (index != 0){
new Notice(`You've earned the "${badgeNames[index].name}" badge. ${badgeNames[index].description}`)
console.log(`You've earned the "${badgeNames[index].name}" badge. ${badgeNames[index].description}`)
}
}
*/
//return { name: badgeNames[index], description: `Congratulations! You've reached Level ${level}. You've earned the "${badgeNames[index]}" badge.` };
return badgeNames[index]
}

Expand Down Expand Up @@ -407,14 +361,6 @@ <h1><a href="index.html">All files</a> badges.ts</h1>
break;
}
}
/*
if (index != 0){
new Notice(`You've earned the "${badgeNamesInit[index].name}" badge. ${badgeNamesInit[index].description}`)
console.log(`You earned ${badgeNamesInit[index].name} - ${badgeNamesInit[index].description}`)
}
*/

//return { name: badgeNames[index], description: `Congratulations! You've reached Level ${level}. You've earned the "${badgeNames[index]}" badge.` };
return badgeNamesInit[index]
}
&nbsp;
Expand Down Expand Up @@ -460,7 +406,7 @@ <h1><a href="index.html">All files</a> badges.ts</h1>
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2023-09-03T06:39:34.970Z
at 2023-09-24T19:39:08.141Z
</div>
<script src="prettify.js"></script>
<script>
Expand Down
60 changes: 27 additions & 33 deletions coverage/lcov-report/creatmodchartcalculation.ts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ <h1><a href="index.html">All files</a> creatmodchartcalculation.ts</h1>
<div class='clearfix'>

<div class='fl pad1y space-right2'>
<span class="strong">28.12% </span>
<span class="strong">26.98% </span>
<span class="quiet">Statements</span>
<span class='fraction'>18/64</span>
<span class='fraction'>17/63</span>
</div>


Expand All @@ -44,9 +44,9 @@ <h1><a href="index.html">All files</a> creatmodchartcalculation.ts</h1>


<div class='fl pad1y space-right2'>
<span class="strong">28.57% </span>
<span class="strong">27.41% </span>
<span class="quiet">Lines</span>
<span class='fraction'>18/63</span>
<span class='fraction'>17/62</span>
</div>


Expand Down Expand Up @@ -176,9 +176,7 @@ <h1><a href="index.html">All files</a> creatmodchartcalculation.ts</h1>
<a name='L111'></a><a href='#L111'>111</a>
<a name='L112'></a><a href='#L112'>112</a>
<a name='L113'></a><a href='#L113'>113</a>
<a name='L114'></a><a href='#L114'>114</a>
<a name='L115'></a><a href='#L115'>115</a>
<a name='L116'></a><a href='#L116'>116</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
<a name='L114'></a><a href='#L114'>114</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1x</span>
<span class="cline-any cline-no">&nbsp;</span>
Expand Down Expand Up @@ -258,8 +256,6 @@ <h1><a href="index.html">All files</a> creatmodchartcalculation.ts</h1>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">2x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">2x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1x</span>
Expand Down Expand Up @@ -293,14 +289,14 @@ <h1><a href="index.html">All files</a> creatmodchartcalculation.ts</h1>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { TFile } from 'obsidian';
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import {TFile} from 'obsidian';
&nbsp;
export function <span class="fstat-no" title="function not covered" >findEarliestCreatedFile(</span>files: TFile[]): TFile {
let earliestCreatedFile: TFile = <span class="cstat-no" title="statement not covered" >files[0];</span>
<span class="cstat-no" title="statement not covered" > for (const file of files) {</span>
<span class="cstat-no" title="statement not covered" > <span class="missing-if-branch" title="if path not taken" >I</span>if (file.stat.ctime &lt; earliestCreatedFile.stat.ctime) {</span>
<span class="cstat-no" title="statement not covered" > earliestCreatedFile = file;</span>
}
<span class="cstat-no" title="statement not covered" > <span class="missing-if-branch" title="if path not taken" >I</span>if (file.stat.ctime &lt; earliestCreatedFile.stat.ctime) {</span>
<span class="cstat-no" title="statement not covered" > earliestCreatedFile = file;</span>
}
}
<span class="cstat-no" title="statement not covered" > return earliestCreatedFile;</span>
}
Expand All @@ -309,9 +305,9 @@ <h1><a href="index.html">All files</a> creatmodchartcalculation.ts</h1>
export function <span class="fstat-no" title="function not covered" >findEarliestModifiedFile(</span>files: TFile[]): TFile {
let earliestModifiedFile: TFile = <span class="cstat-no" title="statement not covered" >files[0];</span>
<span class="cstat-no" title="statement not covered" > for (const file of files) {</span>
<span class="cstat-no" title="statement not covered" > <span class="missing-if-branch" title="if path not taken" >I</span>if (file.stat.mtime &lt; earliestModifiedFile.stat.mtime) {</span>
<span class="cstat-no" title="statement not covered" > earliestModifiedFile = file;</span>
}
<span class="cstat-no" title="statement not covered" > <span class="missing-if-branch" title="if path not taken" >I</span>if (file.stat.mtime &lt; earliestModifiedFile.stat.mtime) {</span>
<span class="cstat-no" title="statement not covered" > earliestModifiedFile = file;</span>
}
}
<span class="cstat-no" title="statement not covered" > return earliestModifiedFile;</span>
}
Expand All @@ -320,12 +316,12 @@ <h1><a href="index.html">All files</a> creatmodchartcalculation.ts</h1>
export function <span class="fstat-no" title="function not covered" >findEarliestDateFile(</span>files: TFile[]): TFile {
let earliestCreatedFile: TFile = <span class="cstat-no" title="statement not covered" >files[0];</span>
<span class="cstat-no" title="statement not covered" > for (const file of files) {</span>
<span class="cstat-no" title="statement not covered" > <span class="missing-if-branch" title="if path not taken" >I</span>if (file.stat.ctime &lt; earliestCreatedFile.stat.ctime) {</span>
<span class="cstat-no" title="statement not covered" > earliestCreatedFile = file;</span>
}
<span class="cstat-no" title="statement not covered" > <span class="missing-if-branch" title="if path not taken" >I</span>if (file.stat.mtime &lt; earliestCreatedFile.stat.ctime) {</span>
<span class="cstat-no" title="statement not covered" > earliestCreatedFile = file;</span>
}
<span class="cstat-no" title="statement not covered" > <span class="missing-if-branch" title="if path not taken" >I</span>if (file.stat.ctime &lt; earliestCreatedFile.stat.ctime) {</span>
<span class="cstat-no" title="statement not covered" > earliestCreatedFile = file;</span>
}
<span class="cstat-no" title="statement not covered" > <span class="missing-if-branch" title="if path not taken" >I</span>if (file.stat.mtime &lt; earliestCreatedFile.stat.ctime) {</span>
<span class="cstat-no" title="statement not covered" > earliestCreatedFile = file;</span>
}
}
<span class="cstat-no" title="statement not covered" > return earliestCreatedFile;</span>
}
Expand All @@ -334,7 +330,7 @@ <h1><a href="index.html">All files</a> creatmodchartcalculation.ts</h1>
export function monthsBetween(startMonth: Date, endMonth: Date): number {
let months = (endMonth.getMonth() - startMonth.getMonth()) + 1;
if (endMonth.getFullYear() &gt; startMonth.getFullYear()) {
months += (endMonth.getFullYear() - startMonth.getFullYear())*12;
months += (endMonth.getFullYear() - startMonth.getFullYear())*12;
}
return months;
}
Expand All @@ -344,7 +340,7 @@ <h1><a href="index.html">All files</a> creatmodchartcalculation.ts</h1>
const creationDates: Array&lt;Date&gt; = <span class="cstat-no" title="statement not covered" >[];</span>

<span class="cstat-no" title="statement not covered" > for (const file of files) {</span>
<span class="cstat-no" title="statement not covered" > creationDates.push(new Date(file.stat.ctime));</span>
<span class="cstat-no" title="statement not covered" > creationDates.push(new Date(file.stat.ctime));</span>
}

<span class="cstat-no" title="statement not covered" > return creationDates;</span>
Expand All @@ -355,25 +351,23 @@ <h1><a href="index.html">All files</a> creatmodchartcalculation.ts</h1>
const creationDates: Array&lt;Date&gt; = <span class="cstat-no" title="statement not covered" >[];</span>

<span class="cstat-no" title="statement not covered" > for (const file of files) {</span>
<span class="cstat-no" title="statement not covered" > creationDates.push(new Date(file.stat.mtime));</span>
<span class="cstat-no" title="statement not covered" > creationDates.push(new Date(file.stat.mtime));</span>
}

<span class="cstat-no" title="statement not covered" > return creationDates;</span>
}
&nbsp;
&nbsp;
export function createChartFormat(y_axis: string,countsStringCreate: string, countsStringMod: string, chartReduzierungMonate: number): string {
export function createChartFormat(y_axis: string, countsStringMod: string, chartReduzierungMonate: number): string {
let monatsbegrenzung = null
if (chartReduzierungMonate == 0){
monatsbegrenzung = 0
} else {
monatsbegrenzung = countsStringCreate.split(',').length - chartReduzierungMonate
monatsbegrenzung = countsStringMod.split(',').length - chartReduzierungMonate
}

//const monatsbegrenzung = lengthcountsStringCreate - this.settings.chartReduzierungMonate
let chart_string = "```chart\ntype: bar\nlabels: [" + y_axis + "]\nseries:\n - title: created\n data: [" + countsStringCreate + "]\n - title: modified\n data: [" + countsStringMod + "]\ntension: 0.2\nwidth: 80 %\nlabelColors: false\nfill: false\nbeginAtZero: false\nbestFit: false\nbestFitTitle: undefined\nbestFitNumber: 0\nstacked: true\nyTitle: \"Number of Notes\"\nxTitle: \"Months\"\nxMin: "+ monatsbegrenzung + "\n```"
&nbsp;
return chart_string;
return "```chart\ntype: bar\nlabels: [" + y_axis + "]\nseries:\n - title: modified\n data: [" + countsStringMod + "]\ntension: 0.2\nwidth: 80 %\nlabelColors: false\nfill: false\nbeginAtZero: false\nbestFit: false\nbestFitTitle: undefined\nbestFitNumber: 0\nstacked: true\nyTitle: \"Number of Notes\"\nxTitle: \"Months\"\nxMin: " + monatsbegrenzung + "\n```";
}
&nbsp;

Expand Down Expand Up @@ -401,11 +395,11 @@ <h1><a href="index.html">All files</a> creatmodchartcalculation.ts</h1>
}
<span class="cstat-no" title="statement not covered" > <span class="missing-if-branch" title="if path not taken" >I</span>if (reference != null){</span>
<span class="cstat-no" title="statement not covered" > end = reference;</span>
<span class="cstat-no" title="statement not covered" > start = reference - 21;</span>
<span class="cstat-no" title="statement not covered" > start = reference - 19;</span>
const newLines = <span class="cstat-no" title="statement not covered" >[...lines.slice(0, start), newContent, ...lines.slice(end)];</span>
<span class="cstat-no" title="statement not covered" > await app.vault.modify(file, newLines.join("\n"));</span>
}
};
}
&nbsp;
&nbsp;
&nbsp;</pre></td></tr></table></pre>
Expand All @@ -415,7 +409,7 @@ <h1><a href="index.html">All files</a> creatmodchartcalculation.ts</h1>
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
at 2023-09-03T06:39:34.970Z
at 2023-09-24T19:39:08.141Z
</div>
<script src="prettify.js"></script>
<script>
Expand Down
Loading

0 comments on commit 5d13470

Please sign in to comment.