From cf26888a9a9f7b313f30a188d718309cbefd01f4 Mon Sep 17 00:00:00 2001 From: Dan Ferguson Date: Thu, 23 Apr 2020 20:39:33 -0400 Subject: [PATCH] _ --- README.md | 17 ++++++++--------- index.js | 3 ++- web/controllers/settings.js | 2 +- web/directives/channel-config.js | 2 +- web/directives/ffmpeg-settings.js | 2 +- web/directives/xmltv-settings.js | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 4497f8a..0b60292 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ FFMPEG is used to transcode media on the fly to MPEG2/AC3 mpegts streams (with c - Web UI for channel configuration and app settings - Select media across multiple Plex servers - Ability to auto update Plex EPG and channel mappings +- Auto Update the xmltv.xml file at a set interval (in hours). You can also set the amount EPG cache (in hours). - Continuous playback support - Commercial support - Docker and prepackage binaries for Windows, Linux and Mac @@ -25,21 +26,21 @@ FFMPEG is used to transcode media on the fly to MPEG2/AC3 mpegts streams (with c ## Installation -Unless your are using the Docker image, you must download and install **ffmpeg** to your system and set the correct path in the Web UI. +Unless your are using the Docker image, you must download and install **ffmpeg** to your system and set the correct path in the PseudoTV Web UI. -By default, pseudotv will create a directory (`.pseudotv`) where the app was lauched. Your xmltv.xml file and pseudotv databases are stored here. +By default, pseudotv will create the directory `.pseudotv` wherever pseudotv is launched from. Your `xmltv.xml` file and config databases are stored here. An M3U can also be downloaded via the Web UI (useful if using xTeVe). -**Do not use a URL when feeding Plex the xmltv.xml file, Plex fails to update it's EPG from a URL for some reason (at least on Windows)** +**Do not use the Web UI XMLTV URL when feeding Plex the xmltv.xml file. Plex fails to update it's EPG from a URL for some reason (at least on Windows). Use the local file path to xmltv.xml** #### Binary Release [Download](https://gitlab.com/DEFENDORe/pseudotv-plex/-/releases) and run the PseudoTV executable (argument defaults below) ``` ./pseudotv-win.exe --host 127.0.0.1 --port 8000 --database ./pseudotv --xmltv ./pseudotv/xmltv.xml ``` -Use the WebUI to provide PseudoTV the path to FFMPEG #### Docker Image ``` +git clone https://gitlab.com/DEFENDORe/pseudotv-plex.git cd pseudotv-plex docker build -t pseudotv . docker run --name pseudotv -p 8000:8000 -v C:\.pseudotv:/home/node/app/.pseudotv pseudotv @@ -47,6 +48,7 @@ docker run --name pseudotv -p 8000:8000 -v C:\.pseudotv:/home/node/app/.pseudotv #### Source ``` +git clone https://gitlab.com/DEFENDORe/pseudotv-plex.git cd pseudotv-plex npm install npm run build @@ -56,18 +58,15 @@ npm run start ## Development -Building Binaries: +Building Binaries: (uses `babel` and `pkg`) ``` -cd pseudotv-plex -npm install npm run build npm run compile npm run package ``` -Live Development: +Live Development: (using `nodemon` and `watchify`) ``` -cd pseudotv-plex npm run dev-client npm run dev-server ``` \ No newline at end of file diff --git a/index.js b/index.js index c9cedc0..b041837 100644 --- a/index.js +++ b/index.js @@ -83,11 +83,12 @@ let xmltvInterval = { } xmltvInterval.updateXML() +xmltvInterval.startInterval() let hdhr = HDHR(db) let app = express() app.use(bodyParser.json()) -app.use(express.static(__dirname + '/web/public')) +app.use(express.static(path.join(__dirname, 'web/public'))) app.use(api.router(db, xmltvInterval)) app.use(video.router(db)) app.use(hdhr.router) diff --git a/web/controllers/settings.js b/web/controllers/settings.js index 878cf96..72d9b1d 100644 --- a/web/controllers/settings.js +++ b/web/controllers/settings.js @@ -1,4 +1,4 @@ -module.exports = function ($rootScope, $scope, pseudotv, plex, $location) { +module.exports = function ($scope, $location) { $scope.selected = $location.hash() if ($scope.selected === '') $scope.selected = 'xmltv' diff --git a/web/directives/channel-config.js b/web/directives/channel-config.js index 663ab2d..0bb7eff 100644 --- a/web/directives/channel-config.js +++ b/web/directives/channel-config.js @@ -1,4 +1,4 @@ -module.exports = function (plex, $timeout) { +module.exports = function ($timeout) { return { restrict: 'E', templateUrl: 'templates/channel-config.html', diff --git a/web/directives/ffmpeg-settings.js b/web/directives/ffmpeg-settings.js index 9b1f685..fe3ad02 100644 --- a/web/directives/ffmpeg-settings.js +++ b/web/directives/ffmpeg-settings.js @@ -1,4 +1,4 @@ -module.exports = function (pseudotv, $interval) { +module.exports = function (pseudotv) { return { restrict: 'E', templateUrl: 'templates/ffmpeg-settings.html', diff --git a/web/directives/xmltv-settings.js b/web/directives/xmltv-settings.js index 16416b5..fc1f5bf 100644 --- a/web/directives/xmltv-settings.js +++ b/web/directives/xmltv-settings.js @@ -1,4 +1,4 @@ -module.exports = function (pseudotv, $interval) { +module.exports = function (pseudotv) { return { restrict: 'E', templateUrl: 'templates/xmltv-settings.html',