Make HiscoreClient call the OSRS hiscore API directly
This commit is contained in:
Tomas Slusny
Adam
@@ -24,51 +24,28 @@
|
||||
*/
|
||||
package net.runelite.http.api.hiscore;
|
||||
|
||||
import com.google.gson.JsonParseException;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.runelite.http.api.RuneLiteAPI;
|
||||
import okhttp3.HttpUrl;
|
||||
import okhttp3.Request;
|
||||
import okhttp3.Response;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.apache.commons.csv.CSVFormat;
|
||||
import org.apache.commons.csv.CSVParser;
|
||||
import org.apache.commons.csv.CSVRecord;
|
||||
|
||||
@Slf4j
|
||||
public class HiscoreClient
|
||||
{
|
||||
private static final Logger logger = LoggerFactory.getLogger(HiscoreClient.class);
|
||||
|
||||
public HiscoreResult lookup(String username, HiscoreEndpoint endpoint) throws IOException
|
||||
{
|
||||
HttpUrl.Builder builder = RuneLiteAPI.getApiBase().newBuilder()
|
||||
.addPathSegment("hiscore")
|
||||
.addPathSegment(endpoint.name().toLowerCase())
|
||||
.addQueryParameter("username", username);
|
||||
return lookup(username, endpoint.getHiscoreURL());
|
||||
}
|
||||
|
||||
HttpUrl url = builder.build();
|
||||
|
||||
logger.debug("Built URI: {}", url);
|
||||
|
||||
Request request = new Request.Builder()
|
||||
.url(url)
|
||||
.build();
|
||||
|
||||
try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute())
|
||||
{
|
||||
if (!response.isSuccessful())
|
||||
{
|
||||
logger.debug("unsuccessful lookup for {}", username);
|
||||
return null;
|
||||
}
|
||||
|
||||
InputStream in = response.body().byteStream();
|
||||
return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), HiscoreResult.class);
|
||||
}
|
||||
catch (JsonParseException ex)
|
||||
{
|
||||
throw new IOException(ex);
|
||||
}
|
||||
public HiscoreResult lookup(String username, HttpUrl endpoint) throws IOException
|
||||
{
|
||||
HiscoreResultBuilder resultBuilder = lookupUsername(username, endpoint);
|
||||
return resultBuilder.build();
|
||||
}
|
||||
|
||||
public HiscoreResult lookup(String username) throws IOException
|
||||
@@ -78,39 +55,82 @@ public class HiscoreClient
|
||||
|
||||
public SingleHiscoreSkillResult lookup(String username, HiscoreSkill skill, HiscoreEndpoint endpoint) throws IOException
|
||||
{
|
||||
HttpUrl.Builder builder = RuneLiteAPI.getApiBase().newBuilder()
|
||||
.addPathSegment("hiscore")
|
||||
.addPathSegment(endpoint.name())
|
||||
.addPathSegment(skill.toString().toLowerCase())
|
||||
.addQueryParameter("username", username);
|
||||
HiscoreResultBuilder resultBuilder = lookupUsername(username, endpoint.getHiscoreURL());
|
||||
HiscoreResult result = resultBuilder.build();
|
||||
|
||||
HttpUrl url = builder.build();
|
||||
|
||||
logger.debug("Built URI: {}", url);
|
||||
|
||||
Request request = new Request.Builder()
|
||||
.url(url)
|
||||
.build();
|
||||
|
||||
try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute())
|
||||
{
|
||||
if (!response.isSuccessful())
|
||||
{
|
||||
logger.debug("unsuccessful lookup for {}", username);
|
||||
return null;
|
||||
}
|
||||
|
||||
InputStream in = response.body().byteStream();
|
||||
return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), SingleHiscoreSkillResult.class);
|
||||
}
|
||||
catch (JsonParseException ex)
|
||||
{
|
||||
throw new IOException(ex);
|
||||
}
|
||||
Skill requested = result.getSkill(skill);
|
||||
SingleHiscoreSkillResult skillResult = new SingleHiscoreSkillResult();
|
||||
skillResult.setPlayer(username);
|
||||
skillResult.setSkillName(skill.getName());
|
||||
skillResult.setSkill(requested);
|
||||
return skillResult;
|
||||
}
|
||||
|
||||
public SingleHiscoreSkillResult lookup(String username, HiscoreSkill skill) throws IOException
|
||||
{
|
||||
return lookup(username, skill, HiscoreEndpoint.NORMAL);
|
||||
}
|
||||
|
||||
private HiscoreResultBuilder lookupUsername(String username, HttpUrl hiscoreUrl) throws IOException
|
||||
{
|
||||
HttpUrl url = hiscoreUrl.newBuilder()
|
||||
.addQueryParameter("player", username)
|
||||
.build();
|
||||
|
||||
log.debug("Built URL {}", url);
|
||||
|
||||
Request okrequest = new Request.Builder()
|
||||
.url(url)
|
||||
.build();
|
||||
|
||||
String responseStr;
|
||||
|
||||
try (Response okresponse = RuneLiteAPI.CLIENT.newCall(okrequest).execute())
|
||||
{
|
||||
if (!okresponse.isSuccessful())
|
||||
{
|
||||
switch (okresponse.code())
|
||||
{
|
||||
case 404:
|
||||
throw new IllegalArgumentException();
|
||||
default:
|
||||
throw new IOException("Error retrieving data from Jagex Hiscores: " + okresponse.message());
|
||||
}
|
||||
}
|
||||
|
||||
responseStr = okresponse.body().string();
|
||||
}
|
||||
|
||||
CSVParser parser = CSVParser.parse(responseStr, CSVFormat.DEFAULT);
|
||||
|
||||
HiscoreResultBuilder hiscoreBuilder = new HiscoreResultBuilder();
|
||||
hiscoreBuilder.setPlayer(username);
|
||||
|
||||
int count = 0;
|
||||
|
||||
for (CSVRecord record : parser.getRecords())
|
||||
{
|
||||
if (count++ >= HiscoreSkill.values().length)
|
||||
{
|
||||
log.warn("Jagex Hiscore API returned unexpected data");
|
||||
break; // rest is other things?
|
||||
}
|
||||
|
||||
// rank, level, experience
|
||||
int rank = Integer.parseInt(record.get(0));
|
||||
int level = Integer.parseInt(record.get(1));
|
||||
|
||||
// items that are not skills do not have an experience parameter
|
||||
long experience = -1;
|
||||
if (record.size() == 3)
|
||||
{
|
||||
experience = Long.parseLong(record.get(2));
|
||||
}
|
||||
|
||||
Skill skill = new Skill(rank, level, experience);
|
||||
hiscoreBuilder.setNextSkill(skill);
|
||||
}
|
||||
|
||||
return hiscoreBuilder;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
/*
|
||||
* Copyright (c) 2017, Adam <Adam@sigterm.info>
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package net.runelite.http.api.hiscore;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import net.runelite.http.api.hiscore.HiscoreResult;
|
||||
import net.runelite.http.api.hiscore.Skill;
|
||||
|
||||
public class HiscoreResultBuilder
|
||||
{
|
||||
private String player;
|
||||
private final List<Skill> skills = new ArrayList<>();
|
||||
|
||||
public void setPlayer(String player)
|
||||
{
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
public void setNextSkill(Skill skill)
|
||||
{
|
||||
skills.add(skill);
|
||||
}
|
||||
|
||||
public Skill getSkill(int index)
|
||||
{
|
||||
return skills.get(index);
|
||||
}
|
||||
|
||||
public HiscoreResult build()
|
||||
{
|
||||
HiscoreResult hiscoreResult = new HiscoreResult();
|
||||
hiscoreResult.setPlayer(player);
|
||||
hiscoreResult.setOverall(skills.get(0));
|
||||
hiscoreResult.setAttack(skills.get(1));
|
||||
hiscoreResult.setDefence(skills.get(2));
|
||||
hiscoreResult.setStrength(skills.get(3));
|
||||
hiscoreResult.setHitpoints(skills.get(4));
|
||||
hiscoreResult.setRanged(skills.get(5));
|
||||
hiscoreResult.setPrayer(skills.get(6));
|
||||
hiscoreResult.setMagic(skills.get(7));
|
||||
hiscoreResult.setCooking(skills.get(8));
|
||||
hiscoreResult.setWoodcutting(skills.get(9));
|
||||
hiscoreResult.setFletching(skills.get(10));
|
||||
hiscoreResult.setFishing(skills.get(11));
|
||||
hiscoreResult.setFiremaking(skills.get(12));
|
||||
hiscoreResult.setCrafting(skills.get(13));
|
||||
hiscoreResult.setSmithing(skills.get(14));
|
||||
hiscoreResult.setMining(skills.get(15));
|
||||
hiscoreResult.setHerblore(skills.get(16));
|
||||
hiscoreResult.setAgility(skills.get(17));
|
||||
hiscoreResult.setThieving(skills.get(18));
|
||||
hiscoreResult.setSlayer(skills.get(19));
|
||||
hiscoreResult.setFarming(skills.get(20));
|
||||
hiscoreResult.setRunecraft(skills.get(21));
|
||||
hiscoreResult.setHunter(skills.get(22));
|
||||
hiscoreResult.setConstruction(skills.get(23));
|
||||
hiscoreResult.setClueScrollEasy(skills.get(24));
|
||||
hiscoreResult.setClueScrollMedium(skills.get(25));
|
||||
hiscoreResult.setClueScrollAll(skills.get(26));
|
||||
hiscoreResult.setBountyHunterRogue(skills.get(27));
|
||||
hiscoreResult.setBountyHunterHunter(skills.get(28));
|
||||
hiscoreResult.setClueScrollHard(skills.get(29));
|
||||
hiscoreResult.setLastManStanding(skills.get(30));
|
||||
hiscoreResult.setClueScrollElite(skills.get(31));
|
||||
hiscoreResult.setClueScrollMaster(skills.get(32));
|
||||
return hiscoreResult;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user