Skip to content

Use findBinaryPath for previews - #26531

Merged
skjnldsv merged 1 commit into
nextcloud:masterfrom
J0WI:refactor-preview-exec
Oct 25, 2021
Merged

Use findBinaryPath for previews#26531
skjnldsv merged 1 commit into
nextcloud:masterfrom
J0WI:refactor-preview-exec

Conversation

@J0WI

@J0WIJ0WI commented Apr 12, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor

findBinaryPath uses cache:

server/lib/private/legacy/OC_Helper.php

Lines 460 to 464 in 4be2e16

publicstaticfunctionfindBinaryPath($program) {
$memcache = \OC::$server->getMemCacheFactory()->createDistributed('findBinaryPath');
if ($memcache->hasKey($program)) {
return$memcache->get($program);
}

I think avconv can be removed completely in near future, the fork is no longer maintained: https://lists.libav.org/pipermail/libav-devel/2020-April/086589.html

@J0WIJ0WI changed the title Refactor preview binary execution to use findBinaryPathUse findBinaryPath for previewsApr 12, 2021
@J0WI
J0WIforce-pushed the refactor-preview-exec branch 5 times, most recently from d88f879 to fd7b742CompareApril 13, 2021 00:33
@J0WI
J0WI marked this pull request as ready for review April 20, 2021 13:10
@J0WIJ0WI added the 3. to review Waiting for reviews label Apr 20, 2021
@szaimenszaimen added this to the Nextcloud 23 milestone Jun 18, 2021
@kesselb

kesselb commented Jul 6, 2021

Copy link
Copy Markdown
Contributor

Fine by me to remove avconv right away.

nickvergessen
nickvergessen reviewed Jul 7, 2021
View reviewed changes
Comment threadlib/private/Preview/Movie.php Outdated
@J0WI
J0WIforce-pushed the refactor-preview-exec branch from fd7b742 to 58e97b1CompareJuly 18, 2021 22:27
@skjnldsvskjnldsv mentioned this pull request Oct 13, 2021
Merged
@skjnldsv

skjnldsv commented Oct 22, 2021

Copy link
Copy Markdown
Member

Please rebase :)

@J0WI
Use findBinaryPath for previews
047cab8
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
@J0WI
J0WIforce-pushed the refactor-preview-exec branch from 58e97b1 to 047cab8CompareOctober 23, 2021 21:16
@skjnldsv
skjnldsv merged commit 8ea91b4 into nextcloud:masterOct 25, 2021
@skjnldsvskjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 25, 2021
@skjnldsvskjnldsv mentioned this pull request Oct 25, 2021
Merged
25 tasks
@J0WI
J0WI deleted the refactor-preview-exec branch October 28, 2021 15:32
@mejo-mejo- mentioned this pull request Feb 1, 2022
Closed
mejo- added a commit that referenced this pull request Feb 2, 2022
@mejo-
Fix preview generation for office documents
702b5bc
`new \imagick` returns an object, but we need the image blob (binary
string) from this object.
This is a partial backport of #26531, which brings a lot of refactoring
but also contains the fix.
Fixes: #29956
Signed-off-by: Jonas Meurer <jonas@freesources.org>
mejo- added a commit that referenced this pull request Feb 2, 2022
@mejo-
Fix preview generation for office documents
0b0ea3d
`new \imagick` returns an object, but we need the image blob (binary
string) from this object.
This is a partial backport of #26531, which brings a lot of refactoring
but also contains the fix.
Fixes: #29956
Signed-off-by: Jonas Meurer <jonas@freesources.org>
mejo- added a commit that referenced this pull request Feb 2, 2022
@mejo-
Fix preview generation for office documents
418473b
`new \imagick()` returns an object, but we need the image blob (binary
string) from this object.
This is a partial backport of #26531, which brings a lot of refactoring
but also contains the fix.
Fixes: #29956
Signed-off-by: Jonas Meurer <jonas@freesources.org>
@mejo-mejo- mentioned this pull request Feb 2, 2022
Merged
@nickvergessennickvergessen mentioned this pull request Sep 20, 2022
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nickvergessennickvergessennickvergessen approved these changes
@skjnldsvskjnldsvskjnldsv approved these changes
@icewind1991icewind1991Awaiting requested review from icewind1991
@kesselbkesselbAwaiting requested review from kesselb
@blizzzblizzzAwaiting requested review from blizzz
@LukasReschkeLukasReschkeAwaiting requested review from LukasReschke

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Milestone

Nextcloud 23

Development

Successfully merging this pull request may close these issues.

5 participants

@J0WI@kesselb@skjnldsv@nickvergessen@szaimen