hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 19:24:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Refactor resource downloading

Browse source
This commit is contained in:
Abs62 2017-04-27 23:55:53 +03:00
parent 67b6b6b91c
commit 747dc0aaaf
3 changed files with 93 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
articleview.cc
View file

@ -1165,6 +1165,7 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref,
activeDicts = &allDictionaries;
if ( activeDicts )
{
for( unsigned x = 0; x < activeDicts->size(); ++x )
{
try
@ -1173,24 +1174,10 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref,
(*activeDicts)[ x ]->getResource(
url.path().mid( 1 ).toUtf8().data() );
if ( req->isFinished() && req->dataSize() >= 0 )
{
// A request was instantly finished with success.
// If we've managed to spawn some lingering requests already,
// erase them.
resourceDownloadRequests.clear();
// Handle the result
resourceDownloadRequests.push_back( req );
resourceDownloadFinished();
return;
}
else
if ( !req->isFinished() )
{
resourceDownloadRequests.push_back( req );
connect( req.get(), SIGNAL( finished() ),
this, SLOT( resourceDownloadFinished() ) );
}
@ -1203,6 +1190,7 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref,
}
}
}
}
else
{
// Normal resource download
@ -1314,14 +1302,14 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref,
}
}
vector< ResourceToSaveHandler * > ArticleView::saveResource( const QUrl & url, const QString & fileName )
ResourceToSaveHandler * ArticleView::saveResource( const QUrl & url, const QString & fileName )
{
return saveResource( url, ui.definition->url(), fileName );
}
vector< ResourceToSaveHandler * > ArticleView::saveResource( const QUrl & url, const QUrl & ref, const QString & fileName )
ResourceToSaveHandler * ArticleView::saveResource( const QUrl & url, const QUrl & ref, const QString & fileName )
{
vector< ResourceToSaveHandler * > handlers;
ResourceToSaveHandler * handler = new ResourceToSaveHandler( this, fileName );
sptr< Dictionary::DataRequest > req;
if( url.scheme() == "bres" || url.scheme() == "gico" || url.scheme() == "gdau" || url.scheme() == "gdvideo" )
@ -1357,14 +1345,7 @@ vector< ResourceToSaveHandler * > ArticleView::saveResource( const QUrl & url, c
req = (*activeDicts)[ x ]->getResource(
Qt4x5::Url::path( url ).mid( 1 ).toUtf8().data() );
ResourceToSaveHandler * handler = new ResourceToSaveHandler( this, req, fileName, true );
handlers.push_back( handler );
if( req.get()->isFinished() && req.get()->dataSize() > 0 )
{
// A request was instantly finished with success. Stop search.
return handlers;
}
handler->addRequest( req );
}
catch( std::exception & e )
{
@ -1382,8 +1363,7 @@ vector< ResourceToSaveHandler * > ArticleView::saveResource( const QUrl & url, c
if( req.get() )
{
ResourceToSaveHandler * handler = new ResourceToSaveHandler( this, req, fileName );
handlers.push_back( handler );
handler->addRequest( req );
}
}
}
@ -1391,18 +1371,20 @@ vector< ResourceToSaveHandler * > ArticleView::saveResource( const QUrl & url, c
{
req = new Dictionary::WebMultimediaDownload( url, articleNetMgr );
ResourceToSaveHandler * handler = new ResourceToSaveHandler( this, req, fileName );
handlers.push_back( handler );
handler->addRequest( req );
}
if ( handlers.empty() ) // No requests were queued
if ( handler->isEmpty() ) // No requests were queued
{
emit statusBarMessage(
tr( "ERROR: %1" ).arg( tr( "The referenced resource doesn't exist." ) ),
10000, QPixmap( ":/icons/error.png" ) );
}
return handlers;
// Check already finished downloads
handler->downloadFinished();
return handler;
}
void ArticleView::updateMutedContents()
@ -1927,8 +1909,8 @@ void ArticleView::resourceDownloadFinished()
resourceDownloadRequests.erase( i++ );
}
}
else // Unfinished, try the next one.
i++;
else // Unfinished, wait.
break;
}
if ( resourceDownloadRequests.empty() )
@ -2747,43 +2729,46 @@ QString ArticleView::wordAtPoint( int x, int y )
#endif
ResourceToSaveHandler::ResourceToSaveHandler(
ArticleView * view, sptr< Dictionary::DataRequest > req,
QString const & fileName, bool search ) :
ResourceToSaveHandler::ResourceToSaveHandler(ArticleView * view, QString const & fileName ) :
QObject( view ),
req( req ),
fileName( fileName ),
search_req( search )
alreadyDone( false )
{
connect( this, SIGNAL( statusBarMessage( QString, int, QPixmap ) ),
view, SIGNAL( statusBarMessage( QString, int, QPixmap ) ) );
}
// If DataRequest finsihed immediately, call our handler directly
if ( req.get()->isFinished() )
void ResourceToSaveHandler::addRequest( sptr<Dictionary::DataRequest> req )
{
if( !alreadyDone )
{
QMetaObject::invokeMethod( this, "downloadFinished", Qt::QueuedConnection );
}
else
{
connect( req.get(), SIGNAL( finished() ), this, SLOT( downloadFinished() ) );
downloadRequests.push_back( req );
connect( req.get(), SIGNAL( finished() ),
this, SLOT( downloadFinished() ) );
}
}
void ResourceToSaveHandler::downloadFinished()
{
assert( req && req.get()->isFinished() );
if ( downloadRequests.empty() )
return; // Stray signal
QByteArray resourceData;
if ( req.get()->dataSize() >= 0 )
// Find any finished resources
for( list< sptr< Dictionary::DataRequest > >::iterator i =
downloadRequests.begin(); i != downloadRequests.end(); )
{
vector< char > const & data = req.get()->getFullData();
if ( (*i)->isFinished() )
{
if ( (*i)->dataSize() >= 0 && !alreadyDone )
{
QByteArray resourceData;
vector< char > const & data = (*i)->getFullData();
resourceData = QByteArray( data.data(), data.size() );
}
// Write data to file
if ( !resourceData.isEmpty() && !fileName.isEmpty() )
if ( !fileName.isEmpty() )
{
QFileInfo fileInfo( fileName );
QDir().mkpath( fileInfo.absoluteDir().absolutePath() );
@ -2802,16 +2787,32 @@ void ResourceToSaveHandler::downloadFinished()
10000, QPixmap( ":/icons/error.png" ) );
}
}
alreadyDone = true;
// Clear other requests
downloadRequests.clear();
break;
}
else
{
if( !search_req )
{
emit statusBarMessage(
tr( "ERROR: %1" ).arg( tr( "The referenced resource failed to download." ) ),
10000, QPixmap( ":/icons/error.png" ) );
// This one had no data. Erase it.
downloadRequests.erase( i++ );
}
}
else // Unfinished, wait.
break;
}
if ( downloadRequests.empty() )
{
if( !alreadyDone )
{
emit statusBarMessage(
tr( "WARNING: %1" ).arg( tr( "The referenced resource failed to download." ) ),
10000, QPixmap( ":/icons/error.png" ) );
}
emit done();
deleteLater();
}
}

16
articleview.hh
View file

@ -177,8 +177,8 @@ public:
/// Returns the dictionary id of the currently active article in the view.
QString getActiveArticleId();
std::vector< ResourceToSaveHandler * > saveResource( const QUrl & url, const QString & fileName );
std::vector< ResourceToSaveHandler * > saveResource( const QUrl & url, const QUrl & ref, const QString & fileName );
ResourceToSaveHandler * saveResource( const QUrl & url, const QString & fileName );
ResourceToSaveHandler * saveResource( const QUrl & url, const QUrl & ref, const QString & fileName );
signals:
@ -365,20 +365,22 @@ class ResourceToSaveHandler: public QObject
Q_OBJECT
public:
explicit ResourceToSaveHandler( ArticleView * view, sptr< Dictionary::DataRequest > req,
QString const & fileName, bool search = false );
explicit ResourceToSaveHandler( ArticleView * view, QString const & fileName );
void addRequest( sptr< Dictionary::DataRequest > req );
bool isEmpty()
{ return downloadRequests.empty(); }
signals:
void done();
void statusBarMessage( QString const & message, int timeout = 0, QPixmap const & pixmap = QPixmap() );
private slots:
public slots:
void downloadFinished();
private:
sptr< Dictionary::DataRequest > req;
std::list< sptr< Dictionary::DataRequest > > downloadRequests;
QString fileName;
bool search_req;
bool alreadyDone;
};
#endif

10
mainwindow.cc
View file

@ -3362,13 +3362,11 @@ void MainWindow::on_saveArticle_triggered()
for ( vector< pair< QUrl, QString > >::const_iterator i = downloadResources.begin();
i != downloadResources.end(); i++ )
{
vector< ResourceToSaveHandler * > handlerss = view->saveResource( i->first, i->second );
maxVal += handlerss.size();
for ( vector< ResourceToSaveHandler * >::iterator j = handlerss.begin();
j != handlerss.end(); j++ )
ResourceToSaveHandler * handler = view->saveResource( i->first, i->second );
if( !handler->isEmpty() )
{
connect( *j, SIGNAL( done() ), progressDialog, SLOT( perform() ) );
maxVal += 1;
connect( handler, SIGNAL( done() ), progressDialog, SLOT( perform() ) );
}
}