From 08975089a49fe50bcef04621fe8e23444239c11f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Thu, 11 Feb 2016 20:12:39 +0100 Subject: [PATCH] fixed comic vine integration by using the new url, a new setting has been added so future binaries should be able to solve issues like this by setting the base url in the .ini file --- YACReaderLibrary/comic_vine/comic_vine_client.cpp | 13 +++++++------ YACReaderLibrary/comic_vine/comic_vine_client.h | 1 + common/yacreader_global_gui.h | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/YACReaderLibrary/comic_vine/comic_vine_client.cpp b/YACReaderLibrary/comic_vine/comic_vine_client.cpp index 409ec8c3..8c69c203 100644 --- a/YACReaderLibrary/comic_vine/comic_vine_client.cpp +++ b/YACReaderLibrary/comic_vine/comic_vine_client.cpp @@ -6,7 +6,7 @@ static const QString CV_API_KEY = "%CV_API_KEY%"; //get from settings static const QString CV_API_KEY_DEFAULT = "46680bebb358f1de690a5a365e15d325f9649f91"; -static const QString CV_WEB_ADDRESS = "http://www.comicvine.com/api"; +static const QString CV_WEB_ADDRESS = "%CV_WEB_ADDRESS%"; //get from settings //gets any volumen containing any comic matching 'query' static const QString CV_SEARCH = CV_WEB_ADDRESS + "/search/?api_key=" + CV_API_KEY + @@ -47,6 +47,7 @@ ComicVineClient::ComicVineClient(QObject *parent) : { settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); //TODO unificar la creación del fichero de config con el servidor settings->beginGroup("ComicVine"); + baseURL = settings->value(COMIC_VINE_BASE_URL, "http://comicvine.gamespot.com/api").toString(); } ComicVineClient::~ComicVineClient() @@ -57,7 +58,7 @@ ComicVineClient::~ComicVineClient() //CV_SEARCH void ComicVineClient::search(const QString & query, int page) { - HttpWorker * search = new HttpWorker(QString(CV_SEARCH).replace(CV_API_KEY,settings->value(COMIC_VINE_API_KEY,CV_API_KEY_DEFAULT).toString()).arg(query).arg(page)); + HttpWorker * search = new HttpWorker(QString(CV_SEARCH).replace(CV_WEB_ADDRESS, baseURL).replace(CV_API_KEY,settings->value(COMIC_VINE_API_KEY,CV_API_KEY_DEFAULT).toString()).arg(query).arg(page)); connect(search,SIGNAL(dataReady(const QByteArray &)),this,SLOT(proccessVolumesSearchData(const QByteArray &))); connect(search,SIGNAL(timeout()),this,SIGNAL(timeOut())); connect(search,SIGNAL(finished()),search,SLOT(deleteLater())); @@ -95,7 +96,7 @@ void ComicVineClient::proccessComicDetailData(const QByteArray &data) //CV_SERIES_DETAIL void ComicVineClient::getSeriesDetail(const QString & id) { - HttpWorker * search = new HttpWorker(QString(CV_SERIES_DETAIL).replace(CV_API_KEY,settings->value(COMIC_VINE_API_KEY,CV_API_KEY_DEFAULT).toString()).arg(id)); + HttpWorker * search = new HttpWorker(QString(CV_SERIES_DETAIL).replace(CV_WEB_ADDRESS, baseURL).replace(CV_API_KEY,settings->value(COMIC_VINE_API_KEY,CV_API_KEY_DEFAULT).toString()).arg(id)); connect(search,SIGNAL(dataReady(const QByteArray &)),this,SLOT(proccessSeriesDetailData(const QByteArray &))); connect(search,SIGNAL(timeout()),this,SIGNAL(timeOut())); connect(search,SIGNAL(finished()),search,SLOT(deleteLater())); @@ -114,7 +115,7 @@ void ComicVineClient::getSeriesCover(const QString & url) //CV_COMIC_IDS void ComicVineClient::getVolumeComicsInfo(const QString & idVolume, int page) { - HttpWorker * search = new HttpWorker(QString(CV_COMICS_INFO).replace(CV_API_KEY,settings->value(COMIC_VINE_API_KEY,CV_API_KEY_DEFAULT).toString()).arg(idVolume).arg((page-1)*100)); //page on works for search, using offset instead + HttpWorker * search = new HttpWorker(QString(CV_COMICS_INFO).replace(CV_WEB_ADDRESS, baseURL).replace(CV_API_KEY,settings->value(COMIC_VINE_API_KEY,CV_API_KEY_DEFAULT).toString()).arg(idVolume).arg((page-1)*100)); //page on works for search, using offset instead connect(search,SIGNAL(dataReady(const QByteArray &)),this,SLOT(processVolumeComicsInfo(const QByteArray &))); connect(search,SIGNAL(timeout()),this,SIGNAL(timeOut())); //TODO connect(search,SIGNAL(finished()),search,SLOT(deleteLater())); @@ -130,7 +131,7 @@ void ComicVineClient::getComicId(const QString & id, int comicNumber) //CV_COMIC_DETAIL QByteArray ComicVineClient::getComicDetail(const QString & id, bool & outError, bool & outTimeout) { - HttpWorker * search = new HttpWorker(QString(CV_COMIC_DETAIL).replace(CV_API_KEY,settings->value(COMIC_VINE_API_KEY,CV_API_KEY_DEFAULT).toString()).arg(id)); + HttpWorker * search = new HttpWorker(QString(CV_COMIC_DETAIL).replace(CV_WEB_ADDRESS, baseURL).replace(CV_API_KEY,settings->value(COMIC_VINE_API_KEY,CV_API_KEY_DEFAULT).toString()).arg(id)); //connect(search,SIGNAL(dataReady(const QByteArray &)),this,SLOT(proccessComicDetailData(const QByteArray &))); //connect(search,SIGNAL(timeout()),this,SIGNAL(timeOut())); @@ -148,7 +149,7 @@ QByteArray ComicVineClient::getComicDetail(const QString & id, bool & outError, //CV_COMIC_DETAIL void ComicVineClient::getComicDetailAsync(const QString & id) { - HttpWorker * search = new HttpWorker(QString(CV_COMIC_DETAIL).replace(CV_API_KEY,settings->value(COMIC_VINE_API_KEY,CV_API_KEY_DEFAULT).toString()).arg(id)); + HttpWorker * search = new HttpWorker(QString(CV_COMIC_DETAIL).replace(CV_WEB_ADDRESS, baseURL).replace(CV_API_KEY,settings->value(COMIC_VINE_API_KEY,CV_API_KEY_DEFAULT).toString()).arg(id)); connect(search,SIGNAL(dataReady(const QByteArray &)),this,SLOT(proccessComicDetailData(const QByteArray &))); connect(search,SIGNAL(timeout()),this,SIGNAL(timeOut())); diff --git a/YACReaderLibrary/comic_vine/comic_vine_client.h b/YACReaderLibrary/comic_vine/comic_vine_client.h index f5fbc44c..f2702fc8 100644 --- a/YACReaderLibrary/comic_vine/comic_vine_client.h +++ b/YACReaderLibrary/comic_vine/comic_vine_client.h @@ -41,6 +41,7 @@ protected slots: protected: QSettings * settings; + QString baseURL; }; #endif // COMIC_VINE_CLIENT_H diff --git a/common/yacreader_global_gui.h b/common/yacreader_global_gui.h index f00dd563..672971a7 100644 --- a/common/yacreader_global_gui.h +++ b/common/yacreader_global_gui.h @@ -55,6 +55,7 @@ #define COMICS_GRID_COVER_SIZES "COMICS_GRID_COVER_SIZES" #define COMIC_VINE_API_KEY "COMIC_VINE_API_KEY" +#define COMIC_VINE_BASE_URL "COMIC_VINE_BASE_URL" namespace YACReader {