ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 12:14:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: use https for xivapi, make cache concurrent

Browse source
This commit is contained in:
goat 2020-02-06 22:23:17 +09:00
parent 38b82a9dd8
commit 56ce07be74
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Dalamud/XivApi.cs
View file

@ -1,4 +1,5 @@
using System; using System;
using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Net.Http; using System.Net.Http;
@ -13,9 +14,9 @@ namespace Dalamud
{ {
class XivApi class XivApi
{ {
private const string URL = "http://xivapi.com/"; private const string URL = "https://xivapi.com/";
private static readonly Dictionary<string, JObject> cachedResponses = new Dictionary<string, JObject>(); private static readonly ConcurrentDictionary<string, JObject> cachedResponses = new ConcurrentDictionary<string, JObject>();
public static async Task<JObject> GetWorld(int world) public static async Task<JObject> GetWorld(int world)
{ {
@ -77,8 +78,8 @@ namespace Dalamud
{ {
Log.Verbose("XIVAPI FETCH: {0}", endpoint); Log.Verbose("XIVAPI FETCH: {0}", endpoint);
if (cachedResponses.ContainsKey(endpoint) && !noCache) if (cachedResponses.TryGetValue(endpoint, out var val) && !noCache)
return cachedResponses[endpoint]; return val;
var client = new HttpClient(); var client = new HttpClient();
var response = await client.GetAsync(URL + endpoint); var response = await client.GetAsync(URL + endpoint);
@ -87,7 +88,7 @@ namespace Dalamud
var obj = JObject.Parse(result); var obj = JObject.Parse(result);
if (!noCache) if (!noCache)
cachedResponses.Add(endpoint, obj); cachedResponses.TryAdd(endpoint, obj);
return obj; return obj;
} }