Browse Source

Filtering protos

flabbet 1 year ago
parent
commit
366be7df06

+ 14 - 0
src/PixiEditor.Extensions.CommonApi/DataContracts/FetchPaletteListQuery.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+package PixiEditor.Palettes;
+
+import "FilteringSettings.proto";
+
+option csharp_namespace = "PixiEditor.Extensions.CommonApi.Palettes";
+
+message FetchPaletteListQuery
+{
+  string DataSourceName = 1;
+  int32 StartIndex = 2;
+  int32 Items = 3;
+  FilteringSettings Filtering = 4;
+}

+ 21 - 0
src/PixiEditor.Extensions.CommonApi/DataContracts/FilteringSettings.proto

@@ -0,0 +1,21 @@
+syntax = "proto3";
+package PixiEditor.Palettes;
+
+option csharp_namespace = "PixiEditor.Extensions.CommonApi.Palettes";
+
+enum ColorsNumberMode
+{
+    Any = 0;
+    Max = 1;
+    Min = 2;
+    Exact = 3;
+}
+
+message FilteringSettings
+{
+  ColorsNumberMode ColorsNumberMode = 1;
+  int32 ColorsCount = 2;
+  string Name = 3;
+  bool ShowOnlyFavourites = 4;
+  repeated string Favourites = 5;
+}

+ 0 - 9
src/PixiEditor.Extensions.CommonApi/Palettes/ColorsNumberMode.cs

@@ -1,9 +0,0 @@
-namespace PixiEditor.Extensions.CommonApi.Palettes;
-
-public enum ColorsNumberMode
-{
-    Any,
-    Max,
-    Min,
-    Exact
-}

+ 1 - 14
src/PixiEditor.Extensions.CommonApi/Palettes/FetchPaletteListQuery.cs → src/PixiEditor.Extensions.CommonApi/Palettes/FetchPaletteListQuery.Impl.cs

@@ -2,21 +2,8 @@
 
 
 namespace PixiEditor.Extensions.CommonApi.Palettes;
 namespace PixiEditor.Extensions.CommonApi.Palettes;
 
 
-[ProtoContract]
-public class FetchPaletteListQuery
+public partial class FetchPaletteListQuery
 {
 {
-    [ProtoMember(1)] 
-    public string DataSourceName { get; set; }
-
-    [ProtoMember(2)] 
-    public int StartIndex { get; set; }
-
-    [ProtoMember(3)] 
-    public int Items { get; set; }
-
-    [ProtoMember(4)] 
-    public FilteringSettings Filtering { get; set; }
-
     public FetchPaletteListQuery()
     public FetchPaletteListQuery()
     {
     {
     }
     }

+ 2 - 24
src/PixiEditor.Extensions.CommonApi/Palettes/FilteringSettings.cs → src/PixiEditor.Extensions.CommonApi/Palettes/FilteringSettings.Impl.cs

@@ -1,29 +1,7 @@
-using ProtoBuf;
+namespace PixiEditor.Extensions.CommonApi.Palettes;
 
 
-namespace PixiEditor.Extensions.CommonApi.Palettes;
-
-[ProtoContract]
-public sealed class FilteringSettings
+public partial class FilteringSettings
 {
 {
-    [ProtoMember(1)]
-    public ColorsNumberMode ColorsNumberMode { get; set; }
-    
-    [ProtoMember(2)]
-    public int ColorsCount { get; set; }
-    
-    [ProtoMember(3)]
-    public string Name { get; set; }
-    
-    [ProtoMember(4)]
-    public bool ShowOnlyFavourites { get; set; }
-    
-    [ProtoMember(5)]
-    public List<string> Favourites { get; set; }
-    
-    public FilteringSettings()
-    {
-    }
-
     public FilteringSettings(ColorsNumberMode colorsNumberMode, int colorsCount, string name, bool showOnlyFavourites, List<string> favourites)
     public FilteringSettings(ColorsNumberMode colorsNumberMode, int colorsCount, string name, bool showOnlyFavourites, List<string> favourites)
     {
     {
         ColorsNumberMode = colorsNumberMode;
         ColorsNumberMode = colorsNumberMode;

+ 1 - 1
src/PixiEditor.Extensions.CommonApi/PixiEditor.Extensions.CommonApi.csproj

@@ -45,7 +45,7 @@
   <Target Name="GenerateProtoContracts" BeforeTargets="BeforeCompile"
   <Target Name="GenerateProtoContracts" BeforeTargets="BeforeCompile"
           Inputs="$(MSBuildProjectDirectory)\DataContracts\*.proto"
           Inputs="$(MSBuildProjectDirectory)\DataContracts\*.proto"
           Outputs="$(MSBuildProjectDirectory)\ProtoAutogen\*.cs">
           Outputs="$(MSBuildProjectDirectory)\ProtoAutogen\*.cs">
-    <Exec Command="dotnet tool run protogen --csharp_out=ProtoAutogen --proto_path=DataContracts *.proto"/>
+    <Exec Command="dotnet tool run protogen --csharp_out=ProtoAutogen --proto_path=DataContracts +listset=yes *.proto"/>
 
 
     <ItemGroup>
     <ItemGroup>
       <Compile Include="ProtoAutogen\*.cs" KeepDuplicates="false"/>
       <Compile Include="ProtoAutogen\*.cs" KeepDuplicates="false"/>

+ 1 - 1
src/PixiEditor.Extensions.CommonApi/ProtoAutogen/ExtensionPalette.cs

@@ -21,7 +21,7 @@ namespace PixiEditor.Extensions.CommonApi.Palettes
         public string Name { get; set; } = "";
         public string Name { get; set; } = "";
 
 
         [global::ProtoBuf.ProtoMember(2)]
         [global::ProtoBuf.ProtoMember(2)]
-        public global::System.Collections.Generic.List<PaletteColor> Colors { get; } = new global::System.Collections.Generic.List<PaletteColor>();
+        public global::System.Collections.Generic.List<PaletteColor> Colors { get; set; } = new global::System.Collections.Generic.List<PaletteColor>();
 
 
         [global::ProtoBuf.ProtoMember(3)]
         [global::ProtoBuf.ProtoMember(3)]
         public bool IsFavourite { get; set; }
         public bool IsFavourite { get; set; }

+ 37 - 0
src/PixiEditor.Extensions.CommonApi/ProtoAutogen/FetchPaletteListQuery.cs

@@ -0,0 +1,37 @@
+// <auto-generated>
+//   This file was generated by a tool; you should avoid making direct changes.
+//   Consider using 'partial classes' to extend these types
+//   Input: FetchPaletteListQuery.proto
+// </auto-generated>
+
+#region Designer generated code
+#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192
+namespace PixiEditor.Extensions.CommonApi.Palettes
+{
+
+    [global::ProtoBuf.ProtoContract()]
+    public partial class FetchPaletteListQuery : global::ProtoBuf.IExtensible
+    {
+        private global::ProtoBuf.IExtension __pbn__extensionData;
+        global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
+            => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing);
+
+        [global::ProtoBuf.ProtoMember(1)]
+        [global::System.ComponentModel.DefaultValue("")]
+        public string DataSourceName { get; set; } = "";
+
+        [global::ProtoBuf.ProtoMember(2)]
+        public int StartIndex { get; set; }
+
+        [global::ProtoBuf.ProtoMember(3)]
+        public int Items { get; set; }
+
+        [global::ProtoBuf.ProtoMember(4)]
+        public FilteringSettings Filtering { get; set; }
+
+    }
+
+}
+
+#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192
+#endregion

+ 49 - 0
src/PixiEditor.Extensions.CommonApi/ProtoAutogen/FilteringSettings.cs

@@ -0,0 +1,49 @@
+// <auto-generated>
+//   This file was generated by a tool; you should avoid making direct changes.
+//   Consider using 'partial classes' to extend these types
+//   Input: FilteringSettings.proto
+// </auto-generated>
+
+#region Designer generated code
+#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192
+namespace PixiEditor.Extensions.CommonApi.Palettes
+{
+
+    [global::ProtoBuf.ProtoContract()]
+    public partial class FilteringSettings : global::ProtoBuf.IExtensible
+    {
+        private global::ProtoBuf.IExtension __pbn__extensionData;
+        global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
+            => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing);
+
+        [global::ProtoBuf.ProtoMember(1)]
+        public ColorsNumberMode ColorsNumberMode { get; set; }
+
+        [global::ProtoBuf.ProtoMember(2)]
+        public int ColorsCount { get; set; }
+
+        [global::ProtoBuf.ProtoMember(3)]
+        [global::System.ComponentModel.DefaultValue("")]
+        public string Name { get; set; } = "";
+
+        [global::ProtoBuf.ProtoMember(4)]
+        public bool ShowOnlyFavourites { get; set; }
+
+        [global::ProtoBuf.ProtoMember(5)]
+        public global::System.Collections.Generic.List<string> Favourites { get; set; } = new global::System.Collections.Generic.List<string>();
+
+    }
+
+    [global::ProtoBuf.ProtoContract()]
+    public enum ColorsNumberMode
+    {
+        Any = 0,
+        Max = 1,
+        Min = 2,
+        Exact = 3,
+    }
+
+}
+
+#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192
+#endregion

+ 1 - 1
src/PixiEditor.Extensions.CommonApi/ProtoAutogen/PaletteListResult.cs

@@ -17,7 +17,7 @@ namespace PixiEditor.Extensions.CommonApi.Palettes
             => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing);
             => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing);
 
 
         [global::ProtoBuf.ProtoMember(1)]
         [global::ProtoBuf.ProtoMember(1)]
-        public global::System.Collections.Generic.List<ExtensionPalette> Palettes { get; } = new global::System.Collections.Generic.List<ExtensionPalette>();
+        public global::System.Collections.Generic.List<ExtensionPalette> Palettes { get; set; } = new global::System.Collections.Generic.List<ExtensionPalette>();
 
 
     }
     }