From e684eaefb94f20714fa00fd61785da6eb3963622 Mon Sep 17 00:00:00 2001 From: skogaby Date: Thu, 24 Jan 2019 01:46:44 -0600 Subject: [PATCH] Rename the rivalload handlers for loadflags 1 and 2 to be the proper names. TODO: implement them --- .../impl/PlayerDataRequestHandler.java | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/buttongames/butterfly/http/handlers/impl/PlayerDataRequestHandler.java b/src/main/java/com/buttongames/butterfly/http/handlers/impl/PlayerDataRequestHandler.java index 6eb0d56..92da602 100644 --- a/src/main/java/com/buttongames/butterfly/http/handlers/impl/PlayerDataRequestHandler.java +++ b/src/main/java/com/buttongames/butterfly/http/handlers/impl/PlayerDataRequestHandler.java @@ -251,9 +251,9 @@ public class PlayerDataRequestHandler extends BaseRequestHandler { int loadFlag = XmlUtils.intAtPath(requestBody, "/playerdata/data/loadflag"); if (loadFlag == 1) { - return this.handleRivalLoad1Request(request, response); + return this.handleMachineScoresRequest(request, response); } else if (loadFlag == 2) { - return this.handleRivalLoad2Request(request, response); + return this.handleAreaScoresRequest(request, response); } else if (loadFlag == 4) { return this.handleGlobalScoresRequest(request, response); } @@ -269,6 +269,9 @@ public class PlayerDataRequestHandler extends BaseRequestHandler { // handle usergamedata_advanced.usersave requests, for saving scores, ghost data, etc. } else if (mode.equals("usersave")) { return this.handleUserSaveRequest(requestBody, request, response); + // handle usergamedata_advanced.minidump requests + } else if (mode.equals("minidump")) { + return this.handleMinidumpRequest(request, response); } // handle usergamedata_send requests } else if (requestMethod.equals("usergamedata_send")) { @@ -282,12 +285,12 @@ public class PlayerDataRequestHandler extends BaseRequestHandler { } /** - * Handles a rivalload request with a loadflag of 1. + * Handles a request to get the machine high scores. * @param request The Spark request * @param response The Spark response * @return A response object for Spark */ - private Object handleRivalLoad1Request(final Request request, final Response response) { + private Object handleMachineScoresRequest(final Request request, final Response response) { // TODO: Implement this properly and load rival data... final KXmlBuilder respBuilder = KXmlBuilder.create("response") .e("playerdata") @@ -304,7 +307,7 @@ public class PlayerDataRequestHandler extends BaseRequestHandler { * @param response The Spark response * @return A response object for Spark */ - private Object handleRivalLoad2Request(final Request request, final Response response) { + private Object handleAreaScoresRequest(final Request request, final Response response) { // TODO: Implement this properly and load rival data... final KXmlBuilder respBuilder = KXmlBuilder.create("response") .e("playerdata") @@ -343,6 +346,7 @@ public class PlayerDataRequestHandler extends BaseRequestHandler { .u8("clearkind", record.getClearKind()).up() .u8("flagdata", 0).up() .str("name", record.getUser().getName()).up() + .s32("area", record.getArea()).up() .s32("code", record.getUser().getDancerCode()).up() .s32("score", record.getScore()).up() .s32("ghostid", ((Long) record.getGhostData().getId()).intValue()).up(2); @@ -1043,4 +1047,19 @@ public class PlayerDataRequestHandler extends BaseRequestHandler { return this.sendResponse(request, response, builder); } + + /** + * Handles a request to post a client mini dump. + * @param request The Spark request + * @param response The Spark response + * @return A response object for Spark + */ + private Object handleMinidumpRequest(final Request request, final Response response) { + // TODO: Save this eventually + final KXmlBuilder respBuilder = KXmlBuilder.create("response") + .e("playerdata") + .s32("result", 0); + + return this.sendResponse(request, response, respBuilder); + } }