better handling of preview generation errors #4620
Merged
+26
−6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@icewind1991, thanks for your PR! By analyzing the history of the files in this pull request, we identified @butonic, @rullzer and @tanghus to be potential reviewers. |
|
Makes sense but I could not verify that it failed before. I took a document and renamed it to .png and triggered the occ preview:generate-all - before and after there is no error. |
|
You need an actual corrupted image, not just a wrongly named one |
Do you have one? |
Codecov Report
@@ Coverage Diff @@
## master #4620 +/- ##
=============================================
- Coverage 54.28% 31.34% -22.94%
- Complexity 22086 22090 +4
=============================================
Files 1360 1360
Lines 84659 84063 -596
Branches 1325 1325
=============================================
- Hits 45958 26352 -19606
- Misses 38701 57711 +19010
|
|
I also added some error handling for the other endpoints that uses that method. |
MorrisJobke
approved these changes
May 1, 2017
rullzer
requested changes
May 2, 2017
lib/private/Preview/Generator.php
Outdated
| @@ -325,6 +327,10 @@ private function generatePreview(ISimpleFolder $previewFolder, ISimpleFile $maxP | |||
| $preview->resize(max($width, $height)); | |||
| } | |||
|
|
|||
| if (!$preview->valid()) { | |||
There was a problem hiding this comment.
Shouldn't this be moved up? Like right after the getImage call?
Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Morris Jobke <[email protected]>
Signed-off-by: Morris Jobke <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
icewind1991
force-pushed
the
preview-error-handling
branch
from
bfb8588 to
2847e9f
Compare
rullzer
approved these changes
May 2, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Prevents failing hard when working with corrupted images