refactor: conditionally include libipfs and link libraries for non-Android platforms

Author: hayzamjs

src/blockchain_utilities/CMakeLists.txt

@@ -140,7 +140,6 @@ scala_add_executable(blockchain_import
 
 target_link_libraries(blockchain_import
  PRIVATE
- libipfs
  cryptonote_core
  blockchain_db
  version
@@ -152,6 +151,10 @@ target_link_libraries(blockchain_import
  ${EXTRA_LIBRARIES}
  $<TARGET_NAME_IF_EXISTS:blocks>)
 
+if(NOT ANDROID)
+ target_link_libraries(blockchain_import PRIVATE libipfs)
+endif()
+ 
 if(ARCH_WIDTH)
  target_compile_definitions(blockchain_import
  PUBLIC -DARCH_WIDTH=${ARCH_WIDTH})

src/blockchain_utilities/blockchain_import.cpp

@@ -707,105 +707,107 @@ int main(int argc, char* argv[])
 
  import_file_path = fs_import_file_path.string();
 
+ #if !defined(__ANDROID__)
+ if (command_line::has_arg(vm, arg_ipfs_import))
+ {
+ std::atomic<bool> downloadInProgress(true);
+ 
+ boost::filesystem::path export_path = boost::filesystem::path(m_config_folder) / "export";
+ if (!boost::filesystem::exists(export_path))
+ {
+ boost::filesystem::create_directories(export_path);
+ }
 
- if (command_line::has_arg(vm, arg_ipfs_import))
- {
- std::atomic<bool> downloadInProgress(true);
- 
- boost::filesystem::path export_path = boost::filesystem::path(m_config_folder) / "export";
- if (!boost::filesystem::exists(export_path))
- {
- boost::filesystem::create_directories(export_path);
- }
-
- opt_verify = false;
- boost::filesystem::path ipfs_path = boost::filesystem::path(m_config_folder) / "ipfs";
- std::string ipfs_path_str = ipfs_path.string();
- std::string startResult = Start(const_cast<char*>(ipfs_path_str.c_str()), ipfs_port);
- 
- rapidjson::Document doc;
- if (doc.Parse(startResult.c_str()).HasParseError()) {
- MGINFO("IPFS start response parse error");
- return 0;
- }
- 
- bool fail = false;
- 
- if (doc.HasMember("Status") && doc["Status"].IsString() &&
- std::string(doc["Status"].GetString()) == "success" &&
- doc.HasMember("Data") && doc["Data"].IsObject()) {
- const rapidjson::Value& dataVal = doc["Data"];
- if (dataVal.IsObject()) {
- const auto& data = dataVal.GetObject();
- if (data.HasMember("peerId") && data["peerId"].IsString()) {
- MGINFO("IPFS Started with Peer ID: " << data["peerId"].GetString());
- 
- if (boost::filesystem::exists(import_file_path)) {
- boost::filesystem::remove(import_file_path);
- }
-
- std::thread progressThread([&]() {
- using boost::posix_time::ptime;
- using boost::posix_time::microsec_clock;
- using boost::posix_time::time_duration;
- using boost::posix_time::to_tm;
- 
- while (downloadInProgress) {
- if (boost::filesystem::exists(import_file_path)) {
- std::uintmax_t size = boost::filesystem::file_size(import_file_path);
- 
- ptime now = microsec_clock::local_time();
- time_duration td = now.time_of_day();
- struct tm tm_now = to_tm(now);
- 
- std::ostringstream time_ss;
- time_ss << std::put_time(&tm_now, "%Y-%m-%d %H:%M:%S")
- << '.' << std::setw(3) << std::setfill('0') << td.total_milliseconds() % 1000;
- 
- std::ostringstream oss;
- oss << time_ss.str() << " I Downloaded: " << (size / (1024 * 1024)) << " MB";
- 
- std::cout << "\r" << oss.str() << std::flush;
- }
- 
- std::this_thread::sleep_for(std::chrono::seconds(1));
- }
- });
- 
- MGINFO("Downloading blockchain from IPFS, this might take a few minutes..");
- 
- const std::string getCid = "/ipns/blockchain.raw.scala.network";
- std::string downloadResult = Get((char*)getCid.c_str(), (char*)import_file_path.c_str(), true);
- downloadInProgress = false;
- progressThread.join();
+ opt_verify = false;
+ boost::filesystem::path ipfs_path = boost::filesystem::path(m_config_folder) / "ipfs";
+ std::string ipfs_path_str = ipfs_path.string();
+ std::string startResult = Start(const_cast<char*>(ipfs_path_str.c_str()), ipfs_port);
 
-  rapidjson::Document dlDoc;
-  if (dlDoc.Parse(downloadResult.c_str()).HasParseError()) {
-  MGINFO("Download result parse error");
-  return 0;
-  }
+ rapidjson::Document doc;
+ if (doc.Parse(startResult.c_str()).HasParseError()) {
+ MGINFO("IPFS start response parse error");
+ return 0;
+ }
 
- if (dlDoc.HasMember("Status") && dlDoc["Status"].IsString() &&
- std::string(dlDoc["Status"].GetString()) == "success") {
- MGINFO("Blockchain downloaded from IPFS");
- } else {
- MGINFO("Blockchain download failed");
- }
+ bool fail = false;
 
- } else {
- fail = true;
- }
- }
- } else {
- fail = true;
- }
- 
- if (fail) {
- MGINFO("IPFS failed to initialize, exiting!");
- return 0;
- }
- }
+ if (doc.HasMember("Status") && doc["Status"].IsString() &&
+ std::string(doc["Status"].GetString()) == "success" &&
+ doc.HasMember("Data") && doc["Data"].IsObject()) {
+ const rapidjson::Value& dataVal = doc["Data"];
+ if (dataVal.IsObject()) {
+ const auto& data = dataVal.GetObject();
+ if (data.HasMember("peerId") && data["peerId"].IsString()) {
+ MGINFO("IPFS Started with Peer ID: " << data["peerId"].GetString());
+ 
+ if (boost::filesystem::exists(import_file_path)) {
+ boost::filesystem::remove(import_file_path);
+ }
 
+ std::thread progressThread([&]() {
+ using boost::posix_time::ptime;
+ using boost::posix_time::microsec_clock;
+ using boost::posix_time::time_duration;
+ using boost::posix_time::to_tm;
+ 
+ while (downloadInProgress) {
+ if (boost::filesystem::exists(import_file_path)) {
+ std::uintmax_t size = boost::filesystem::file_size(import_file_path);
+ 
+ ptime now = microsec_clock::local_time();
+ time_duration td = now.time_of_day();
+ struct tm tm_now = to_tm(now);
+ 
+ std::ostringstream time_ss;
+ time_ss << std::put_time(&tm_now, "%Y-%m-%d %H:%M:%S")
+ << '.' << std::setw(3) << std::setfill('0') << td.total_milliseconds() % 1000;
+ 
+ std::ostringstream oss;
+ oss << time_ss.str() << " I Downloaded: " << (size / (1024 * 1024)) << " MB";
+ 
+ std::cout << "\r" << oss.str() << std::flush;
+ }
+ 
+ std::this_thread::sleep_for(std::chrono::seconds(1));
+ }
+ });
+ 
+ MGINFO("Downloading blockchain from IPFS, this might take a few minutes..");
+ 
+ const std::string getCid = "/ipns/blockchain.raw.scala.network";
+ std::string downloadResult = Get((char*)getCid.c_str(), (char*)import_file_path.c_str(), true);
+ downloadInProgress = false;
+ progressThread.join();
+ 
+ rapidjson::Document dlDoc;
+ if (dlDoc.Parse(downloadResult.c_str()).HasParseError()) {
+ MGINFO("Download result parse error");
+ return 0;
+ }
+ 
+ if (dlDoc.HasMember("Status") && dlDoc["Status"].IsString() &&
+ std::string(dlDoc["Status"].GetString()) == "success") {
+ MGINFO("Blockchain downloaded from IPFS");
+ } else {
+ MGINFO("Blockchain download failed");
+ }
+ 
+ } else {
+ fail = true;
+ }
+ }
+ } else {
+ fail = true;
+ }
+ 
+ if (fail) {
+ MGINFO("IPFS failed to initialize, exiting!");
+ return 0;
+ }
+ }
+ #else
+ MGINFO("IPFS import is not supported on Android");
+ #endif
 
  if (command_line::has_arg(vm, arg_ipfs_import))
  {

src/blockchain_utilities/blockchain_import.h

@@ -29,5 +29,9 @@
 #pragma once
 
 #include "version.h"
-#include "libipfs.h"
+
+#if !defined(__ANDROID__)
+ #include "libipfs.h"
+#endif
+
 

src/daemon/CMakeLists.txt

@@ -48,7 +48,6 @@ scala_add_executable(daemon
 target_link_libraries(daemon
  PRIVATE
  rpc
- libipfs
  blockchain_db
  cryptonote_core
  cncrypto
@@ -70,6 +69,11 @@ target_link_libraries(daemon
  ${GNU_READLINE_LIBRARY}
  ${EXTRA_LIBRARIES}
  $<TARGET_NAME_IF_EXISTS:blocks>)
+
+if(NOT ANDROID)
+ target_link_libraries(blockchain_import PRIVATE libipfs)
+endif()
+
 set_property(TARGET daemon
  PROPERTY
  OUTPUT_NAME "scalad")

src/daemon/daemon.cpp

@@ -125,21 +125,25 @@ struct t_internals {
  }
  }
 
- if (!command_line::get_arg(vm, daemon_args::arg_ipfs_enabled))
- {
- MGINFO("IPFS disabled");
- } else {
- boost::filesystem::path data_dir = boost::filesystem::absolute(
- command_line::get_arg(vm, cryptonote::arg_data_dir));
- boost::filesystem::path ipfs_dir = data_dir / "ipfs";
- std::string ipfs_path_str = ipfs_dir.string();
- const std::string ipfs_p2p_port_str = command_line::get_arg(vm, daemon_args::arg_ipfs_bind_port);
- int ipfs_p2p_port = std::stoi(ipfs_p2p_port_str);
- 
- Start(const_cast<char*>(ipfs_path_str.c_str()), ipfs_p2p_port);
-
- MGINFO("IPFS initialized OK on port: " << ipfs_p2p_port);
- }
+ #if !defined(__ANDROID__)
+ if (!command_line::get_arg(vm, daemon_args::arg_ipfs_enabled))
+ {
+ MGINFO("IPFS disabled");
+ } else {
+ boost::filesystem::path data_dir = boost::filesystem::absolute(
+ command_line::get_arg(vm, cryptonote::arg_data_dir));
+ boost::filesystem::path ipfs_dir = data_dir / "ipfs";
+ std::string ipfs_path_str = ipfs_dir.string();
+ const std::string ipfs_p2p_port_str = command_line::get_arg(vm, daemon_args::arg_ipfs_bind_port);
+ int ipfs_p2p_port = std::stoi(ipfs_p2p_port_str);
+ 
+ Start(const_cast<char*>(ipfs_path_str.c_str()), ipfs_p2p_port);
+
+ MGINFO("IPFS initialized OK on port: " << ipfs_p2p_port);
+ }
+ #elif
+ MGINFO("IPFS disabled on Android");
+ #endif
  }
 };
 

src/daemon/daemon.h

@@ -28,7 +28,10 @@
 
 #pragma once
 #include <boost/program_options.hpp>
-#include "libipfs.h"
+
+#if !defined(__ANDROID__)
+ #include "libipfs.h"
+#endif
 
 #undef SCALA_DEFAULT_LOG_CATEGORY
 #define SCALA_DEFAULT_LOG_CATEGORY "daemon"