Return to owm weather provider

Since yahoo support already exists, so I've added new option
X-AW-Provider (apiver 3). Added tests for these cases
This commit is contained in:
2016-06-02 11:09:02 +03:00
parent 4337379177
commit 620c4bd1e3
26 changed files with 704 additions and 131 deletions

View File

@ -27,11 +27,12 @@
#include <QNetworkRequest>
#include <QSettings>
#include <QStandardPaths>
#include <QUrlQuery>
#include <qreplytimeout/qreplytimeout.h>
#include "awdebug.h"
#include "owmweatherprovider.h"
#include "yahooweatherprovider.h"
ExtWeather::ExtWeather(QWidget *parent, const QString filePath)
@ -68,6 +69,7 @@ ExtWeather::~ExtWeather()
SLOT(weatherReplyReceived(QNetworkReply *)));
m_manager->deleteLater();
delete m_providerObject;
delete ui;
}
@ -83,6 +85,7 @@ ExtWeather *ExtWeather::copy(const QString _fileName, const int _number)
item->setCountry(country());
item->setImage(image());
item->setNumber(_number);
item->setProvider(provider());
item->setTs(ts());
return item;
@ -117,6 +120,28 @@ bool ExtWeather::image() const
}
ExtWeather::Provider ExtWeather::provider() const
{
return m_provider;
}
QString ExtWeather::strProvider() const
{
QString value;
switch (m_provider) {
case Provider::OWM:
value = QString("OWM");
break;
case Provider::Yahoo:
value = QString("Yahoo");
break;
}
return value;
}
int ExtWeather::ts() const
{
return m_ts;
@ -134,7 +159,7 @@ void ExtWeather::setCity(const QString _city)
qCDebug(LOG_LIB) << "City" << _city;
m_city = _city;
initUrl();
initProvider();
}
@ -143,7 +168,7 @@ void ExtWeather::setCountry(const QString _country)
qCDebug(LOG_LIB) << "Country" << _country;
m_country = _country;
initUrl();
initProvider();
}
@ -155,11 +180,32 @@ void ExtWeather::setImage(const bool _image)
}
void ExtWeather::setProvider(const Provider _provider)
{
qCDebug(LOG_LIB) << "Provider" << static_cast<int>(_provider);
m_provider = _provider;
initProvider();
}
void ExtWeather::setStrProvider(const QString _provider)
{
qCDebug(LOG_LIB) << "Provider" << _provider;
if (_provider == QString("Yahoo"))
setProvider(Provider::Yahoo);
else
setProvider(Provider::OWM);
}
void ExtWeather::setTs(const int _ts)
{
qCDebug(LOG_LIB) << "Timestamp" << _ts;
m_ts = _ts;
initProvider();
}
@ -176,16 +222,11 @@ void ExtWeather::readConfiguration()
// api == 2
setImage(settings.value(QString("X-AW-Image"), QVariant(m_image)).toString()
== QString("true"));
// api == 3
setStrProvider(
settings.value(QString("X-AW-Provider"), strProvider()).toString());
settings.endGroup();
// update for current API
if ((apiVersion() > 0) && (apiVersion() < AWEWAPI)) {
qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to"
<< AWEWAPI;
setApiVersion(AWEWAPI);
writeConfiguration();
}
bumpApi(AWEWAPI);
}
@ -224,7 +265,8 @@ QVariantHash ExtWeather::run()
if (times == 1) {
qCInfo(LOG_LIB) << "Send request";
isRunning = true;
QNetworkReply *reply = m_manager->get(QNetworkRequest(m_url));
QNetworkReply *reply
= m_manager->get(QNetworkRequest(m_providerObject->url()));
new QReplyTimeout(reply, REQUEST_TIMEOUT);
}
@ -244,6 +286,7 @@ int ExtWeather::showConfiguration(const QVariant args)
ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment());
ui->label_numberValue->setText(QString("%1").arg(number()));
ui->comboBox_provider->setCurrentIndex(static_cast<int>(m_provider));
ui->lineEdit_city->setText(m_city);
ui->lineEdit_country->setText(m_country);
ui->spinBox_timestamp->setValue(m_ts);
@ -261,6 +304,7 @@ int ExtWeather::showConfiguration(const QVariant args)
setApiVersion(AWEWAPI);
setCity(ui->lineEdit_city->text());
setCountry(ui->lineEdit_country->text());
setProvider(static_cast<Provider>(ui->comboBox_provider->currentIndex()));
setTs(ui->spinBox_timestamp->value());
setImage(ui->checkBox_image->checkState() == Qt::Checked);
setActive(ui->checkBox_active->checkState() == Qt::Checked);
@ -282,6 +326,7 @@ void ExtWeather::writeConfiguration() const
settings.setValue(QString("X-AW-City"), m_city);
settings.setValue(QString("X-AW-Country"), m_country);
settings.setValue(QString("X-AW-Image"), m_image);
settings.setValue(QString("X-AW-Provider"), strProvider());
settings.setValue(QString("X-AW-TS"), m_ts);
settings.endGroup();
@ -304,69 +349,31 @@ void ExtWeather::weatherReplyReceived(QNetworkReply *reply)
return;
}
// convert to map
QVariantMap json = jsonDoc.toVariant().toMap()[QString("query")].toMap();
if (json[QString("count")].toInt() != 1) {
qCWarning(LOG_LIB) << "Found data count"
<< json[QString("count")].toInt() << "is not 1";
QVariantHash data = m_providerObject->parse(jsonDoc.toVariant().toMap());
if (data.isEmpty())
return;
}
QVariantMap results
= json[QString("results")].toMap()[QString("channel")].toMap();
QVariantMap item = results[QString("item")].toMap();
if (m_ts == 0) {
// current weather
int id = item[QString("condition")].toMap()[QString("code")].toInt();
values[tag(QString("weatherId"))] = id;
values[tag(QString("weather"))] = weatherFromInt(id);
values[tag(QString("temperature"))]
= item[QString("condition")].toMap()[QString("temp")].toInt();
values[tag(QString("timestamp"))]
= item[QString("condition")].toMap()[QString("date")].toString();
values[tag(QString("humidity"))] = results[QString("atmosphere")]
.toMap()[QString("humidity")]
.toInt();
values[tag(QString("pressure"))]
= static_cast<int>(results[QString("atmosphere")]
.toMap()[QString("pressure")]
.toFloat());
} else {
// forecast weather
QVariantList weatherList = item[QString("forecast")].toList();
QVariantMap weatherMap = weatherList.count() < m_ts
? weatherList.last().toMap()
: weatherList.at(m_ts).toMap();
int id = weatherMap[QString("code")].toInt();
values[tag(QString("weatherId"))] = id;
values[tag(QString("weather"))] = weatherFromInt(id);
values[tag(QString("timestamp"))]
= weatherMap[QString("date")].toString();
// yahoo provides high and low temperatures. Lets calculate average one
values[tag(QString("temperature"))]
= (weatherMap[QString("high")].toFloat()
+ weatherMap[QString("low")].toFloat())
/ 2.0;
// ... and no forecast data for humidity and pressure
values[tag(QString("humidity"))] = 0;
values[tag(QString("pressure"))] = 0.0;
}
values = data;
values[tag(QString("weather"))]
= weatherFromInt(values[tag(QString("weatherId"))].toInt());
emit(dataReceived(values));
}
void ExtWeather::initUrl()
void ExtWeather::initProvider()
{
// init query
m_url = QUrl(YAHOO_WEATHER_URL);
QUrlQuery params;
params.addQueryItem(QString("format"), QString("json"));
params.addQueryItem(QString("env"),
QString("store://datatables.org/alltableswithkeys"));
params.addQueryItem(QString("q"),
QString(YAHOO_WEATHER_QUERY).arg(m_city, m_country));
m_url.setQuery(params);
delete m_providerObject;
switch (m_provider) {
case Provider::OWM:
m_providerObject = new OWMWeatherProvider(this, number());
break;
case Provider::Yahoo:
m_providerObject = new YahooWeatherProvider(this, number());
break;
}
return m_providerObject->initUrl(m_city, m_country, m_ts);
}
@ -375,6 +382,7 @@ void ExtWeather::translate()
ui->label_name->setText(i18n("Name"));
ui->label_comment->setText(i18n("Comment"));
ui->label_number->setText(i18n("Tag"));
ui->label_provider->setText(i18n("Provider"));
ui->label_city->setText(i18n("City"));
ui->label_country->setText(i18n("Country"));
ui->label_timestamp->setText(i18n("Timestamp"));