chore(release): 发布 1.1.7-rc.202604131019

Author: coderDJing

backlog.md

@@ -27,4 +27,4 @@ mixtape应该增加一个loop功能，可以loop一段
 
 要加一个菜单，一键将其他格式转为mp3
 
-其实可以记录下用户加入过筛选库的歌手的名字，后续再碰到可以高亮，还可以加一个窗口来展示给用户看，用户可以自己编辑或删除
+双轨横推还没有控制音量的东西

package.json

@@ -1,6 +1,6 @@
 {
   "name": "frkb",
-  "version": "1.1.7-rc.202604130913",
+  "version": "1.1.7-rc.202604131019",
   "description": "Rapid Audio Organization Tool",
   "license": "GPL-2.0-or-later",
   "main": "./out/main/index.js",

scripts/find-long-files.mjs

@@ -30,7 +30,7 @@ function parseArgs(argv) {
     root: '.',
     gt: 1200,
     ext: ['.ts', '.tsx', '.js', '.jsx', '.vue', '.css', '.scss', '.json', '.md'],
-    exclude: ['node_modules', 'dist', 'out', '.git', '.vitepress','vendor'],
+    exclude: ['node_modules', 'dist', 'out', '.git', '.vitepress','vendor','.codex_tmp'],
     json: false
   }
   for (let i = 2; i < argv.length; i++) {

src/main/layoutConfig.ts

@@ -2,41 +2,20 @@ import fs = require('fs-extra')
 import type { ILayoutConfig } from 'src/types/globals'
 import { log } from './log'
 import url from './url'
-
-type MainWindowSizeMigration = {
-  version: number
-  minWidth: number
-  minHeight: number
-}
-
-const MAIN_WINDOW_SIZE_MIGRATIONS: MainWindowSizeMigration[] = [
-  {
-    version: 1,
-    minWidth: 1200,
-    minHeight: 720
-  }
-]
-
-const latestMainWindowSizeMigration = MAIN_WINDOW_SIZE_MIGRATIONS[
-  MAIN_WINDOW_SIZE_MIGRATIONS.length - 1
-] ?? {
-  version: 0,
-  minWidth: 900,
-  minHeight: 600
-}
-
-export const MAIN_WINDOW_DEFAULT_WIDTH = latestMainWindowSizeMigration.minWidth
-export const MAIN_WINDOW_DEFAULT_HEIGHT = latestMainWindowSizeMigration.minHeight
-export const MAIN_WINDOW_MIN_WIDTH = latestMainWindowSizeMigration.minWidth
-export const MAIN_WINDOW_MIN_HEIGHT = latestMainWindowSizeMigration.minHeight
-
-export const defaultLayoutConfig: ILayoutConfig = {
-  libraryAreaWidth: 175,
-  isMaxMainWin: false,
-  mainWindowWidth: MAIN_WINDOW_DEFAULT_WIDTH,
-  mainWindowHeight: MAIN_WINDOW_DEFAULT_HEIGHT,
-  mainWindowSizeMigrationVersion: latestMainWindowSizeMigration.version
-}
+import {
+  MAIN_WINDOW_MIN_HEIGHT,
+  MAIN_WINDOW_MIN_WIDTH,
+  MAIN_WINDOW_SIZE_MIGRATIONS,
+  defaultLayoutConfig
+} from './layoutConfigDefaults'
+
+export {
+  MAIN_WINDOW_DEFAULT_HEIGHT,
+  MAIN_WINDOW_DEFAULT_WIDTH,
+  MAIN_WINDOW_MIN_HEIGHT,
+  MAIN_WINDOW_MIN_WIDTH,
+  defaultLayoutConfig
+} from './layoutConfigDefaults'
 
 const isRecord = (value: unknown): value is Record<string, unknown> =>
   typeof value === 'object' && value !== null && !Array.isArray(value)

src/main/layoutConfigDefaults.ts

@@ -0,0 +1,36 @@
+import type { ILayoutConfig } from 'src/types/globals'
+
+type MainWindowSizeMigration = {
+  version: number
+  minWidth: number
+  minHeight: number
+}
+
+export const MAIN_WINDOW_SIZE_MIGRATIONS: MainWindowSizeMigration[] = [
+  {
+    version: 1,
+    minWidth: 1200,
+    minHeight: 720
+  }
+]
+
+const latestMainWindowSizeMigration = MAIN_WINDOW_SIZE_MIGRATIONS[
+  MAIN_WINDOW_SIZE_MIGRATIONS.length - 1
+] ?? {
+  version: 0,
+  minWidth: 900,
+  minHeight: 600
+}
+
+export const MAIN_WINDOW_DEFAULT_WIDTH = latestMainWindowSizeMigration.minWidth
+export const MAIN_WINDOW_DEFAULT_HEIGHT = latestMainWindowSizeMigration.minHeight
+export const MAIN_WINDOW_MIN_WIDTH = latestMainWindowSizeMigration.minWidth
+export const MAIN_WINDOW_MIN_HEIGHT = latestMainWindowSizeMigration.minHeight
+
+export const defaultLayoutConfig: ILayoutConfig = {
+  libraryAreaWidth: 175,
+  isMaxMainWin: false,
+  mainWindowWidth: MAIN_WINDOW_DEFAULT_WIDTH,
+  mainWindowHeight: MAIN_WINDOW_DEFAULT_HEIGHT,
+  mainWindowSizeMigrationVersion: latestMainWindowSizeMigration.version
+}

src/main/log.ts

@@ -1,12 +1,74 @@
-import url from './url'
 import path = require('path')
-import { app } from 'electron'
 import fs = require('fs-extra')
-export import log = require('electron-log')
+
+type ElectronAppLike = {
+  isPackaged?: boolean
+  getVersion?: () => string
+  getPath?: (name: string) => string
+}
+
+type LogTransportFileLike = {
+  level?: string
+  format?: string
+  maxSize?: number
+  resolvePathFn?: () => string
+}
+
+type LoggerLike = {
+  debug: (...args: unknown[]) => void
+  info: (...args: unknown[]) => void
+  warn: (...args: unknown[]) => void
+  error: (...args: unknown[]) => void
+  transports: {
+    file: LogTransportFileLike
+  }
+}
+
+const safeRequire = (id: string): unknown => {
+  try {
+    const dynamicRequire = Function('return require')() as NodeRequire
+    return dynamicRequire(id)
+  } catch {
+    return null
+  }
+}
+
+const electronModule =
+  (safeRequire('electron') as {
+    app?: ElectronAppLike
+  } | null) || null
+const electronApp = electronModule?.app || null
+
+const createConsoleLogger = (): LoggerLike => ({
+  debug: (...args: unknown[]) => console.debug(...args),
+  info: (...args: unknown[]) => console.info(...args),
+  warn: (...args: unknown[]) => console.warn(...args),
+  error: (...args: unknown[]) => console.error(...args),
+  transports: {
+    file: {}
+  }
+})
+
+const loadedElectronLog =
+  (safeRequire('electron-log') as Partial<LoggerLike> | null | undefined) || null
+
+export const log: LoggerLike =
+  loadedElectronLog &&
+  typeof loadedElectronLog.debug === 'function' &&
+  typeof loadedElectronLog.info === 'function' &&
+  typeof loadedElectronLog.warn === 'function' &&
+  typeof loadedElectronLog.error === 'function'
+    ? ({
+        ...loadedElectronLog,
+        transports: {
+          file: loadedElectronLog.transports?.file || {}
+        }
+      } as LoggerLike)
+    : createConsoleLogger()
 
 const isPackagedRuntime = (() => {
   try {
-    return !!(app && typeof app.isPackaged === 'boolean' && app.isPackaged)
+    return !!(electronApp && typeof electronApp.isPackaged === 'boolean' && electronApp.isPackaged)
   } catch {
     return false
   }
@@ -18,35 +80,40 @@ const isDevRuntime = (() => {
   return !isPackagedRuntime
 })()
 
-log.transports.file.level = 'debug' // 设置日志级别
+const resolveUserDataDir = () => {
+  if (!isPackagedRuntime) return __dirname
+  try {
+    const resolved = electronApp?.getPath?.('userData')
+    return typeof resolved === 'string' && resolved.trim() ? resolved : __dirname
+  } catch {
+    return __dirname
+  }
+}
+
 const appVersion = (() => {
   try {
-    return app.getVersion()
-  } catch (_e) {
+    const resolved = electronApp?.getVersion?.()
+    return typeof resolved === 'string' && resolved.trim() ? resolved : 'unknown'
+  } catch {
     return 'unknown'
   }
 })()
-log.transports.file.format = `{y}-{m}-{d} {h}:{i}:{s}.{ms} [v${appVersion}] {text}` // 自定义日志格式，带版本号
-log.transports.file.maxSize = 20 * 1024 * 1024 // 提高上限，避免长时间追踪时日志过快轮转
 
-// dev 模式下日志保存在项目根目录，生产模式下保存在用户数据目录
+log.transports.file.level = 'debug'
+log.transports.file.format = `{y}-{m}-{d} {h}:{i}:{s}.{ms} [v${appVersion}] {text}`
+log.transports.file.maxSize = 20 * 1024 * 1024
 log.transports.file.resolvePathFn = () => {
   if (isDevRuntime) {
-    // dev 模式：保存到项目根目录
     return path.join(process.cwd(), 'log.txt')
-  } else {
-    // 生产模式：保存到用户数据目录
-    return path.join(url.userDataDir, 'log.txt')
   }
+  return path.join(resolveUserDataDir(), 'log.txt')
 }
 
-// 导出获取日志路径的函数，供其他模块使用
 export function getLogPath(): string {
   if (isDevRuntime) {
     return path.join(process.cwd(), 'log.txt')
-  } else {
-    return path.join(url.userDataDir, 'log.txt')
   }
+  return path.join(resolveUserDataDir(), 'log.txt')
 }
 
 export function clearLogFileSync(): void {
@@ -68,7 +135,6 @@ type ErrorLike = {
   message?: unknown
 }
 
-// 预期内错误规则集中定义，后续可在此追加
 const expectedErrorRules: ExpectedErrorRule[] = [
   { code: 'ENOSPC' },
   { messageIncludes: /no space left on device/i }
@@ -84,10 +150,11 @@ export function isExpectedError(error: unknown): boolean {
       if (rule.messageIncludes && rule.messageIncludes.test(message)) return true
     }
     return false
-  } catch (_e) {
+  } catch {
     return false
   }
 }
+
 process.on('uncaughtException', (error) => {
   if (isExpectedError(error)) return
   log.error(error)