From 80f75520d23f9037d4b6d41bae7d3bf6b2cf40ce Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Sat, 16 Apr 2016 17:58:21 +0800 Subject: [PATCH] code cleaning --- main.cpp | 27 +++++++++++++++------------ src/page.h | 3 ++- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/main.cpp b/main.cpp index 7699409..4a734e8 100644 --- a/main.cpp +++ b/main.cpp @@ -30,22 +30,32 @@ int main(int ac, const char* av[]) { return 0; } - auto port_opt = opts.get_option("port"); - auto bc_path_opt = opts.get_option("bc-path"); + + auto port_opt = opts.get_option("port"); + auto bc_path_opt = opts.get_option("bc-path"); + auto deamon_url_opt = opts.get_option("deamon-url"); //cast port number in string to uint16 uint16_t app_port = boost::lexical_cast(*port_opt); + // get blockchain path + path blockchain_path; - path blockchain_path {"/home/mwo/.bitmonero/lmdb"}; + if (!xmreg::get_blockchain_path(bc_path_opt, blockchain_path)) + { + cerr << "Error getting blockchain path." << endl; + return 1; + } // enable basic monero log output xmreg::enable_monero_log(); // create instance of our MicroCore + // and make pointer to the Blockchain xmreg::MicroCore mcore; cryptonote::Blockchain* core_storage; + // initialize mcore and core_storage if (!xmreg::init_blockchain(blockchain_path.string(), mcore, core_storage)) { @@ -54,19 +64,17 @@ int main(int ac, const char* av[]) { } // create instance of page class which - // coins logic for the website - xmreg::page xmrblocks(&mcore, core_storage); + // contains logic for the website + xmreg::page xmrblocks(&mcore, core_storage, *deamon_url_opt); // crow instance crow::SimpleApp app; - CROW_ROUTE(app, "/") ([&]() { return xmrblocks.index(); }); - CROW_ROUTE(app, "/page/") ([&](size_t page_no) { return xmrblocks.index(page_no); @@ -89,11 +97,6 @@ int main(int ac, const char* av[]) { return xmrblocks.index(page_no, refresh_page); }); - CROW_ROUTE(app, "/css/style.css") - ([&]() { - return xmreg::read("./templates/css/style.css"); - }); - // run the crow http server app.port(app_port).multithreaded().run(); diff --git a/src/page.h b/src/page.h index 4c43d1d..e6ecdf5 100644 --- a/src/page.h +++ b/src/page.h @@ -52,9 +52,10 @@ namespace xmreg { public: - page(MicroCore* _mcore, Blockchain* _core_storage) + page(MicroCore* _mcore, Blockchain* _core_storage, string deamon_url) : mcore {_mcore}, core_storage {_core_storage}, + rpc {deamon_url}, server_timestamp {std::time(nullptr)} { }