added command to upload existing tapes to server

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 93a4b59724af8d9fb458d2e0f9bdcd27ffae2df5..1dd328c0f1f4fa744d28e84e7deb19865bb3881a 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -8537,6 +8537,7 @@ static void setScoreInfoToDefaultsExt(struct ScoreInfo *scores)
   scores->last_added_local = -1;
 
   scores->updated = FALSE;
+  scores->uploaded = FALSE;
   scores->force_last_added = FALSE;
 }
 
@@ -9016,6 +9017,26 @@ static void ExecuteAsThread(SDL_ThreadFunction function, char *name, void *data,
   Delay(1);
 }
 
+static char *getPasswordJSON(char *password)
+{
+  static char password_json[MAX_FILENAME_LEN] = "";
+  static boolean initialized = FALSE;
+
+  if (!initialized)
+  {
+    if (password != NULL &&
+       !strEqual(password, "") &&
+       !strEqual(password, UNDEFINED_PASSWORD))
+      snprintf(password_json, MAX_FILENAME_LEN,
+              "  \"password\":             \"%s\",\n",
+              setup.api_server_password);
+
+    initialized = TRUE;
+  }
+
+  return password_json;
+}
+
 static void DownloadServerScoreToCacheExt(struct HttpRequest *request,
                                          struct HttpResponse *response,
                                          int level_nr,
@@ -9028,9 +9049,11 @@ static void DownloadServerScoreToCacheExt(struct HttpRequest *request,
 
   snprintf(request->body, MAX_HTTP_BODY_SIZE,
           "{\n"
+          "%s"
           "  \"levelset_identifier\":  \"%s\",\n"
           "  \"level_nr\":             \"%d\"\n"
           "}\n",
+          getPasswordJSON(setup.api_server_password),
           levelset.identifier, level_nr);
 
   ConvertHttpRequestBodyToServerEncoding(request);
@@ -9298,6 +9321,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
 
   snprintf(request->body, MAX_HTTP_BODY_SIZE,
           "{\n"
+          "%s"
           "  \"game_version\":         \"%s\",\n"
           "  \"levelset_identifier\":  \"%s\",\n"
           "  \"levelset_name\":        \"%s\",\n"
@@ -9314,6 +9338,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
           "  \"tape_basename\":        \"%s\",\n"
           "  \"tape\":                 \"%s\"\n"
           "}\n",
+          getPasswordJSON(setup.api_server_password),
           getProgramRealVersionString(),
           levelset_identifier,
           levelset_name,
@@ -9356,6 +9381,8 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
 
     return;
   }
+
+  server_scores.uploaded = TRUE;
 }
 
 static void UploadScoreToServer(int level_nr, char *score_tape_filename,
@@ -9392,12 +9419,14 @@ static int UploadScoreToServerThread(void *data_raw)
   return 0;
 }
 
-static void UploadScoreToServerAsThread(int nr)
+static void UploadScoreToServerAsThread(int nr, char *score_tape_filename)
 {
   struct UploadScoreToServerThreadData *data =
     checked_malloc(sizeof(struct UploadScoreToServerThreadData));
   struct ScoreEntry *score_entry = &scores.entry[scores.last_added];
-  char *score_tape_filename = getScoreTapeFilename(score_entry->tape_basename, nr);
+
+  if (score_tape_filename == NULL)
+    score_tape_filename = getScoreTapeFilename(score_entry->tape_basename, nr);
 
   data->level_nr = nr;
   data->score_entry = *score_entry;
@@ -9413,7 +9442,15 @@ void SaveServerScore(int nr)
   if (!runtime.api_server)
     return;
 
-  UploadScoreToServerAsThread(nr);
+  UploadScoreToServerAsThread(nr, NULL);
+}
+
+void SaveServerScoreFromFile(int nr, char *score_tape_filename)
+{
+  if (!runtime.api_server)
+    return;
+
+  UploadScoreToServerAsThread(nr, score_tape_filename);
 }
 
 void LoadLocalAndServerScore(int nr, boolean download_score)
@@ -9681,6 +9718,10 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_STRING,
     &setup.api_server_hostname,                        "api_server_hostname"
   },
+  {
+    TYPE_STRING,
+    &setup.api_server_password,                        "api_server_password"
+  },
   {
     TYPE_STRING,
     &setup.touch.control_type,                 "touch.control_type"
@@ -10317,6 +10358,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
 
   si->api_server = TRUE;
   si->api_server_hostname = getStringCopy(API_SERVER_HOSTNAME);
+  si->api_server_password = getStringCopy(UNDEFINED_PASSWORD);
 
   si->touch.control_type = getStringCopy(TOUCH_CONTROL_DEFAULT);
   si->touch.move_distance = TOUCH_MOVE_DISTANCE_DEFAULT;       // percent