Merge pull request #375 from vexorian/20210920_dev

20210920 dev

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" ]

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.

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)

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);

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"
 }

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;
     })
 
     

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 {

web/public/views/version.html

@@ -20,7 +20,12 @@
             <td>FFMPEG</td>
             <td><div class='loader' ng-if="version.length &lt;= 0"></div>{{ffmpegVersion}}</td>
         </tr>
-        <!-- coming soon, ffmpeg version, nodejs version, plex version, whatever can be used to help debug things-->
+        <tr>
+            <td>nodejs</td>
+            <td><div class='loader' ng-if="version.length &lt;= 0"></div>{{nodejs}}</td>
+        </tr>
+
+        <!-- coming soon: plex version, whatever can be used to help debug things-->
     </table>
 
 </div>