Merge branch 'master' into mediainfo-async-await

jesec · Nov 29, 2023 · 47d44f5 · 47d44f5
2 parents c3821c7 + 572ce1e
commit 47d44f5
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 32 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,9 +21,10 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
+          cache: 'npm'
 
       - run: npm ci
       - run: npm run build

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -22,9 +22,10 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
+          cache: npm
 
       - run: npm ci
       - run: npm run ${{ matrix.check }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -39,13 +39,13 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
 
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v2
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/distribute-debian.yml b/.github/workflows/distribute-debian.yml
@@ -19,10 +19,11 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           registry-url: 'https://registry.npmjs.org'
+          cache: npm
 
       - name: Set up QEMU
         run: |

diff --git a/.github/workflows/publish-rolling.yml b/.github/workflows/publish-rolling.yml
@@ -17,10 +17,11 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           registry-url: 'https://registry.npmjs.org'
+          cache: npm
 
       - run: npm ci
 
@@ -33,9 +34,9 @@ jobs:
           npm version --no-git-tag-version $build_version
           echo ::set-output name=BUILD_VERSION::$build_version
 
-      - name: Use @${{ github.actor }} scope
+      - name: Use @jesec scope
         run: |
-          jq '.name = "@${{ github.actor }}/flood"' package.json > package.new.json
+          jq '.name = "@jesec/flood"' package.json > package.new.json
           mv package.new.json package.json
 
       - run: npm pack
@@ -124,10 +125,11 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           registry-url: 'https://registry.npmjs.org'
+          cache: npm
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -177,7 +179,7 @@ jobs:
 
     steps:
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           registry-url: 'https://registry.npmjs.org'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,10 +17,11 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           registry-url: 'https://registry.npmjs.org'
+          cache: npm
 
       - run: sudo npm i -g pkg
       - run: npm ci

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
@@ -10,20 +10,21 @@ on:
 
 jobs:
   test-backend:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
-        node: [18, 20]
+        node: ['18', '20']
       fail-fast: false
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
+          cache: npm
 
       - run: sudo add-apt-repository -y ppa:qbittorrent-team/qbittorrent-stable
       - run: sudo add-apt-repository -y ppa:transmissionbt/ppa
@@ -36,7 +37,7 @@ jobs:
       - run: npm ci
       - run: npm test || npm test || npm test
 
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v3
         if: matrix.node == 20
 
       - run: |

diff --git a/.travis.yml b/.travis.yml
diff --git a/server/routes/api/torrents.ts b/server/routes/api/torrents.ts
@@ -913,8 +913,8 @@ router.get<{hash: string}>(
 
       const mediainfoProcess = childProcess.execFile(
         'mediainfo',
-        torrentContentPaths,
-        {maxBuffer: 1024 * 2000, timeout: 1000 * 10},
+        torrentContentPaths.map((x) => path.relative(torrentDirectory, x)),
+        {maxBuffer: 1024 * 2000, timeout: 1000 * 10, cwd: torrentDirectory},
         (error, stdout) => {
           if (error) {
             return res.status(500).json({code: error.code, message: error.message});