Skip to content
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.

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

fix 404 on blank.mp4 #1636

Merged
merged 1 commit into from May 24, 2023
Merged

fix 404 on blank.mp4 #1636

merged 1 commit into from May 24, 2023

Conversation

hamza221
Copy link
Contributor

@hamza221 hamza221 commented May 1, 2023

The blank.mp4 file is used to prevent MEDIA_ERR_SRC_NOT_SUPPORTED
The default value of blankVideo prop is cdn.plyr.io/static/blank.mp4. The previous value would result into 404 because /index.php/s/blank.mp4 doesn't exist, alternatively we can ship Nextcloud with a blank.mp4 file by default if we don't want to query an external cdn

image

@hamza221 hamza221 added bug Something isn't working 3. to review Waiting for reviews labels May 1, 2023
@nickvergessen
Copy link
Member

if we don't want to query an external cdn

We definetly don't want to do that.

@skjnldsv
Copy link
Member

skjnldsv commented May 2, 2023

I think we should decide to ship it, I'm fine with it.

@skjnldsv skjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels May 2, 2023
@hamza221 hamza221 added 3. to review Waiting for reviews and removed 2. developing Work in progress labels May 3, 2023
@nickvergessen
Copy link
Member

Conflicting files
js/viewer-main.js
js/viewer-main.js.map

@@ -84,6 +84,8 @@ export default {
options() {
return {
autoplay: this.active === true,
// Used to reset the video streams https://github.com/sampotts/plyr#javascript-1
blankVideo: '../img/blank.mp4',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do that even works?
Shouldn't it be a geenrateImgPath or something? 🤔

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imagePath is the function name

@skjnldsv skjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels May 4, 2023
@skjnldsv skjnldsv marked this pull request as draft May 11, 2023 07:09
@hamza221 hamza221 force-pushed the bug/blank.mp4 branch 2 times, most recently from 5f55350 to e30b34c Compare May 23, 2023 15:17
@hamza221 hamza221 marked this pull request as ready for review May 23, 2023 15:17
@hamza221 hamza221 added 3. to review Waiting for reviews and removed 2. developing Work in progress labels May 23, 2023
Signed-off-by: hamza221 <hamzamahjoubi221@gmail.com>
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels May 24, 2023
@skjnldsv
Copy link
Member

/backport to stable26

@skjnldsv
Copy link
Member

/backport to stable27

@backportbot-nextcloud backportbot-nextcloud bot added the backport-request Pending backport by the backport-bot label May 24, 2023
@skjnldsv
Copy link
Member

/backport to stable25

@skjnldsv skjnldsv added this to the Nextcloud 28 milestone May 24, 2023
@skjnldsv skjnldsv merged commit 06d74e3 into master May 24, 2023
27 checks passed
@skjnldsv skjnldsv deleted the bug/blank.mp4 branch May 24, 2023 05:17
@backportbot-nextcloud backportbot-nextcloud bot removed the backport-request Pending backport by the backport-bot label May 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants