Skip to content

Commit

Permalink
fixed canPlayUra field
Browse files Browse the repository at this point in the history
  • Loading branch information
NotImplementedLife committed Oct 1, 2023
1 parent 7de65ea commit cd69799
Show file tree
Hide file tree
Showing 80 changed files with 4,817 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Commons/Emit/DatatableEntityTypeBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ private void GenerateProperty(TypeBuilder tb, ILGenerator ilg, EntityPropertyInf
pb.SetGetMethod(mbGetAccessor);
pb.SetSetMethod(mbSetAccessor);

if (property.JsonPropertyName != null)
if (property.JsonPropertyName != null && property.JsonPropertyName != "")
AddAttribute(pb, typeof(JsonPropertyNameAttribute), property.JsonPropertyName);
else
AddAttribute(pb, typeof(JsonIgnoreAttribute), new object[0]);
Expand Down
2 changes: 1 addition & 1 deletion Commons/Extensions/ObjectExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ internal static class ObjectExtensions
{
public static string ToStringProperties(this object obj)
{
return "{" + string.Join("; ", obj.GetType().GetProperties().Select(p => $"{p.Name}=`{p?.GetValue(obj) ?? "(null)"}`")) + "}";
return obj.GetType() + "{" + string.Join("; ", obj.GetType().GetProperties().Select(p => $"{p.Name}=`{p?.GetValue(obj) ?? "(null)"}`")) + "}";
}

}
Expand Down
25 changes: 25 additions & 0 deletions DatatableTypes.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
using System;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using TaikoSoundEditor.Commons.Emit;
using TaikoSoundEditor.Commons.Extensions;
using TaikoSoundEditor.Commons.IO;
using TaikoSoundEditor.Commons.Utils;
using TaikoSoundEditor.Data;

namespace TaikoSoundEditor
Expand Down Expand Up @@ -61,12 +66,32 @@ public static T Clone<T>(this T item)
public static void LoadFromJson(string json)
{
var types = DatatableEntityTypeBuilder.LoadTypes(Json.Deserialize<DynamicTypeCollection>(json));
var c = Json.Deserialize<DynamicTypeCollection>(json);

Debug.WriteLine(string.Join("\n", c.Types.Select(t => t.Properties).SelectMany(_ => _).Select(_ => _.ToStringProperties())));

Word = types["Word"];
MusicOrder = types["MusicOrder"];
MusicAttribute = types["MusicAttribute"];
MusicInfo = types["MusicInfo"];

Logger.Info("Changed datatable types");
DescribeType(Word);
DescribeType(MusicAttribute);
DescribeType(MusicInfo);
DescribeType(MusicOrder);
}

private static void DescribeType(Type t)
{
Logger.Info($"Type {t}");

foreach(var p in t.GetProperties())
{
Logger.Info($" {p.PropertyType} {p.Name} [{string.Join(", ", p.GetCustomAttributes().Select(_ => _.ToStringProperties()))}]");
}
}


public static string ToString(this IMusicInfo mi) => $"{mi.UniqueId}. {mi.Id}";
}
Expand Down
43 changes: 42 additions & 1 deletion TaikoSoundEditor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,23 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<PublisherName>NotImplementedLife</PublisherName>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>0.5.10.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -33,6 +50,18 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>23CA8017F66093D403087AA29CBDE8F5189B0644</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
<ManifestKeyFile>TaikoSoundEditor_TemporaryKey.pfx</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>true</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<SignManifests>true</SignManifests>
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.4.2.13, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
Expand Down Expand Up @@ -185,6 +214,7 @@
</Compile>
<None Include="README.md" />
<None Include="Resources\song_ABCDEF_nus3bank.bin" />
<None Include="TaikoSoundEditor_TemporaryKey.pfx" />
<None Include="Tools\7z\Far\7-ZipEng.hlf" />
<None Include="Tools\7z\Far\7-ZipEng.lng" />
<None Include="Tools\7z\Far\7-ZipRus.hlf" />
Expand Down Expand Up @@ -262,6 +292,17 @@
<Content Include="Tools\VGAudio\VGAudioTools.pdb" />
<Content Include="Tools\VGAudio\wav\empty.txt" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.8">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.8 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
Binary file added TaikoSoundEditor_TemporaryKey.pfx
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
bin/
obj/
*.user
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<History>True|2023-09-30T15:47:20.4082736Z;True|2023-09-19T08:18:20.9103571+03:00;True|2023-08-16T20:18:53.8725792+03:00;True|2023-08-16T19:59:52.2179312+03:00;True|2023-07-31T20:19:48.4524724+03:00;False|2023-07-31T20:17:55.5982472+03:00;False|2023-07-31T20:17:38.1663347+03:00;True|2023-07-31T19:49:36.9770534+03:00;True|2023-07-31T19:48:14.6352025+03:00;True|2023-07-30T09:51:53.3737837+03:00;True|2023-07-30T09:20:22.7718733+03:00;True|2023-07-30T09:02:22.1384796+03:00;True|2023-07-30T08:20:21.5020489+03:00;True|2023-07-29T11:28:56.2445862+03:00;True|2023-07-29T11:05:03.3876668+03:00;True|2023-07-29T10:54:04.8963992+03:00;True|2023-07-29T10:22:03.4096107+03:00;True|2023-07-29T10:05:26.6712083+03:00;True|2023-07-28T19:30:15.3174413+03:00;True|2023-07-22T19:07:39.3718711+03:00;True|2023-07-22T19:06:41.2393088+03:00;True|2023-07-22T12:07:26.2620601+03:00;True|2023-07-22T12:06:39.9230498+03:00;True|2023-07-22T11:29:18.0153916+03:00;True|2023-07-22T08:23:07.5000923+03:00;True|2023-07-21T20:03:15.6598520+03:00;True|2023-07-21T19:41:13.2800435+03:00;True|2023-07-19T13:08:33.4726289+03:00;True|2023-07-19T12:08:17.2430335+03:00;True|2023-07-18T09:38:50.7615921+03:00;True|2023-07-18T09:25:23.0403589+03:00;True|2023-07-17T17:57:08.1469738+03:00;True|2023-07-17T11:28:41.9554245+03:00;True|2023-07-17T11:15:26.2194507+03:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<assemblyIdentity name="TaikoSoundEditor.application" version="0.5.10.0" publicKeyToken="d711172f47c29008" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="NotImplementedLife" asmv2:product="TaikoSoundEditor" xmlns="urn:schemas-microsoft-com:asm.v1" />
<deployment install="true" mapFileExtensions="true" />
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
<framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
</compatibleFrameworks>
<dependency>
<dependentAssembly dependencyType="install" codebase="Application Files\TaikoSoundEditor_0_5_10_0\TaikoSoundEditor.exe.manifest" size="37680">
<assemblyIdentity name="TaikoSoundEditor.exe" version="0.5.10.0" publicKeyToken="d711172f47c29008" language="neutral" processorArchitecture="msil" type="win32" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>Ze1kp4xZ+RD9kR4VjlVI159j3Hcn35jzM5pyCh/kLAo=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<publisherIdentity name="CN=DESKTOP-9HMTO67\NotImpLife" issuerKeyHash="f749febff8a059379ef8dfd87a99479b0f6e1463" /><Signature Id="StrongNameSignature" xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha256" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /><DigestValue>0jYTmUr7TnQXCvZ65VJVhzIbJ/T3x4UwabXBSjffzLo=</DigestValue></Reference></SignedInfo><SignatureValue>RTU8xBSfJN3L1yWcgNxtMM3k9ribYYPxLfP2aKZADdqqN/9608yq3kNEexWaGTx4vvc31PFXD0WJ+UODbKN/QvQWYyfsDxpRN2FQ3v4eFUyQh/mQgp5jZELiUdGRa2VgxQ01ZNAlKTzrp0kf0LPLMuNLWADfFzqKenry25Mjx1o=</SignatureValue><KeyInfo Id="StrongNameKeyInfo"><KeyValue><RSAKeyValue><Modulus>ty1X7y/YNLEgnq/ynaVxeFhF4zU1tZ+3TWdVMhW4i/s3yLxyjAWvXPlM84oTsvKkUoEuBKACHZOCDomwM0LBlB4Baw2dXY08IxQR7FhBcT3N1/5raXWUZQLMy/4v+az5UkGCwi+cPFfmaKZXrs4mYMVXWJTR9JdYYuQb7OTzhJk=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue><msrel:RelData xmlns:msrel="http://schemas.microsoft.com/windows/rel/2005/reldata"><r:license xmlns:r="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:as="http://schemas.microsoft.com/windows/pki/2005/Authenticode"><r:grant><as:ManifestInformation Hash="baccdf374ac1b5693085c7f7f4271b32875552e57af60a17744efb4a991336d2" Description="" Url=""><as:assemblyIdentity name="TaikoSoundEditor.application" version="0.5.10.0" publicKeyToken="d711172f47c29008" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" /></as:ManifestInformation><as:SignedBy /><as:AuthenticodePublisher><as:X509SubjectName>CN=DESKTOP-9HMTO67\NotImpLife</as:X509SubjectName></as:AuthenticodePublisher></r:grant><r:issuer><Signature Id="AuthenticodeSignature" xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha256" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /><DigestValue>n4aul2z2CGNoIf2AGxLR5CQqRewTaYyajvOOUemLSp8=</DigestValue></Reference></SignedInfo><SignatureValue>FTgYQrRfKVA/4gaoLP+ziupwcf8qUkwzkCmyW9wTkxT3+5Q5sAaRT8KXkTANL9M/a5QvpgtsefAEKbb+giSn3f1cmqRYrGx+iHRX3dNIjw5F8rxmJp30z+PGBj7f7kKAs8/6htbHbxLMqO3ADP9pkHu2/Pfm9BZKrHstN6n9Cog=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>ty1X7y/YNLEgnq/ynaVxeFhF4zU1tZ+3TWdVMhW4i/s3yLxyjAWvXPlM84oTsvKkUoEuBKACHZOCDomwM0LBlB4Baw2dXY08IxQR7FhBcT3N1/5raXWUZQLMy/4v+az5UkGCwi+cPFfmaKZXrs4mYMVXWJTR9JdYYuQb7OTzhJk=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue><X509Data><X509Certificate>MIICATCCAWqgAwIBAgIQfqH591KU4LRIS2mVis7iVDANBgkqhkiG9w0BAQsFADA/MT0wOwYDVQQDHjQARABFAFMASwBUAE8AUAAtADkASABNAFQATwA2ADcAXABOAG8AdABJAG0AcABMAGkAZgBlMB4XDTIzMTAwMTE5NDIwMFoXDTI0MTAwMTAxNDIwMFowPzE9MDsGA1UEAx40AEQARQBTAEsAVABPAFAALQA5AEgATQBUAE8ANgA3AFwATgBvAHQASQBtAHAATABpAGYAZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAty1X7y/YNLEgnq/ynaVxeFhF4zU1tZ+3TWdVMhW4i/s3yLxyjAWvXPlM84oTsvKkUoEuBKACHZOCDomwM0LBlB4Baw2dXY08IxQR7FhBcT3N1/5raXWUZQLMy/4v+az5UkGCwi+cPFfmaKZXrs4mYMVXWJTR9JdYYuQb7OTzhJkCAwEAATANBgkqhkiG9w0BAQsFAAOBgQBLNeTqKAi+Bw9f0qvoRHA9gOCzoAYYzHJD4f4fFjOlNZfL2AxE4V5pt6ftkPv9xyj0GcHSn+P+N+fxoNOw76sJTydR02yb3BBn/aTnKFKt4tVUV93TtaW356RZz6dHoF0YDpIIkDifL8mvUXvywbyjne+QqcmDJ6VMZPGlqGcbVA==</X509Certificate></X509Data></KeyInfo></Signature></r:issuer></r:license></msrel:RelData></KeyInfo></Signature></asmv1:assembly>
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Binary file not shown.
Loading

0 comments on commit cd69799

Please sign in to comment.