added graph of sensors (web server)

[psensor.git] / src / server / server.c

diff --git a/src/server/server.c b/src/server/server.c
index 673964c..8395609 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2010-2011 wpitchoune@gmail.com
+    Copyright (C) 2010-2011 jeanfi@gmail.com
 
     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
@@ -40,10 +40,6 @@
 #include "sysinfo.h"
 #endif
 
-#ifdef HAVE_LUA
-#include "server_lua.h"
-#endif
-
 #include "psensor_json.h"
 #include "plib/url.h"
 #include "plib/plib_io.h"
@@ -77,7 +73,7 @@ static int server_stop_requested;
 void print_version()
 {
        printf("psensor-server %s\n", VERSION);
-       printf(_("Copyright (C) %s wpitchoune@gmail.com\n\
+       printf(_("Copyright (C) %s jeanfi@gmail.com\n\
 License GPLv2: GNU GPL version 2 or later \
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n\
 This is free software: you are free to change and redistribute it.\n\
@@ -113,19 +109,6 @@ void print_help()
 }
 
 /*
-  Returns '1' if the path denotates a Lua file, otherwise returns 0.
- */
-int is_path_lua(const char *path)
-{
-       char *dot = rindex(path, '.');
-
-       if (dot && !strcasecmp(dot, ".lua"))
-               return 1;
-
-       return 0;
-}
-
-/*
   Returns the file path corresponding to a given URL
 */
 char *get_path(const char *url, const char *www_dir)
@@ -134,7 +117,7 @@ char *get_path(const char *url, const char *www_dir)
        char *res;
 
        if (!strlen(url) || !strcmp(url, ".") || !strcmp(url, "/"))
-               p = "/index.lua";
+               p = "/index.html";
        else
                p = url;
 
@@ -160,20 +143,26 @@ create_response_api(const char *nurl,
                    const char *method,
                    unsigned int *rp_code)
 {
+       struct MHD_Response *resp;
+       struct psensor *s;
        char *page = NULL;
 
        if (!strcmp(nurl, URL_BASE_API_1_0_SENSORS))  {
 
                page = sensors_to_json_string(server_data.sensors);
 
+#ifdef HAVE_GTOP
+       } else if (!strcmp(nurl, URL_API_1_0_SYSINFO)) {
+
+               page = sysinfo_to_json_string(&server_data.psysinfo);
+#endif
        } else if (!strncmp(nurl, URL_BASE_API_1_0_SENSORS,
                            strlen(URL_BASE_API_1_0_SENSORS))
                   && nurl[strlen(URL_BASE_API_1_0_SENSORS)] == '/') {
 
                const char *sid = nurl + strlen(URL_BASE_API_1_0_SENSORS) + 1;
 
-               struct psensor *s
-                       = psensor_list_get_by_id(server_data.sensors, sid);
+               s = psensor_list_get_by_id(server_data.sensors, sid);
 
                if (s)
                        page = sensor_to_json_string(s);
@@ -188,29 +177,14 @@ create_response_api(const char *nurl,
        if (page) {
                *rp_code = MHD_HTTP_OK;
 
-               return MHD_create_response_from_data
-                       (strlen(page), page, MHD_YES, MHD_NO);
-       }
-
-       return NULL;
-}
-
-struct MHD_Response *
-create_response_lua(const char *nurl,
-                   const char *method,
-                   unsigned int *rp_code,
-                   const char *fpath)
-{
-#ifdef HAVE_LUA
-       char *page = lua_to_html_page(&server_data, fpath);
+               resp = MHD_create_response_from_data(strlen(page), page,
+                                                    MHD_YES, MHD_NO);
 
-       if (page) {
-               *rp_code = MHD_HTTP_OK;
+               MHD_add_response_header(resp, MHD_HTTP_HEADER_CONTENT_TYPE,
+                                       "application/json");
 
-               return MHD_create_response_from_data
-                       (strlen(page), page, MHD_YES, MHD_NO);
+               return resp;
        }
-#endif
 
        return NULL;
 }
@@ -259,12 +233,7 @@ create_response(const char *nurl, const char *method, unsigned int *rp_code)
        } else {
                char *fpath = get_path(nurl, server_data.www_dir);
 
-               if (is_path_lua(fpath))
-                       resp = create_response_lua
-                               (nurl, method, rp_code, fpath);
-               else
-                       resp = create_response_file
-                               (nurl, method, rp_code, fpath);
+               resp = create_response_file(nurl, method, rp_code, fpath);
 
                free(fpath);
        }
@@ -294,7 +263,6 @@ cbk_http_request(void *cls,
        int ret;
        char *nurl;
        unsigned int resp_code;
-       char *page = NULL;
 
        if (strcmp(method, "GET"))
                return MHD_NO;
@@ -345,6 +313,7 @@ int main(int argc, char *argv[])
 #endif
 
        server_data.www_dir = DEFAULT_WWW_DIR;
+       server_data.psysinfo.interfaces = NULL;
 
        while ((optc = getopt_long(argc, argv,
                                   "vhp:w:d", long_options, NULL)) != -1) {
@@ -378,12 +347,9 @@ int main(int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
 
-       if (!lmsensor_init()) {
-               fprintf(stderr, _("ERROR: failed to init lm-sensors\n"));
-               exit(EXIT_FAILURE);
-       }
+       psensor_init();
 
-       server_data.sensors = get_all_sensors(1);
+       server_data.sensors = get_all_sensors(600);
 
        if (!*server_data.sensors)
                fprintf(stderr, _("ERROR: no sensors detected\n"));