Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-27 00:58:36 +00:00
Code Issues Releases Activity

Remove deprecated EVE online support.

Browse Source 
The EVE API that was in use is now deprecated and no longer works.

This resolves #732.
This commit is contained in:
Brenden Matthews 2019-01-03 09:10:43 -05:00
parent 03f3ce7bdc
commit 282160156f
9 changed files with 45 additions and 557 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/ConkyBuildOptions.cmake
View File

@ -230,8 +230,6 @@ option(BUILD_MOC "Enable if you want MOC (music player) support" true)
option(BUILD_XMMS2 "Enable if you want XMMS2 (music player) support" false)
option(BUILD_EVE "Enable if you want Eve-Online skill monitoring support" true)
option(BUILD_CURL "Enable if you want Curl support" false)
option(BUILD_RSS "Enable if you want RSS support" false)

5
cmake/ConkyPlatformChecks.cmake
View File

@ -424,11 +424,6 @@ if(BUILD_XMMS2)
set(conky_includes ${conky_includes} ${XMMS2_INCLUDE_DIRS})
endif(BUILD_XMMS2)
if(BUILD_EVE)
set(WANT_CURL true)
set(WANT_LIBXML2 true)
endif(BUILD_EVE)
if(BUILD_CURL)
set(WANT_CURL true)
endif(BUILD_CURL)

2
cmake/config.h.in
View File

@ -76,8 +76,6 @@
#cmakedefine BUILD_HDDTEMP 1
#cmakedefine BUILD_EVE 1
#cmakedefine BUILD_LIBXML2 1
#cmakedefine BUILD_CURL 1

5
src/CMakeLists.txt
View File

@ -232,11 +232,6 @@ if(BUILD_HDDTEMP)
set(optional_sources ${optional_sources} ${hddtemp})
endif(BUILD_HDDTEMP)
if(BUILD_EVE)
set(eve eve.cc eve.h)
set(optional_sources ${optional_sources} ${eve})
endif(BUILD_EVE)
if(BUILD_CURL)
set(ccurl_thread ccurl_thread.cc ccurl_thread.h)
set(optional_sources ${optional_sources} ${ccurl_thread})

4
src/conky.h
View File

@ -74,10 +74,6 @@ struct text_object;
#include "bmpx.h"
#endif /* BUILD_BMPX */
#ifdef BUILD_EVE
#include "eve.h"
#endif /* BUILD_EVE */
#ifdef BUILD_HDDTEMP
#include "hddtemp.h"
#endif /* BUILD_HDDTEMP */

95
src/core.cc
View File

@ -28,12 +28,12 @@
*/
/* local headers */
#include "core.h"
#include "algebra.h"
#include "bsdapm.h"
#include "build.h"
#include "colours.h"
#include "combine.h"
#include "core.h"
#include "diskio.h"
#include "entropy.h"
#include "exec.h"
@ -431,7 +431,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
END OBJ(freq, nullptr) get_cpu_count();
if ((arg == nullptr) || (isdigit((unsigned char)arg[0]) == 0) ||
strlen(arg) >= 3 || atoi(&arg[0]) == 0 ||
(unsigned int) atoi(&arg[0]) > info.cpu_count) {
(unsigned int)atoi(&arg[0]) > info.cpu_count) {
obj->data.i = 1;
/* NORM_ERR("freq: Invalid CPU number or you don't have that many CPUs! "
"Displaying the clock for CPU 1."); */
@ -442,7 +442,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
END OBJ(freq_g, nullptr) get_cpu_count();
if ((arg == nullptr) || (isdigit((unsigned char)arg[0]) == 0) ||
strlen(arg) >= 3 || atoi(&arg[0]) == 0 ||
(unsigned int) atoi(&arg[0]) > info.cpu_count) {
(unsigned int)atoi(&arg[0]) > info.cpu_count) {
obj->data.i = 1;
/* NORM_ERR("freq_g: Invalid CPU number or you don't have that many "
"CPUs! Displaying the clock for CPU 1."); */
@ -468,7 +468,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
#if defined(__linux__)
END OBJ(voltage_mv, 0) get_cpu_count();
if (!arg || !isdigit((unsigned char)arg[0]) || strlen(arg) >= 3 ||
atoi(&arg[0]) == 0 || (unsigned int) atoi(&arg[0]) > info.cpu_count) {
atoi(&arg[0]) == 0 || (unsigned int)atoi(&arg[0]) > info.cpu_count) {
obj->data.i = 1;
/* NORM_ERR("voltage_mv: Invalid CPU number or you don't have that many "
"CPUs! Displaying voltage for CPU 1."); */
@ -478,7 +478,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
obj->callbacks.print = &print_voltage_mv;
END OBJ(voltage_v, 0) get_cpu_count();
if (!arg || !isdigit((unsigned char)arg[0]) || strlen(arg) >= 3 ||
atoi(&arg[0]) == 0 || (unsigned int) atoi(&arg[0]) > info.cpu_count) {
atoi(&arg[0]) == 0 || (unsigned int)atoi(&arg[0]) > info.cpu_count) {
obj->data.i = 1;
/* NORM_ERR("voltage_v: Invalid CPU number or you don't have that many "
"CPUs! Displaying voltage for CPU 1."); */
@ -490,37 +490,37 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
#endif /* __linux__ */
#ifdef BUILD_WLAN
END OBJ(wireless_essid, &update_net_stats) obj->data.opaque =
get_net_stat(arg, obj, free_at_crash);
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_essid;
END OBJ(wireless_channel, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_channel;
END OBJ(wireless_freq, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_frequency;
END OBJ(wireless_mode, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_mode;
END OBJ(wireless_bitrate, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_bitrate;
END OBJ(wireless_ap, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_ap;
END OBJ(wireless_link_qual, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_link_qual;
END OBJ(wireless_link_qual_max, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_link_qual_max;
END OBJ(wireless_link_qual_perc, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_link_qual_perc;
END OBJ(wireless_link_bar, &update_net_stats)
parse_net_stat_bar_arg(obj, arg, free_at_crash);
obj->callbacks.barval = &wireless_link_barval;
END OBJ(wireless_essid, &update_net_stats) obj->data.opaque =
get_net_stat(arg, obj, free_at_crash);
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_essid;
END OBJ(wireless_channel, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_channel;
END OBJ(wireless_freq, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_frequency;
END OBJ(wireless_mode, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_mode;
END OBJ(wireless_bitrate, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_bitrate;
END OBJ(wireless_ap, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_ap;
END OBJ(wireless_link_qual, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_link_qual;
END OBJ(wireless_link_qual_max, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_link_qual_max;
END OBJ(wireless_link_qual_perc, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_link_qual_perc;
END OBJ(wireless_link_bar, &update_net_stats)
parse_net_stat_bar_arg(obj, arg, free_at_crash);
obj->callbacks.barval = &wireless_link_barval;
#endif /* BUILD_WLAN */
#ifndef __OpenBSD__
@ -546,7 +546,8 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
obj->callbacks.print = &print_battery_short;
obj->callbacks.free = &gen_free_opaque;
END OBJ(battery_status, 0) obj->data.s = strndup(arg ? arg : "BAT0", text_buffer_size.get(*state));
END OBJ(battery_status, 0) obj->data.s =
strndup(arg ? arg : "BAT0", text_buffer_size.get(*state));
obj->callbacks.print = &print_battery_status;
obj->callbacks.free = &gen_free_opaque;
END OBJ(battery_time, nullptr) char bat[64];
@ -664,7 +665,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
END OBJ(obsd_vendor, 0) obj->callbacks.print = &get_obsd_vendor;
END OBJ(obsd_product, 0) obj->callbacks.print = &get_obsd_product;
#endif /* __OpenBSD__ */
END OBJ(buffers, &update_meminfo) obj->data.s = STRNDUP_ARG;
END OBJ(buffers, &update_meminfo) obj->data.s = STRNDUP_ARG;
obj->callbacks.print = &print_buffers;
obj->callbacks.free = &gen_free_opaque;
END OBJ(cached, &update_meminfo) obj->data.s = STRNDUP_ARG;
@ -873,7 +874,8 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
obj->callbacks.free = &gen_free_opaque;
#endif /* __FreeBSD__ */
END OBJ(password, 0) obj->data.s = strndup(arg ? arg : "20", text_buffer_size.get(*state));
END OBJ(password, 0) obj->data.s =
strndup(arg ? arg : "20", text_buffer_size.get(*state));
obj->callbacks.print = &print_password;
obj->callbacks.free = &gen_free_opaque;
@ -1517,8 +1519,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
obj->callbacks.print = &print_pop3_used;
obj->callbacks.free = &free_mail_obj;
#ifdef BUILD_IBM
END OBJ_ARG(smapi, 0, "smapi needs an argument") obj->data.s =
STRNDUP_ARG;
END OBJ_ARG(smapi, 0, "smapi needs an argument") obj->data.s = STRNDUP_ARG;
obj->callbacks.print = &print_smapi;
obj->callbacks.free = &gen_free_opaque;
END OBJ_IF_ARG(if_smapi_bat_installed, 0,
@ -1725,12 +1726,6 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
END OBJ(bmpx_bitrate, &update_bmpx) obj->callbacks.print =
&print_bmpx_bitrate;
#endif /* BUILD_BMPX */
#ifdef BUILD_EVE
END OBJ_ARG(eve, 0, "eve needs arguments: <userid> <apikey> <characterid>")
scan_eve(obj, arg);
obj->callbacks.print = &print_eve;
obj->callbacks.free = &free_eve;
#endif /* BUILD_EVE */
#ifdef BUILD_CURL
END OBJ_ARG(curl, 0, "curl needs arguments: <uri> <interval in minutes>")
curl_parse_arg(obj, arg);
@ -1746,7 +1741,8 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
obj->callbacks.free = &rss_free_obj_info;
#endif /* BUILD_RSS */
#ifdef BUILD_WEATHER_METAR
END OBJ_ARG(weather, 0, "weather still needs to written...") obj->callbacks.print = &print_weather;
END OBJ_ARG(weather, 0, "weather still needs to written...")
obj->callbacks.print = &print_weather;
#endif /* BUILD_WEATHER_METAR */
END OBJ_ARG(lua, nullptr,
"lua needs arguments: <function name> [function parameters]")
@ -1800,8 +1796,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
obj->callbacks.free = &gen_free_opaque;
#endif /* BUILD_X11 */
#ifdef BUILD_HDDTEMP
END OBJ(hddtemp, &update_hddtemp) if (arg) obj->data.s =
STRNDUP_ARG;
END OBJ(hddtemp, &update_hddtemp) if (arg) obj->data.s = STRNDUP_ARG;
obj->callbacks.print = &print_hddtemp;
obj->callbacks.free = &free_hddtemp;
#endif /* BUILD_HDDTEMP */

448
src/eve.cc
View File

@ -1,448 +0,0 @@
/*
*
* Conky, a system monitor, based on torsmo
*
* Copyright (c) 2008 Asbjørn Zweidorff Kjær
* Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al.
* (see AUTHORS)
* All rights reserved.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <utime.h>
#include <string>
#include "config.h"
#include "eve.h"
#include "logging.h"
#include "text_object.h"
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xmlwriter.h>
#include <curl/curl.h>
#include <curl/easy.h>
#include <time.h>
#include "conky.h"
#define MAXCHARS 64
#define EVE_UPDATE_DELAY 60
typedef struct {
char *charid;
char *skillname;
char *time;
char *lastOutput;
struct tm ends;
struct tm cache;
time_t delay;
int isTraining;
int level;
int skill;
} Character;
struct xmlData {
char *data;
size_t size;
};
struct eve_data {
char apiVCode[65];
char charid[21];
char apiKeyID[21];
};
int num_chars = 0;
Character eveCharacters[MAXCHARS];
static size_t write_data(void *ptr, size_t size, size_t nmemb, void *stream) {
size_t realsize = 0;
struct xmlData *data = 0;
data = (struct xmlData *)stream;
realsize = size * nmemb;
data->data = (char *)realloc(data->data, data->size + realsize + 1);
if (data->data) {
memcpy(&(data->data[data->size]), ptr, realsize);
data->size += realsize;
data->data[data->size] = '\0';
}
return realsize;
}
int parseTrainingXml(char *data, Character *s) {
char *skill = nullptr;
char *level = nullptr;
char ends[20] = "";
char cache[20] = "";
char *isTraining = nullptr;
xmlNodePtr n;
xmlDocPtr doc = 0;
xmlNodePtr root = 0;
struct tm end_tm, cache_tm;
// initialize the time structs
time_t now = time(nullptr);
localtime_r(&now, &end_tm);
localtime_r(&now, &cache_tm);
if (!data) return 1;
doc = xmlReadMemory(data, strlen(data), "", nullptr, XML_PARSE_RECOVER);
root = xmlDocGetRootElement(doc);
for (n = root->children; n; n = n->next) {
if (n->type == XML_ELEMENT_NODE) {
if (!strcasecmp((const char *)n->name, "error")) {
return 1;
} else if (!strcasecmp((const char *)n->name, "result")) {
xmlNodePtr c;
for (c = n->children; c; c = c->next) {
if (!strcasecmp((const char *)c->name, "SkillInTraining")) {
isTraining = (char *)c->children->content;
} else if (!strcasecmp((const char *)c->name, "trainingEndTime")) {
strncpy(ends, (const char *)c->children->content, 20);
} else if (!strcasecmp((const char *)c->name, "trainingTypeID")) {
if (c->children->content) skill = (char *)c->children->content;
} else if (!strcasecmp((const char *)c->name, "trainingToLevel")) {
level = (char *)c->children->content;
}
}
} else if (!strcasecmp((const char *)n->name, "cachedUntil")) {
strncpy(cache, (const char*)n->children->content, 20);
}
}
}
if(isTraining == nullptr) s->isTraining = 0; else s->isTraining = atoi(isTraining);
if(skill == nullptr) s->skill = 0; else s->skill = atoi(skill);
if(level == nullptr) s->level = 0; else s->level = atoi(level);
strptime(cache, "%Y-%m-%d %H:%M:%S", &cache_tm);
s->cache = cache_tm;
if (s->isTraining) {
strptime(ends, "%Y-%m-%d %H:%M:%S", &end_tm);
s->ends = end_tm;
}
xmlFreeDoc(doc);
return 0;
}
static char *getXmlFromAPI(const char *apiKeyID, const char *apiVCode,
const char *charid, const char *url) {
struct xmlData chr;
char *content;
CURL *curl_handle;
chr.data = nullptr;
chr.size = 0;
curl_handle = curl_easy_init();
curl_easy_setopt(curl_handle, CURLOPT_FAILONERROR, 1);
curl_easy_setopt(curl_handle, CURLOPT_NOPROGRESS, 1);
curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, write_data);
curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *)&chr);
std::string real_url = std::string(url, strlen(url));
if (apiKeyID && apiVCode && charid) {
real_url += "?keyID=";
real_url += curl_easy_escape(curl_handle, apiKeyID, strlen(apiKeyID));
real_url += "&vCode=";
real_url += curl_easy_escape(curl_handle, apiVCode, strlen(apiVCode));
real_url += "&characterID=";
real_url += curl_easy_escape(curl_handle, charid, strlen(charid));
}
curl_easy_setopt(curl_handle, CURLOPT_URL, real_url.c_str());
curl_easy_perform(curl_handle);
if (chr.data == nullptr) { return nullptr; }
content = strdup(chr.data);
curl_easy_cleanup(curl_handle);
return content;
}
static void init_eve(void) {
int i;
for (i = 0; i < MAXCHARS; i++) {
eveCharacters[i].charid = nullptr;
eveCharacters[i].skillname = nullptr;
eveCharacters[i].time = nullptr;
eveCharacters[i].level = 0;
eveCharacters[i].skill = 0;
eveCharacters[i].delay = 0;
}
}
static int isCacheValid(struct tm cached) {
// struct timeval tv;
// struct timezone tz;
double offset = 0;
time_t now = time(nullptr);
time_t cache = 0;
double diff = 0;
// gettimeofday(&tv, &tz);
// tzset();
struct tm *lt = localtime(&now);
offset = (double)(-lt->tm_gmtoff);
cache = mktime(&cached);
diff = difftime(cache, now);
if (diff < offset)
return 0;
else
return 1;
}
static char *formatTime(struct tm *ends) {
// struct timeval tv;
// struct timezone tz;
double offset = 0;
time_t now = time(nullptr);
time_t tEnds = 0;
long lin = 0;
long lie = 0;
long diff = 0;
// gettimeofday(&tv, &tz);
struct tm *lt = localtime(&now);
offset = (double)(-lt->tm_gmtoff);
tEnds = mktime(ends);
lin = (long)now;
lin += (long)offset;
lie = (long)tEnds;
diff = (lie - lin);
if (diff > 0) {
int days = (int)(diff / 60 / 60 / 24);
int hours = (int)((diff / 60 / 60) - (days * 24));
int minutes = (int)((diff / 60) - ((hours * 60) + (days * 60 * 24)));
int seconds = (int)(diff - ((minutes * 60) + (hours * 60 * 60) +
(days * 60 * 60 * 24)));
char *output = (char *)malloc(100 * sizeof(char));
if (days > 0)
sprintf(output, "%dd %dh %02dm %02ds", days, hours, minutes, seconds);
else if (hours > 0)
sprintf(output, "%dh %02dm %02ds", hours, minutes, seconds);
else
sprintf(output, "%02dm %02ds", minutes, seconds);
return output;
} else {
char *output = strdup("Done");
return output;
}
}
static void writeSkilltree(char *content, const char *filename) {
FILE *fp = fopen(filename, "w");
if (fwrite(content, sizeof(char), strlen(content), fp) < strlen(content))
NORM_ERR("skill tree write failed");
fclose(fp);
}
static char *getSkillname(const char *file, int skillid) {
char *skilltree;
char *skill = nullptr;
xmlNodePtr n;
xmlDocPtr doc = 0;
xmlNodePtr root = 0;
skilltree = getXmlFromAPI(nullptr, NULL, NULL, EVEURL_SKILLTREE);
if (skilltree) {
writeSkilltree(skilltree, file);
free(skilltree);
}
doc = xmlReadFile(file, nullptr, XML_PARSE_RECOVER);
unlink(file);
if (!doc) return nullptr;
root = xmlDocGetRootElement(doc);
for (n = root->children; n; n = n->next) {
xmlNodePtr o;
for (o = n->children; o; o = o->next) {
xmlNodePtr p;
for (p = o->children; p; p = p->next) {
xmlNodePtr q;
for (q = p->children; q; q = q->next) {
xmlNodePtr r;
for (r = q->children; r; r = r->next) {
xmlElementPtr ele = (xmlElementPtr)r;
xmlAttrPtr attr = (xmlAttrPtr)ele->attributes;
char *mySkill = nullptr;
int id = -1;
while (attr != nullptr) {
if (!strcasecmp((const char *)attr->name, "typeName")) {
mySkill = strdup((const char *)attr->children->content);
} else if (!strcasecmp((const char *)attr->name, "typeID")) {
id = atoi((const char *)attr->children->content);
}
attr = attr->next;
}
if (id == skillid) {
skill = mySkill;
goto END;
}
free(mySkill);
}
}
}
}
}
END:
xmlFreeDoc(doc);
return skill;
}
static char *eve(char *apiKeyID, char *apiVCode, char *charid) {
Character *chr = nullptr;
char skillfile[] = "/tmp/.cesfXXXXXX";
int i = 0;
char *output = 0;
char *timel = 0;
char *skill = 0;
char *content = 0;
time_t now = 0;
char *error = 0;
int tmp_fd, old_umask;
for (i = 0; i < num_chars; i++) {
if (eveCharacters[i].charid != nullptr) {
if (strcasecmp(eveCharacters[i].charid, charid) == 0) {
chr = &eveCharacters[i];
break;
}
}
}
if (!chr) {
if (num_chars == MAXCHARS - 1) return nullptr;
chr = &eveCharacters[num_chars];
memset(chr, 0, sizeof(Character));
chr->charid = strdup(charid);
num_chars++;
}
if (chr->delay > 0) {
now = time(nullptr);
if (now < chr->delay) {
output = strdup("Server error");
return output;
} else
chr->delay = 0;
}
if (isCacheValid(chr->cache)) {
if (chr->isTraining) {
output = (char *)malloc(200 * sizeof(char));
timel = strdup(formatTime(&chr->ends));
sprintf(output, EVE_OUTPUT_FORMAT, chr->skillname, chr->level, timel);
free(timel);
return output;
} else {
return strdup(TRAINING_INACTIVE);
}
} else {
content = getXmlFromAPI(apiKeyID, apiVCode, charid, EVEURL_TRAINING);
if (content == nullptr) {
error = strdup("Server error");
now = time(nullptr);
now += (time_t)1800;
chr->delay = now;
return error;
}
if (parseTrainingXml(content, chr)) {
output = strdup("API error");
return output;
}
timel = formatTime(&chr->ends);
old_umask = umask(0066);
tmp_fd = mkstemp(skillfile);
umask(old_umask);
if (tmp_fd == -1) {
error = strdup("Cannot create temporary file");
return error;
}
close(tmp_fd);
skill = getSkillname(skillfile, chr->skill);
if (skill) {
chr->skillname = strdup(skill);
output = (char *)malloc(200 * sizeof(char));
sprintf(output, EVE_OUTPUT_FORMAT, chr->skillname, chr->level, timel);
free(skill);
return output;
} else {
return strdup(TRAINING_INACTIVE);
}
}
}
void scan_eve(struct text_object *obj, const char *arg) {
struct eve_data *ed;
ed = (struct eve_data *)malloc(sizeof(struct eve_data));
memset(ed, 0, sizeof(struct eve_data));
sscanf(arg, "%20s %64s %20s", ed->apiKeyID, ed->apiVCode, ed->charid);
init_eve();
obj->data.opaque = ed;
}
void print_eve(struct text_object *obj, char *p, unsigned int p_max_size) {
struct eve_data *ed = (struct eve_data *)obj->data.opaque;
if (!ed) return;
snprintf(p, p_max_size, "%s", eve(ed->apiKeyID, ed->apiVCode, ed->charid));
}
void free_eve(struct text_object *obj) {
free_and_zero(obj->data.opaque);
num_chars = 0;
}

38
src/eve.h
View File

@ -1,38 +0,0 @@
/*
*
* Conky, a system monitor, based on torsmo
*
* Copyright (c) 2008 Asbjørn Zweidorff Kjær
* Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al.
* (see AUTHORS)
* All rights reserved.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#ifndef _EVE_H
#define _EVE_H
#define EVEURL_TRAINING \
"https://api.eveonline.com/char/SkillInTraining.xml.aspx"
#define EVEURL_SKILLTREE "https://api.eveonline.com/eve/Skilltree.xml.aspx"
#define EVE_OUTPUT_FORMAT "%s %d in %s"
#define TRAINING_INACTIVE ""
void scan_eve(struct text_object *, const char *);
void print_eve(struct text_object *, char *, unsigned int);
void free_eve(struct text_object *);
#endif /* _EVE_H */

3
src/main.cc
View File

@ -108,9 +108,6 @@ static void print_version() {
#ifdef BUILD_NVIDIA
<< _(" * nvidia\n")
#endif /* BUILD_NVIDIA */
#ifdef BUILD_EVE
<< _(" * eve-online\n")
#endif /* BUILD_EVE */
#ifdef BUILD_BUILTIN_CONFIG
<< _(" * builtin default configuration\n")
#endif /* BUILD_BUILTIN_CONFIG */