diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 474a67b3..a59983fe 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -9,15 +9,20 @@ runs: with: node-version: '20' + # - name: Get npm cache directory + # run: node -p -e '`NPM_CACHE_DIR=${require("child_process").execSync("npm config get cache").toString()}`' >> $GITHUB_ENV + # run: echo "NPM_CACHE_DIR=$(npm config get cache)" >> $GITHUB_ENV + + # https://docs.npmjs.com/cli/v10/configuring-npm/folders#cache - name: Cache node modules id: cache-npm uses: actions/cache@v4 with: path: | ${{ env.NPM_CACHE }} - key: ${{ runner.os }}-node-modules-cache-${{ hashFiles('package-lock.json') }} + key: ${{ runner.os }}-npm-cache-${{ hashFiles('package-lock.json') }} restore-keys: | - ${{ runner.os }}-node-modules-cache- + ${{ runner.os }}-npm-cache- - name: Install dependencies run: npm ci diff --git a/.github/workflows/beta-pack.yml b/.github/workflows/beta-pack.yml index 828ffde0..8a13bf47 100644 --- a/.github/workflows/beta-pack.yml +++ b/.github/workflows/beta-pack.yml @@ -44,7 +44,7 @@ jobs: name: Windows runs-on: windows-latest env: - NPM_CACHE: '%APPDATA%\npm-cache' + NPM_CACHE: '%LocalAppData%/npm-cache' # needs: CheckCode steps: - name: Check out git repository @@ -131,7 +131,7 @@ jobs: runs-on: macos-latest # needs: CheckCode env: - NPM_CACHE: $HOME/.npm + NPM_CACHE: ~/.npm steps: - name: Check out git repository uses: actions/checkout@v4 @@ -178,7 +178,7 @@ jobs: name: Linux runs-on: ubuntu-latest env: - NPM_CACHE: $HOME/.npm + NPM_CACHE: ~/.npm # needs: CheckCode steps: - name: Install package diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index debb975d..838178d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,7 +44,7 @@ jobs: name: Windows runs-on: windows-latest env: - NPM_CACHE: '%APPDATA%\npm-cache' + NPM_CACHE: '%LocalAppData%/npm-cache' # needs: CheckCode steps: - name: Check out git repository @@ -78,7 +78,7 @@ jobs: name: Windows_7 runs-on: windows-latest env: - NPM_CACHE: '%APPDATA%\npm-cache' + NPM_CACHE: '%LocalAppData%/npm-cache' # needs: CheckCode steps: - name: Check out git repository @@ -115,7 +115,7 @@ jobs: name: Mac runs-on: macos-latest env: - NPM_CACHE: $HOME/.npm + NPM_CACHE: ~/.npm # needs: CheckCode steps: - name: Check out git repository @@ -153,7 +153,7 @@ jobs: name: Linux runs-on: ubuntu-latest env: - NPM_CACHE: $HOME/.npm + NPM_CACHE: ~/.npm # needs: CheckCode steps: - name: Install package diff --git a/src/renderer/core/useApp/useDeeplink/useMusicAction.js b/src/renderer/core/useApp/useDeeplink/useMusicAction.js index 01bca77d..ce59e66d 100644 --- a/src/renderer/core/useApp/useDeeplink/useMusicAction.js +++ b/src/renderer/core/useApp/useDeeplink/useMusicAction.js @@ -188,7 +188,7 @@ const useSearchPlayMusic = () => { // console.log(paths, data) let info if (paths.length) { - let name = paths[0] + let name = paths[0].trim() let singer = '' if (name.includes('-')) [name, singer] = name.split('-').map(val => val.trim()) info = { @@ -197,6 +197,7 @@ const useSearchPlayMusic = () => { } } else info = data info = verifyInfo(info) + if (!info.name) return const musicList = await searchMusic(info.name, info.singer || '', info.albumName || '', info.interval || null) if (musicList.length) { console.log('find music:', musicList)