Add days in default time format (sheepzh#411)

Author: sheepzh

.vscode/settings.json

@@ -16,6 +16,7 @@
         "Auths",
         "Cascader",
         "clbbddpinhgdejpoepalbfnkogbobfdb",
+        "COPYFILE",
         "countup",
         "daterange",
         "domcontentloaded",
@@ -44,6 +45,7 @@
         "webstore",
         "webtime",
         "wfhg",
+        "zcvf",
         "zrender"
     ],
     "cSpell.ignorePaths": [

script/zip.sh

@@ -6,7 +6,7 @@ FOLDER=$(
 )
 TARGET_PATH="${FOLDER}/aaa"
 
-tar -zcvf ${TARGET_PATH} \
+COPYFILE_DISABLE=1 tar -zcvf ${TARGET_PATH} \
     --exclude=dist*/ \
     --exclude=.git/ \
     --exclude=package-lock.json \

src/content-script/printer.ts

@@ -6,23 +6,18 @@
  */
 
 import { sendMsg2Runtime } from "@api/chrome/runtime"
-import { formatPeriod } from "@util/time"
+import { formatPeriodCommon } from "@util/time"
 import { t } from "./locale"
 
 /**
  * Print info of today
  */
 export default async function printInfo(host: string) {
     const waste: timer.core.Result = await sendMsg2Runtime('cs.getTodayInfo', host)
-    const hourMsg = t(msg => msg.console.timeWithHour)
-    const minuteMsg = t(msg => msg.console.timeWithMinute)
-    const secondMsg = t(msg => msg.console.timeWithSecond)
-
-    const msg = { hourMsg, minuteMsg, secondMsg }
 
     const param = {
         time: waste.time ? '' + waste.time : '-',
-        focus: formatPeriod(waste.focus, msg),
+        focus: formatPeriodCommon(waste.focus),
         host,
     }
     const info0 = t(msg => msg.console.consoleLog, param)

src/i18n/message/cs/console-resource.json

@@ -1,72 +1,42 @@
 {
     "zh_CN": {
         "consoleLog": "今天您打开了 {time} 次 {host}，花费了 {focus} 来浏览它。",
-        "closeAlert": "你可以在【网费很贵】的选项中关闭以上提示！",
-        "timeWithHour": "{hour} 小时 {minute} 分 {second} 秒",
-        "timeWithMinute": "{minute} 分 {second} 秒",
-        "timeWithSecond": "{second} 秒"
+        "closeAlert": "你可以在【网费很贵】的选项中关闭以上提示！"
     },
     "zh_TW": {
         "consoleLog": "今天您打開了 {time} 次 {host}，花費了 {focus} 來瀏覽它。",
-        "closeAlert": "你可以在【{appName}】的選項中關閉以上提示！",
-        "timeWithHour": "{hour} 小時 {minute} 分 {second} 秒",
-        "timeWithMinute": "{minute} 分 {second} 秒",
-        "timeWithSecond": "{second} 秒"
+        "closeAlert": "你可以在【{appName}】的選項中關閉以上提示！"
     },
     "en": {
         "consoleLog": "You have open {host} for {time} time(s) and browsed it for {focus} today.",
-        "closeAlert": "You can turn off the above tips in the option of [{appName}]!",
-        "timeWithHour": "{hour} hour(s) {minute} minute(s) {second} second(s)",
-        "timeWithMinute": "{minute} minute(s) {second} second(s)",
-        "timeWithSecond": "{second} second(s)"
+        "closeAlert": "You can turn off the above tips in the option of [{appName}]!"
     },
     "ja": {
         "consoleLog": "{host} を {time} 回開いて、今日 {focus} をブラウズしました。",
-        "closeAlert": "{appName} のオプションで上記のヒントをオフにすることができます！",
-        "timeWithHour": "{hour} 時間 {minute} 分 {second} 秒",
-        "timeWithMinute": "{minute} 分 {second} 秒",
-        "timeWithSecond": "{second} 秒"
+        "closeAlert": "{appName} のオプションで上記のヒントをオフにすることができます！"
     },
     "pt_PT": {
         "consoleLog": "Abriu {host} por {time} vez(es) e navegou por {focus} hoje.",
-        "closeAlert": "Você pode desligar as dicas acima na opção do {appName}!",
-        "timeWithHour": "{hour} horas {minute} minutos {second} segundos",
-        "timeWithMinute": "{minute} minuto(s) {second} segundo(s)",
-        "timeWithSecond": "{second} segundo(s)"
+        "closeAlert": "Você pode desligar as dicas acima na opção do {appName}!"
     },
     "uk": {
         "consoleLog": "Сьогодні ви відкривали {host} {time} разів і перебували там {focus}.",
-        "closeAlert": "Ви можете вимкнути поради в налаштуваннях [{appName}]!",
-        "timeWithHour": "{hour} год {minute} хв {second} с",
-        "timeWithMinute": "{minute} хв {second} с",
-        "timeWithSecond": "{second} с"
+        "closeAlert": "Ви можете вимкнути поради в налаштуваннях [{appName}]!"
     },
     "es": {
         "consoleLog": "Has abierto {host} por {time} vez(veces) y navegado por {focus} hoy.",
-        "closeAlert": "¡Puedes desactivar los consejos de arriba en la opción de [{appName}]!",
-        "timeWithHour": "{hour} hora(s) {minute} minuto(s) {second} segundo(s)",
-        "timeWithMinute": "{minute} minuto(s) {second} segundo(s)",
-        "timeWithSecond": "{second} segundo(s)"
+        "closeAlert": "¡Puedes desactivar los consejos de arriba en la opción de [{appName}]!"
     },
     "de": {
         "consoleLog": "Sie haben {host} für {time} Mal(e) geöffnet und heute {focus} durchsucht.",
-        "closeAlert": "Sie können die oben genannten Tipps in der Option [{appName}] deaktivieren!",
-        "timeWithHour": "{hour} Stunden {minute} Minuten {second} Sekunden",
-        "timeWithMinute": "{minute} Minuten {second} Sekunden",
-        "timeWithSecond": "{seconds} Sekunde(n)"
+        "closeAlert": "Sie können die oben genannten Tipps in der Option [{appName}] deaktivieren!"
     },
     "fr": {
         "consoleLog": "Vous avez ouvert {host} pendant {time} fois et vous l'avez parcouru pendant {focus} aujourd'hui.",
-        "closeAlert": "Vous pouvez désactiver les conseils ci-dessus dans l'option [{appName}] !",
-        "timeWithHour": "{heure} heures {minute} minutes {seconde} secondes",
-        "timeWithMinute": "{minute} minutes {seconde} secondes",
-        "timeWithSecond": "{second} seconds"
+        "closeAlert": "Vous pouvez désactiver les conseils ci-dessus dans l'option [{appName}] !"
     },
     "ru": {
         "consoleLog": "Вы открыли {host} для {time} раз(а) и просматривали его сегодня для {focus}.",
-        "closeAlert": "Вы можете выключить вышеперечисленные советы по адресу [{appName}]!",
-        "timeWithHour": "{hour} часов {minute} минут {second} секунд",
-        "timeWithMinute": "{minute} минут {second} секунд",
-        "timeWithSecond": "{second} секунд"
+        "closeAlert": "Вы можете выключить вышеперечисленные советы по адресу [{appName}]!"
     }
 }

src/i18n/message/cs/console.ts

@@ -3,9 +3,6 @@ import resource from './console-resource.json'
 export type ConsoleMessage = {
     consoleLog: string
     closeAlert: string
-    timeWithHour: string
-    timeWithMinute: string
-    timeWithSecond: string
 }
 
 const _default: Messages<ConsoleMessage> = resource

src/pages/app/components/Limit/LimitTable/RuleContent.tsx

@@ -6,6 +6,7 @@ import { ElTag } from "element-plus"
 import { computed, defineComponent, toRef, type PropType } from "vue"
 
 const TIME_FORMAT = {
+    dayMsg: '{day}d{hour}h{minute}m{second}s',
     hourMsg: '{hour}h{minute}m{second}s',
     minuteMsg: '{minute}m{second}s',
     secondMsg: '{second}s',

src/util/time.ts

@@ -64,18 +64,29 @@ export function formatTimeYMD(time: Date | string | number) {
 /**
  * Format milliseconds for display
  */
-export function formatPeriod(milliseconds: number, message: { hourMsg: string, minuteMsg: string, secondMsg: string }): string {
+export function formatPeriod(milliseconds: number, message: Record<'dayMsg' | 'hourMsg' | 'minuteMsg' | 'secondMsg', string>): string {
     const prefix = milliseconds < 0 ? '-' : ''
     milliseconds = Math.abs(milliseconds)
-    const { hourMsg, minuteMsg, secondMsg } = message
+    const { dayMsg, hourMsg, minuteMsg, secondMsg } = message
     const seconds = Math.floor(milliseconds / 1000)
-    const hour = Math.floor(seconds / 3600)
-    const minute = Math.floor(seconds / 60 - hour * 60)
-    const second = seconds - hour * 3600 - minute * 60
-
-    let msg = hourMsg
-    hour === 0 && (msg = minuteMsg) && minute === 0 && (msg = secondMsg)
-    const result = msg.replace('{hour}', hour.toString())
+    const day = Math.floor(seconds / 86400)
+    const hour = Math.floor(seconds / 3600 - day * 24)
+    const minute = Math.floor(seconds / 60 - (day * 24 + hour) * 60)
+    const second = seconds - day * 86400 - hour * 3600 - minute * 60
+
+    let msg = dayMsg
+    if (!day) {
+        msg = hourMsg
+        if (!hour) {
+            msg = minuteMsg
+            if (!minute) {
+                msg = secondMsg
+            }
+        }
+    }
+    const result = msg
+        .replace('{day}', day.toString())
+        .replace('{hour}', hour.toString())
         .replace('{minute}', minute.toString())
         .replace('{second}', second.toString())
     return prefix + result
@@ -94,10 +105,12 @@ export function formatPeriod(milliseconds: number, message: { hourMsg: string, m
  */
 export function formatPeriodCommon(milliseconds: number): string {
     const defaultMessage = isRtl() ? {
+        dayMsg: 's {second} m {minute} h {hour} d',
         hourMsg: 's {second} m {minute} h {hour}',
         minuteMsg: 's {second} m {minute}',
         secondMsg: 's {second}',
     } : {
+        dayMsg: '{day} d {hour} h {minute} m {second} s',
         hourMsg: '{hour} h {minute} m {second} s',
         minuteMsg: '{minute} m {second} s',
         secondMsg: '{second} s',

test/util/time.test.ts

@@ -31,11 +31,14 @@ test('time', () => {
 
 test('format', () => {
     const msg = {
+        dayMsg: '{day}天{hour}时{minute}分{second}秒',
         hourMsg: '{hour}时{minute}分{second}秒',
         minuteMsg: '{minute}分{second}秒',
         secondMsg: '{second}秒'
     }
+    expect(formatPeriod(86400 * 1000, msg)).toEqual('1天0时0分0秒')
     expect(formatPeriod(3666 * 1000, msg)).toEqual('1时1分6秒')
+    expect(formatPeriodCommon(86400 * 1000)).toEqual('1 d 0 h 0 m 0 s')
     expect(formatPeriodCommon(3666 * 1000)).toEqual('1 h 1 m 6 s')
     expect(formatPeriodCommon(1)).toEqual('0 s')
 })