Fix intermediate 100% download progress reports caused by redirects

nyalldawson · nyalldawson · commit c1b6e8f5ba44 · 2018-04-06T14:19:09.000+10:00
(cherry-picked from 149ccf2)
diff --git a/src/core/qgsnetworkcontentfetchertask.cpp b/src/core/qgsnetworkcontentfetchertask.cpp
@@ -45,11 +45,16 @@ bool QgsNetworkContentFetcherTask::run()
   {
     if ( bytesTotal > 0 )
     {
-      setProgress( ( bytesReceived * 100 ) / bytesTotal );
+      int progress = ( bytesReceived * 100 ) / bytesTotal;
+      // don't emit 100% progress reports until completely fetched - otherwise we get
+      // intermediate 100% reports from redirects
+      if ( progress < 100 )
+        setProgress( progress );
     }
   } );
   mFetcher->fetchContent( mRequest );
   loop.exec();
+  setProgress( 100 );
   emit fetched();
   return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,16 @@ bool QgsNetworkContentFetcherTask::run()`
`45`	`45`	`{`
`46`	`46`	`if ( bytesTotal > 0 )`
`47`	`47`	`{`
`48`		`- setProgress( ( bytesReceived * 100 ) / bytesTotal );`
	`48`	`+ int progress = ( bytesReceived * 100 ) / bytesTotal;`
	`49`	`+ // don't emit 100% progress reports until completely fetched - otherwise we get`
	`50`	`+ // intermediate 100% reports from redirects`
	`51`	`+ if ( progress < 100 )`
	`52`	`+ setProgress( progress );`
`49`	`53`	`}`
`50`	`54`	`} );`
`51`	`55`	`mFetcher->fetchContent( mRequest );`
`52`	`56`	`loop.exec();`
	`57`	`+ setProgress( 100 );`
`53`	`58`	`emit fetched();`
`54`	`59`	`return true;`
`55`	`60`	`}`