Set resource total size to content size when using a qrc:// resource #1068
Conversation
This file contains hidden or 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
When a Resource is requested from qrc://, the Resource::handleDownloadProgress event is never called, and therefore _bytesTotal remains at zero. This confuses ResourceCache later, which has a sanity check that doesn't pass when resources are retrieved, yet no data accumulates. Fixes vircadia#1065
daleglass
commented
Feb 26, 2021
| @@ -809,6 +807,14 @@ void Resource::handleReplyFinished() { | |||
| } | |||
|
|
|||
| auto data = _request->getData(); | |||
| if (_request->getUrl().scheme() == "qrc") { | |||
There was a problem hiding this comment.
I'm not entirely sure if this check is necessary. It may be perfectly safe to do it always
daleglass
commented
Feb 26, 2021
| _bytesTotal = data.length(); | ||
| } | ||
|
|
||
| setSize(_bytesTotal); |
There was a problem hiding this comment.
Note we're not calling setSize in the case of failure anymore.
I think this should be fine since on failure no data arrives, and this can cause confusion in ResourceCache.
|
The following links are available: build (ubuntu-18.04, full)
build (windows-latest, full) build (ubuntu-18.04, android) |
daleglass
added
bugfix
needs CR (code review)
needs testing (QA)
ctrlaltdavid
added
CR Approved
|
What might be a good way to test this to confirm it works? |
ctrlaltdavid
approved these changes
Mar 11, 2021
digisomni
approved these changes
Mar 11, 2021
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.
When a Resource is requested from qrc://, the Resource::handleDownloadProgress
event is never called, and therefore _bytesTotal remains at zero. This confuses
ResourceCache later, which has a sanity check that doesn't pass when resources
are retrieved, yet no data accumulates.
Fixes #1065