mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

timeOut added for ComicVineClient

Browse Source
This commit is contained in:
Luis Ángel San Martín 2013-10-24 19:06:02 +02:00
parent 952a191170
commit 3d48eeb12d
4 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
YACReaderLibrary/comic_vine/comic_vine_client.cpp
View File

@ -71,17 +71,12 @@ void ComicVineClient::processVolumeComicsInfo(const QByteArray &data)
emit finished(); emit finished();
} }
void ComicVineClient::queryTimeOut()
{
}
//CV_SERIES_DETAIL //CV_SERIES_DETAIL
void ComicVineClient::getSeriesDetail(const QString & id) void ComicVineClient::getSeriesDetail(const QString & id)
{ {
HttpWorker * search = new HttpWorker(CV_SERIES_DETAIL.arg(id)); HttpWorker * search = new HttpWorker(CV_SERIES_DETAIL.arg(id));
connect(search,SIGNAL(dataReady(const QByteArray &)),this,SLOT(proccessSeriesDetailData(const QByteArray &))); connect(search,SIGNAL(dataReady(const QByteArray &)),this,SLOT(proccessSeriesDetailData(const QByteArray &)));
connect(search,SIGNAL(timeout()),this,SLOT(queryTimeOut())); connect(search,SIGNAL(timeout()),this,SIGNAL(timeOut()));
connect(search,SIGNAL(finished()),search,SLOT(deleteLater())); connect(search,SIGNAL(finished()),search,SLOT(deleteLater()));
search->get(); search->get();
} }
@ -90,7 +85,7 @@ void ComicVineClient::getSeriesCover(const QString & url)
{ {
HttpWorker * search = new HttpWorker(url); HttpWorker * search = new HttpWorker(url);
connect(search,SIGNAL(dataReady(const QByteArray &)),this,SIGNAL(seriesCover(const QByteArray &))); connect(search,SIGNAL(dataReady(const QByteArray &)),this,SIGNAL(seriesCover(const QByteArray &)));
connect(search,SIGNAL(timeout()),this,SLOT(queryTimeOut())); //TODO connect(search,SIGNAL(timeout()),this,SIGNAL(timeOut())); //TODO
connect(search,SIGNAL(finished()),search,SLOT(deleteLater())); connect(search,SIGNAL(finished()),search,SLOT(deleteLater()));
search->get(); search->get();
} }
@ -100,7 +95,7 @@ void ComicVineClient::getVolumeComicsInfo(const QString & idVolume)
{ {
HttpWorker * search = new HttpWorker(CV_COMICS_INFO.arg(idVolume)); HttpWorker * search = new HttpWorker(CV_COMICS_INFO.arg(idVolume));
connect(search,SIGNAL(dataReady(const QByteArray &)),this,SLOT(processVolumeComicsInfo(const QByteArray &))); connect(search,SIGNAL(dataReady(const QByteArray &)),this,SLOT(processVolumeComicsInfo(const QByteArray &)));
connect(search,SIGNAL(timeout()),this,SLOT(queryTimeOut())); //TODO connect(search,SIGNAL(timeout()),this,SIGNAL(timeOut())); //TODO
connect(search,SIGNAL(finished()),search,SLOT(deleteLater())); connect(search,SIGNAL(finished()),search,SLOT(deleteLater()));
search->get(); search->get();
} }

4
YACReaderLibrary/comic_vine/comic_vine_client.h
View File

@ -16,7 +16,7 @@ signals:
void seriesDetail(QString);//JSON void seriesDetail(QString);//JSON
void seriesCover(const QByteArray &); void seriesCover(const QByteArray &);
void volumeComicsInfo(QString); void volumeComicsInfo(QString);
void timeOut();
void finished(); void finished();
public slots: public slots:
void search(const QString & query, int page = 0); void search(const QString & query, int page = 0);
@ -32,7 +32,5 @@ protected slots:
void proccessSeriesDetailData(const QByteArray & data); void proccessSeriesDetailData(const QByteArray & data);
void processVolumeComicsInfo(const QByteArray & data); void processVolumeComicsInfo(const QByteArray & data);
void queryTimeOut();
}; };
#endif // COMIC_VINE_CLIENT_H #endif // COMIC_VINE_CLIENT_H

21
YACReaderLibrary/comic_vine/comic_vine_dialog.cpp
View File

@ -133,6 +133,7 @@ void ComicVineDialog::goNext()
ComicVineClient * comicVineClient = new ComicVineClient; ComicVineClient * comicVineClient = new ComicVineClient;
connect(comicVineClient,SIGNAL(volumeComicsInfo(QString)),this,SLOT(showSortVolumeComics(QString))); connect(comicVineClient,SIGNAL(volumeComicsInfo(QString)),this,SLOT(showSortVolumeComics(QString)));
connect(comicVineClient,SIGNAL(timeOut()),this,SLOT(queryTimeOut()));
connect(comicVineClient,SIGNAL(finished()),comicVineClient,SLOT(deleteLater())); connect(comicVineClient,SIGNAL(finished()),comicVineClient,SLOT(deleteLater()));
comicVineClient->getVolumeComicsInfo(selectVolumeWidget->getSelectedVolumeId()); comicVineClient->getVolumeComicsInfo(selectVolumeWidget->getSelectedVolumeId());
} }
@ -307,6 +308,25 @@ void ComicVineDialog::showSortVolumeComics(const QString &json)
closeButton->setVisible(true); closeButton->setVisible(true);
} }
void ComicVineDialog::queryTimeOut()
{
QMessageBox::warning(this,"Comic Vine error", "Time out connecting to Comic Vine");
switch (status) {
case SelectingSeries:
if(mode == Volume)
showSearchVolume();
else
showSearchSingleComic();
break;
case SortingComics:
showSelectVolume();
break;
default:
break;
}
}
void ComicVineDialog::showLoading() void ComicVineDialog::showLoading()
{ {
content->setCurrentIndex(0); content->setCurrentIndex(0);
@ -333,6 +353,7 @@ void ComicVineDialog::searchVolume(const QString &v)
{ {
ComicVineClient * comicVineClient = new ComicVineClient; ComicVineClient * comicVineClient = new ComicVineClient;
connect(comicVineClient,SIGNAL(searchResult(QString)),this,SLOT(debugClientResults(QString))); connect(comicVineClient,SIGNAL(searchResult(QString)),this,SLOT(debugClientResults(QString)));
connect(comicVineClient,SIGNAL(timeOut()),this,SLOT(queryTimeOut()));
connect(comicVineClient,SIGNAL(finished()),comicVineClient,SLOT(deleteLater())); connect(comicVineClient,SIGNAL(finished()),comicVineClient,SLOT(deleteLater()));
comicVineClient->search(v); comicVineClient->search(v);

1
YACReaderLibrary/comic_vine/comic_vine_dialog.h
View File

@ -50,6 +50,7 @@ protected slots:
void showSelectVolume(); void showSelectVolume();
void showSelectComic(const QString & json); void showSelectComic(const QString & json);
void showSortVolumeComics(const QString & json); void showSortVolumeComics(const QString & json);
void queryTimeOut();
private: private:
enum ScraperMode enum ScraperMode