Skip to content

chore: electronのカレントディレクトリの変更のロジックを共通化 #2570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hiroshiba wants to merge 4 commits into
base: main
Choose a base branch
from
Open

chore: electronのカレントディレクトリの変更のロジックを共通化 #2570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
156e2cb
chore: electronのカレントディレクトリの変更のロジックを共通化
Hiroshiba Feb 26, 2025
245a020
製品版のみパスを変えるようにする
Hiroshiba Feb 26, 2025
e234de8
chore!: 製品版でもカレントディレクトリを移動しないようにする
Hiroshiba Feb 26, 2025
45dc63e
Merge branch 'main' into chore!--製品版でもカレントディレクトリを移動しないようにする
Hiroshiba Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/backend/electron/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ process.on("unhandledRejection", (reason) => {
log.error(reason);
});

function initializeAppPaths() {
function getAppPaths() {
let appDirPath: string;
let __static: string;

Expand All @@ -129,7 +129,7 @@ function initializeAppPaths() {

return { appDirPath, __static };
}
const { appDirPath, __static } = initializeAppPaths();
const { appDirPath, __static } = getAppPaths();

protocol.registerSchemesAsPrivileged([
{ scheme: "app", privileges: { secure: true, standard: true, stream: true } },
Expand Down Expand Up @@ -196,7 +196,7 @@ initializeRuntimeInfoManager({
appVersion: app.getVersion(),
});
initializeEngineInfoManager({
defaultEngineDir: appDirPath,
appDirPath,
vvppEngineDir,
Comment on lines 198 to 200
Copy link
Member Author

@Hiroshiba Hiroshiba Feb 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

引数defaultEngineDirにはappDirPathを渡してたのですが、ややこしいからもうappDirPathのまま受け取るようにしてみました。
VOICEVOXの場合、「デフォルトエンジンディレクトリ」の場所はどっちかというと{appDirPath}/vv-engineだよなぁと思ったので。

});
initializeEngineProcessManager({ onEngineProcessError });
Expand Down
15 changes: 9 additions & 6 deletions src/backend/electron/manager/engineInfoManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ const log = createLogger("EngineInfoManager");

/** 利用可能なエンジンの情報を管理するクラス */
export class EngineInfoManager {
defaultEngineDir: string;
appDirPath: string;
vvppEngineDir: string;

/** 代替ポート情報 */
public altPortInfos: AltPortInfos = {};

private envEngineInfos = loadEnvEngineInfos();

constructor(payload: { defaultEngineDir: string; vvppEngineDir: string }) {
this.defaultEngineDir = payload.defaultEngineDir;
constructor(payload: { appDirPath: string; vvppEngineDir: string }) {
this.appDirPath = payload.appDirPath;
this.vvppEngineDir = payload.vvppEngineDir;
}

Expand Down Expand Up @@ -93,11 +93,14 @@ export class EngineInfoManager {
pathname: pathname === "/" ? "" : pathname,
isDefault: true,
type: engineInfo.type,
executionFilePath: path.resolve(engineInfo.executionFilePath),
executionFilePath: path.resolve(
this.appDirPath,
engineInfo.executionFilePath,
),
path:
engineInfo.path == undefined
? undefined
: path.resolve(this.defaultEngineDir, engineInfo.path),
: path.resolve(this.appDirPath, engineInfo.path),
} satisfies EngineInfo;
});
}
Expand Down Expand Up @@ -253,7 +256,7 @@ export class EngineInfoManager {
let manager: EngineInfoManager | undefined;

export function initializeEngineInfoManager(payload: {
defaultEngineDir: string;
appDirPath: string;
vvppEngineDir: string;
}) {
manager = new EngineInfoManager(payload);
Expand Down
1 change: 1 addition & 0 deletions src/domain/defaultEngine/envEngineInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const envEngineInfoSchema = z
.and(
z.union([
// エンジンをパス指定する場合
// NOTE: 相対パスの場合はアプリのパスで解決する
z.object({
type: z.literal("path").default("path"),
executionFilePath: z.string(),
Expand Down
Loading