Merge branch 'dev/1.4.x' into dev/1.5.x

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

@@ -68,7 +68,6 @@ npm run dev-server
 ## Contribute
 
 * Pull requests welcome but please read the [Code of Conduct](CODE_OF_CONDUCT.md) and the [Pull Request Template](pull_request_template.md) first.
-* We use [Conventional Commits](https://www.conventionalcommits.org/), a specification for adding human and machine readable meaning to commit messages. Add files with `git add` and call `git commit` to use your command line utility and create a commit.
 * Tip Jar: https://buymeacoffee.com/vexorian
 
 ## License

index.js

@@ -42,6 +42,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

@@ -37,6 +37,7 @@ function api(db, channelService, fillerDB, customShowDB, xmltvInterval,  guideSe
         res.send( {
             "dizquetv" : constants.VERSION_NAME,
             "ffmpeg" : v,
+            "nodejs" : process.version,
         } );
       } catch(err) {
           console.error(err);

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

@@ -1711,7 +1711,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>