mirror of
https://github.com/blitzkit/blitzkit.git
synced 2026-10-24 20:19:49 +02:00
feat: enable commiting
This commit is contained in:
1 parent
553c9d552b
commit
9fbdaaf87f
5 files changed
+51
-53
No files matched your search
@@ -6,6 +6,6 @@ package blitzkit;
|
|||||||
|
|
||||||
message Tank {
|
message Tank {
|
||||||
required string id = 1;
|
required string id = 1;
|
||||||
required string seo_id = 2;
|
required string slug = 2;
|
||||||
required I18n name = 3;
|
required I18n name = 3;
|
||||||
}
|
}
|
||||||
@@ -12,12 +12,12 @@ export const protobufPackage = "blitzkit";
|
|||||||
|
|
||||||
export interface Tank {
|
export interface Tank {
|
||||||
id: string;
|
id: string;
|
||||||
seo_id: string;
|
slug: string;
|
||||||
name: I18n;
|
name: I18n;
|
||||||
}
|
}
|
||||||
|
|
||||||
function createBaseTank(): Tank {
|
function createBaseTank(): Tank {
|
||||||
return { id: "", seo_id: "", name: createBaseI18n() };
|
return { id: "", slug: "", name: createBaseI18n() };
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Tank: MessageFns<Tank> = {
|
export const Tank: MessageFns<Tank> = {
|
||||||
@@ -25,8 +25,8 @@ export const Tank: MessageFns<Tank> = {
|
|||||||
if (message.id !== "") {
|
if (message.id !== "") {
|
||||||
writer.uint32(10).string(message.id);
|
writer.uint32(10).string(message.id);
|
||||||
}
|
}
|
||||||
if (message.seo_id !== "") {
|
if (message.slug !== "") {
|
||||||
writer.uint32(18).string(message.seo_id);
|
writer.uint32(18).string(message.slug);
|
||||||
}
|
}
|
||||||
if (message.name !== undefined) {
|
if (message.name !== undefined) {
|
||||||
I18n.encode(message.name, writer.uint32(26).fork()).join();
|
I18n.encode(message.name, writer.uint32(26).fork()).join();
|
||||||
@@ -54,7 +54,7 @@ export const Tank: MessageFns<Tank> = {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
message.seo_id = reader.string();
|
message.slug = reader.string();
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case 3: {
|
case 3: {
|
||||||
@@ -77,7 +77,7 @@ export const Tank: MessageFns<Tank> = {
|
|||||||
fromJSON(object: any): Tank {
|
fromJSON(object: any): Tank {
|
||||||
return {
|
return {
|
||||||
id: globalThis.String(assertSet("Tank.id", object.id)),
|
id: globalThis.String(assertSet("Tank.id", object.id)),
|
||||||
seo_id: globalThis.String(assertSet("Tank.seo_id", object.seo_id)),
|
slug: globalThis.String(assertSet("Tank.slug", object.slug)),
|
||||||
name: I18n.fromJSON(assertSet("Tank.name", object.name)),
|
name: I18n.fromJSON(assertSet("Tank.name", object.name)),
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -87,8 +87,8 @@ export const Tank: MessageFns<Tank> = {
|
|||||||
if (message.id !== "") {
|
if (message.id !== "") {
|
||||||
obj.id = message.id;
|
obj.id = message.id;
|
||||||
}
|
}
|
||||||
if (message.seo_id !== "") {
|
if (message.slug !== "") {
|
||||||
obj.seo_id = message.seo_id;
|
obj.slug = message.slug;
|
||||||
}
|
}
|
||||||
if (message.name !== undefined) {
|
if (message.name !== undefined) {
|
||||||
obj.name = I18n.toJSON(message.name);
|
obj.name = I18n.toJSON(message.name);
|
||||||
@@ -102,7 +102,7 @@ export const Tank: MessageFns<Tank> = {
|
|||||||
fromPartial<I extends Exact<DeepPartial<Tank>, I>>(object: I): Tank {
|
fromPartial<I extends Exact<DeepPartial<Tank>, I>>(object: I): Tank {
|
||||||
const message = createBaseTank();
|
const message = createBaseTank();
|
||||||
message.id = object.id ?? "";
|
message.id = object.id ?? "";
|
||||||
message.seo_id = object.seo_id ?? "";
|
message.slug = object.slug ?? "";
|
||||||
message.name = (object.name !== undefined && object.name !== null)
|
message.name = (object.name !== undefined && object.name !== null)
|
||||||
? I18n.fromPartial(object.name)
|
? I18n.fromPartial(object.name)
|
||||||
: createBaseI18n();
|
: createBaseI18n();
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ namespace BlitzKit.CLI.Functions
|
|||||||
{
|
{
|
||||||
await FetchStrings();
|
await FetchStrings();
|
||||||
MangleNations();
|
MangleNations();
|
||||||
// await BlitzKitAssets.CommitAssets("ue assets", changes);
|
await BlitzKitAssets.CommitAssets("ue assets", changes);
|
||||||
}
|
}
|
||||||
|
|
||||||
I18n GetString(string name)
|
I18n GetString(string name)
|
||||||
@@ -127,20 +127,20 @@ namespace BlitzKit.CLI.Functions
|
|||||||
|
|
||||||
var name = GetString($"{id}_SHORT_NAME");
|
var name = GetString($"{id}_SHORT_NAME");
|
||||||
|
|
||||||
var seoId = Diacritics.Remove(name.Locales["en"]).ToLower();
|
var slug = Diacritics.Remove(name.Locales["en"]).ToLower();
|
||||||
seoId = Regex.Replace(seoId, "[^a-z0-9]", "-");
|
slug = Regex.Replace(slug, "[^a-z0-9]", "-");
|
||||||
seoId = Regex.Replace(seoId, "--+", "-");
|
slug = Regex.Replace(slug, "--+", "-");
|
||||||
seoId = Regex.Replace(seoId, "-$", "");
|
slug = Regex.Replace(slug, "-$", "");
|
||||||
|
|
||||||
// MangleHull(id, pda);
|
// MangleHull(id, pda);
|
||||||
|
|
||||||
Console.WriteLine(seoId);
|
Console.WriteLine(slug);
|
||||||
|
|
||||||
Tank tank = new()
|
Tank tank = new()
|
||||||
{
|
{
|
||||||
Id = id,
|
Id = id,
|
||||||
Name = name,
|
Name = name,
|
||||||
SeoId = seoId,
|
Slug = slug,
|
||||||
};
|
};
|
||||||
|
|
||||||
changes.Add(new($"definitions/tanks/{id}.pb", tank.ToByteArray()));
|
changes.Add(new($"definitions/tanks/{id}.pb", tank.ToByteArray()));
|
||||||
|
|||||||
@@ -13,7 +13,9 @@ namespace BlitzKit.CLI.Models
|
|||||||
|
|
||||||
public static async Task CommitAssets(string message, List<FileChange> changes)
|
public static async Task CommitAssets(string message, List<FileChange> changes)
|
||||||
{
|
{
|
||||||
Console.WriteLine($"Committing \"{message}\"... with {changes.Count} proposed changes");
|
Console.WriteLine(
|
||||||
|
$"Committing \"{message}\"... with {changes.Count} proposed changes to the \"{Env.GetString("PUBLIC_ASSET_BRANCH")}\" branch"
|
||||||
|
);
|
||||||
|
|
||||||
if (changes.Count == 0)
|
if (changes.Count == 0)
|
||||||
return;
|
return;
|
||||||
@@ -62,11 +64,7 @@ namespace BlitzKit.CLI.Models
|
|||||||
{
|
{
|
||||||
var bytes = await response.Content.ReadAsByteArrayAsync();
|
var bytes = await response.Content.ReadAsByteArrayAsync();
|
||||||
|
|
||||||
// we discard blob if they're the same size; it's unlikely their
|
if (!bytes.SequenceEqual([.. change.Content]))
|
||||||
// contents will be different; I love playing russian roulette!
|
|
||||||
var equal =
|
|
||||||
bytes.Length == change.Content.Count || bytes.SequenceEqual([.. change.Content]);
|
|
||||||
if (!equal)
|
|
||||||
{
|
{
|
||||||
var diff = change.Content.Count - bytes.Length;
|
var diff = change.Content.Count - bytes.Length;
|
||||||
|
|
||||||
|
|||||||
@@ -25,13 +25,13 @@ namespace Blitzkit {
|
|||||||
byte[] descriptorData = global::System.Convert.FromBase64String(
|
byte[] descriptorData = global::System.Convert.FromBase64String(
|
||||||
string.Concat(
|
string.Concat(
|
||||||
"CiNwYWNrYWdlcy9jb3JlL3NyYy9wcm90b3MvdGFuay5wcm90bxIIYmxpdHpr",
|
"CiNwYWNrYWdlcy9jb3JlL3NyYy9wcm90b3MvdGFuay5wcm90bxIIYmxpdHpr",
|
||||||
"aXQaI3BhY2thZ2VzL2NvcmUvc3JjL3Byb3Rvcy9pMThuLnByb3RvIkAKBFRh",
|
"aXQaI3BhY2thZ2VzL2NvcmUvc3JjL3Byb3Rvcy9pMThuLnByb3RvIj4KBFRh",
|
||||||
"bmsSCgoCaWQYASACKAkSDgoGc2VvX2lkGAIgAigJEhwKBG5hbWUYAyACKAsy",
|
"bmsSCgoCaWQYASACKAkSDAoEc2x1ZxgCIAIoCRIcCgRuYW1lGAMgAigLMg4u",
|
||||||
"Di5ibGl0emtpdC5JMThu"));
|
"YmxpdHpraXQuSTE4bg=="));
|
||||||
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
|
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
|
||||||
new pbr::FileDescriptor[] { global::Blitzkit.I18NReflection.Descriptor, },
|
new pbr::FileDescriptor[] { global::Blitzkit.I18NReflection.Descriptor, },
|
||||||
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
|
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
|
||||||
new pbr::GeneratedClrTypeInfo(typeof(global::Blitzkit.Tank), global::Blitzkit.Tank.Parser, new[]{ "Id", "SeoId", "Name" }, null, null, null, null)
|
new pbr::GeneratedClrTypeInfo(typeof(global::Blitzkit.Tank), global::Blitzkit.Tank.Parser, new[]{ "Id", "Slug", "Name" }, null, null, null, null)
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
@@ -74,7 +74,7 @@ namespace Blitzkit {
|
|||||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||||
public Tank(Tank other) : this() {
|
public Tank(Tank other) : this() {
|
||||||
id_ = other.id_;
|
id_ = other.id_;
|
||||||
seoId_ = other.seoId_;
|
slug_ = other.slug_;
|
||||||
name_ = other.name_ != null ? other.name_.Clone() : null;
|
name_ = other.name_ != null ? other.name_.Clone() : null;
|
||||||
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
|
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
|
||||||
}
|
}
|
||||||
@@ -111,30 +111,30 @@ namespace Blitzkit {
|
|||||||
id_ = null;
|
id_ = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Field number for the "seo_id" field.</summary>
|
/// <summary>Field number for the "slug" field.</summary>
|
||||||
public const int SeoIdFieldNumber = 2;
|
public const int SlugFieldNumber = 2;
|
||||||
private readonly static string SeoIdDefaultValue = "";
|
private readonly static string SlugDefaultValue = "";
|
||||||
|
|
||||||
private string seoId_;
|
private string slug_;
|
||||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
||||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||||
public string SeoId {
|
public string Slug {
|
||||||
get { return seoId_ ?? SeoIdDefaultValue; }
|
get { return slug_ ?? SlugDefaultValue; }
|
||||||
set {
|
set {
|
||||||
seoId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
|
slug_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// <summary>Gets whether the "seo_id" field is set</summary>
|
/// <summary>Gets whether the "slug" field is set</summary>
|
||||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
||||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||||
public bool HasSeoId {
|
public bool HasSlug {
|
||||||
get { return seoId_ != null; }
|
get { return slug_ != null; }
|
||||||
}
|
}
|
||||||
/// <summary>Clears the value of the "seo_id" field</summary>
|
/// <summary>Clears the value of the "slug" field</summary>
|
||||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
||||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||||
public void ClearSeoId() {
|
public void ClearSlug() {
|
||||||
seoId_ = null;
|
slug_ = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Field number for the "name" field.</summary>
|
/// <summary>Field number for the "name" field.</summary>
|
||||||
@@ -165,7 +165,7 @@ namespace Blitzkit {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (Id != other.Id) return false;
|
if (Id != other.Id) return false;
|
||||||
if (SeoId != other.SeoId) return false;
|
if (Slug != other.Slug) return false;
|
||||||
if (!object.Equals(Name, other.Name)) return false;
|
if (!object.Equals(Name, other.Name)) return false;
|
||||||
return Equals(_unknownFields, other._unknownFields);
|
return Equals(_unknownFields, other._unknownFields);
|
||||||
}
|
}
|
||||||
@@ -175,7 +175,7 @@ namespace Blitzkit {
|
|||||||
public override int GetHashCode() {
|
public override int GetHashCode() {
|
||||||
int hash = 1;
|
int hash = 1;
|
||||||
if (HasId) hash ^= Id.GetHashCode();
|
if (HasId) hash ^= Id.GetHashCode();
|
||||||
if (HasSeoId) hash ^= SeoId.GetHashCode();
|
if (HasSlug) hash ^= Slug.GetHashCode();
|
||||||
if (name_ != null) hash ^= Name.GetHashCode();
|
if (name_ != null) hash ^= Name.GetHashCode();
|
||||||
if (_unknownFields != null) {
|
if (_unknownFields != null) {
|
||||||
hash ^= _unknownFields.GetHashCode();
|
hash ^= _unknownFields.GetHashCode();
|
||||||
@@ -199,9 +199,9 @@ namespace Blitzkit {
|
|||||||
output.WriteRawTag(10);
|
output.WriteRawTag(10);
|
||||||
output.WriteString(Id);
|
output.WriteString(Id);
|
||||||
}
|
}
|
||||||
if (HasSeoId) {
|
if (HasSlug) {
|
||||||
output.WriteRawTag(18);
|
output.WriteRawTag(18);
|
||||||
output.WriteString(SeoId);
|
output.WriteString(Slug);
|
||||||
}
|
}
|
||||||
if (name_ != null) {
|
if (name_ != null) {
|
||||||
output.WriteRawTag(26);
|
output.WriteRawTag(26);
|
||||||
@@ -221,9 +221,9 @@ namespace Blitzkit {
|
|||||||
output.WriteRawTag(10);
|
output.WriteRawTag(10);
|
||||||
output.WriteString(Id);
|
output.WriteString(Id);
|
||||||
}
|
}
|
||||||
if (HasSeoId) {
|
if (HasSlug) {
|
||||||
output.WriteRawTag(18);
|
output.WriteRawTag(18);
|
||||||
output.WriteString(SeoId);
|
output.WriteString(Slug);
|
||||||
}
|
}
|
||||||
if (name_ != null) {
|
if (name_ != null) {
|
||||||
output.WriteRawTag(26);
|
output.WriteRawTag(26);
|
||||||
@@ -242,8 +242,8 @@ namespace Blitzkit {
|
|||||||
if (HasId) {
|
if (HasId) {
|
||||||
size += 1 + pb::CodedOutputStream.ComputeStringSize(Id);
|
size += 1 + pb::CodedOutputStream.ComputeStringSize(Id);
|
||||||
}
|
}
|
||||||
if (HasSeoId) {
|
if (HasSlug) {
|
||||||
size += 1 + pb::CodedOutputStream.ComputeStringSize(SeoId);
|
size += 1 + pb::CodedOutputStream.ComputeStringSize(Slug);
|
||||||
}
|
}
|
||||||
if (name_ != null) {
|
if (name_ != null) {
|
||||||
size += 1 + pb::CodedOutputStream.ComputeMessageSize(Name);
|
size += 1 + pb::CodedOutputStream.ComputeMessageSize(Name);
|
||||||
@@ -263,8 +263,8 @@ namespace Blitzkit {
|
|||||||
if (other.HasId) {
|
if (other.HasId) {
|
||||||
Id = other.Id;
|
Id = other.Id;
|
||||||
}
|
}
|
||||||
if (other.HasSeoId) {
|
if (other.HasSlug) {
|
||||||
SeoId = other.SeoId;
|
Slug = other.Slug;
|
||||||
}
|
}
|
||||||
if (other.name_ != null) {
|
if (other.name_ != null) {
|
||||||
if (name_ == null) {
|
if (name_ == null) {
|
||||||
@@ -296,7 +296,7 @@ namespace Blitzkit {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 18: {
|
case 18: {
|
||||||
SeoId = input.ReadString();
|
Slug = input.ReadString();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 26: {
|
case 26: {
|
||||||
@@ -330,7 +330,7 @@ namespace Blitzkit {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 18: {
|
case 18: {
|
||||||
SeoId = input.ReadString();
|
Slug = input.ReadString();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 26: {
|
case 26: {
|
||||||
|
|||||||
Reference in new issue
Block a user