Skip to content
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.

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

Add: UtaFormatixを導入してインポートできる対応形式を増やす #2104

Merged
merged 55 commits into from
Jun 15, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
833e077
Add: @sevenc-nanashi/utaformatix-tsを入れる
sevenc-nanashi May 27, 2024
c84f432
Change: ImportExternalProjectDialogにする
sevenc-nanashi May 27, 2024
1ff5555
Change: IMPORT_MIDI_FILEをIMPORT_EXTERNAL_PROJECT_FILEに
sevenc-nanashi May 27, 2024
c5b717e
Add: 歌詞を変換する
sevenc-nanashi May 27, 2024
e0a21b7
Delete: midi-fileを依存から消す
sevenc-nanashi May 27, 2024
313021e
Add: parseFailedのメッセージを追加
sevenc-nanashi May 27, 2024
8db4c01
Change: convertVowelConnectionsを有効にする
sevenc-nanashi May 27, 2024
3e9f379
Add: vvprojを読み込めるように
sevenc-nanashi Jun 1, 2024
81c0234
Change: externalSongProjectにする
sevenc-nanashi Jun 1, 2024
aeeaf0a
Change: 残っていたmidiを変える
sevenc-nanashi Jun 1, 2024
ca12e9d
Change: 0.2.3に更新
sevenc-nanashi Jun 1, 2024
3b53f6a
Fix: ファイル名を修正
sevenc-nanashi Jun 1, 2024
da9f09e
Fix: 型エラーを修正
sevenc-nanashi Jun 1, 2024
0f42d37
Code: フォーマット
sevenc-nanashi Jun 1, 2024
31253d5
Add: 拡張子一覧を追加
sevenc-nanashi Jun 1, 2024
d943f02
Merge: upstream/main -> add/utaformatix-integration
sevenc-nanashi Jun 1, 2024
e9a7bf4
Update: DIの方を更新
sevenc-nanashi Jun 1, 2024
1bd263e
Change: プロジェクトファイルの順番を変える
sevenc-nanashi Jun 2, 2024
93cec53
Change: CeVIO AI -> CeVIO
sevenc-nanashi Jun 2, 2024
0a05781
Refactor: projectFileErrorを良い感じにする
sevenc-nanashi Jun 2, 2024
f081d62
Change: SMFの表記を変える
sevenc-nanashi Jun 2, 2024
c25a85d
Change: details-summaryで囲む
sevenc-nanashi Jun 2, 2024
b8c5619
Change: Project -> UfProject
sevenc-nanashi Jun 2, 2024
8c10ecb
Change: PARSE_PROJECT_FILEに移動
sevenc-nanashi Jun 2, 2024
023ef73
Change: ufDataの変換を別ファイルに移動
sevenc-nanashi Jun 2, 2024
a7da848
Add: テストを追加
sevenc-nanashi Jun 2, 2024
8e86241
Change: midi -> ufProjectToSongState
sevenc-nanashi Jun 2, 2024
207f9ba
Fix: Add忘れ
sevenc-nanashi Jun 2, 2024
e76de1e
Change: log.errorの引数を変える
sevenc-nanashi Jun 2, 2024
488e5e9
Update: パスを更新
sevenc-nanashi Jun 2, 2024
1832137
Code: コメントを追加
sevenc-nanashi Jun 2, 2024
58c9c0b
Change: プロジェクトファイルのインポート -> インポート
sevenc-nanashi Jun 2, 2024
bdb2568
Refactor: 整理
sevenc-nanashi Jun 2, 2024
526a46a
Fix: パスを更新
sevenc-nanashi Jun 2, 2024
07dbe29
Add: vvprojの読み込みお変える
sevenc-nanashi Jun 3, 2024
9da2a09
Update: Update utaformatix-ts
sevenc-nanashi Jun 3, 2024
30c551a
Update: 本家の色々に追従
sevenc-nanashi Jun 3, 2024
cc568a1
Delete: 不要なフォールバックを削除
sevenc-nanashi Jun 3, 2024
4aceb20
Fix: 変換を修正
sevenc-nanashi Jun 3, 2024
189c58a
Update: テスTを更新
sevenc-nanashi Jun 3, 2024
92a81c9
Merge: main -> add/utaformatix-integration
sevenc-nanashi Jun 4, 2024
9abc95e
Change: uuidv4 -> crypto.randomUUID
sevenc-nanashi Jun 4, 2024
1dbac03
Change: コンバーターの名前を変える
sevenc-nanashi Jun 4, 2024
ebb233d
Change: SongState -> VoicevoxScore
sevenc-nanashi Jun 4, 2024
a40f1d9
Code: npm run fmt
sevenc-nanashi Jun 4, 2024
3ddb4ae
Add: TODOを追加
sevenc-nanashi Jun 5, 2024
5cde03f
Code: TODOを追加
sevenc-nanashi Jun 8, 2024
935432a
Code: TODOを削除
sevenc-nanashi Jun 8, 2024
190bb61
Code: コメントの解釈を一つに
sevenc-nanashi Jun 8, 2024
66b6eda
Code: TODOを追加
sevenc-nanashi Jun 8, 2024
1feb7c1
Refactor: 良い感じにする
sevenc-nanashi Jun 8, 2024
8eae4b2
Add: エクスポートのテストを追加
sevenc-nanashi Jun 8, 2024
940826d
改変してみた
Hiroshiba Jun 9, 2024
e97f36e
Delete: 不要なroundを削除
sevenc-nanashi Jun 9, 2024
33a825e
Delete: 不要なimportを削除
sevenc-nanashi Jun 9, 2024
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
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
engine-strict=true
save-exact=true
@jsr:registry=https://npm.jsr.io
50 changes: 26 additions & 24 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"dependencies": {
"@gtm-support/vue-gtm": "1.2.3",
"@quasar/extras": "1.10.10",
"@sevenc-nanashi/utaformatix-ts": "npm:@jsr/sevenc-nanashi__utaformatix-ts@0.2.3",
"async-lock": "1.4.0",
"buffer": "6.0.3",
"clone-deep": "4.0.1",
Expand All @@ -48,7 +49,6 @@
"hotkeys-js": "3.13.6",
"immer": "9.0.21",
"markdown-it": "13.0.2",
"midi-file": "1.2.4",
"move-file": "3.0.0",
"multistream": "4.1.0",
"pixi.js": "7.4.0",
Expand Down
12 changes: 6 additions & 6 deletions src/components/Dialog/AllDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<UpdateNotificationDialogContainer
:can-open-dialog="canOpenNotificationDialog"
/>
<ImportMidiDialog v-model="isImportMidiDialogOpenComputed" />
<ImportSongProjectDialog v-model="isImportSongProjectDialogOpenComputed" />
</template>

<script setup lang="ts">
Expand All @@ -38,7 +38,7 @@ import AcceptTermsDialog from "@/components/Dialog/AcceptTermsDialog.vue";
import DictionaryManageDialog from "@/components/Dialog/DictionaryManageDialog.vue";
import EngineManageDialog from "@/components/Dialog/EngineManageDialog.vue";
import UpdateNotificationDialogContainer from "@/components/Dialog/UpdateNotificationDialog/Container.vue";
import ImportMidiDialog from "@/components/Dialog/ImportMidiDialog.vue";
import ImportSongProjectDialog from "@/components/Dialog/ImportSongProjectDialog.vue";
import { useStore } from "@/store";
import { filterCharacterInfosByStyleType } from "@/store/utility";

Expand Down Expand Up @@ -159,12 +159,12 @@ const canOpenNotificationDialog = computed(() => {
);
});

// MIDIインポート時の設定ダイアログ
const isImportMidiDialogOpenComputed = computed({
get: () => store.state.isImportMidiDialogOpen,
// ソングのプロジェクトファイルのインポート時の設定ダイアログ
const isImportSongProjectDialogOpenComputed = computed({
get: () => store.state.isImportSongProjectDialogOpen,
set: (val) =>
store.dispatch("SET_DIALOG_OPEN", {
isImportMidiDialogOpen: val,
isImportSongProjectDialogOpen: val,
}),
});
</script>
180 changes: 0 additions & 180 deletions src/components/Dialog/ImportMidiDialog.vue

This file was deleted.

Loading
Loading