SaveScoreToFilename(filename);
}
-static void ExecuteAsThread(SDL_ThreadFunction function, char *name, int data,
+static void ExecuteAsThread(SDL_ThreadFunction function, char *name, void *data,
char *error)
{
- static int data_static;
-
- data_static = data;
-
- SDL_Thread *thread = SDL_CreateThread(function, name, &data_static);
+ SDL_Thread *thread = SDL_CreateThread(function, name, data);
if (thread != NULL)
SDL_DetachThread(thread);
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 nr)
+ int level_nr,
+ char *score_cache_filename)
{
request->hostname = setup.api_server_hostname;
request->port = API_SERVER_PORT;
snprintf(request->body, MAX_HTTP_BODY_SIZE,
"{\n"
+ "%s"
" \"levelset_identifier\": \"%s\",\n"
- " \"level_nr\": \"%d\",\n"
- " \"rate_time_over_score\": \"%d\"\n"
+ " \"level_nr\": \"%d\"\n"
"}\n",
- levelset.identifier, nr, level.rate_time_over_score);
+ getPasswordJSON(setup.api_server_password),
+ levelset.identifier, level_nr);
ConvertHttpRequestBodyToServerEncoding(request);
ConvertHttpResponseBodyToClientEncoding(response);
- char *filename = getScoreCacheFilename(nr);
+ char *filename = score_cache_filename;
FILE *file;
int i;
server_scores.updated = TRUE;
}
-static void DownloadServerScoreToCache(int nr)
+static void DownloadServerScoreToCache(int level_nr, char *score_cache_filename)
{
struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
- DownloadServerScoreToCacheExt(request, response, nr);
+ DownloadServerScoreToCacheExt(request, response,
+ level_nr, score_cache_filename);
checked_free(request);
checked_free(response);
}
-static int DownloadServerScoreToCacheThread(void *data)
+struct DownloadServerScoreToCacheThreadData
+{
+ int level_nr;
+ char *score_cache_filename;
+};
+
+static int DownloadServerScoreToCacheThread(void *data_raw)
{
- DownloadServerScoreToCache(*(int *)data);
+ struct DownloadServerScoreToCacheThreadData *data = data_raw;
+
+ DownloadServerScoreToCache(data->level_nr,
+ data->score_cache_filename);
+
+ checked_free(data->score_cache_filename);
+ checked_free(data);
return 0;
}
static void DownloadServerScoreToCacheAsThread(int nr)
{
+ struct DownloadServerScoreToCacheThreadData *data =
+ checked_malloc(sizeof(struct DownloadServerScoreToCacheThreadData));
+ char *score_cache_filename = getScoreCacheFilename(nr);
+
+ data->level_nr = nr;
+ data->score_cache_filename = getStringCopy(score_cache_filename);
+
ExecuteAsThread(DownloadServerScoreToCacheThread,
- "DownloadServerScoreToCache", nr,
+ "DownloadServerScoreToCache", data,
"download scores from server");
}
if (stat(filename, &file_status) != 0)
{
- Error("cannot stat file '%s'\n", filename);
+ Error("cannot stat file '%s'", filename);
return NULL;
}
if (!(file = fopen(filename, MODE_READ)))
{
- Error("cannot open file '%s'\n", filename);
+ Error("cannot open file '%s'", filename);
checked_free(buffer);
if (c == EOF)
{
- Error("cannot read from input file '%s'\n", filename);
+ Error("cannot read from input file '%s'", filename);
fclose(file);
checked_free(buffer);
static void UploadScoreToServerExt(struct HttpRequest *request,
struct HttpResponse *response,
- int nr)
+ int level_nr,
+ char *score_tape_filename,
+ struct ScoreEntry *score_entry)
{
- struct ScoreEntry *score_entry = &scores.entry[scores.last_added];
-
request->hostname = setup.api_server_hostname;
request->port = API_SERVER_PORT;
request->method = API_SERVER_METHOD;
request->uri = API_SERVER_URI_ADD;
- char *tape_filename = getScoreTapeFilename(score_entry->tape_basename, nr);
- char *tape_base64 = get_file_base64(tape_filename);
+ char *tape_base64 = get_file_base64(score_tape_filename);
if (tape_base64 == NULL)
{
char *levelset_identifier = getEscapedJSON(leveldir_current->identifier);
char *levelset_name = getEscapedJSON(leveldir_current->name);
char *levelset_author = getEscapedJSON(leveldir_current->author);
+ char *level_name = getEscapedJSON(level.name);
+ char *level_author = getEscapedJSON(level.author);
char *player_name = getEscapedJSON(score_entry->name);
snprintf(request->body, MAX_HTTP_BODY_SIZE,
"{\n"
+ "%s"
" \"game_version\": \"%s\",\n"
" \"levelset_identifier\": \"%s\",\n"
" \"levelset_name\": \"%s\",\n"
" \"levelset_num_levels\": \"%d\",\n"
" \"levelset_first_level\": \"%d\",\n"
" \"level_nr\": \"%d\",\n"
+ " \"level_name\": \"%s\",\n"
+ " \"level_author\": \"%s\",\n"
+ " \"rate_time_over_score\": \"%d\",\n"
" \"player_name\": \"%s\",\n"
" \"score\": \"%d\",\n"
" \"time\": \"%d\",\n"
" \"tape_basename\": \"%s\",\n"
" \"tape\": \"%s\"\n"
"}\n",
+ getPasswordJSON(setup.api_server_password),
getProgramRealVersionString(),
levelset_identifier,
levelset_name,
leveldir_current->levels,
leveldir_current->first_level,
level_nr,
+ level_name,
+ level_author,
+ level.rate_time_over_score,
player_name,
score_entry->score,
score_entry->time,
checked_free(levelset_identifier);
checked_free(levelset_name);
checked_free(levelset_author);
+ checked_free(level_name);
+ checked_free(level_author);
checked_free(player_name);
ConvertHttpRequestBodyToServerEncoding(request);
}
}
-static void UploadScoreToServer(int nr)
+static void UploadScoreToServer(int level_nr, char *score_tape_filename,
+ struct ScoreEntry *score_entry)
{
struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
- UploadScoreToServerExt(request, response, nr);
+ UploadScoreToServerExt(request, response,
+ level_nr, score_tape_filename, score_entry);
checked_free(request);
checked_free(response);
}
-static int UploadScoreToServerThread(void *data)
+struct UploadScoreToServerThreadData
+{
+ int level_nr;
+ char *score_tape_filename;
+ struct ScoreEntry score_entry;
+};
+
+static int UploadScoreToServerThread(void *data_raw)
{
- UploadScoreToServer(*(int *)data);
+ struct UploadScoreToServerThreadData *data = data_raw;
+
+ UploadScoreToServer(data->level_nr,
+ data->score_tape_filename,
+ &data->score_entry);
+
+ checked_free(data->score_tape_filename);
+ checked_free(data);
return 0;
}
static void UploadScoreToServerAsThread(int nr)
{
+ 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);
+
+ data->level_nr = nr;
+ data->score_entry = *score_entry;
+ data->score_tape_filename = getStringCopy(score_tape_filename);
+
ExecuteAsThread(UploadScoreToServerThread,
- "UploadScoreToServer", nr,
+ "UploadScoreToServer", data,
"upload score to server");
}
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"
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
projects / rocksndiamonds.git / blobdiff