Skip to content

Commit

Permalink
re-enable poi
Browse files Browse the repository at this point in the history
  • Loading branch information
@myangelkamikaze
myangelkamikaze committed Nov 26, 2024
1 parent 043f805 commit 1813a84
Show file tree
Hide file tree
Showing 5 changed files with 257 additions and 15 deletions.
123 changes: 123 additions & 0 deletions ElectronicObserver/Data/PoiDbSubmission/PoiDbSubmissionResources.en.resx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Error" xml:space="preserve">
<value>PoiDB error</value>
</data>
</root>
103 changes: 103 additions & 0 deletions ElectronicObserver/Data/PoiDbSubmission/PoiDbSubmissionResources.resx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 1.3
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">1.3</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1">this is my long string</data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
[base64 mime encoded serialized .NET Framework object]
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
[base64 mime encoded string representing a byte array form of the .NET Framework object]
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>1.3</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Error" xml:space="preserve">
<value>PoiDBエラー</value>
</data>
</root>
5 changes: 1 addition & 4 deletions ElectronicObserver/Data/PoiDbSubmission/PoiDbSubmissionService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ public PoiDbSubmissionService(KCDatabase kcDatabase)

private void OnConfigurationChanged()
{
// disable poi till we can make it work
return;

if (Configuration.Config.DataSubmission.SendDataToPoiPreview)
{
SubscribeToApis();
Expand Down Expand Up @@ -291,6 +288,6 @@ private static void UnsubscribeFromRouteApis(PoiDbRouteSubmissionService routeSu

private static void LogError(Exception e)
{
Logger.Add(2, "PoiDB error", e);
Logger.Add(2, PoiDbSubmissionResources.Error, e);
}
}
35 changes: 29 additions & 6 deletions ElectronicObserver/Data/PoiDbSubmission/PoiHttpClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,43 +16,66 @@ public class PoiHttpClient
BaseAddress = new("http://report2.kcwiki.org:17027/api/report/"),
};

private static async Task EnsureSuccessStatusCode(HttpResponseMessage response)
{
#if DEBUG
if (response.RequestMessage?.Content is HttpContent content)
{
string requestBody = await content.ReadAsStringAsync();
Utility.Logger.Add(3, requestBody);
}
#endif

if (response.IsSuccessStatusCode) return;

string responseMessage = await response.Content.ReadAsStringAsync();
string errorMessage = $"{response.ReasonPhrase} {responseMessage}";

throw new HttpRequestException(errorMessage);
}

public async Task Quest(PoiDbQuestSubmissionData submission)
{
using HttpClient client = MakeHttpClient();

HttpResponseMessage response = await client.PostAsJsonAsync("quest", submission);
response.EnsureSuccessStatusCode();
await EnsureSuccessStatusCode(response);
}

public async Task Battle(PoiDbBattleSubmissionData submission)
{
using HttpClient client = MakeHttpClient();

HttpResponseMessage response = await client.PostAsJsonAsync("battle", submission);
response.EnsureSuccessStatusCode();
await EnsureSuccessStatusCode(response);
}

public async Task FriendFleet(Dictionary<string, Dictionary<string, JsonNode?>> submission)
{
using HttpClient client = MakeHttpClient();

HttpResponseMessage response = await client.PostAsJsonAsync("friendly_info", submission);
response.EnsureSuccessStatusCode();
await EnsureSuccessStatusCode(response);
}

public async Task AirDefense(Dictionary<string, JsonNode?> submission)
{
using HttpClient client = MakeHttpClient();

HttpResponseMessage response = await client.PostAsJsonAsync("air_base_attack", submission);
response.EnsureSuccessStatusCode();
MultipartFormDataContent formData = new()
{
JsonContent.Create(submission),
};

HttpResponseMessage response = await client.PostAsync("air_base_attack", formData);
await EnsureSuccessStatusCode(response);
}

public async Task Route(PoiDbRouteSubmissionData submission)
{
using HttpClient client = MakeHttpClient();

HttpResponseMessage response = await client.PostAsJsonAsync("next_way_v2", submission);
response.EnsureSuccessStatusCode();
await EnsureSuccessStatusCode(response);
}
}
6 changes: 1 addition & 5 deletions ...tronicObserver/Window/Settings/DataSubmission/ConfigurationDataSubmissionUserControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@
</TextBlock>
</StackPanel>

<CheckBox
Content="PoiDB"
IsChecked="{Binding SendDataToPoi}"
Visibility="Collapsed"
/>
<CheckBox Content="PoiDB" IsChecked="{Binding SendDataToPoi}" />

<StackPanel Orientation="Horizontal">
<CheckBox Content="{Binding Translation.BonodereIntegration, Mode=OneWay}" IsChecked="{Binding BonodereIntegrationEnabled}" />
Expand Down

0 comments on commit 1813a84

Please sign in to comment.