Commit b41df3cc authored by jan.koester's avatar jan.koester
Browse files

test

parent d2dcccc6

plugins/media/media.cpp

+15 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 


#include <htmlpp/html.h>

#include <httppp/http.h>

#include <httppp/exception.h>



#include <mediadb/client.h>
@@ -532,6 +533,19 @@ namespace blogi { 
                json_object_array_add(jnav, jcfg);

                json_object_object_add(jerr, "nav", jnav);

                return jerr;

            } catch(libhttppp::HTTPException &e) {

                std::cerr << "media plugin: mediadb connection failed: " << e.what() << std::endl;

                json_object *jerr = json_object_new_object();

                json_object_object_add(jerr, "title", json_object_new_string(tr(_lang,"media library").c_str()));

                json_object_object_add(jerr, "message", json_object_new_string(e.what().c_str()));

                json_object_object_add(jerr, "message_type", json_object_new_string("error"));

                json_object *jnav = json_object_new_array();

                json_object *jcfg = json_object_new_object();

                json_object_object_add(jcfg, "label", json_object_new_string(tr(_lang,"Configuration").c_str()));

                json_object_object_add(jcfg, "url", json_object_new_string(Args->config->buildurl("settings/media/config").c_str()));

                json_object_array_add(jnav, jcfg);

                json_object_object_add(jerr, "nav", jnav);

                return jerr;

            } catch(...) {

                std::cerr << "media plugin: mediadb connection failed (unknown exception)" << std::endl;

                json_object *jerr = json_object_new_object();
@@ -634,7 +648,7 @@ namespace blogi { 
            std::string mdbUrl;

            try { getConfig(*Args->database[0],"MEDIADB_URL",mdbUrl); } catch(...) {}

            if(mdbUrl.empty())

                mdbUrl = "http://127.0.0.1:8080";

                mdbUrl = "https://127.0.0.1:8442";

            _mdbUrl = mdbUrl;



            _loadStores(0);