Fix import URL eating tons of memory on large file downloads #5826
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
|
🎉 Ta-daaa, freshly created APKs are available for 4f4fc96: arm64-android |
m-kuhn
reviewed
Nov 17, 2024
|
good move |
suricactus
approved these changes
Nov 17, 2024
nirvn
force-pushed
the
import_url_bigfile_fix
branch
from
558b678
to
955a9a4
Compare
nirvn
force-pushed
the
import_url_bigfile_fix
branch
from
1d2113d
to
4f4fc96
Compare
m-kuhn
reviewed
Nov 18, 2024
| @@ -286,15 +296,18 @@ void AppInterface::importUrl( const QString &url ) | |||
|
|
|||
| QNetworkReply *reply = manager->get( request ); | |||
| connect( reply, &QNetworkReply::downloadProgress, this, [=]( int bytesReceived, int bytesTotal ) { | |||
| temporaryFile->write( reply->readAll() ); | |||
| if ( bytesTotal != 0 ) | |||
| { | |||
| emit importProgress( static_cast<double>( bytesReceived ) / bytesTotal ); | |||
| } | |||
| } ); | |||
|
|
|||
| connect( reply, &QNetworkReply::finished, this, [=]() { | |||
There was a problem hiding this comment.
Suggested change
| connect( reply, &QNetworkReply::finished, this, [=]() { | |
| std::unique_ptr<QTemporaryFile> temporaryFile = std::make_unique<QTemporaryFile>(); | |
| connect( reply, &QNetworkReply::finished, tmpFile = std::move( temporaryFile ), this, [=]() { |
I don't see it bringing many real advantages, but it would be a tiny bit cleaner ... does that work?
There was a problem hiding this comment.
That would scope out at the end of the importUrl function and kill the object no?
There was a problem hiding this comment.
There can only be one unique_ptr wich is moved into the lambda.
The lambda lifetime is bound to the connection.
The connection lifetime is bound to the lifetime of reply and this.
But I admit my understanding of this is not 100% water proof.
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.
This PR introduces the use of a temporary file to progressively save data as a file is being downloaded during the import URL process.
This should prevent QField from crashed caused by running out of memory when downloading large files in this process.