Skip to content

Commit a875e65

Browse files
committed
Test timer-databse.ts
1 parent 843e0ea commit a875e65

File tree

11 files changed

+391
-144
lines changed

11 files changed

+391
-144
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@
4545
"vue": "^3.0.11",
4646
"vue-router": "^4.0.8"
4747
}
48-
}
48+
}

src/app/components/report/index.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { ElButton, ElDatePicker, ElDropdown, ElDropdownMenu, ElDropdownItem, ElInput, ElLink, ElMessage, ElPagination, ElPopconfirm, ElSwitch, ElTable, ElTableColumn, ElTooltip } from "element-plus"
22
import { computed, defineComponent, h, reactive, Ref, ref, UnwrapRef } from 'vue'
33
import { t } from '../../locale'
4-
import { DATE_FORMAT } from "../../../database/constant"
54
import timerDatabase from "../../../database/timer-database"
65
import SiteInfo, { SiteItem } from "../../../entity/dto/site-info"
76
import timerService, { SortDirect } from "../../../service/timer-service"
@@ -370,8 +369,8 @@ export default defineComponent(() => {
370369
// Delete by range
371370
timerDatabase.deleteByUrlBetween(
372371
host,
373-
formatTime(dateRange[0], DATE_FORMAT),
374-
formatTime(dateRange[1], DATE_FORMAT)
372+
dateRange[0],
373+
dateRange[1]
375374
).then(queryData)
376375
}
377376
} else {

src/app/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Main from './layout'
33
import 'element-plus/lib/theme-chalk/index.css'
44
import './styles' // global css
55
import installRouter from './router'
6-
import '../common/console-logger'
6+
import '../common/timer'
77
import '../common/element-plus'
88

99
const app: App = createApp(Main)

src/common/console-logger.ts

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/common/logger.ts

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { getUsedStorage } from "../database/memory-detector"
2-
31
let OPEN_LOG = false
42

53
/**
@@ -24,27 +22,4 @@ export function openLog(): string {
2422
export function closeLog(): string {
2523
OPEN_LOG = false
2624
return 'Closed the log manually.'
27-
}
28-
29-
/**
30-
* Show the memory info
31-
*
32-
* @since 0.0.9
33-
*/
34-
export function showMemory() {
35-
getUsedStorage().then(({ used, total }) => {
36-
console.log(`\t${used} / ${total} = ${Math.round(used * 100.0 / total * 100) / 100}%`)
37-
})
38-
return 'Memory used:'
39-
}
40-
41-
/**
42-
* @since 0.0.8
43-
*/
44-
export default { openLog, closeLog, showMemory } as TimerLogger
45-
46-
export type TimerLogger = {
47-
openLog: () => string
48-
closeLog: () => string
49-
showMemory: () => void
5025
}

src/common/timer.ts

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
import { getUsedStorage } from '../database/memory-detector'
2+
import { openLog, closeLog } from './logger'
3+
4+
/**
5+
* Show the memory info
6+
*
7+
* @since 0.0.9
8+
*/
9+
export function showMemory() {
10+
getUsedStorage().then(({ used, total }) => {
11+
console.log(`\t${used} / ${total} = ${Math.round(used * 100.0 / total * 100) / 100}%`)
12+
})
13+
return 'Memory used:'
14+
}
15+
16+
17+
export type Timer = {
18+
openLog: () => string
19+
closeLog: () => string
20+
showMemory: () => void
21+
}
22+
23+
/**
24+
* @since 0.0.8
25+
*/
26+
const timer = { openLog, closeLog, showMemory } as Timer
27+
28+
declare global {
29+
interface Window {
30+
timer: Timer
31+
}
32+
}
33+
34+
/**
35+
* Manually open and close the log
36+
*
37+
* @since 0.0.8
38+
*/
39+
window.timer = timer

0 commit comments

Comments
 (0)