From 3c3b3544f11def676830177ef4c8f4f4e098b9c7 Mon Sep 17 00:00:00 2001 From: vexorian Date: Sat, 1 Aug 2020 07:13:47 -0400 Subject: [PATCH 1/8] Fork version 0.0.56 --- README.md | 12 ++++++++++-- src/constants.js | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5d45d89..2edd1af 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,16 @@ -# pseudotv-plex +# pseudotv 0.0.56-unofficial-vx Create live TV channel streams from media on your Plex servers. -Project recently migrated from [gitlab](https://gitlab.com/DEFENDORe/pseudotv-plex) to github to improve development flow (docker builds and binary releases). +Official project is at: [https://github.com/DEFENDORe/pseudotv](https://github.com/DEFENDORe/pseudotv) +This is a set of modifications that I am releasing in order to get testing of new features I am proposing to pseudotv official. + +Check the releases page for downloads for Linux, MacOSX and Windows. For docker you will need to build the image from sourcecode. Sorry for that. + +Make sure to make a backup of your .pseudotv folder before installing this version. Depending on how old your existing version is, you might need to clean up the folder before installing this one and start from scratch. + +The remaining of this readme file is a copy of the one in the official repository. + diff --git a/src/constants.js b/src/constants.js index 7d25ccc..2b24c61 100644 --- a/src/constants.js +++ b/src/constants.js @@ -2,5 +2,5 @@ module.exports = { SLACK: 9999, TVGUIDE_MAXIMUM_PADDING_LENGTH_MS: 30*60*1000, - VERSION_NAME: "0.0.54-testing" + VERSION_NAME: "0.0.56-unofficial-vx" } From 0e1d2e4bb17265bb94632d1bf7689c5686069cb6 Mon Sep 17 00:00:00 2001 From: vexorian Date: Tue, 4 Aug 2020 22:38:44 -0400 Subject: [PATCH 2/8] Tweaked Flex random algorithm AGAIN --- src/helperFuncs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helperFuncs.js b/src/helperFuncs.js index bbac0aa..39faf18 100644 --- a/src/helperFuncs.js +++ b/src/helperFuncs.js @@ -219,7 +219,7 @@ function pickRandomWithMaxDuration(channel, list, maxDuration) { //30 minutes is too little, don't repeat it at all } if (timeSince >= D) { - let w = Math.pow(clip.actualDuration, 1.0 / 8.0); + let w = Math.pow(clip.actualDuration, 1.0 / 4.0); n += w; if ( n*Math.random() < w) { pick1 = clip; From e1d79490a5a10f4698d207b5165923886a514c79 Mon Sep 17 00:00:00 2001 From: vexorian Date: Tue, 4 Aug 2020 22:43:15 -0400 Subject: [PATCH 3/8] Fix Pad Time bug. To improve on channel loading times in the UI, channel editor will only show 100 programs at once, but there's a slider to see more. --- web/directives/channel-config.js | 23 ++++++++--- web/public/templates/channel-config.html | 49 +++++++++++++++++++++--- 2 files changed, 61 insertions(+), 11 deletions(-) diff --git a/web/directives/channel-config.js b/web/directives/channel-config.js index 9f3b25e..4e84352 100644 --- a/web/directives/channel-config.js +++ b/web/directives/channel-config.js @@ -13,6 +13,7 @@ module.exports = function ($timeout, $location) { scope._frequencyModified = false; scope._frequencyMessage = ""; scope.millisecondsOffset = 0; + scope.minProgramIndex = 0; if (typeof scope.channel === 'undefined' || scope.channel == null) { scope.channel = {} scope.channel.programs = [] @@ -97,6 +98,17 @@ module.exports = function ($timeout, $location) { scope._selectedProgram = null updateChannelDuration() } + scope.dropFunction = (dropIndex, index, program) => { + if (scope.channel.programs[index].start == program.start) { + return false; + } + + setTimeout( () => { + scope.channel.programs.splice(dropIndex + index, 0, program); + updateChannelDuration() + }, 1); + return true; + } scope.updateChannelFromOfflineResult = (program) => { scope.channel.offlineMode = program.channelOfflineMode; scope.channel.offlinePicture = program.channelPicture; @@ -170,6 +182,9 @@ module.exports = function ($timeout, $location) { scope.channel.programs = newProgs.concat(movies) updateChannelDuration() } + scope.dateForGuide = (date) => { + return date.toLocaleString(); + } scope.sortByDate = () => { scope.removeOffline(); scope.channel.programs.sort( (a,b) => { @@ -474,7 +489,7 @@ module.exports = function ($timeout, $location) { scope.wipeSchedule = () => { - wipeSchedule(scope.channel.programs); + scope.channel.programs = []; updateChannelDuration(); } scope.makeOfflineFromChannel = (duration) => { @@ -520,10 +535,6 @@ module.exports = function ($timeout, $location) { } return array } - function wipeSchedule(array) { - array.splice(0, array.length) - return array; - } function equalizeShows(array, freqObject) { let shows = {}; let progs = []; @@ -702,6 +713,7 @@ module.exports = function ($timeout, $location) { updateChannelDuration() } scope.paddingOptions = [ + { id: -1, description: "Allowed start times", allow5: false }, { id: 30, description: ":00, :30", allow5: false }, { id: 15, description: ":00, :15, :30, :45", allow5: false }, { id: 60, description: ":00", allow5: false }, @@ -712,6 +724,7 @@ module.exports = function ($timeout, $location) { { id: 30, description: ":00, :05, :30, :35", allow5: true }, ] + scope.paddingOption = scope.paddingOptions[0]; scope.breakAfterOptions = [ { id: -1, description: "After" }, { id: 5, description: "5 minutes" }, diff --git a/web/public/templates/channel-config.html b/web/public/templates/channel-config.html index ea99578..fc66297 100644 --- a/web/public/templates/channel-config.html +++ b/web/public/templates/channel-config.html @@ -216,7 +216,7 @@ ng-options="o as o.description for o in paddingOptions" /> - + @@ -248,11 +248,27 @@ -
-
  • +
    +
    +
    Showing programs {{minProgramIndex+1}} to {{minProgramIndex+100}}
    +
    + +
    -
    {{x.start.toLocaleString()}}
    -
    {{x.stop.toLocaleString()}}
    +
    {{ dateForGuide(channel.startTime) }}
    +
    {{ dateForGuide(channel.programs[minProgramIndex-1].stop)}}
    +
    + +
    + ⋮ +
    +
    +
    +
    +
    +
    {{ dateForGuide(x.start) }}
    +
    {{ dateForGuide(x.stop) }}
    {{x.isOffline? channel.fillerContent.length: x.commercials.length}} @@ -264,7 +280,28 @@ Flex
    -
    • +
    + +
    +
    +
    {{ dateForGuide(channel.programs[minProgramIndex + 100 - 1].stop)}}
    +
    {{ dateForGuide(channel.programs[channel.programs.length-1].stop) }}
    +
    + +
    + ⋮ +
    +
    +
    +
    +
    {{ dateForGuide(channel.programs[channel.programs.length-1].stop)}}
    +
    + +
    + (Restart programming from beginning) +
    +
    + From 97b8fd73e1ca95bf8c671ae034636691bb8b5310 Mon Sep 17 00:00:00 2001 From: vexorian Date: Tue, 4 Aug 2020 22:47:28 -0400 Subject: [PATCH 4/8] Fork 0.0.57 --- README.md | 2 +- src/constants.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2edd1af..8e116f8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# pseudotv 0.0.56-unofficial-vx +# pseudotv 0.0.57-unofficial-vx Create live TV channel streams from media on your Plex servers. diff --git a/src/constants.js b/src/constants.js index 2b24c61..dda3099 100644 --- a/src/constants.js +++ b/src/constants.js @@ -2,5 +2,5 @@ module.exports = { SLACK: 9999, TVGUIDE_MAXIMUM_PADDING_LENGTH_MS: 30*60*1000, - VERSION_NAME: "0.0.56-unofficial-vx" + VERSION_NAME: "0.0.57-unofficial-vx" } From 20934d05d3e7f731eb8e96f07106cb8884379081 Mon Sep 17 00:00:00 2001 From: vexorian Date: Sun, 9 Aug 2020 15:18:23 -0400 Subject: [PATCH 5/8] Fork version 0.0.58 --- README.md | 2 +- src/constants.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8e116f8..970c392 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# pseudotv 0.0.57-unofficial-vx +# pseudotv 0.0.58-vx Create live TV channel streams from media on your Plex servers. diff --git a/src/constants.js b/src/constants.js index dda3099..e7895b2 100644 --- a/src/constants.js +++ b/src/constants.js @@ -2,5 +2,5 @@ module.exports = { SLACK: 9999, TVGUIDE_MAXIMUM_PADDING_LENGTH_MS: 30*60*1000, - VERSION_NAME: "0.0.57-unofficial-vx" + VERSION_NAME: "0.0.58-vx" } From 000928024c5a4464da068a3dbdc2527a2f4a4949 Mon Sep 17 00:00:00 2001 From: vexorian Date: Sun, 9 Aug 2020 23:39:33 -0400 Subject: [PATCH 6/8] Fork Version 0.0.59 --- README.md | 2 +- src/constants.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 66da4d5..78570c6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# pseudotv 0.0.58-vx +# pseudotv 0.0.59-vx ![Discord](https://img.shields.io/discord/711313431457693727?logo=discord&logoColor=fff&style=flat-square) ![GitHub top language](https://img.shields.io/github/languages/top/DEFENDORe/pseudotv?logo=github&style=flat-square) ![Docker Pulls](https://img.shields.io/docker/pulls/defendore/pseudotv?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 e7895b2..5604b16 100644 --- a/src/constants.js +++ b/src/constants.js @@ -2,5 +2,5 @@ module.exports = { SLACK: 9999, TVGUIDE_MAXIMUM_PADDING_LENGTH_MS: 30*60*1000, - VERSION_NAME: "0.0.58-vx" + VERSION_NAME: "0.0.59-vx" } From 4f9bbba5e5e4a17a504c399493ffd47dd7175a02 Mon Sep 17 00:00:00 2001 From: vexorian Date: Mon, 10 Aug 2020 00:34:26 -0400 Subject: [PATCH 7/8] 0.0.60-vx . Dependabot is a bad bot. --- README.md | 2 +- src/constants.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 78570c6..927982f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# pseudotv 0.0.59-vx +# pseudotv 0.0.60-vx ![Discord](https://img.shields.io/discord/711313431457693727?logo=discord&logoColor=fff&style=flat-square) ![GitHub top language](https://img.shields.io/github/languages/top/DEFENDORe/pseudotv?logo=github&style=flat-square) ![Docker Pulls](https://img.shields.io/docker/pulls/defendore/pseudotv?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 5604b16..a60a7ab 100644 --- a/src/constants.js +++ b/src/constants.js @@ -2,5 +2,5 @@ module.exports = { SLACK: 9999, TVGUIDE_MAXIMUM_PADDING_LENGTH_MS: 30*60*1000, - VERSION_NAME: "0.0.59-vx" + VERSION_NAME: "0.0.60-vx" } From e72d0bf160fe9678578e779aa2fc43e45968dc09 Mon Sep 17 00:00:00 2001 From: vexorian Date: Tue, 11 Aug 2020 21:07:03 -0400 Subject: [PATCH 8/8] Bump version 0.0.60 --- README.md | 2 +- src/constants.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3260a9f..dbd87be 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# dizqueTV 0.0.60-vx +# dizqueTV 0.0.60 ![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 a60a7ab..817c712 100644 --- a/src/constants.js +++ b/src/constants.js @@ -2,5 +2,5 @@ module.exports = { SLACK: 9999, TVGUIDE_MAXIMUM_PADDING_LENGTH_MS: 30*60*1000, - VERSION_NAME: "0.0.60-vx" + VERSION_NAME: "0.0.60" }