miner client submit to v2 api (#613)

Author: loader3229

src/cmd/test.cpp

@@ -980,8 +980,8 @@ bool Test::checkEvaluator(const Settings& settings, size_t id, std::string path,
 void Test::apiClient() {
   Log::get().info("Testing API client");
   ApiClient client;
-  client.postProgram(std::string("tests") + FILE_SEP + "programs" + FILE_SEP +
-                     "oeis" + FILE_SEP + "000" + FILE_SEP + "A000005.asm");
+  // client.postProgram(std::string("tests") + FILE_SEP + "programs" + FILE_SEP
+  // + "oeis" + FILE_SEP + "000" + FILE_SEP + "A000005.asm");
   auto submission = client.getNextSubmission();
   if (submission.mode == Submission::Mode::REMOVE) return;
   auto program = submission.toProgram();

src/mine/api_client.cpp

@@ -4,6 +4,7 @@
 #include <sstream>
 #include <thread>
 
+#include "lang/comments.hpp"
 #include "lang/program_util.hpp"
 #include "sys/file.hpp"
 #include "sys/git.hpp"
@@ -40,18 +41,34 @@ ApiClient& ApiClient::getDefaultInstance() {
   return api_client;
 }
 
+std::string ApiClient::toJson(const Program& program){
+  const std::string id = Comments::getSequenceIdFromProgram(program);
+  const std::string submitter = Comments::getSubmitter(program);
+  const std::string change_type = Comments::getCommentField(program, Comments::PREFIX_CHANGE_TYPE);
+  const std::string mode = ((change_type == "" || change_type == "Found") ? "add" : "update");
+  const std::string type = "program";
+  std::ostringstream oss;
+  ProgramUtil::print(program, oss);
+  const std::string content = oss.str();
+  return "{\"id\":\"" + escapeJsonString(id) + "\","
+         "\"submitter\":\"" + escapeJsonString(submitter) + "\","
+         "\"mode\":\"" + escapeJsonString(mode) + "\","
+         "\"type\":\"" + escapeJsonString(type) + "\","
+         "\"content\":\"" + escapeJsonString(content) + "\"}";
+}
+
 void ApiClient::postProgram(const Program& program, size_t max_buffer) {
   // attention: curl sometimes has problems with absolute paths.
   // so we use a relative path here!
-  const std::string tmp = "post_program_" + std::to_string(client_id) + ".asm";
+  const std::string tmp = "post_program_" + std::to_string(client_id) + ".json";
   out_queue.push_back(program);
   while (!out_queue.empty()) {
     {
       std::ofstream out(tmp);
-      ProgramUtil::print(out_queue.back(), out);
+      out << toJson(out_queue.back());
       out.close();
     }
-    if (postProgram(tmp, out_queue.size() > max_buffer)) {
+    if (postSubmission(tmp, out_queue.size() > max_buffer)) {
       out_queue.pop_back();
     } else {
       break;
@@ -60,11 +77,11 @@ void ApiClient::postProgram(const Program& program, size_t max_buffer) {
   std::remove(tmp.c_str());
 }
 
-bool ApiClient::postProgram(const std::string& path, bool fail_on_error) {
+bool ApiClient::postSubmission(const std::string& path, bool fail_on_error) {
   if (!isFile(path)) {
     Log::get().error("File not found: " + path, true);
   }
-  const std::string url = base_url + "programs";
+  const std::string url = base_url_v2 + "submissions";
   if (!WebClient::postFile(url, path)) {
     const std::string msg("Cannot submit program to API server");
     if (fail_on_error) {

src/mine/api_client.hpp

@@ -12,9 +12,13 @@ class ApiClient {
 
   static ApiClient& getDefaultInstance();
 
+  std::string toJson(const Program& program);
+
   void postProgram(const Program& program, size_t max_buffer = 0);
 
-  bool postProgram(const std::string& path, bool fail_on_error = true);
+  //void postSubmission(const Submission& submission, size_t max_buffer = 0);
+
+  bool postSubmission(const std::string& path, bool fail_on_error = true);
 
   void postCPUHour();