8000 fix: playlist allocates inaccurate time to smartblocks by rjhelms · Pull Request #3026 · libretime/libretime · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: playlist allocates inaccurate time to smartblocks #3026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Jun 5, 2024
Merged

fix: playlist allocates inaccurate time to smartblocks #3026

merged 2 commits into from
Jun 5, 2024

Conversation

rjhelms
Copy link
Contributor
@rjhelms rjhelms commented Jun 5, 2024

Description

In the existing logic of retrieveMediaFiles, the time remaining in show is calculated incorrectly in some scenarios. Each time a duration is subtracted from showLimit, it is not the duration of the files just added, but instead the length of all files scheduled. This can cause cases where a smart block set to "time remaining in show" fails to completely fill the program.

For example, given a 30 minute show, and a playlist like follows:

  1. a 5 minute track
  2. another 5 minute track
  3. smart block, set to time remaining in show

When item 1 is added, showLimit is reduced by 5 minutes as expected. When item 2 is added, showLimit is reduced by 10 minutes (as both items 1 and 2 are counted). As a result, the smart block is only run to fill 15 minutes, leaving 5 minutes unfilled.

This PR resolves this issue, by recalculating showLimit from the original duration rather than subtracting from a running total.

This change not does implement a new feature and should not require any changes to documentation.

Testing Notes

What I did:

  • On a dev environment, set up a playlist as described above.
  • Before applying this PR, created a show and scheduled playlist, and confirmed issue was reproducible
  • Applied PR and repeated, and confirmed show was filled completely.

Also repeated this testing with sample data from our production instance.

Here is a sample schedule of the "before" case with sample data, showing the issue
image
The smartblock that scheduled the music is set to allow last track to overflow, but 3m55s was left unscheduled.

Using the same playlist and same track library, here is a sample schedule after the PR applied:
image
As expected, the show is fully scheduled with the last track overflowing.

Additionally, I've applied this PR as a hot fix to our production instance, where it has been running for a week without issue.

Also performed spot tests of playlists without smart blocks, smart blocks scheduled directly (not in playlists) and autoloading playlists, with no change in behaviour observed as a result of this change.

How you can replicate my testing:

Same test steps as I followed should be able to reproduce issue & validate fix on any instance.

Links

Not directly related to issue fixed by #3019, but also addresses the issue of dead air left at end of blocks.

@rjhelms
Copy link
Contributor Author
rjhelms commented Jun 5, 2024

I don't believe this check failure is a result of my changes - please let me know if anything further is required!

@paddatrapper
Copy link
Contributor

It's not related - I'm about to merge the fix in #3027

@paddatrapper paddatrapper merged commit 2b43e51 into libretime:main Jun 5, 2024
14 checks passed
@libretime-bot libretime-bot mentioned this pull request Jun 5, 2024
Merged
@rjhelms rjhelms deleted the block_sched_fix branch June 11, 2024 05:14
jooola pushed a commit that referenced this pull request Jun 22, 2024
@libretime-bot
chore(main): release 4.2.0 (#3028)
60db15e 
🤖 I have created a release *beep* *boop*
---


## [4.2.0](4.1.0...4.2.0)
(2024-06-22)


### Features

* **legacy:** add current date macro to string block criteria
([#3013](#3013))
([451652b](451652b))
* **legacy:** add filename block criteria
([#3015](#3015))
([4642b6c](4642b6c))


### Bug Fixes

* pin pip version to <24.1 to allow installing pytz (celery)
([#3043](#3043))
([646bc81](646bc81))
* playlist allocates inaccurate time to smartblocks
([#3026](#3026))
([2b43e51](2b43e51))


### Performance Improvements

* optimize the api image health check
([#3038](#3038))
([d99d6e1](d99d6e1))
* optimize the rabbitmq health check
([#3037](#3037))
([9684214](9684214))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paddatrapper paddatrapper paddatrapper approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rjhelms @paddatrapper
0