added counting active API threads

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index fab3df37653d139a61b68d0b52aa39e09c306e5a..4c5a366138a27fb6df88a3ce6a2688ce4e82c93b 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -9114,20 +9114,28 @@ static boolean SetRequest_ApiGetScore(struct HttpRequest *request,
   request->method   = API_SERVER_METHOD;
   request->uri      = API_SERVER_URI_GET;
 
+  char *levelset_identifier = getEscapedJSON(leveldir_current->identifier);
+  char *levelset_name       = getEscapedJSON(leveldir_current->name);
+
   snprintf(request->body, MAX_HTTP_BODY_SIZE,
           "{\n"
           "%s"
           "  \"game_version\":         \"%s\",\n"
           "  \"game_platform\":        \"%s\",\n"
           "  \"levelset_identifier\":  \"%s\",\n"
+          "  \"levelset_name\":        \"%s\",\n"
           "  \"level_nr\":             \"%d\"\n"
           "}\n",
           getPasswordJSON(setup.api_server_password),
           getProgramRealVersionString(),
           getProgramPlatformString(),
-          levelset.identifier,
+          levelset_identifier,
+          levelset_name,
           level_nr);
 
+  checked_free(levelset_identifier);
+  checked_free(levelset_name);
+
   ConvertHttpRequestBodyToServerEncoding(request);
 
   return TRUE;
@@ -9243,6 +9251,10 @@ static void ApiGetScore_HttpRequestExt(struct HttpRequest *request,
 
   if (!HTTP_SUCCESS(response->status_code))
   {
+    // do not show error message if no scores found for this level set
+    if (response->status_code == 404)
+      return;
+
     Error("server failed to handle request: %d %s",
          response->status_code,
          response->status_text);
@@ -9268,12 +9280,16 @@ static int ApiGetScoreThread(void *data_raw)
   struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
   struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
 
+  program.api_thread_count++;
+
 #if defined(PLATFORM_EMSCRIPTEN)
   Emscripten_ApiGetScore_HttpRequest(request, data_raw);
 #else
   ApiGetScore_HttpRequest(request, response, data_raw);
 #endif
 
+  program.api_thread_count--;
+
   checked_free(request);
   checked_free(response);
 
@@ -9432,11 +9448,13 @@ static char *get_file_base64(char *filename)
 struct ApiAddScoreThreadData
 {
   int level_nr;
+  boolean tape_saved;
   char *score_tape_filename;
   struct ScoreEntry score_entry;
 };
 
-static void *CreateThreadData_ApiAddScore(int nr, char *score_tape_filename)
+static void *CreateThreadData_ApiAddScore(int nr, boolean tape_saved,
+                                         char *score_tape_filename)
 {
   struct ApiAddScoreThreadData *data =
     checked_malloc(sizeof(struct ApiAddScoreThreadData));
@@ -9446,6 +9464,7 @@ static void *CreateThreadData_ApiAddScore(int nr, char *score_tape_filename)
     score_tape_filename = getScoreTapeFilename(score_entry->tape_basename, nr);
 
   data->level_nr = nr;
+  data->tape_saved = tape_saved;
   data->score_entry = *score_entry;
   data->score_tape_filename = getStringCopy(score_tape_filename);
 
@@ -9466,6 +9485,7 @@ static boolean SetRequest_ApiAddScore(struct HttpRequest *request,
   struct ApiAddScoreThreadData *data = data_raw;
   struct ScoreEntry *score_entry = &data->score_entry;
   char *score_tape_filename = data->score_tape_filename;
+  boolean tape_saved = data->tape_saved;
   int level_nr = data->level_nr;
 
   request->hostname = setup.api_server_hostname;
@@ -9513,12 +9533,14 @@ static boolean SetRequest_ApiAddScore(struct HttpRequest *request,
           "  \"level_nr\":             \"%d\",\n"
           "  \"level_name\":           \"%s\",\n"
           "  \"level_author\":         \"%s\",\n"
+          "  \"use_step_counter\":     \"%d\",\n"
           "  \"rate_time_over_score\": \"%d\",\n"
           "  \"player_name\":          \"%s\",\n"
           "  \"player_uuid\":          \"%s\",\n"
           "  \"score\":                \"%d\",\n"
           "  \"time\":                 \"%d\",\n"
           "  \"tape_basename\":        \"%s\",\n"
+          "  \"tape_saved\":           \"%d\",\n"
           "  \"tape\":                 \"%s\"\n"
           "}\n",
           getPasswordJSON(setup.api_server_password),
@@ -9533,12 +9555,14 @@ static boolean SetRequest_ApiAddScore(struct HttpRequest *request,
           level_nr,
           level_name,
           level_author,
+          level.use_step_counter,
           level.rate_time_over_score,
           player_name,
           player_uuid,
           score_entry->score,
           score_entry->time,
           score_entry->tape_basename,
+          tape_saved,
           tape_base64);
 
   checked_free(tape_base64);
@@ -9659,54 +9683,65 @@ static int ApiAddScoreThread(void *data_raw)
   struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
   struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
 
+  program.api_thread_count++;
+
 #if defined(PLATFORM_EMSCRIPTEN)
   Emscripten_ApiAddScore_HttpRequest(request, data_raw);
 #else
   ApiAddScore_HttpRequest(request, response, data_raw);
 #endif
 
+  program.api_thread_count--;
+
   checked_free(request);
   checked_free(response);
 
   return 0;
 }
 
-static void ApiAddScoreAsThread(int nr, char *score_tape_filename)
+static void ApiAddScoreAsThread(int nr, boolean tape_saved,
+                               char *score_tape_filename)
 {
   struct ApiAddScoreThreadData *data =
-    CreateThreadData_ApiAddScore(nr, score_tape_filename);
+    CreateThreadData_ApiAddScore(nr, tape_saved, score_tape_filename);
 
   ExecuteAsThread(ApiAddScoreThread,
                  "ApiAddScore", data,
                  "upload score to server");
 }
 
-void SaveServerScore(int nr)
+void SaveServerScore(int nr, boolean tape_saved)
 {
   if (!runtime.use_api_server)
     return;
 
-  ApiAddScoreAsThread(nr, NULL);
+  ApiAddScoreAsThread(nr, tape_saved, NULL);
 }
 
-void SaveServerScoreFromFile(int nr, char *score_tape_filename)
+void SaveServerScoreFromFile(int nr, boolean tape_saved,
+                            char *score_tape_filename)
 {
   if (!runtime.use_api_server)
     return;
 
-  ApiAddScoreAsThread(nr, score_tape_filename);
+  ApiAddScoreAsThread(nr, tape_saved, score_tape_filename);
 }
 
 void LoadLocalAndServerScore(int nr, boolean download_score)
 {
   int last_added_local = scores.last_added_local;
 
-  LoadScore(nr);
+  // needed if only showing server scores
+  setScoreInfoToDefaults();
+
+  if (!strEqual(setup.scores_in_highscore_list, STR_SCORES_TYPE_SERVER_ONLY))
+    LoadScore(nr);
 
   // restore last added local score entry (before merging server scores)
   scores.last_added = scores.last_added_local = last_added_local;
 
-  if (setup.use_api_server && !setup.only_show_local_scores)
+  if (setup.use_api_server &&
+      !strEqual(setup.scores_in_highscore_list, STR_SCORES_TYPE_LOCAL_ONLY))
   {
     // load server scores from cache file and trigger update from server
     LoadServerScore(nr, download_score);
@@ -9907,8 +9942,8 @@ static struct TokenInfo global_setup_tokens[] =
     &setup.show_undo_redo_buttons,             "show_undo_redo_buttons"
   },
   {
-    TYPE_SWITCH,
-    &setup.only_show_local_scores,             "only_show_local_scores"
+    TYPE_STRING,
+    &setup.scores_in_highscore_list,           "scores_in_highscore_list"
   },
   {
     TYPE_STRING,
@@ -10603,7 +10638,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->small_game_graphics = FALSE;
   si->show_load_save_buttons = FALSE;
   si->show_undo_redo_buttons = FALSE;
-  si->only_show_local_scores = FALSE;
+  si->scores_in_highscore_list = getStringCopy(STR_SCORES_TYPE_DEFAULT);
 
   si->graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR);
   si->sounds_set   = getStringCopy(SND_CLASSIC_SUBDIR);