epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8149 from Mailaender/fetch-geoip-db

Browse Source 
Automatized GeoIP database download
This commit is contained in:
Pavel Penev
2015-05-24 16:43:22 +03:00
parent 767a63d43e a2c553478d
commit 902cd124ba
13 changed files with 89 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Widgets/Logic/Lobby/ClientTooltipLogic.cs
View File

@@ -85,7 +85,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
address = UPnP.NatDevice.GetExternalIP().ToString();
var cachedDescriptiveIP = LobbyUtils.DescriptiveIpAddress(address);
ip.GetText = () => cachedDescriptiveIP;
var cachedCountryLookup = LobbyUtils.LookupCountry(address);
var cachedCountryLookup = GeoIP.LookupCountry(address);
location.GetText = () => cachedCountryLookup;
}
}

15
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
View File

@@ -235,21 +235,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return ip;
}
public static string LookupCountry(string ip)
{
const string Unknown = "Unknown Location";
try
{
return Game.GeoIpDatabase.Country(ip).Country.Name ?? Unknown;
}
catch (Exception e)
{
Log.Write("geoip", "LookupCountry failed: {0}", e);
return Unknown;
}
}
public static void SetupClientWidget(Widget parent, Session.Slot s, Session.Client c, OrderManager orderManager, bool visible)
{
parent.Get("ADMIN_INDICATOR").IsVisible = () => c.IsAdmin;