Fixed issue where twitch chat downloader could not be found in docker

Merge pull request #864 from nardis556/master
Update entrypoint.sh
2026-03-07 12:00:01 +03:00 · 2023-05-11 02:27:35 -04:00 · 2023-05-11 03:19:50 +02:00 · 2023-05-11 03:17:40 +02:00 · 2023-05-11 03:16:08 +02:00 · 2023-05-10 13:49:19 +02:00
6 changed files with 54 additions and 2 deletions
--- a/backend/entrypoint.sh
+++ b/backend/entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu

-CMD="npm start"
+CMD="npm start && pm2 start"

 # if the first arg starts with "-" pass it to program
 if [ "${1#-}" != "$1" ]; then
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -769,6 +769,11 @@
        "delayed-stream": "~1.0.0"
      }
    },
+    "command-exists": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
+      "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
+    },
    "compress-commons": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz",
--- a/backend/package.json
+++ b/backend/package.json
@@ -30,6 +30,7 @@
    "async-mutex": "^0.4.0",
    "axios": "^0.21.2",
    "bcryptjs": "^2.4.0",
+    "command-exists": "^1.2.9",
    "compression": "^1.7.4",
    "config": "^3.2.3",
    "express": "^4.18.2",
--- a/backend/twitch.js
+++ b/backend/twitch.js
@@ -6,6 +6,7 @@ const fs = require('fs-extra')
 const path = require('path');
 const { promisify } = require('util');
 const child_process = require('child_process');
+const commandExistsSync = require('command-exists').sync;

 async function getCommentsForVOD(vodId) {
    const exec = promisify(child_process.exec);
@@ -20,7 +21,7 @@ async function getCommentsForVOD(vodId) {
    const cliExt = is_windows ? '.exe' : ''
    const cliPath = `TwitchDownloaderCLI${cliExt}`

-    if (!fs.existsSync(cliPath)) {
+    if (!commandExistsSync(cliPath)) {
        logger.error(`${cliPath} does not exist. Twitch chat download failed! Get it here: https://github.com/lay295/TwitchDownloader`);
        return null;
    }
--- a/src/assets/i18n/messages.es.xlf
+++ b/src/assets/i18n/messages.es.xlf
@@ -3916,6 +3916,24 @@
          <context context-type="linenumber">183</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="7cedb649779673568447b994463b2882c4e0436a" datatype="html">
+        <source>Slack Webhook URL</source>
+        <target state="translated">URL del webhook de Slack</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/settings/settings.component.html</context>
+          <context context-type="linenumber">397</context>
+        </context-group>
+        <note priority="1" from="description">Slack Webhook URL</note>
+      </trans-unit>
+      <trans-unit id="3264d82792954815be755b3da01e2625458711dc" datatype="html">
+        <source>Discord Webhook URL</source>
+        <target state="translated">URL del webhook de Discord</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/settings/settings.component.html</context>
+          <context context-type="linenumber">390</context>
+        </context-group>
+        <note priority="1" from="description">Discord Webhook URL</note>
+      </trans-unit>
    </body>
  </file>
 </xliff>
--- a/src/assets/i18n/messages.pl.xlf
+++ b/src/assets/i18n/messages.pl.xlf
@@ -3757,6 +3757,33 @@
        </context-group>
        <note priority="1" from="description">Select a version</note>
      </trans-unit>
+      <trans-unit id="2361a4f76caaa4574803fbcdca8b0a47c91cc7ed" datatype="html">
+        <source>Task finished</source>
+        <target state="translated">Zadanie zakończone</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/settings/settings.component.html</context>
+          <context context-type="linenumber">377</context>
+        </context-group>
+        <note priority="1" from="description">Task finished</note>
+      </trans-unit>
+      <trans-unit id="c5dc5fbcce45e9b1530e2a5c2baa8ebe722aef4c" datatype="html">
+        <source>Download complete</source>
+        <target state="translated">Pobieranie zakończone</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/settings/settings.component.html</context>
+          <context context-type="linenumber">375</context>
+        </context-group>
+        <note priority="1" from="description">Download complete</note>
+      </trans-unit>
+      <trans-unit id="3ffd9490f3a4c0b24021d25e1dc71fcfe5d39cd6" datatype="html">
+        <source>Download error</source>
+        <target state="translated">Błąd pobierania</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/settings/settings.component.html</context>
+          <context context-type="linenumber">376</context>
+        </context-group>
+        <note priority="1" from="description">Download error</note>
+      </trans-unit>
    </body>
  </file>
 </xliff>
Author	SHA1	Message	Date
Tzahi12345	9e481bbd5f	Fixed issue where twitch chat downloader could not be found in docker	2023-05-11 02:27:35 -04:00
Glassed Silver	78b29a76b8	Merge pull request #864 from nardis556/master Update entrypoint.sh	2023-05-11 03:19:50 +02:00
Glassed Silver	0342d18f76	Merge pull request #906 from weblate/weblate-youtubedl-material-ytdl-material Translations update from Hosted Weblate	2023-05-11 03:17:40 +02:00
Glassed Silver	70754c580c	Merge pull request #908 from Tzahi12345/ffmpeg-force-v5 Force ffmpeg 5.1.1	2023-05-11 03:16:08 +02:00
YMisterXY	df8f8070ca	Translated using Weblate (Polish) Currently translated at 80.5% (385 of 478 strings) Translation: YoutubeDL-Material/ytdl-material Translate-URL: https://hosted.weblate.org/projects/youtubedl-material/ytdl-material/pl/	2023-05-10 13:49:19 +02:00
gallegonovato	0b8ca31594	Translated using Weblate (Spanish) Currently translated at 100.0% (478 of 478 strings) Translation: YoutubeDL-Material/ytdl-material Translate-URL: https://hosted.weblate.org/projects/youtubedl-material/ytdl-material/es/	2023-05-10 13:49:19 +02:00
nardis556	26988bd607	Update entrypoint.sh	2023-04-16 15:03:12 -05:00