diff --git a/.gitignore b/.gitignore index f47483e5..ac4b2e72 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ Makefile aclocal.m4 autom4te.cache +compile config.h config.guess config.status diff --git a/src/command_download.cc b/src/command_download.cc index 1e2cd4e2..9fa2157a 100644 --- a/src/command_download.cc +++ b/src/command_download.cc @@ -284,15 +284,6 @@ retrieve_d_bitfield(core::Download* download) { return torrent::Object(rak::transform_hex(bitField->begin(), bitField->end())); } -// Just a helper function atm. -torrent::Object -cmd_d_initialize_logs(core::Download* download) { - download->info()->signal_network_log().push_back(tr1::bind(&core::Manager::push_log_complete, control->core(), tr1::placeholders::_1)); - download->info()->signal_storage_error().push_back(tr1::bind(&core::Manager::push_log_complete, control->core(), tr1::placeholders::_1)); - - return torrent::Object(); -} - struct call_add_d_peer_t { call_add_d_peer_t(core::Download* d, int port) : m_download(d), m_port(port) { } @@ -872,8 +863,6 @@ initialize_command_download() { CMD2_DL ("d.group.name", tr1::bind(&cg_d_group, tr1::placeholders::_1)); CMD2_DL_V ("d.group.set", tr1::bind(&cg_d_group_set, tr1::placeholders::_1, tr1::placeholders::_2)); - CMD2_DL ("d.initialize_logs", tr1::bind(&cmd_d_initialize_logs, tr1::placeholders::_1)); - CMD2_DL_LIST ("f.multicall", tr1::bind(&f_multicall, tr1::placeholders::_1, tr1::placeholders::_2)); CMD2_DL_LIST ("p.multicall", tr1::bind(&p_multicall, tr1::placeholders::_1, tr1::placeholders::_2)); CMD2_DL_LIST ("t.multicall", tr1::bind(&t_multicall, tr1::placeholders::_1, tr1::placeholders::_2)); diff --git a/src/core/download.cc b/src/core/download.cc index c17e8e4f..3d2a3634 100644 --- a/src/core/download.cc +++ b/src/core/download.cc @@ -65,7 +65,6 @@ Download::Download(download_type d) : m_download.info()->signal_tracker_success().push_back(tr1::bind(&Download::receive_tracker_msg, this, "")); m_download.info()->signal_tracker_failed().push_back(tr1::bind(&Download::receive_tracker_msg, this, tr1::placeholders::_1)); - m_download.info()->signal_storage_error().push_back(tr1::bind(&Download::receive_storage_error, this, tr1::placeholders::_1)); m_download.info()->signal_chunk_failed().push_back(tr1::bind(&Download::receive_chunk_failed, this, tr1::placeholders::_1)); } @@ -118,11 +117,6 @@ Download::receive_tracker_msg(std::string msg) { m_message = "Tracker: [" + msg + "]"; } -void -Download::receive_storage_error(std::string msg) { - m_message = "Storage error: [" + msg + "]"; -} - float Download::distributed_copies() const { const uint8_t* avail = m_download.chunks_seen(); diff --git a/src/core/download.h b/src/core/download.h index 4ac058bd..bf4999c9 100644 --- a/src/core/download.h +++ b/src/core/download.h @@ -140,7 +140,6 @@ private: void operator () (const Download&); void receive_tracker_msg(std::string msg); - void receive_storage_error(std::string msg); void receive_chunk_failed(uint32_t idx); diff --git a/src/main.cc b/src/main.cc index 54e4aae9..36ace224 100644 --- a/src/main.cc +++ b/src/main.cc @@ -262,7 +262,6 @@ main(int argc, char** argv) { "method.insert = event.download.hash_removed,multi|rlookup|static\n" "method.insert = event.download.hash_queued,multi|rlookup|static\n" - "method.set_key = event.download.inserted, 1_connect_logs, ((d.initialize_logs))\n" "method.set_key = event.download.inserted, 1_send_scrape, ((d.tracker.send_scrape,30))\n" "method.set_key = event.download.inserted_new, 1_prepare, {(branch,((d.state)),((view.set_visible,started)),((view.set_visible,stopped)) ),(d.save_full_session)}\n" "method.set_key = event.download.inserted_session, 1_prepare, {(branch,((d.state)),((view.set_visible,started)),((view.set_visible,stopped)) )}\n"