From 4c5739d659f0e965761d308773dafe6852b504b9 Mon Sep 17 00:00:00 2001 From: vexorian Date: Mon, 20 Sep 2021 09:24:08 -0400 Subject: [PATCH 1/4] 1.4.5-development --- README.md | 2 +- src/constants.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fba70a9..f39d0d8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# dizqueTV 1.4.4-development +# dizqueTV 1.4.5-development ![Discord](https://img.shields.io/discord/711313431457693727?logo=discord&logoColor=fff&style=flat-square) ![GitHub top language](https://img.shields.io/github/languages/top/vexorian/dizquetv?logo=github&style=flat-square) ![Docker Pulls](https://img.shields.io/docker/pulls/vexorian/dizquetv?logo=docker&logoColor=fff&style=flat-square) Create live TV channel streams from media on your Plex servers. diff --git a/src/constants.js b/src/constants.js index 75ac3f0..72afbba 100644 --- a/src/constants.js +++ b/src/constants.js @@ -5,5 +5,5 @@ module.exports = { TVGUIDE_MAXIMUM_FLEX_DURATION : 6 * 60 * 60 * 1000, TOO_FREQUENT: 100, - VERSION_NAME: "1.4.4-development" + VERSION_NAME: "1.4.5-development" } From 7b1e00d54701557aa268252a7db31179bb9f619d Mon Sep 17 00:00:00 2001 From: vexorian Date: Sun, 19 Sep 2021 22:39:40 -0400 Subject: [PATCH 2/4] Fix #373 nvidia docker builds. --- Dockerfile-nvidia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-nvidia b/Dockerfile-nvidia index f21f8b1..2b22dc9 100644 --- a/Dockerfile-nvidia +++ b/Dockerfile-nvidia @@ -6,7 +6,7 @@ COPY --from=vexorian/dizquetv:nexecache /var/nexe/linux-x64-12.16.2 /var/nexe/ COPY . . RUN npm run build && LINUXBUILD=dizquetv sh make_dist.sh linuxonly -FROM jrottenberg/ffmpeg:4.3-nvidia +FROM jrottenberg/ffmpeg:4.3-nvidia1804 EXPOSE 8000 WORKDIR /home/node/app ENTRYPOINT [ "./dizquetv" ] From b7d61cb707778fa695d9f5b691fa1f0884d61eba Mon Sep 17 00:00:00 2001 From: vexorian Date: Sun, 19 Sep 2021 22:52:56 -0400 Subject: [PATCH 3/4] #374 Fix channel numbers smaller than 10 not being allowed. --- web/directives/channel-config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/directives/channel-config.js b/web/directives/channel-config.js index b9008db..e0ce3ca 100644 --- a/web/directives/channel-config.js +++ b/web/directives/channel-config.js @@ -1675,7 +1675,7 @@ function validURL(url) { } function checkChannelNumber(number) { - if ( /^[1-9][0-9]+$/.test(number) ) { + if ( /^(([1-9][0-9]*)|(0))$/.test(number) ) { let x = parseInt(number); return (0 <= x && x < 10000); } else { From 0b1dc22e6c12861130156d9acafb00b7c8cc3208 Mon Sep 17 00:00:00 2001 From: vexorian Date: Mon, 20 Sep 2021 09:23:47 -0400 Subject: [PATCH 4/4] nodejs version warning and it also appears in version page. --- index.js | 6 ++++++ src/api.js | 1 + web/controllers/version.js | 1 + web/public/views/version.html | 7 ++++++- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index cfe1f39..7b8b5a3 100644 --- a/index.js +++ b/index.js @@ -35,6 +35,12 @@ console.log( '------------' `); +const NODE = parseInt( process.version.match(/^[^0-9]*(\d+)\..*$/)[1] ); + +if (NODE < 12) { + console.error(`WARNING: Your nodejs version ${process.version} is lower than supported. dizqueTV has been tested best on nodejs 12.16.`); +} + for (let i = 0, l = process.argv.length; i < l; i++) { if ((process.argv[i] === "-p" || process.argv[i] === "--port") && i + 1 !== l) diff --git a/src/api.js b/src/api.js index 4adea09..f6a1f28 100644 --- a/src/api.js +++ b/src/api.js @@ -38,6 +38,7 @@ function api(db, channelDB, fillerDB, customShowDB, xmltvInterval, guideService res.send( { "dizquetv" : constants.VERSION_NAME, "ffmpeg" : v, + "nodejs" : process.version, } ); } catch(err) { console.error(err); diff --git a/web/controllers/version.js b/web/controllers/version.js index 7fedd00..5b5fe83 100644 --- a/web/controllers/version.js +++ b/web/controllers/version.js @@ -4,6 +4,7 @@ module.exports = function ($scope, dizquetv) { dizquetv.getVersion().then((version) => { $scope.version = version.dizquetv; $scope.ffmpegVersion = version.ffmpeg; + $scope.nodejs = version.nodejs; }) diff --git a/web/public/views/version.html b/web/public/views/version.html index 13b531c..01d77c5 100644 --- a/web/public/views/version.html +++ b/web/public/views/version.html @@ -20,7 +20,12 @@ FFMPEG
{{ffmpegVersion}} - + + nodejs +
{{nodejs}} + + + \ No newline at end of file