From 94e28a285b2bce96088ffe9bc7537dae8081b728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E9=88=9E?= Date: Sun, 20 Oct 2024 18:17:40 +0800 Subject: [PATCH 1/3] ci: enhance Docker publish workflow with security and caching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add permissions section to grant GITHUB_TOKEN read and write permissions - Correct the Docker image name casing from uppercase to lowercase - Change password reference from `secrets.CR_PAT` to `${{ github.token }}` - Update `docker/build-push-action` from version 5 to version 6 - Add Docker cache settings to use registry for caching - Enable SBOM (Software Bill of Materials) and provenance for build and push Signed-off-by: 陳鈞 --- .github/workflows/docker_publish.yml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml index f89ea8e..aac2ffd 100644 --- a/.github/workflows/docker_publish.yml +++ b/.github/workflows/docker_publish.yml @@ -1,6 +1,6 @@ -name: docker_publish +name: docker_publish -# Controls when the action will run. +# Controls when the action will run. on: # Triggers the workflow on push or pull request events but only for the master branch push: @@ -10,6 +10,11 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: +# Sets the permissions granted to the GITHUB_TOKEN for the actions in this job. +permissions: + contents: read + packages: write + # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "build" @@ -22,13 +27,13 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: - submodules: true + submodules: true - name: Docker meta id: meta uses: docker/metadata-action@v5 with: - images: ghcr.io/YoutubeClipPlaylist/PlaylistAutoGenerator + images: ghcr.io/youtubeclipplaylist/playlistautogenerator tags: | latest @@ -37,17 +42,17 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - + # Create a Access Token with `read:packages` and `write:packages` scopes - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} - password: ${{ secrets.CR_PAT }} + password: ${{ github.token }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: ./AutoGenerator/AutoGenerator file: ./AutoGenerator/AutoGenerator/Dockerfile @@ -56,3 +61,8 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64 + # Cache to regietry instead of gha to avoid the capacity limit. + cache-from: type=registry,ref=ghcr.io/youtubeclipplaylist/playlistautogenerator:cache + cache-to: type=registry,ref=ghcr.io/youtubeclipplaylist/playlistautogenerator:cache,mode=max + sbom: true + provenance: true From b61b311a20247eed8cd1d6db399aded0cbc0f035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E9=88=9E?= Date: Sun, 20 Oct 2024 18:20:45 +0800 Subject: [PATCH 2/3] ci: enhance AutoGenerator workflow with secure token use MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove `pull-requests` permission from the workflow - Change `GH_TOKEN` environment variable to use `secrets.CR_PAT` instead of `github.token` Signed-off-by: 陳鈞 --- .github/workflows/AutoGenerator.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/AutoGenerator.yml b/.github/workflows/AutoGenerator.yml index 8e097a3..4a9fe9c 100644 --- a/.github/workflows/AutoGenerator.yml +++ b/.github/workflows/AutoGenerator.yml @@ -9,7 +9,6 @@ on: workflow_dispatch: permissions: - pull-requests: write contents: write jobs: @@ -47,7 +46,8 @@ jobs: - name: Create or Update Pull Request env: - GH_TOKEN: ${{ github.token }} + # Use CR_PAT to trigger another workflow + GH_TOKEN: ${{ secrets.CR_PAT }} run: | gh_pr_up() { gh pr create "$@" || gh pr edit "$@" From fd8fad237dbd8f982b1d351c39b6dfa0377916af Mon Sep 17 00:00:00 2001 From: Github Action Bot Date: Sun, 20 Oct 2024 10:31:13 +0000 Subject: [PATCH 3/3] Github Action: Auto Generator --- .../HACHIAutoGeneratedSonglist.jsonc | 247 ++++++++------- .../MaisakiBerryAutoGeneratedSonglist.jsonc | 70 ++--- .../MizukiAutoGeneratedSonglist.jsonc | 293 ++++++++++++------ .../RirisyaAutoGeneratedSonglist.jsonc | 38 +-- ...ShishigamiLeonaAutoGeneratedSonglist.jsonc | 277 +++++++++-------- .../YOSHIKAAutoGeneratedSonglist.jsonc | 28 +- 6 files changed, 550 insertions(+), 403 deletions(-) diff --git a/AutoGenerator/HACHIAutoGeneratedSonglist.jsonc b/AutoGenerator/HACHIAutoGeneratedSonglist.jsonc index 0360269..0ecfd13 100644 --- a/AutoGenerator/HACHIAutoGeneratedSonglist.jsonc +++ b/AutoGenerator/HACHIAutoGeneratedSonglist.jsonc @@ -4,6 +4,83 @@ */ [ + [ + "hsd0Loi9nZw", + 2053, + 2386, + "NAO", + "" + ], + [ + "hsd0Loi9nZw", + 3285, + 3601, + "グレゴリオ／Gregorio", + "" + ], + [ + "hsd0Loi9nZw", + 1159, + 1558, + "夕日坂（Yuuhizaka）", + "" + ], + [ + "hsd0Loi9nZw", + 732, + 971, + "六月は雨上がりの街を書く", + "" + ], + [ + "hsd0Loi9nZw", + 2467, + 2868, + "いきのこり●ぼくら（Ikinokori●Bokura）", + "" + ], + [ + "hsd0Loi9nZw", + 4047, + 4334, + "サリシノハラ", + "" + ], + [ + "hsd0Loi9nZw", + 3838, + 3956, + "若者のすべて（Wakamono No Subete）（Short ver.）", + "" + ], + [ + "hsd0Loi9nZw", + 4444, + 4800, + "RE:I AM", + "" + ], + [ + "hsd0Loi9nZw", + 4912, + 5198, + "Ref:rain", + "" + ], + [ + "hsd0Loi9nZw", + 5951, + 6124, + "さよならfrequency（Sayonara Frequency）", + "" + ], + [ + "P4uOhJWG_iM", + 0, + 249, + "万華鏡（Mangekyo）", + "" + ], [ "ZDh4lkSzgXg", 0, @@ -221,13 +298,6 @@ "いつまでも（Itsumademo）", "" ], - [ - "bfN-lDkNn_k", - 3356, - 3538, - "さよならfrequency（Sayonara Frequency）", - "" - ], [ "bfN-lDkNn_k", 4129, @@ -664,16 +734,16 @@ ], [ "IeG8SmCJmQo", - 860, - 1146, - "春よ、来い（Haru Yo, Koi）", + 1692, + 1948, + "バーモント・キス／Vermont Kiss", "" ], [ "IeG8SmCJmQo", - 1692, - 1948, - "バーモント・キス／Vermont Kiss", + 860, + 1146, + "春よ、来い（Haru Yo, Koi）", "" ], [ @@ -690,13 +760,6 @@ "六月は雨上がりの街を書く（Rokugatsu wa Ameaagari no Machi o Kaku）", "" ], - [ - "IeG8SmCJmQo", - 2092, - 2478, - "いきのこり●ぼくら（Ikinokori●Bokura）", - "" - ], [ "IeG8SmCJmQo", 3056, @@ -711,13 +774,6 @@ "Departures 〜あなたにおくるアイの歌〜", "" ], - [ - "on1InYHEA4o", - 3921, - 4255, - "NAO", - "" - ], [ "on1InYHEA4o", 4683, @@ -830,13 +886,6 @@ "未来（Mirai）", "" ], - [ - "BsY8JBICfxM", - 2671, - 3069, - "夕日坂（Yuuhizaka）", - "" - ], [ "BsY8JBICfxM", 609, @@ -851,13 +900,6 @@ "桜流し（Sakura Nagashi）", "" ], - [ - "UjGzffzyfPA", - 54, - 410, - "RE:I AM", - "" - ], [ "UjGzffzyfPA", 1583, @@ -928,13 +970,6 @@ "魔法（Mahou）", "" ], - [ - "Qf89LkqUUoU", - 716, - 955, - "六月は雨上がりの街を書く", - "" - ], [ "Qf89LkqUUoU", 1036, @@ -1427,16 +1462,16 @@ ], [ "6WYfZjY_Q6o", - 82, - 340, - "風のゆくえ／Where the Wind Blows", + 761, + 934, + "晩餐歌（Bansanka）", "" ], [ "6WYfZjY_Q6o", - 761, - 934, - "晩餐歌（Bansanka）", + 82, + 340, + "風のゆくえ／Where the Wind Blows", "" ], [ @@ -1686,16 +1721,16 @@ ], [ "zBo49150kgo", - 418, - 676, - "風のゆくえ／Where the Wind Blows（ft. YOMI）", + 6781, + 7055, + "いつか（Itsuka）（ft. YOMI）", "" ], [ "zBo49150kgo", - 6781, - 7055, - "いつか（Itsuka）（ft. YOMI）", + 418, + 676, + "風のゆくえ／Where the Wind Blows（ft. YOMI）", "" ], [ @@ -1770,16 +1805,16 @@ ], [ "I1Fp7_TAn30", - 5609, - 5855, - "回る空うさぎ／Sky Passing Around, Moon Rabbit", + 2515, + 2802, + "春よ、来い（Haruyokoi）", "" ], [ "I1Fp7_TAn30", - 2515, - 2802, - "春よ、来い（Haruyokoi）", + 5609, + 5855, + "回る空うさぎ／Sky Passing Around, Moon Rabbit", "" ], [ @@ -1966,16 +2001,16 @@ ], [ "CZxvq8Onrcw", - 5348, - 5528, - "死神（Shinigami）", + 2287, + 2560, + "いつか（Itsuka）", "" ], [ "CZxvq8Onrcw", - 2287, - 2560, - "いつか（Itsuka）", + 5348, + 5528, + "死神（Shinigami）", "" ], [ @@ -2335,13 +2370,6 @@ "瞬き（Mabataki）", "" ], - [ - "riDMJez3F6o", - 3202, - 3488, - "Ref:rain", - "" - ], [ "riDMJez3F6o", 857, @@ -2552,6 +2580,13 @@ "地獄先生", "" ], + [ + "KOXZE9ZwWOQ", + 3165, + 3480, + "桜流し", + "" + ], [ "KOXZE9ZwWOQ", 2361, @@ -2573,13 +2608,6 @@ "再会 (Saikai)", "" ], - [ - "KOXZE9ZwWOQ", - 3165, - 3480, - "桜流し", - "" - ], [ "KOXZE9ZwWOQ", 342, @@ -2946,16 +2974,16 @@ ], [ "EyQx44wg9ok", - 7742, - 7844, - "クライヤ／Crier（Short ver.）", + 9884, + 10013, + "月の繭（アカペラ Short ver.）", "" ], [ "EyQx44wg9ok", - 9884, - 10013, - "月の繭（アカペラ Short ver.）", + 7742, + 7844, + "クライヤ／Crier（Short ver.）", "" ], [ @@ -3518,6 +3546,13 @@ "春泥棒", "" ], + [ + "0B6AHn4M5VU", + 810, + 1099, + "アイネクライネ", + "" + ], [ "0B6AHn4M5VU", 3257, @@ -3532,13 +3567,6 @@ "完全感覚Dreamer", "" ], - [ - "0B6AHn4M5VU", - 810, - 1099, - "アイネクライネ", - "" - ], [ "0B6AHn4M5VU", 1655, @@ -3595,6 +3623,13 @@ "カタオモイ", "" ], + [ + "m-RyPeqsrfg", + 6759, + 7001, + "夜迷い言", + "" + ], [ "m-RyPeqsrfg", 6078, @@ -3609,13 +3644,6 @@ "花の唄", "" ], - [ - "m-RyPeqsrfg", - 6759, - 7001, - "夜迷い言", - "" - ], [ "m-RyPeqsrfg", 4829, @@ -5380,13 +5408,6 @@ "Twilight Line", "" ], - [ - "1PAH4OYdMEs", - 1694, - 1962, - "サリシノハラ", - "" - ], [ "1PAH4OYdMEs", 1245, diff --git a/AutoGenerator/MaisakiBerryAutoGeneratedSonglist.jsonc b/AutoGenerator/MaisakiBerryAutoGeneratedSonglist.jsonc index 929c02b..5a75fee 100644 --- a/AutoGenerator/MaisakiBerryAutoGeneratedSonglist.jsonc +++ b/AutoGenerator/MaisakiBerryAutoGeneratedSonglist.jsonc @@ -293,16 +293,16 @@ ], [ "Xy06FJDZNuc", - 5403, - 5708, - "未来 (Mirai)", + 3600, + 3939, + "雪の華 (Yuki no Hana)", "" ], [ "Xy06FJDZNuc", - 3600, - 3939, - "雪の華 (Yuki no Hana)", + 5403, + 5708, + "未来 (Mirai)", "" ], [ @@ -1929,13 +1929,6 @@ "Get Over", "" ], - [ - "szGKVd89H90", - 4771, - 5055, - "謎 (Nazo)", - "" - ], [ "szGKVd89H90", 3228, @@ -1945,9 +1938,9 @@ ], [ "szGKVd89H90", - 3580, - 3869, - "Grip!", + 4771, + 5055, + "謎 (Nazo)", "" ], [ @@ -1957,6 +1950,13 @@ "ココロのちず (Kokoro no Chizu)", "" ], + [ + "szGKVd89H90", + 3580, + 3869, + "Grip!", + "" + ], [ "szGKVd89H90", 4434, @@ -1978,6 +1978,13 @@ "踊 (Odo)", "" ], + [ + "UdCgDna-o64", + 1688, + 1981, + "サイハテ (Saihate)", + "" + ], [ "UdCgDna-o64", 4457, @@ -1992,13 +1999,6 @@ "フォニイ (Phony)", "" ], - [ - "UdCgDna-o64", - 1688, - 1981, - "サイハテ (Saihate)", - "" - ], [ "UdCgDna-o64", 4808, @@ -3604,16 +3604,16 @@ ], [ "zf3YSNeQITQ", - 6653, - 6958, - "恋になりたいAQUARIUM (Koi ni Naritai Aquarium)", + 9198, + 9454, + "START:DASH!!", "" ], [ "zf3YSNeQITQ", - 9198, - 9454, - "START:DASH!!", + 6653, + 6958, + "恋になりたいAQUARIUM (Koi ni Naritai Aquarium)", "" ], [ @@ -4465,16 +4465,16 @@ ], [ "RN94zvOJ_qk", - 6445, - 6807, - "たばこ", + 2723, + 2975, + "空色デイズ", "" ], [ "RN94zvOJ_qk", - 2723, - 2975, - "空色デイズ", + 6445, + 6807, + "たばこ", "" ], [ diff --git a/AutoGenerator/MizukiAutoGeneratedSonglist.jsonc b/AutoGenerator/MizukiAutoGeneratedSonglist.jsonc index f5ab5fe..90b7d09 100644 --- a/AutoGenerator/MizukiAutoGeneratedSonglist.jsonc +++ b/AutoGenerator/MizukiAutoGeneratedSonglist.jsonc @@ -4,6 +4,118 @@ */ [ + [ + "kGssir-XUIQ", + 2044, + 2377, + "Can I Be Your Baby", + "" + ], + [ + "kGssir-XUIQ", + 394, + 592, + "Title", + "" + ], + [ + "kGssir-XUIQ", + 1058, + 1332, + "戀人未滿", + "" + ], + [ + "kGssir-XUIQ", + 4107, + 4344, + "愛唄", + "" + ], + [ + "kGssir-XUIQ", + 1373, + 1683, + "青春紀念冊", + "" + ], + [ + "kGssir-XUIQ", + 2839, + 3125, + "ふたりごと", + "" + ], + [ + "kGssir-XUIQ", + 3502, + 3695, + "Dum Dum (English Version)", + "" + ], + [ + "kGssir-XUIQ", + 5142, + 5452, + "愛してる", + "" + ], + [ + "kGssir-XUIQ", + 5743, + 5978, + "Marry You", + "" + ], + [ + "kGssir-XUIQ", + 6031, + 6322, + "アイネクライネ (English Cover)", + "" + ], + [ + "kGssir-XUIQ", + 6603, + 6869, + "Think of You", + "" + ], + [ + "kGssir-XUIQ", + 7290, + 7516, + "心跳的證明 (電影《一吻定情》心動版主題曲)", + "" + ], + [ + "kGssir-XUIQ", + 8796, + 8994, + "我多喜歡你, 你會知道 (劇集《致我們單純的小美好》推廣曲)", + "" + ], + [ + "kGssir-XUIQ", + 9334, + 9574, + "Wildest Dreams", + "" + ], + [ + "x5Q2ZtdUQCw", + 0, + 210, + "響•念Missing", + "" + ], + [ + "VdvYEQ-HvgU", + 18, + 248, + "BaNG!!!", + "" + ], [ "8duk42SHaH4", 7, @@ -11,6 +123,20 @@ "にゃんにゃんにゃん", "" ], + [ + "_Tz6DTS_dfU", + 13803, + 14008, + "KILLER B", + "" + ], + [ + "_Tz6DTS_dfU", + 16192, + 16520, + "光の向こうへ (Hikari No Mukoue)", + "" + ], [ "_Tz6DTS_dfU", 17768, @@ -25,6 +151,13 @@ "Kill This Love", "" ], + [ + "_Tz6DTS_dfU", + 8616, + 8842, + "純白之誓", + "" + ], [ "_Tz6DTS_dfU", 15388, @@ -67,13 +200,6 @@ "Paper Rings", "" ], - [ - "_Tz6DTS_dfU", - 8616, - 8842, - "純白之誓", - "" - ], [ "_Tz6DTS_dfU", 10074, @@ -116,13 +242,6 @@ "行走的魚", "" ], - [ - "_Tz6DTS_dfU", - 16192, - 16520, - "光の向こうへ (Hikari No Mukoue)", - "" - ], [ "_Tz6DTS_dfU", 20558, @@ -151,6 +270,13 @@ "Day by Day", "" ], + [ + "_Tz6DTS_dfU", + 9726, + 9892, + "クエスチョン", + "" + ], [ "_Tz6DTS_dfU", 5304, @@ -186,13 +312,6 @@ "デビルじゃないもん", "" ], - [ - "_Tz6DTS_dfU", - 9726, - 9892, - "クエスチョン", - "" - ], [ "_Tz6DTS_dfU", 11115, @@ -214,13 +333,6 @@ "神の名前に堕ちる者 (feat. 初音ミク)", "" ], - [ - "_Tz6DTS_dfU", - 13803, - 14008, - "KILLER B", - "" - ], [ "_Tz6DTS_dfU", 32228, @@ -536,6 +648,13 @@ "STAY", "" ], + [ + "-EJ-cIlGpfo", + 1860, + 2070, + "囍", + "" + ], [ "-EJ-cIlGpfo", 9035, @@ -543,6 +662,13 @@ "Liar", "" ], + [ + "-EJ-cIlGpfo", + 1339, + 1670, + "縱癡也狂", + "" + ], [ "-EJ-cIlGpfo", 3847, @@ -564,20 +690,6 @@ "迷迭香", "" ], - [ - "-EJ-cIlGpfo", - 1339, - 1670, - "縱癡也狂", - "" - ], - [ - "-EJ-cIlGpfo", - 1860, - 2070, - "囍", - "" - ], [ "-EJ-cIlGpfo", 2262, @@ -795,6 +907,13 @@ "千本桜 (feat. 初音ミク)", "" ], + [ + "Z2ZXHBRRxds", + 5372, + 5565, + "玫瑰少年", + "" + ], [ "Z2ZXHBRRxds", 1150, @@ -851,13 +970,6 @@ "在你的婚礼我多喝了两杯", "" ], - [ - "Z2ZXHBRRxds", - 5372, - 5565, - "玫瑰少年", - "" - ], [ "Z2ZXHBRRxds", 7745, @@ -1292,6 +1404,13 @@ "Fix You", "" ], + [ + "BL4ka1Ye0og", + 4612, + 4809, + "golden hour", + "" + ], [ "BL4ka1Ye0og", 7228, @@ -1362,13 +1481,6 @@ "さよならだけが人生だ", "" ], - [ - "BL4ka1Ye0og", - 4612, - 4809, - "golden hour", - "" - ], [ "BL4ka1Ye0og", 8488, @@ -1481,6 +1593,20 @@ "damn", "" ], + [ + "SsmHvXLWXKU", + 2036, + 2228, + "君色に染まる", + "" + ], + [ + "SsmHvXLWXKU", + 438, + 674, + "可惜夜", + "" + ], [ "SsmHvXLWXKU", 2463, @@ -1509,13 +1635,6 @@ "雲を裂け", "" ], - [ - "SsmHvXLWXKU", - 438, - 674, - "可惜夜", - "" - ], [ "SsmHvXLWXKU", 881, @@ -1530,13 +1649,6 @@ "怪獣の花唄", "" ], - [ - "SsmHvXLWXKU", - 2036, - 2228, - "君色に染まる", - "" - ], [ "SsmHvXLWXKU", 1432, @@ -1810,6 +1922,13 @@ "平凡的一天", "" ], + [ + "It4TMmc2l54", + 8894, + 9194, + "Fairytale,", + "" + ], [ "It4TMmc2l54", 6650, @@ -1915,13 +2034,6 @@ "モザイクロール (feat. 初音ミク)", "" ], - [ - "It4TMmc2l54", - 8894, - 9194, - "Fairytale,", - "" - ], [ "gKWw2nnm2lE", 0, @@ -3070,13 +3182,6 @@ "欠一個勇敢", "" ], - [ - "7rMN3pHhnJk", - 1170, - 1438, - "你在煩惱什麼", - "" - ], [ "7rMN3pHhnJk", 4702, @@ -3086,9 +3191,9 @@ ], [ "7rMN3pHhnJk", - 5428, - 5647, - "Wildest Dreams", + 1170, + 1438, + "你在煩惱什麼", "" ], [ @@ -4134,6 +4239,13 @@ "My Heart Will Go On", "" ], + [ + "hUvTYMCmllo", + 29152, + 29374, + "Mamma Mia", + "" + ], [ "hUvTYMCmllo", 23506, @@ -4302,13 +4414,6 @@ "Radioactive", "" ], - [ - "hUvTYMCmllo", - 29152, - 29374, - "Mamma Mia", - "" - ], [ "hUvTYMCmllo", 34721, diff --git a/AutoGenerator/RirisyaAutoGeneratedSonglist.jsonc b/AutoGenerator/RirisyaAutoGeneratedSonglist.jsonc index 090ffa5..60a5ceb 100644 --- a/AutoGenerator/RirisyaAutoGeneratedSonglist.jsonc +++ b/AutoGenerator/RirisyaAutoGeneratedSonglist.jsonc @@ -270,6 +270,13 @@ "ピエロ", "" ], + [ + "l160NdX9GYU", + 4055, + 4271, + "アイドル", + "" + ], [ "l160NdX9GYU", 795, @@ -319,13 +326,6 @@ "真夜中のドア", "" ], - [ - "l160NdX9GYU", - 4055, - 4271, - "アイドル", - "" - ], [ "l160NdX9GYU", 1438, @@ -685,16 +685,16 @@ ], [ "jhJTzDI7LKA", - 697, - 968, - "#あくあ色ぱれっと", + 1543, + 1751, + "ゴーストルール", "" ], [ "jhJTzDI7LKA", - 1543, - 1751, - "ゴーストルール", + 697, + 968, + "#あくあ色ぱれっと", "" ], [ @@ -3121,16 +3121,16 @@ ], [ "i_cioYNLA-M", - 2128, - 2258, - "歌うたいのバラッド (Acoustic ver.)", + 2685, + 2786, + "恋愛写真 (Acoustic ver.)", "" ], [ "i_cioYNLA-M", - 2685, - 2786, - "恋愛写真 (Acoustic ver.)", + 2128, + 2258, + "歌うたいのバラッド (Acoustic ver.)", "" ], [ diff --git a/AutoGenerator/ShishigamiLeonaAutoGeneratedSonglist.jsonc b/AutoGenerator/ShishigamiLeonaAutoGeneratedSonglist.jsonc index 9a7b849..ca2086f 100644 --- a/AutoGenerator/ShishigamiLeonaAutoGeneratedSonglist.jsonc +++ b/AutoGenerator/ShishigamiLeonaAutoGeneratedSonglist.jsonc @@ -4,6 +4,111 @@ */ [ + [ + "zS8D9MHOyqA", + 2050, + 2216, + "Bling-Bang-Bang-Born", + "" + ], + [ + "zS8D9MHOyqA", + 613, + 854, + "夢をかなえてドラえもん", + "" + ], + [ + "zS8D9MHOyqA", + 1591, + 1771, + "U", + "" + ], + [ + "zS8D9MHOyqA", + 1858, + 1952, + "オトノケ", + "" + ], + [ + "zS8D9MHOyqA", + 6673, + 6752, + "QUEEN (short ver.)", + "" + ], + [ + "zS8D9MHOyqA", + 2261, + 2352, + "ずうっといっしょ!", + "" + ], + [ + "zS8D9MHOyqA", + 2556, + 2872, + "茜色の約束", + "" + ], + [ + "zS8D9MHOyqA", + 2971, + 3310, + "YELL", + "" + ], + [ + "zS8D9MHOyqA", + 4028, + 4296, + "Good-bye days", + "" + ], + [ + "zS8D9MHOyqA", + 4390, + 4684, + "恋文", + "" + ], + [ + "zS8D9MHOyqA", + 4783, + 5048, + "それがあなたの幸せとしても", + "" + ], + [ + "zS8D9MHOyqA", + 5666, + 5937, + "地球儀", + "" + ], + [ + "zS8D9MHOyqA", + 6008, + 6273, + "風のゆくえ", + "" + ], + [ + "zS8D9MHOyqA", + 7062, + 7310, + "メリーゴーランド", + "" + ], + [ + "zS8D9MHOyqA", + 7538, + 7859, + "rain stops, good-bye", + "" + ], [ "mUhY8JXpX8w", 470, @@ -340,20 +445,6 @@ "slash", "" ], - [ - "PIq8nwtAY8M", - 5513, - 5806, - "恋文", - "" - ], - [ - "PIq8nwtAY8M", - 399, - 566, - "Bling-Bang-Bang-Born", - "" - ], [ "PIq8nwtAY8M", 634, @@ -718,13 +809,6 @@ "またあえる日まで", "" ], - [ - "L4KnFqmViqI", - 1712, - 1953, - "夢をかなえてドラえもん", - "" - ], [ "L4KnFqmViqI", 3642, @@ -956,6 +1040,13 @@ "さくらんぼ", "" ], + [ + "kkPqqbZc0DU", + 5676, + 5965, + "プラネタリウム", + "" + ], [ "kkPqqbZc0DU", 4523, @@ -998,13 +1089,6 @@ "オラはにんきもの", "" ], - [ - "kkPqqbZc0DU", - 5676, - 5965, - "プラネタリウム", - "" - ], [ "kkPqqbZc0DU", 3495, @@ -1068,13 +1152,6 @@ "Lemon", "" ], - [ - "ieyu7s_WGAI", - 5444, - 5692, - "メリーゴーランド", - "" - ], [ "DyMJt8fePjU", 501, @@ -1187,13 +1264,6 @@ "clock lock works", "" ], - [ - "MPo_5ZyoeQU", - 2004, - 2276, - "地球儀", - "" - ], [ "MPo_5ZyoeQU", 2468, @@ -1299,13 +1369,6 @@ "メフィスト", "" ], - [ - "A4XlF_Cy6E8", - 6196, - 6463, - "それがあなたの幸せとしても", - "" - ], [ "f8a0NmDlQas", 0, @@ -1313,6 +1376,13 @@ "ダウト", "" ], + [ + "w-CiWveg19g", + 2912, + 3109, + "唱", + "" + ], [ "w-CiWveg19g", 1960, @@ -1348,13 +1418,6 @@ "炉心融解", "" ], - [ - "w-CiWveg19g", - 2912, - 3109, - "唱", - "" - ], [ "w-CiWveg19g", 4586, @@ -1476,9 +1539,9 @@ ], [ "HkY08z-CUJ8", - 2703, - 2971, - "Good-bye days", + 3008, + 3320, + "M", "" ], [ @@ -1488,13 +1551,6 @@ "ないものねだり", "" ], - [ - "HkY08z-CUJ8", - 3008, - 3320, - "M", - "" - ], [ "HkY08z-CUJ8", 3561, @@ -1642,6 +1698,13 @@ "シャンティ", "" ], + [ + "BBPJG8WWd7g", + 3361, + 3618, + "向日葵", + "" + ], [ "BBPJG8WWd7g", 4635, @@ -1649,6 +1712,13 @@ "すべり台", "" ], + [ + "BBPJG8WWd7g", + 2587, + 2900, + "鱗(うろこ)", + "" + ], [ "BBPJG8WWd7g", 4185, @@ -1670,20 +1740,6 @@ "ルージュの伝言", "" ], - [ - "BBPJG8WWd7g", - 2587, - 2900, - "鱗(うろこ)", - "" - ], - [ - "BBPJG8WWd7g", - 3361, - 3618, - "向日葵", - "" - ], [ "BBPJG8WWd7g", 3735, @@ -1705,13 +1761,6 @@ "もっと！", "" ], - [ - "YidRxfN2KLE", - 2559, - 2882, - "rain stops, good-bye", - "" - ], [ "YidRxfN2KLE", 5216, @@ -1978,13 +2027,6 @@ "letter song", "" ], - [ - "Uj5PXZOwY0M", - 2934, - 3115, - "U", - "" - ], [ "Uj5PXZOwY0M", 2590, @@ -2167,13 +2209,6 @@ "ブルーバード", "" ], - [ - "wjzsNHKvDuc", - 1530, - 1792, - "風のゆくえ", - "" - ], [ "9_6Qo4YaK5w", 4796, @@ -4029,6 +4064,13 @@ "シャッター", "" ], + [ + "ngKPtZSPw60", + 17253, + 17361, + "きらきら星", + "" + ], [ "ngKPtZSPw60", 7888, @@ -4064,13 +4106,6 @@ "帰りたくなったよ", "" ], - [ - "ngKPtZSPw60", - 17253, - 17361, - "きらきら星", - "" - ], [ "ngKPtZSPw60", 18177, @@ -4372,13 +4407,6 @@ "サリシノハラ", "" ], - [ - "W7Ru-jw5en8", - 11800, - 12143, - "YELL", - "" - ], [ "W7Ru-jw5en8", 1560, @@ -6045,13 +6073,6 @@ "あいたい", "" ], - [ - "QmnTjFkelaU", - 513, - 829, - "茜色の約束", - "" - ], [ "QmnTjFkelaU", 9449, @@ -6803,16 +6824,16 @@ ], [ "yIaKxYEnyAU", - 4030, - 4144, - "東京ゾンビランド", + 4304, + 4394, + "Henceforth (short ver.)", "" ], [ "yIaKxYEnyAU", - 4304, - 4394, - "Henceforth (short ver.)", + 4030, + 4144, + "東京ゾンビランド", "" ], [ diff --git a/AutoGenerator/YOSHIKAAutoGeneratedSonglist.jsonc b/AutoGenerator/YOSHIKAAutoGeneratedSonglist.jsonc index b3beffd..0cd698f 100644 --- a/AutoGenerator/YOSHIKAAutoGeneratedSonglist.jsonc +++ b/AutoGenerator/YOSHIKAAutoGeneratedSonglist.jsonc @@ -249,6 +249,13 @@ "小さきもの [Chiisaki Mono]", "" ], + [ + "19E9VfQyWic", + 11150, + 11448, + "OVER THE TOP", + "" + ], [ "19E9VfQyWic", 8650, @@ -284,13 +291,6 @@ "ハレ晴レユカイ [Hare Hare Yukai]", "" ], - [ - "19E9VfQyWic", - 11150, - 11448, - "OVER THE TOP", - "" - ], [ "B2H7fA2HoH0", 2533, @@ -802,6 +802,13 @@ "恋だろ", "" ], + [ + "Jwz1OIBrCEg", + 7783, + 8048, + "明け星", + "" + ], [ "Jwz1OIBrCEg", 2847, @@ -823,13 +830,6 @@ "灼熱にて純情(wii-wii-woo)", "" ], - [ - "Jwz1OIBrCEg", - 7783, - 8048, - "明け星", - "" - ], [ "Jwz1OIBrCEg", 6146,