fix(release): 发布 1.1.7-rc.202604130913

Author: coderDJing

.github/workflows/demucs-runtime-assets.yml

@@ -358,9 +358,24 @@ jobs:
             exit 1
           fi
 
+          PRERELEASE=false
+          case "$TAG_NAME" in
+            *-rc|*-beta|*-alpha)
+              PRERELEASE=true
+              ;;
+          esac
+
           if gh release view "$TAG_NAME" >/dev/null 2>&1; then
             gh release upload "$TAG_NAME" "${assets[@]}" --clobber
-            gh release edit "$TAG_NAME" --title "$TAG_NAME"
+            if [ "$PRERELEASE" = "true" ]; then
+              gh release edit "$TAG_NAME" --title "$TAG_NAME" --prerelease
+            else
+              gh release edit "$TAG_NAME" --title "$TAG_NAME"
+            fi
           else
-            gh release create "$TAG_NAME" "${assets[@]}" --title "$TAG_NAME" --verify-tag
+            if [ "$PRERELEASE" = "true" ]; then
+              gh release create "$TAG_NAME" "${assets[@]}" --title "$TAG_NAME" --prerelease --verify-tag
+            else
+              gh release create "$TAG_NAME" "${assets[@]}" --title "$TAG_NAME" --verify-tag
+            fi
           fi

.github/workflows/release.yml

@@ -154,6 +154,7 @@ jobs:
             "ffmpeg/win32-x64/ffmpeg.exe",
             "ffmpeg/win32-x64/ffprobe.exe",
             "demucs/bootstrap/mixtape_demucs_bootstrap.py",
+            "demucs/bootstrap/beat_this_bridge.py",
             "demucs/models/htdemucs.yaml",
             "demucs/models/955717e8-8726e21a.th",
             "rekordboxDesktopLibrary/bridge.py",
@@ -454,6 +455,7 @@ jobs:
             "ffmpeg/darwin/ffmpeg"
             "ffmpeg/darwin/ffprobe"
             "demucs/bootstrap/mixtape_demucs_bootstrap.py"
+            "demucs/bootstrap/beat_this_bridge.py"
             "demucs/models/htdemucs.yaml"
             "demucs/models/955717e8-8726e21a.th"
             "rekordboxDesktopLibrary/bridge.py"

electron-builder.yml

@@ -15,6 +15,8 @@ extraResources:
     to: licenses/THIRD_PARTY_NOTICES.md
   - from: LICENSE
     to: licenses/LICENSE
+  - from: scripts/beat_this_bridge.py
+    to: demucs/bootstrap/beat_this_bridge.py
   - from: vendor/rekordbox-desktop-runtime
     to: rekordboxDesktopRuntime
   - from: resources/rekordboxDesktopLibrary

package.json

@@ -1,6 +1,6 @@
 {
   "name": "frkb",
-  "version": "1.1.7-rc.202604111221",
+  "version": "1.1.7-rc.202604130913",
   "description": "Rapid Audio Organization Tool",
   "license": "GPL-2.0-or-later",
   "main": "./out/main/index.js",
@@ -27,6 +27,10 @@
       {
         "from": "resources/rekordboxDesktopLibrary",
         "to": "rekordboxDesktopLibrary"
+      },
+      {
+        "from": "scripts/beat_this_bridge.py",
+        "to": "demucs/bootstrap/beat_this_bridge.py"
       }
     ],
     "appId": "com.electron.frkb",

src/main/workers/beatThisAnalyzer.ts

@@ -53,6 +53,7 @@ type PendingRequest = {
 const ENV_BEAT_THIS_BRIDGE = 'FRKB_BEAT_THIS_BRIDGE'
 const ENV_BEAT_THIS_DBN = 'FRKB_BEAT_THIS_DBN'
 const LOCAL_BRIDGE_PATH = 'scripts/beat_this_bridge.py'
+const PACKAGED_BRIDGE_RELATIVE_PATH = 'demucs/bootstrap/beat_this_bridge.py'
 const DEFAULT_WINDOW_SEC = 30
 const DEFAULT_MAX_SCAN_SEC = 120
 const WINDOW_MIN_DURATION_SEC = 8
@@ -94,6 +95,26 @@ const resolveBridgeScriptPath = () => {
     return envBridge
   }
 
+  const packagedBridge = normalizeBeatThisFsPath(
+    path.join(normalizeBeatThisFsPath(process.resourcesPath || ''), PACKAGED_BRIDGE_RELATIVE_PATH)
+  )
+  if (packagedBridge && fs.existsSync(packagedBridge)) {
+    cachedBridgePath = packagedBridge
+    return packagedBridge
+  }
+
+  const unpackedBridge = normalizeBeatThisFsPath(
+    path.join(
+      normalizeBeatThisFsPath(process.resourcesPath || ''),
+      'app.asar.unpacked',
+      LOCAL_BRIDGE_PATH
+    )
+  )
+  if (unpackedBridge && fs.existsSync(unpackedBridge)) {
+    cachedBridgePath = unpackedBridge
+    return unpackedBridge
+  }
+
   const localBridge = path.join(resolveBeatThisProjectRoot(), LOCAL_BRIDGE_PATH)
   cachedBridgePath = localBridge
   return localBridge