vexorian/dizquetv
1
0
Fork 0
mirror of https://github.com/vexorian/dizquetv.git synced 2025-12-11 02:23:36 -06:00
Code Issues Packages Projects Releases 48 Wiki Activity

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

Browse Source
This commit is contained in:
vexorian 2021-09-20 10:50:47 -04:00
commit 670b9a015d
7 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile-nvidia
View File

@ -6,7 +6,7 @@ COPY --from=vexorian/dizquetv:nexecache /var/nexe/linux-x64-12.16.2 /var/nexe/
COPY . . COPY . .
RUN npm run build && LINUXBUILD=dizquetv sh make_dist.sh linuxonly 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 EXPOSE 8000
WORKDIR /home/node/app WORKDIR /home/node/app
ENTRYPOINT [ "./dizquetv" ] ENTRYPOINT [ "./dizquetv" ]

1
README.md
View File

@ -68,7 +68,6 @@ npm run dev-server
## Contribute ## 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. * 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 * Tip Jar: https://buymeacoffee.com/vexorian
## License ## License

6
index.js
View File

@ -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++) { for (let i = 0, l = process.argv.length; i < l; i++) {
if ((process.argv[i] === "-p" || process.argv[i] === "--port") && i + 1 !== l) if ((process.argv[i] === "-p" || process.argv[i] === "--port") && i + 1 !== l)

1
src/api.js
View File

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

1
web/controllers/version.js
View File

@ -4,6 +4,7 @@ module.exports = function ($scope, dizquetv) {
dizquetv.getVersion().then((version) => { dizquetv.getVersion().then((version) => {
$scope.version = version.dizquetv; $scope.version = version.dizquetv;
$scope.ffmpegVersion = version.ffmpeg; $scope.ffmpegVersion = version.ffmpeg;
$scope.nodejs = version.nodejs;
}) })

2
web/directives/channel-config.js
View File

@ -1711,7 +1711,7 @@ function validURL(url) {
} }
function checkChannelNumber(number) { function checkChannelNumber(number) {
if ( /^[1-9][0-9]+$/.test(number) ) { if ( /^(([1-9][0-9]*)|(0))$/.test(number) ) {
let x = parseInt(number); let x = parseInt(number);
return (0 <= x && x < 10000); return (0 <= x && x < 10000);
} else { } else {

7
web/public/views/version.html
View File

@ -20,7 +20,12 @@
<td>FFMPEG</td> <td>FFMPEG</td>
<td><div class='loader' ng-if="version.length &lt;= 0"></div>{{ffmpegVersion}}</td> <td><div class='loader' ng-if="version.length &lt;= 0"></div>{{ffmpegVersion}}</td>
</tr> </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> </table>
</div> </div>