();
const handleClick = useCallback(async () => {
- if (oarPath === '' && darPath === '') {
+ if ((oarPath === undefined || oarPath === '') && (darPath === undefined || darPath === '')) {
NOTIFY.error(t('remove-oar-specify-error'));
return;
}
+ const path = oarPath === '' ? darPath : oarPath;
await progressListener(
'/dar2oar/progress/remove-oar',
async () => {
- const path = oarPath === '' ? darPath : oarPath;
- await removeOarDir(path);
+ await removeOarDir(path ?? '');
},
{
setLoading,
setProgress,
success: t('remove-oar-success'),
- error: t('remove-oar-failed'),
+ error: `${path}:\n${t('remove-oar-failed')}`,
},
);
}, [darPath, oarPath, t]);
return (
- {t('remove-oar-tooltip')}}>
- : }
- sx={{
- marginTop: '9px',
- minHeight: '50px',
- width: '100%',
- }}
- type='button'
- variant='outlined'
- >
- {t('remove-oar-btn')}
-
-
+ : }
+ tooltipTitle={{t('remove-oar-tooltip')}
}
+ variant='contained'
+ />
);
};
diff --git a/gui/frontend/src/components/organisms/UnhideDarButton/UnhideDarButton.tsx b/gui/frontend/src/components/organisms/UnhideDarButton/UnhideDarButton.tsx
index 1c10250..d62de3b 100644
--- a/gui/frontend/src/components/organisms/UnhideDarButton/UnhideDarButton.tsx
+++ b/gui/frontend/src/components/organisms/UnhideDarButton/UnhideDarButton.tsx
@@ -1,25 +1,24 @@
import VisibilityIcon from '@mui/icons-material/Visibility';
-import { Tooltip } from '@mui/material';
-import Button from '@mui/material/Button';
import { useCallback, useState } from 'react';
+import { useWatch } from 'react-hook-form';
+import { ButtonWithToolTip } from '@/components/atoms/ButtonWithToolTip';
import { CircularProgressWithLabel } from '@/components/atoms/CircularProgressWithLabel';
import { useTranslation } from '@/components/hooks/useTranslation';
import { NOTIFY } from '@/lib/notify';
import { unhideDarDir } from '@/services/api/convert';
import { progressListener } from '@/services/api/event';
-type Props = {
- path: string;
-};
+import type { FormProps } from '../ConvertForm/ConvertForm';
-export const UnhideDarButton = ({ path }: Props) => {
+export const UnhideDarButton = () => {
const { t } = useTranslation();
const [loading, setLoading] = useState(false);
const [progress, setProgress] = useState(0);
+ const { src: path } = useWatch();
const handleClick = useCallback(async () => {
- if (path === '') {
+ if (path === undefined || path === '') {
NOTIFY.error(t('unhide-dar-specify-error'));
return;
}
@@ -33,26 +32,18 @@ export const UnhideDarButton = ({ path }: Props) => {
setLoading,
setProgress,
success: t('unhide-dar-success'),
- error: t('unhide-dar-failed'),
+ error: `${path}:\n${t('unhide-dar-failed')}`,
},
);
}, [path, t]);
return (
- {t('unhide-dar-btn-tooltip')}}>
- : }
- sx={{
- marginTop: '9px',
- minHeight: '50px',
- width: '100%',
- }}
- type='button'
- variant='outlined'
- >
- {t('unhide-dar-btn')}
-
-
+ : }
+ onClick={handleClick}
+ tooltipTitle={{t('unhide-dar-btn-tooltip')}
}
+ variant='contained'
+ />
);
};
diff --git a/gui/frontend/src/lib/css/index.ts b/gui/frontend/src/lib/css/index.ts
index 1c14009..373eeb6 100644
--- a/gui/frontend/src/lib/css/index.ts
+++ b/gui/frontend/src/lib/css/index.ts
@@ -76,13 +76,13 @@ label.Mui-focused,
background-color: var(--hover-btn-color);
}
-#x-data-grid-selected,
-.MuiLoadingButton-root {
+.MuiButton-containedPrimary,
+#x-data-grid-selected {
color: #fff;
background-color: var(--convert-btn-color);
}
-.MuiLoadingButton-root:hover {
+.MuiButton-containedPrimary:hover {
background-color: var(--hover-convert-btn-color);
}
@@ -118,13 +118,13 @@ const preset2 = createPreset(
const preset3 = createPreset(
`--autofill-color: #eb37ff1c;
- --convert-btn-color: #ab2b7e6e;
+ --convert-btn-color: #7c00c932;
--hover-btn-color: #8b51fb8b;
- --hover-convert-btn-color: #7d00c9a3;
+ --hover-convert-btn-color: #8737b884;
--image-size: cover;
--image-url: url("https://images.pexels.com/photos/6162265/pexels-photo-6162265.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=1");
--main-bg-color: #2223;
- --theme-color: #9644f1;`,
+ --theme-color: #9644f1`,
);
const preset4 = createPreset(
diff --git a/gui/frontend/src/lib/path/parseDarPath.test.ts b/gui/frontend/src/lib/path/parseDarPath.test.ts
new file mode 100644
index 0000000..b22fd7b
--- /dev/null
+++ b/gui/frontend/src/lib/path/parseDarPath.test.ts
@@ -0,0 +1,45 @@
+import { describe, it, expect } from 'vitest';
+
+import { parseDarPath } from './parseDarPath';
+
+describe('parseDarPath', () => {
+ it('should parse DAR path correctly when "meshes" is present', () => {
+ const path = '../ModName/meshes';
+ const result = parseDarPath(path);
+
+ expect(result).toHaveProperty('oarRoot', '../ModName/meshes');
+ expect(result).toHaveProperty('modName', 'ModName');
+ });
+
+ it('should return the full path as oarRoot when "meshes" is not present', () => {
+ const path = '../OtherMod/otherDir';
+ const result = parseDarPath(path);
+
+ expect(result).toHaveProperty('oarRoot', '../OtherMod/otherDir');
+ expect(result).toHaveProperty('modName', 'otherDir');
+ });
+
+ it('should handle paths with mixed slashes', () => {
+ const path = '../ModName\\meshes';
+ const result = parseDarPath(path);
+
+ expect(result).toHaveProperty('oarRoot', '../ModName/meshes');
+ expect(result).toHaveProperty('modName', 'ModName');
+ });
+
+ it('should return only ASCII parts as modName when no "meshes" is found', () => {
+ const path = '../ModName/NonASCII_ディレクトリ_With_English';
+ const result = parseDarPath(path);
+
+ expect(result).toHaveProperty('oarRoot', '../ModName/NonASCII_ディレクトリ_With_English');
+ expect(result).toHaveProperty('modName', 'NonASCII__With_English'); // ASCII parts should be extracted
+ });
+
+ it('should return modName as the last ASCII directory when no "meshes" is found and it is ASCII', () => {
+ const path = '../ModName/lastDir';
+ const result = parseDarPath(path);
+
+ expect(result).toHaveProperty('oarRoot', '../ModName/lastDir');
+ expect(result).toHaveProperty('modName', 'lastDir'); // ASCII should yield 'lastDir'
+ });
+});
diff --git a/gui/frontend/src/lib/path/parseDarPath.ts b/gui/frontend/src/lib/path/parseDarPath.ts
new file mode 100644
index 0000000..a4d037a
--- /dev/null
+++ b/gui/frontend/src/lib/path/parseDarPath.ts
@@ -0,0 +1,50 @@
+// The information necessary for the conversion
+export type ParsedPath = {
+ oarRoot: string;
+ modName?: string;
+};
+
+const PATH_SEP = /\\|\//g;
+// biome-ignore lint/suspicious/noControlCharactersInRegex:
+const ASCII0 = /^[\x00-\x7F]*$/;
+// biome-ignore lint/suspicious/noControlCharactersInRegex:
+const NON_ASCII = /[^\x00-\x7F]+/;
+
+// Check if a string is ASCII
+function isAscii(str: string): boolean {
+ return ASCII0.test(str);
+}
+
+// Extract ASCII parts from a string
+function extractAsciiParts(str: string): string {
+ return str
+ .split(NON_ASCII) // Split by non-alphabetical characters
+ .filter(isAscii)
+ .join('');
+}
+
+// Function to parse the DAR path
+export function parseDarPath(path: string): ParsedPath {
+ const paths = path.split(PATH_SEP).filter(Boolean);
+
+ const meshIndex = paths.findIndex((part) => part.toLowerCase() === 'meshes');
+
+ // Correctly derive oarRoot based on the meshIndex
+ const oarRoot = meshIndex !== -1 ? paths.slice(0, meshIndex + 1).join('/') : path;
+
+ // Determine modName based on meshIndex
+ let modName: string | undefined;
+ if (meshIndex === -1) {
+ const lastPart = paths.at(-1); // Using at method
+ if (lastPart) {
+ modName = extractAsciiParts(lastPart); // Extract ASCII parts from last directory
+ }
+ } else {
+ modName = extractAsciiParts(paths.at(meshIndex - 1) || ''); // Extract ASCII parts from the preceding directory
+ }
+
+ return {
+ oarRoot,
+ modName,
+ };
+}
diff --git a/gui/frontend/src/lib/storage/cacheKeys.ts b/gui/frontend/src/lib/storage/cacheKeys.ts
index 4c77a2d..8785829 100644
--- a/gui/frontend/src/lib/storage/cacheKeys.ts
+++ b/gui/frontend/src/lib/storage/cacheKeys.ts
@@ -4,12 +4,15 @@ const FORM_PUB_CACHE_KEYS_OBJ = {
hideDar: 'hideDar',
runParallel: 'runParallel',
showProgress: 'showProgress',
+ inferPath: 'inferPath',
} as const;
const FORM_PRIVATE_CACHE_KEYS_OBJ = {
cachedDst: 'cached-dst',
cachedMapping1PersonPath: 'cached-mapping1personPath',
cachedMappingPath: 'cached-mappingPath',
+ cachedModAuthor: 'cached-modName',
+ cachedModName: 'cached-modAuthor',
cachedSrc: 'cached-src',
dst: 'dst',
mapping1personPath: 'mapping1personPath',
diff --git a/gui/frontend/src/lib/storage/storage.ts b/gui/frontend/src/lib/storage/storage.ts
index cf5c3a2..09587da 100644
--- a/gui/frontend/src/lib/storage/storage.ts
+++ b/gui/frontend/src/lib/storage/storage.ts
@@ -25,6 +25,14 @@ export const createStorage = <
*/
get: (key: CacheKey) => localStorage.getItem(key),
+ /**
+ * Retrieves the value from localStorage for the given cache key.
+ * @param key - The cache key to retrieve.
+ * @example
+ * assert(storage.getOrDefault('snackbar-limit') === '');
+ */
+ getOrDefault: (key: CacheKey) => localStorage.getItem(key) ?? '',
+
/**
* Retrieves the values for multiple cache keys from localStorage.
* @param keys - Array of cache keys to retrieve.
diff --git a/locales/en-US.json b/locales/en-US.json
index 2dd7666..d1e0351 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -16,7 +16,7 @@
"convert-form-author-name-helper": "[Optional]",
"convert-form-author-placeholder": "Name",
"convert-form-dar-helper": "[Required] Path of dir containing \"DynamicAnimationReplacer\".",
- "convert-form-dar-helper2": "\"C:\\[...]/Mod Name/\" -> Convert 1st & 3rd person",
+ "convert-form-dar-helper2": "\"C:/[...]/Mod Name/\" -> Convert 1st & 3rd person",
"convert-form-dar-helper3": "\"[...]/animations/DynamicAnimationReplacer\" -> Convert 3rd person",
"convert-form-dar-label": "DAR(source) Directory",
"convert-form-mapping-1st-label": "Mapping Table Path(For _1st_person)",
@@ -50,6 +50,8 @@
"import-lang-btn": "Import Language",
"import-lang-tooltip": "Import any language from a Json file. (automatically reloads for validation).",
"import-lang-tooltip2": "Note: For invalid Json, fall back to English. (See Wiki for how to write Json)",
+ "infer-btn": "Infer",
+ "infer-btn-tooltip": "Infer OAR and ModName from DAR (input). (Even if each item is not entered without this function, it is inferred to some extent on the back-end side.)",
"lang-preset-auto": "Auto",
"lang-preset-custom": "Custom",
"lang-preset-label": "Language",
@@ -71,17 +73,17 @@
"open-log-dir-btn": "Log(dir)",
"open-log-dir-tooltip": "Open the log storage location.",
"open-log-tooltip": "Open current log file.(Rotate to a new log file each time the application is launched.)",
- "progress-btn": "ProgressBar",
- "progress-btn-tooltip": "Display detail progress",
- "progress-btn-tooltip2": "",
+ "progress-btn": "Progress",
+ "progress-btn-tooltip": "Let the back-end report detailed progress.",
+ "progress-btn-tooltip2": "(conversion may be slightly slower)",
"remove-oar-btn": "Remove OAR",
"remove-oar-failed": "Not found \"OpenAnimationReplacer\" directory",
"remove-oar-specify-error": "DAR or OAR dir must be specified.",
"remove-oar-success": "Removed OAR directory.",
"remove-oar-tooltip": "Find and delete OAR dir from \"OAR(destination) Directory\"(or \"DAR(source) Directory*\" if not specified).",
- "run-parallel-btn-tooltip": "Use multi-threading.",
- "run-parallel-btn-tooltip2": "Note: More than twice the processing speed can be expected, but the concurrent processing results in thread termination timings being out of order, so log writes will be out of order as well, greatly reducing readability of the logs.",
- "run-parallel-label": "Run Parallel",
+ "run-parallel-btn-tooltip": "Attempt file-by-file parallel conversion.",
+ "run-parallel-btn-tooltip2": "Pros: extremely fast conversion / Cons: entries in logs are out of order and difficult to read",
+ "run-parallel-label": "Parallel",
"select-btn": "Select",
"tab-label-backup": "Backup",
"tab-label-editor": "Editor / Preset",
diff --git a/locales/ja-JP.json b/locales/ja-JP.json
index ab07aa3..dfb55c7 100644
--- a/locales/ja-JP.json
+++ b/locales/ja-JP.json
@@ -16,16 +16,16 @@
"convert-form-author-name-helper": "[任意]",
"convert-form-author-placeholder": "作者名",
"convert-form-dar-helper": "[必須] \"DynamicAnimationReplacer\"が含まれているディレクトリ",
- "convert-form-dar-helper2": "\"C:\\[...]/Mod Name/\" -> 1人称と3人称を変換",
+ "convert-form-dar-helper2": "\"C:/[...]/Mod Name/\" -> 1人称と3人称を変換",
"convert-form-dar-helper3": "\"[...]/animations/DynamicAnimationReplacer\" -> 3人称のみ変換",
"convert-form-dar-label": "DAR(入力)ディレクトリ",
"convert-form-mapping-1st-label": "マッピングテーブルのパス(1人称用)",
- "convert-form-mapping-help-link-name": "マッピングファイルとは？",
+ "convert-form-mapping-help-link-name": "マッピングテーブルについて",
"convert-form-mapping-helper": "[任意] 優先番号とセクション名の対応付けが書かれたファイルを指定",
"convert-form-mapping-helper2": "ヘルプ: ",
"convert-form-mapping-label": "マッピングテーブルのパス",
"convert-form-mod-name": "Mod名",
- "convert-form-mod-name-helper": "[任意] ASCII(英語)推奨",
+ "convert-form-mod-name-helper": "[任意] (英数字推奨)",
"convert-form-oar-helper": "[任意] OARの出力先を指定(例: \"NewMod\" -> \"NewMod/meshes/[...]\")",
"convert-form-oar-helper2": "指定されない場合、DARと同階層の場所にOARが作られます。",
"convert-form-oar-label": "OAR(出力先)ディレクトリ",
@@ -44,12 +44,14 @@
"custom-js-auto-run-tooltip2": "この設定項目はユーザーが手動で選択しない限り有効化されることはありません",
"custom-js-label": "(実行許可時のみ)ページ移動ごとに実行されるJavaScript",
"editor-mode-list-label": "エディタモード",
- "hide-dar-btn": "DARを非表示",
+ "hide-dar-btn": "DAR隠蔽",
"hide-dar-btn-tooltip": "変換後、DARの全ファイルに「.mohidden」を追加して非表示化します(MO2ユーザ向け)",
"hide-dar-btn-tooltip2": "INFO: OARの出力先を指定しない場合、特に便利です。",
"import-lang-btn": "言語インポート",
"import-lang-tooltip": "Jsonファイルから任意の言語をインポートします。(有効化のため自動で再読み込みします)",
"import-lang-tooltip2": "注: 無効なJsonの場合、英語にフォールバックします。(Jsonの書き方はWikiを参照してください)",
+ "infer-btn": "パス推論",
+ "infer-btn-tooltip": "DAR(入力)からOARとMod名(ASCIIのみを自動抽出)を推論します(この機能を使わず各項目が未入力でもバックエンド側である程度推論します)",
"lang-preset-auto": "自動",
"lang-preset-custom": "カスタム",
"lang-preset-label": "言語",
@@ -71,17 +73,17 @@
"open-log-dir-btn": "ログ(dir)",
"open-log-dir-tooltip": "ログの格納場所を開きます。",
"open-log-tooltip": "現在のログファイルを開きます。(アプリを起動するたびに新しいログファイルにローテーションします)",
- "progress-btn": "進捗バー",
- "progress-btn-tooltip": "詳細な進捗状況を表示します",
- "progress-btn-tooltip2": "",
+ "progress-btn": "進捗報告",
+ "progress-btn-tooltip": "バックエンドから詳細な進捗状況を報告させます",
+ "progress-btn-tooltip2": "(変換が遅くなる可能性があります)",
"remove-oar-btn": "OARを削除",
"remove-oar-failed": "「OpenAnimationReplacer」ディレクトリが見つかりません",
"remove-oar-specify-error": "DARまたはOARが入力されていません",
"remove-oar-success": "OARディレクトリを削除しました",
"remove-oar-tooltip": "「OAR(出力先)」、未指定なら「DAR(入力)」からOARディレクトリを探して削除します",
- "run-parallel-btn-tooltip": "マルチスレッドを使用します",
- "run-parallel-btn-tooltip2": "注意: 2倍以上の処理速度が期待できますが、並行処理によりスレッドの終了タイミングが順不同になるため、ログの書き込みも同様に順不同になりログの可読性が大幅に低下します。",
- "run-parallel-label": "並列実行",
+ "run-parallel-btn-tooltip": "ファイル別並列変換を試みます",
+ "run-parallel-btn-tooltip2": "長所: 変換の高速化 / 短所: ログへの記述が順不同になり読みづらくなります",
+ "run-parallel-label": "並列",
"select-btn": "選択",
"tab-label-backup": "バックアップ",
"tab-label-editor": "エディタ・プリセット",
@@ -94,6 +96,6 @@
"unhide-dar-btn": "DAR再表示",
"unhide-dar-btn-tooltip": "「DARを非表示」による非表示化の解除(MO2ユーザ向け)",
"unhide-dar-failed": "拡張子「.mohidden」のついたファイルが見つかりません",
- "unhide-dar-specify-error": "DAR(src)を指定してください",
+ "unhide-dar-specify-error": "DAR(入力)を指定してください",
"unhide-dar-success": "DARの非表示化が解除されました"
}