1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-25 12:10:03 +00:00

Add weather_forecast object

This commit is contained in:
Cesare Tirabassi 2009-08-02 23:54:44 +02:00
parent dbf3448031
commit 14b7acdab6
5 changed files with 400 additions and 87 deletions

View File

@ -3423,6 +3423,79 @@
and can be subject to many future changes.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<command>
<option>weather_forecast</option>
</command>
<option>URI locID day data_type
(interval_in_minutes)</option>
</term>
<listitem>
<para>Download, parse and display weather forecast data
for a given day (daytime only).</para>
<para>For the 'URI', for the time being only
http://xoap.weather.com/weather/local/ is
supported. See 'weather' above for details of usage</para>
<para>'locID', see 'weather' above.</para>
<para>'day' is a number from 0 (today) to 4 (3 days
after tomorrow).</para>
<para>'data_type' must be one of the following:</para>
<simplelist>
<member>
<command>low</command>
<option>Minimun temperature (you can use the
'temperature_unit' config setting to change
units)</option>
</member>
<member>
<command>high</command>
<option>Maximum temperature (you can use the
'temperature_unit' config setting to change
units)</option>
</member>
<member>
<command>icon</command>
<option>Weather icon. Can be used together with the
icon kit provided upon registering to the weather.com
service</option>
</member>
<member>
<command>forecast</command>
<option>Weather forecast (sunny, rainy, etc.)</option>
</member>
<member>
<command>wind_speed</command>
<option>Wind speed in km/h</option>
</member>
<member>
<command>wind_dir</command>
<option>Wind direction</option>
</member>
<member>
<command>wind_dir_DEG</command>
<option>Compass wind direction</option>
</member>
<member>
<command>humidity</command>
<option>Relative humidity in %</option>
</member>
<member>
<command>precipitation</command>
<option>Probability of having a
precipitation (in %)</option>
</member>
</simplelist>
<para>'delay_in_minutes' (optional, default 150) cannot
be lower than 150 min.</para>
<para>This object is threaded, and once a thread is
created it can't be explicitely destroyed. One thread
will run for each URI specified. You can use any
protocol that Curl supports.</para>
<para>Note that these variables are still EXPERIMENTAL
and can be subject to many future changes.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<command>

View File

@ -992,6 +992,12 @@ static void free_text_objects(struct text_object *root, int internal)
free(data.weather.data_type);
break;
#endif
#ifdef XOAP
case OBJ_weather_forecast:
free(data.weather_forecast.uri);
free(data.weather_forecast.data_type);
break;
#endif
#ifdef HAVE_LUA
case OBJ_lua:
case OBJ_lua_parse:
@ -2985,7 +2991,7 @@ static struct text_object *construct_text_object(const char *s,
argc = sscanf(arg, "%119s %8s %31s %f", uri, locID, data_type, &interval);
if (argc >= 3) {
if (process_weather_uri(uri, locID)) {
if (process_weather_uri(uri, locID, 0)) {
free(data_type);
free(uri);
free(locID);
@ -3017,6 +3023,57 @@ static struct text_object *construct_text_object(const char *s,
CRIT_ERR(obj, free_at_crash, "weather needs arguments: <uri> <locID> <data_type> [interval in minutes]");
}
#endif
#ifdef XOAP
END OBJ(weather_forecast, 0)
if (arg) {
int argc;
unsigned int day;
float interval = 0;
char *locID = (char *) malloc(9 * sizeof(char));
char *uri = (char *) malloc(128 * sizeof(char));
char *data_type = (char *) malloc(32 * sizeof(char));
argc = sscanf(arg, "%119s %8s %1u %31s %f", uri, locID, &day, data_type, &interval);
if (argc >= 4) {
if (process_weather_uri(uri, locID, 1)) {
free(data_type);
free(uri);
free(locID);
CRIT_ERR(obj, free_at_crash, \
"could not recognize the weather forecast uri");
}
obj->data.weather_forecast.uri = uri;
obj->data.weather_forecast.data_type = data_type;
/* Limit the day between 0 (today) and 4 */
if (day > 4) {
day = 4;
}
obj->data.weather_forecast.day = day;
/* Limit the data retrieval interval to 2 hours and an half */
if (interval < 150) {
interval = 150;
}
/* Convert to seconds */
obj->data.weather_forecast.interval = interval * 60;
free(locID);
DBGP("weather_forecast: fetching %s for day %d from %s every %d seconds", \
data_type, day, uri, obj->data.weather_forecast.interval);
} else {
free(data_type);
free(uri);
free(locID);
CRIT_ERR(obj, free_at_crash, "wrong number of arguments for $weather_forecast");
}
} else {
CRIT_ERR(obj, free_at_crash, "weather_forecast needs arguments: <uri> <locID> <day> <data_type> [interval in minutes]");
}
#endif
#ifdef HAVE_LUA
END OBJ(lua, 0)
if (arg) {
@ -4787,6 +4844,15 @@ static void generate_text_internal(char *p, int p_max_size,
}
}
#endif
#ifdef XOAP
OBJ(weather_forecast) {
if (obj->data.weather_forecast.uri != NULL) {
weather_forecast_process_info(p, p_max_size, obj->data.weather_forecast.uri, obj->data.weather_forecast.day, obj->data.weather_forecast.data_type, obj->data.weather_forecast.interval);
} else {
NORM_ERR("error processing weather forecast data, check that you have a valid XOAP key if using XOAP.");
}
}
#endif
#ifdef HAVE_LUA
OBJ(lua) {
char *str = llua_getstring(obj->data.s);

View File

@ -385,6 +385,7 @@ enum text_object_type {
#endif /* RSS */
#ifdef WEATHER
OBJ_weather,
OBJ_weather_forecast,
#endif /* WEATHER */
#ifdef HAVE_LUA
OBJ_lua,
@ -561,6 +562,14 @@ struct text_object {
char *data_type;
int interval;
} weather;
#endif
#ifdef XOAP
struct {
char *uri;
unsigned int day;
char *data_type;
int interval;
} weather_forecast;
#endif
struct {
char *text;

View File

@ -24,11 +24,6 @@
*
*/
/*
* TODO: Add weather forecast info from weather.com
*
*/
#include "conky.h"
#include "logging.h"
#include "weather.h"
@ -44,12 +39,20 @@
#include <libxml/xpath.h>
/* Xpath expressions for XOAP xml parsing */
#define NUM_XPATH_EXPRESSIONS 8
const char *xpath_expression[NUM_XPATH_EXPRESSIONS] = {
#define NUM_XPATH_EXPRESSIONS_CC 8
const char *xpath_expression_cc[NUM_XPATH_EXPRESSIONS_CC] = {
"/weather/cc/lsup", "/weather/cc/tmp", "/weather/cc/t",
"/weather/cc/bar/r", "/weather/cc/wind/s", "/weather/cc/wind/d",
"/weather/cc/hmid", "/weather/cc/icon"
};
#define NUM_XPATH_EXPRESSIONS_DF 8
const char *xpath_expression_df[NUM_XPATH_EXPRESSIONS_DF] = {
"/weather/dayf/day[*]/hi", "/weather/dayf/day[*]/low",
"/weather/dayf/day[*]/part[1]/icon", "/weather/dayf/day[*]/part[1]/t",
"/weather/dayf/day[*]/part[1]/wind/s","/weather/dayf/day[*]/part[1]/wind/d",
"/weather/dayf/day[*]/part[1]/ppcp", "/weather/dayf/day[*]/part[1]/hmid"
};
#endif /* XOAP */
/* Possible sky conditions */
@ -73,11 +76,17 @@ const char *WC_CODES[NUM_WC_CODES] = {
"FC", "PO", "SQ", "SS", "DS"
};
static ccurl_location_t *locations_head = 0;
static ccurl_location_t *locations_head_cc = 0;
#ifdef XOAP
static ccurl_location_t *locations_head_df = 0;
#endif
void weather_free_info(void)
{
ccurl_free_locations(&locations_head);
ccurl_free_locations(&locations_head_cc);
#ifdef XOAP
ccurl_free_locations(&locations_head_df);
#endif
}
int rel_humidity(int dew_point, int air) {
@ -93,46 +102,113 @@ int rel_humidity(int dew_point, int air) {
}
#ifdef XOAP
static void parse_df(PWEATHER_FORECAST *res, xmlXPathContextPtr xpathCtx)
{
int i, j, k;
char *content;
xmlXPathObjectPtr xpathObj;
for (i = 0; i < NUM_XPATH_EXPRESSIONS_DF; i++) {
xpathObj = xmlXPathEvalExpression((xmlChar *)xpath_expression_df[i], xpathCtx);
if (xpathObj != NULL) {
xmlNodeSetPtr nodes = xpathObj->nodesetval;
k = 0;
for (j = 0; j < nodes->nodeNr; ++j) {
if (nodes->nodeTab[j]->type == XML_ELEMENT_NODE) {
content = (char *)xmlNodeGetContent(nodes->nodeTab[k]);
switch(i) {
case 0:
res->hi[k] = atoi(content);
break;
case 1:
res->low[k] = atoi(content);
break;
case 2:
strncpy(res->icon[k], content, 2);
case 3:
strncpy(res->xoap_t[k], content, 31);
break;
case 4:
res->wind_s[k] = atoi(content);
break;
case 5:
res->wind_d[k] = atoi(content);
break;
case 6:
res->ppcp[k] = atoi(content);
break;
case 7:
res->hmid[k] = atoi(content);
}
xmlFree(content);
if (k++ == 4) break;
}
}
xmlXPathFreeObject(xpathObj);
}
}
return;
}
static void parse_weather_forecast_xml(PWEATHER_FORECAST *res, const char *data)
{
xmlDocPtr doc;
xmlXPathContextPtr xpathCtx;
if (!(doc = xmlReadMemory(data, strlen(data), "", NULL, 0))) {
NORM_ERR("weather_forecast: can't read xml data");
return;
}
xpathCtx = xmlXPathNewContext(doc);
if(xpathCtx == NULL) {
NORM_ERR("weather_forecast: unable to create new XPath context");
xmlFreeDoc(doc);
return;
}
parse_df(res, xpathCtx);
xmlXPathFreeContext(xpathCtx);
xmlFreeDoc(doc);
return;
}
static void parse_cc(PWEATHER *res, xmlXPathContextPtr xpathCtx)
{
int i;
char *content;
xmlXPathObjectPtr xpathObj;
for (i = 0; i < NUM_XPATH_EXPRESSIONS; i++) {
xpathObj = xmlXPathEvalExpression((xmlChar *)xpath_expression[i], xpathCtx);
for (i = 0; i < NUM_XPATH_EXPRESSIONS_CC; i++) {
xpathObj = xmlXPathEvalExpression((xmlChar *)xpath_expression_cc[i], xpathCtx);
if ((xpathObj != NULL) && (xpathObj->nodesetval->nodeTab[0]->type == XML_ELEMENT_NODE)) {
content = (char *)xmlNodeGetContent(xpathObj->nodesetval->nodeTab[0]);
switch(i) {
case 0:
strncpy(res->lastupd, content, 31);
break;
case 1:
res->temp = atoi(content);
break;
case 2:
if(res->xoap_t[0] == '\0') {
strncpy(res->xoap_t, content, 31);
}
break;
case 3:
res->bar = atoi(content);
break;
case 4:
res->wind_s = atoi(content);
break;
case 5:
if (isdigit((char)content[0])) {
res->wind_d = atoi(content);
}
break;
case 6:
res->hmid = atoi(content);
content = (char *)xmlNodeGetContent(xpathObj->nodesetval->nodeTab[0]);
switch(i) {
case 0:
strncpy(res->lastupd, content, 31);
break;
case 7:
strncpy(res->icon, content, 2);
}
xmlFree(content);
case 1:
res->temp = atoi(content);
break;
case 2:
strncpy(res->xoap_t, content, 31);
break;
case 3:
res->bar = atoi(content);
break;
case 4:
res->wind_s = atoi(content);
break;
case 5:
res->wind_d = atoi(content);
break;
case 6:
res->hmid = atoi(content);
break;
case 7:
strncpy(res->icon, content, 2);
}
xmlFree(content);
}
xmlXPathFreeObject(xpathObj);
}
@ -453,6 +529,20 @@ static inline void parse_token(PWEATHER *res, char *token) {
}
}
#ifdef XOAP
void parse_weather_forecast(void *result, const char *data)
{
PWEATHER_FORECAST *res = (PWEATHER_FORECAST*)result;
/* Reset results */
memset(res, 0, sizeof(PWEATHER_FORECAST));
//Check if it is an xml file
if ( strncmp(data, "<?xml ", 6) == 0 ) {
parse_weather_forecast_xml(res, data);
}
}
#endif /* XOAP */
void parse_weather(void *result, const char *data)
{
PWEATHER *res = (PWEATHER*)result;
@ -497,6 +587,84 @@ void parse_weather(void *result, const char *data)
}
}
void wind_deg_to_dir(char *p, int p_max_size, int wind_deg) {
if ((wind_deg >= 349) || (wind_deg < 12)) {
strncpy(p, "N", p_max_size);
} else if (wind_deg < 33) {
strncpy(p, "NNE", p_max_size);
} else if (wind_deg < 57) {
strncpy(p, "NE", p_max_size);
} else if (wind_deg < 79) {
strncpy(p, "ENE", p_max_size);
} else if (wind_deg < 102) {
strncpy(p, "E", p_max_size);
} else if (wind_deg < 124) {
strncpy(p, "ESE", p_max_size);
} else if (wind_deg < 147) {
strncpy(p, "SE", p_max_size);
} else if (wind_deg < 169) {
strncpy(p, "SSE", p_max_size);
} else if (wind_deg < 192) {
strncpy(p, "S", p_max_size);
} else if (wind_deg < 214) {
strncpy(p, "SSW", p_max_size);
} else if (wind_deg < 237) {
strncpy(p, "SW", p_max_size);
} else if (wind_deg < 259) {
strncpy(p, "WSW", p_max_size);
} else if (wind_deg < 282) {
strncpy(p, "W", p_max_size);
} else if (wind_deg < 304) {
strncpy(p, "WNW", p_max_size);
} else if (wind_deg < 327) {
strncpy(p, "NW", p_max_size);
} else if (wind_deg < 349) {
strncpy(p, "NNW", p_max_size);
};
}
#ifdef XOAP
void weather_forecast_process_info(char *p, int p_max_size, char *uri, unsigned int day, char *data_type, int interval)
{
PWEATHER_FORECAST *data;
ccurl_location_t *curloc = ccurl_find_location(&locations_head_df, uri);
if (!curloc->p_timed_thread) {
curloc->result = malloc(sizeof(PWEATHER_FORECAST));
memset(curloc->result, 0, sizeof(PWEATHER_FORECAST));
curloc->process_function = &parse_weather_forecast;
ccurl_init_thread(curloc, interval);
if (!curloc->p_timed_thread) {
NORM_ERR("error setting up weather_forecast thread");
}
}
timed_thread_lock(curloc->p_timed_thread);
data = (PWEATHER_FORECAST*)curloc->result;
if (strcmp(data_type, "hi") == EQUAL) {
temp_print(p, p_max_size, data->hi[day], TEMP_CELSIUS);
} else if (strcmp(data_type, "low") == EQUAL) {
temp_print(p, p_max_size, data->low[day], TEMP_CELSIUS);
} else if (strcmp(data_type, "icon") == EQUAL) {
strncpy(p, data->icon[day], p_max_size);
} else if (strcmp(data_type, "forecast") == EQUAL) {
strncpy(p, data->xoap_t[day], p_max_size);
} else if (strcmp(data_type, "wind_speed") == EQUAL) {
snprintf(p, p_max_size, "%d", data->wind_s[day]);
} else if (strcmp(data_type, "wind_dir") == EQUAL) {
wind_deg_to_dir(p, p_max_size, data->wind_d[day]);
} else if (strcmp(data_type, "wind_dir_DEG") == EQUAL) {
snprintf(p, p_max_size, "%d", data->wind_d[day]);
} else if (strcmp(data_type, "humidity") == EQUAL) {
snprintf(p, p_max_size, "%d", data->hmid[day]);
} else if (strcmp(data_type, "precipitation") == EQUAL) {
snprintf(p, p_max_size, "%d", data->ppcp[day]);
}
timed_thread_unlock(curloc->p_timed_thread);
}
#endif /* XOAP */
void weather_process_info(char *p, int p_max_size, char *uri, char *data_type, int interval)
{
static const char *wc[] = {
@ -507,7 +675,7 @@ void weather_process_info(char *p, int p_max_size, char *uri, char *data_type, i
};
PWEATHER *data;
ccurl_location_t *curloc = ccurl_find_location(&locations_head, uri);
ccurl_location_t *curloc = ccurl_find_location(&locations_head_cc, uri);
if (!curloc->p_timed_thread) {
curloc->result = malloc(sizeof(PWEATHER));
memset(curloc->result, 0, sizeof(PWEATHER));
@ -554,39 +722,7 @@ void weather_process_info(char *p, int p_max_size, char *uri, char *data_type, i
} else if (strcmp(data_type, "wind_speed") == EQUAL) {
snprintf(p, p_max_size, "%d", data->wind_s);
} else if (strcmp(data_type, "wind_dir") == EQUAL) {
if ((data->wind_d >= 349) || (data->wind_d < 12)) {
strncpy(p, "N", p_max_size);
} else if (data->wind_d < 33) {
strncpy(p, "NNE", p_max_size);
} else if (data->wind_d < 57) {
strncpy(p, "NE", p_max_size);
} else if (data->wind_d < 79) {
strncpy(p, "ENE", p_max_size);
} else if (data->wind_d < 102) {
strncpy(p, "E", p_max_size);
} else if (data->wind_d < 124) {
strncpy(p, "ESE", p_max_size);
} else if (data->wind_d < 147) {
strncpy(p, "SE", p_max_size);
} else if (data->wind_d < 169) {
strncpy(p, "SSE", p_max_size);
} else if (data->wind_d < 192) {
strncpy(p, "S", p_max_size);
} else if (data->wind_d < 214) {
strncpy(p, "SSW", p_max_size);
} else if (data->wind_d < 237) {
strncpy(p, "SW", p_max_size);
} else if (data->wind_d < 259) {
strncpy(p, "WSW", p_max_size);
} else if (data->wind_d < 282) {
strncpy(p, "W", p_max_size);
} else if (data->wind_d < 304) {
strncpy(p, "WNW", p_max_size);
} else if (data->wind_d < 327) {
strncpy(p, "NW", p_max_size);
} else if (data->wind_d < 349) {
strncpy(p, "NNW", p_max_size);
};
wind_deg_to_dir(p, p_max_size, data->wind_d);
} else if (strcmp(data_type, "wind_dir_DEG") == EQUAL) {
snprintf(p, p_max_size, "%d", data->wind_d);
@ -602,7 +738,8 @@ void weather_process_info(char *p, int p_max_size, char *uri, char *data_type, i
#ifdef XOAP
/* xoap suffix for weather from weather.com */
static char *xoap = NULL;
static char *xoap_cc = NULL;
static char *xoap_df = NULL;
/*
* TODO: make the xoap keys file readable from the config file
@ -614,17 +751,27 @@ void load_xoap_keys(void)
FILE *fp;
char *par = (char *) malloc(11 * sizeof(char));
char *key = (char *) malloc(17 * sizeof(char));
char *xoap = NULL;
xoap = (char *) malloc(64 * sizeof(char));
to_real_path(xoap, XOAP_FILE);
fp = fopen(xoap, "r");
if (fp != NULL) {
if (fscanf(fp, "%10s %16s", par, key) == 2) {
strcpy(xoap, "?cc=*&link=xoap&prod=xoap&par=");
strcat(xoap, par);
strcat(xoap, "&key=");
strcat(xoap, key);
strcat(xoap, "&unit=m");
xoap_cc = (char *) malloc(64 * sizeof(char));
xoap_df = (char *) malloc(64 * sizeof(char));
strcpy(xoap_cc, "?cc=*&link=xoap&prod=xoap&par=");
strcat(xoap_cc, par);
strcat(xoap_cc, "&key=");
strcat(xoap_cc, key);
strcat(xoap_cc, "&unit=m");
strcpy(xoap_df, "?dayf=5&link=xoap&prod=xoap&par=");
strcat(xoap_df, par);
strcat(xoap_df, "&key=");
strcat(xoap_df, key);
strcat(xoap_df, "&unit=m");
} else {
free(xoap);
xoap = NULL;
@ -639,7 +786,7 @@ void load_xoap_keys(void)
}
#endif /* XOAP */
int process_weather_uri(char *uri, char *locID)
int process_weather_uri(char *uri, char *locID, int dayf)
{
/* locID MUST BE upper-case */
char *tmp_p = locID;
@ -651,9 +798,12 @@ int process_weather_uri(char *uri, char *locID)
/* Construct complete uri */
#ifdef XOAP
if (strstr(uri, "xoap.weather.com")) {
if (xoap != NULL) {
if ((dayf == 0) && (xoap_cc != NULL)) {
strcat(uri, locID);
strcat(uri, xoap);
strcat(uri, xoap_cc);
} else if ((dayf == 1) && (xoap_df != NULL)) {
strcat(uri, locID);
strcat(uri, xoap_df);
} else {
free(uri);
uri = NULL;
@ -668,4 +818,3 @@ int process_weather_uri(char *uri, char *locID)
}
return 0;
}

View File

@ -49,10 +49,26 @@ typedef struct PWEATHER_ {
int wc;
} PWEATHER;
#ifdef XOAP
typedef struct PWEATHER_FORECAST_ {
int hi[5];
int low[5];
char icon[5][3];
char xoap_t[5][32];
int wind_s[5];
int wind_d[5];
int hmid[5];
int ppcp[5];
} PWEATHER_FORECAST;
#endif /* XOAP */
/* Prototypes */
void weather_free_info(void);
void weather_process_info(char *p, int p_max_size, char *uri, char *data_type, int interval);
int process_weather_uri(char *uri, char *locID);
#ifdef XOAP
void weather_forecast_process_info(char *p, int p_max_size, char *uri, unsigned int day, char *data_type, int interval);
#endif /* XOAP */
int process_weather_uri(char *uri, char *locID, int dayf);
#ifdef XOAP
void load_xoap_keys(void);