Fixed a bug that sometimes it was not possible to sort by song title …

…or delete a song without pressing the delete button twice. fix #2

src/components/beatmap/table/BeatmapsTable.vue

@@ -10,7 +10,7 @@
     :fixed-header="fixedHeader"
     :show-select="selected !== undefined"
     loading-text="Loading contents ..."
-    item-key="hash"
+    item-key="tableKey"
     aria-describedby="List of beatmaps for the current context"
     hide-default-footer
     dense
@@ -416,6 +416,9 @@ export default Vue.extend({
         uploaded: entry.data.uploaded,
         key: entry.data.key,
         hash: entry.data.hash,
+        tableKey: `${entry.data.hash}${
+          entry.folderNameHash ? `-${entry.folderNameHash}` : ""
+        }`,
       }));
     },
     beatmapAsTableDataFiltered(): { raw: BeatmapsTableDataUnit }[] {

src/components/beatmap/table/BeatmapsTableOnline.vue

@@ -179,6 +179,7 @@ export default Vue.extend({
           (beatmap): BeatmapsTableDataUnit => ({
             local: undefined,
             data: beatmap,
+            folderNameHash: undefined,
           })
         ) ?? []
       );

src/components/beatmap/table/core/BeatmapsTableDataUnit.ts

@@ -4,4 +4,6 @@ import { BeatmapLocal } from "@/libraries/beatmap/BeatmapLocal";
 export interface BeatmapsTableDataUnit {
   local: BeatmapLocal | undefined;
   data: BeatsaverBeatmap;
+  // foldeNameHash will only be used to display local maps.
+  folderNameHash: string | undefined;
 }

src/libraries/beatmap/BeatmapLibrary.ts

@@ -1,6 +1,8 @@
 /* istanbul ignore file */
 import store from "@/plugins/store";
+import crypto from "crypto";
 import fs from "fs-extra";
+import path from "path";
 import { BeatmapLocal } from "@/libraries/beatmap/BeatmapLocal";
 import {
   BeatsaverBeatmap,
@@ -59,8 +61,8 @@ export default class BeatmapLibrary {
     const promiseResults: Promise<{
       local: BeatmapLocal;
       data: BeatsaverBeatmap | undefined;
+      folderNameHash: string | undefined;
     }>[] = [];
-    // TODO 1000件ずつくらいに分割しないと、Local に 40000件くらいあったら 40000件の promise が作成されてしまう。
     const validCache = BeatsaverCachedLibrary.GetAllValid();
     let cnt = 0;
     for (const beatmap of localValidMaps) {
@@ -75,12 +77,14 @@ export default class BeatmapLibrary {
       let mydata: BeatsaverBeatmap | undefined;
       if (beatmap.hash) {
         const hash = beatmap.hash.toUpperCase();
+        const folderNameHash = this.getFolderNameHash(beatmap.folderPath);
         // mydata = BeatsaverCachedLibrary.GetByHash(hash)?.beatmap;
         mydata = validCache.get(hash)?.beatmap;
         if (mydata != null) {
           result.push({
             local: undefined,
             data: mydata,
+            folderNameHash,
           });
           // eslint-disable-next-line no-continue
           continue;
@@ -90,19 +94,23 @@ export default class BeatmapLibrary {
           result.push({
             local: beatmap,
             data: generatedCache,
+            folderNameHash,
           });
           // eslint-disable-next-line no-continue
           continue;
         }
+        // TODO 事前キャッシュはあるから Local に 40000件あっても大半はここに到達しないが、1000件ずつくらいに分割したほうがいい。
         promiseResults.push(
           new Promise<{
             local: BeatmapLocal;
             data: BeatsaverBeatmap | undefined;
+            folderNameHash: string | undefined;
           }>((resolve) => {
             BeatmapLibrary.GenerateBeatmap(beatmap).then((generatedMap) => {
               resolve({
                 local: beatmap,
                 data: generatedMap,
+                folderNameHash,
               });
             });
           })
@@ -116,6 +124,7 @@ export default class BeatmapLibrary {
     let resolved: {
       local: BeatmapLocal;
       data: BeatsaverBeatmap | undefined;
+      folderNameHash: string | undefined;
     }[] = [];
     if (promiseResults.length > 0) {
       Logger.debug(
@@ -151,6 +160,23 @@ export default class BeatmapLibrary {
     */
   }
 
+  static getFolderNameHash(folderPath: string) {
+    if (folderPath == null) {
+      return undefined;
+    }
+    try {
+      const { base } = path.parse(folderPath);
+      return crypto
+        .createHash("sha1")
+        .update(base.toLowerCase())
+        .digest("hex")
+        .substr(0, 5);
+    } catch (error) {
+      console.warn(`Get folder name hash failed: ${folderPath}`, error);
+      return undefined;
+    }
+  }
+
   static async GenerateBeatmap(
     beatmap: BeatmapLocal | undefined
   ): Promise<BeatsaverBeatmap | undefined> {

src/libraries/playlist/PlaylistMapsLibrary.ts

@@ -72,6 +72,7 @@ export default class PlaylistMapsLibrary {
     const promiseResults: Promise<{
       local: BeatmapLocal;
       data: BeatsaverBeatmap | undefined;
+      folderNameHash: string | undefined;
     }>[] = [];
     Logger.debug(
       `    start validMaps loop ${validMaps.length}`,
@@ -86,6 +87,7 @@ export default class PlaylistMapsLibrary {
         result.push({
           local: undefined,
           data: mydata,
+          folderNameHash: undefined,
         });
         // eslint-disable-next-line no-continue
         continue;
@@ -97,15 +99,20 @@ export default class PlaylistMapsLibrary {
         // eslint-disable-next-line no-continue
         continue;
       }
+      const folderNameHash = BeatmapLibrary.getFolderNameHash(
+        beatmapLocal.folderPath
+      );
       promiseResults.push(
         new Promise<{
           local: BeatmapLocal;
           data: BeatsaverBeatmap | undefined;
+          folderNameHash: string | undefined;
         }>((resolve) => {
           BeatmapLibrary.GenerateBeatmap(beatmapLocal).then((generatedMap) => {
             resolve({
               local: beatmapLocal as BeatmapLocal,
               data: generatedMap,
+              folderNameHash,
             });
           });
         })