2.0.3

Eternal-ll · Jan 7, 2023 · e8cdfa4 · e8cdfa4
1 parent 2d0ec0c
commit e8cdfa4
Show file tree

Hide file tree

Showing 40 changed files with 1,432 additions and 629 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,28 @@
 # Changelog
 
+## [2.0.3](https://github.com/Eternal-ll/Ethereal-FAF-Client/releases/tag/2.0.3)
+
+** Changelog **
+
+- Added search support by map name in Hosting tab
+- Added Mods vault tab
+- Changed list views in Players/Games/Maps/Hosting tab
+- Fixed error when grouping by rating ranges in Players tab
+- Fixed Changelog tab
+- Preview of Profile tab
+- Preview of Data tab
+
 ## [2.0.2](https://github.com/Eternal-ll/Ethereal-FAF-Client/releases/tag/2.0.2-beta.1) (2023-01-03)
 
 **Changelog**
 
-- [x] Support of multiple connected servers
-- [x] Fixed Ice related problems
-- [x] Fixed patch related problems
-- [x] Added startup pages
-- [x] Added vault page
-- [x] Added maps vault page
-- [x] Added [3.3.0 Ice Adapter](https://github.com/FAForever/java-ice-adapter/releases/tag/v3.3.0)
+- Support of multiple connected servers
+- Fixed Ice related problems
+- Fixed patch related problems
+- Added startup pages
+- Added vault page
+- Added maps vault page
+- Added [3.3.0 Ice Adapter](https://github.com/FAForever/java-ice-adapter/releases/tag/v3.3.0)
 
 **FAQ**
 

diff --git a/Ethereal.FA.Scmap/MapScenario.cs b/Ethereal.FA.Scmap/MapScenario.cs
@@ -7,7 +7,7 @@ public static class FAUtils
     {
         public static double KmFromPixels(double pixels) => pixels switch
         {
-            2096 => 80,
+            4096 => 80,
             2048 => 40,
             1024 => 20,
             512 => 10,
@@ -29,15 +29,20 @@ public class MapScenario
         public double WidthInKm => FAUtils.KmFromPixels(Width);
         public double HeigthInKm => FAUtils.KmFromPixels(Height);
 
+        public string SizeLabelKm => $"{WidthInKm}x{WidthInKm} km";
+
         public string PathToMap { get; set; }
         public string PathToSave { get; set; }
         public string PathToScript { get; set; }
+        public string PathToScenario { get; set; }
+        public string PathToDirectory { get; set; }
 
         public double NoRushRadius { get; set; }
 
         public bool Starts { get; set; }
 
         public List<string> Armies { get; set; }
+        public string BattleType { get; set; }
 
         /// <summary>
         /// 
@@ -47,7 +52,11 @@ public class MapScenario
         public static MapScenario FromFile(string file)
         {
             if (!File.Exists(file)) return null;
-            var scenario = new MapScenario();
+            var scenario = new MapScenario()
+            {
+                PathToScenario = file,
+                PathToDirectory = Path.GetDirectoryName(file)
+            };
             var test = File.ReadAllText(file);
             var regex = new Regex(@"STRING\( (.*) \)");
             var match = regex.Match(test);
@@ -83,6 +92,7 @@ public static MapScenario FromFile(string file)
                         {
                             if (teams[1] is LuaTable data)
                             {
+                                scenario.BattleType = data["name"].ToString();
                                 if (data["armies"] is LuaTable armiesTable)
                                 {
                                     var armies = new List<string>();

diff --git a/Ethereal.FAF.API.Client/Converters/SingleOrArrayConverter.cs b/Ethereal.FAF.API.Client/Converters/SingleOrArrayConverter.cs
@@ -15,21 +15,29 @@ public SingleOrArrayConverter() : this(true) { }
 
         public override TCollection Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
-            switch (reader.TokenType)
+            try
             {
-                case JsonTokenType.Null:
-                    return null;
-                case JsonTokenType.StartArray:
-                    var list = new TCollection();
-                    while (reader.Read())
-                    {
-                        if (reader.TokenType == JsonTokenType.EndArray)
-                            break;
-                        list.Add(JsonSerializer.Deserialize<TItem>(ref reader, options));
-                    }
-                    return list;
-                default:
-                    return new TCollection { JsonSerializer.Deserialize<TItem>(ref reader, options) };
+
+                switch (reader.TokenType)
+                {
+                    case JsonTokenType.Null:
+                        return null;
+                    case JsonTokenType.StartArray:
+                        var list = new TCollection();
+                        while (reader.Read())
+                        {
+                            if (reader.TokenType == JsonTokenType.EndArray)
+                                break;
+                            list.Add(JsonSerializer.Deserialize<TItem>(ref reader, options));
+                        }
+                        return list;
+                    default:
+                        return new TCollection { JsonSerializer.Deserialize<TItem>(ref reader, options) };
+                }
+            }
+            catch (Exception ex)
+            {
+                return null;
             }
         }
 

diff --git a/Ethereal.FAF.API.Client/Interfaces/IFafApiClient.cs b/Ethereal.FAF.API.Client/Interfaces/IFafApiClient.cs
@@ -57,6 +57,12 @@ Task<ApiResponse<ApiMapsResult>> GetMapsAsync(
             [Query(CollectionFormat.Csv)]
             string[] include = null,
             CancellationToken cancellationToken = default);
+        [Get("/data/mod")]
+        Task<ApiResponse<ModsResult>> GetModsAsync(string filter = null, Sorting sorting = null, Pagination pagination = null,
+            [AliasAs("include")]
+            [Query(CollectionFormat.Csv)]
+            string[] include = null,
+            CancellationToken cancellationToken = default);
     }
     public interface IFafContentClient
     {

diff --git a/Ethereal.FAF.API.Client/Models/Base/ApiUniversalResult.cs b/Ethereal.FAF.API.Client/Models/Base/ApiUniversalResult.cs
@@ -30,6 +30,43 @@ public virtual void ParseIncluded(out SortedDictionary<string, string[]> entityP
             entityProperties = null;
         }
     }
+    public class ModsResult : ApiUniversalResult<Mod[]>
+    {
+        public override void ParseIncluded()
+        {
+            var included = Included;
+            if (included is null || Data is null) return;
+            if (included.Length == 0 || Data.Length == 0) return;
+            foreach (var mod in Data)
+            {
+                if (mod.Relations is null) continue;
+                foreach (var relation in mod.Relations)
+                {
+                    if (relation.Value.Data is null) continue;
+                    if (relation.Value.Data.Count == 0) continue;
+                    var entity = ApiUniversalTools.GetDataFromIncluded(included, relation.Value.Data[0].Type, relation.Value.Data[0].Id);
+                    if (entity is null) continue;
+
+                    switch (relation.Value.Data[0].Type)
+                    {
+                        case ApiDataType.modVersion:
+                            mod.LatestVersion = entity.CastTo<ModVersion>();
+                            //if (map.LatestVersion.IsLegacyMap)
+                            //{
+                            //    map.LatestVersion.Attributes["hidden"] = "false";
+                            //}
+                            continue;
+                        case ApiDataType.player:
+                            mod.Uploader = entity?.Attributes["login"];
+                            continue;
+                        case ApiDataType.modReviewsSummary:
+                            mod.ReviewsSummary = entity?.CastTo<ApiUniversalSummary>();
+                            continue;
+                    }
+                }
+            }
+        }
+    }
     public class ApiMapsResult : ApiUniversalResult<ApiMapModel[]>
     {
         public override void ParseIncluded()

diff --git a/Ethereal.FAF.API.Client/Models/Enums/ApiDataType.cs b/Ethereal.FAF.API.Client/Models/Enums/ApiDataType.cs
@@ -3,10 +3,14 @@
     public enum ApiDataType : byte
     {
         mod,
-        modVersion,
+        modStatistics,
         modReviewsSummary,
 
-
+        modVersion,
+        modVersionStatistics,
+        modVersionReview,
+        modVersionReviewsSummary,
+
         map,
         mapStatistics,
         mapReviewsSummary,
@@ -21,13 +25,17 @@ public enum ApiDataType : byte
 
         player,
         clanMembership,
+
         avatar,
         avatarAssignment,
+
         nameRecord,
         globalRating,
         ladder1v1Rating,
-
-
+
+        accountLink,
+
+
         game,
         gamePlayerStats,
 

diff --git a/Ethereal.FAF.API.Client/Models/MapsVault/ApiMap.cs b/Ethereal.FAF.API.Client/Models/MapsVault/ApiMap.cs
@@ -1,9 +1,13 @@
-using beta.Models.API.Enums;
-using beta.Models.API.Universal;
+using beta.Models.API.Universal;
 using System.Text.Json.Serialization;
 
 namespace beta.Models.API.MapsVault
 {
+    public interface IVaultEntity
+    {
+        public bool IsHidden { get; }
+        public bool HasVersion { get; }
+    }
     public class ApiMap : Base.ApiUniversalData
     {
         public string DisplayedName => Attributes["displayName"];
@@ -40,12 +44,12 @@ public class ApiMapPoolAssignment : Base.ApiUniversalData
         //    JsonSerializer.Deserialize<MapPoolAssignmentParams>(parameters) : null;
         public MapVersionModel LatestVersion { get; set; }
     }
-    public class ApiMapModel : ApiMap
+    public class ApiMapModel : ApiMap, IVaultEntity
     {
         public string Author { get; set; } = "Unknown";
 
         public string SmallPreviewUrl => LatestVersion is null ?
-            $"https://via.placeholder.com/468x60?text={DisplayedName}.png" :
+            $"https://via.placeholder.com/60x60?text={DisplayedName}.png" :
             LatestVersion.ThumbnailUrlLarge.Replace("faforever.ru", "content.faforever.ru");
 
 
@@ -54,40 +58,7 @@ public class ApiMapModel : ApiMap
         public MapVersionModel LatestVersion { get; set; }
         public MapVersionModel[] Versions { get; set; }
 
-
-
-        public bool TryGetRelationId(ApiDataType type, out int id)
-        {
-            id = -1;
-            var relations = Relations;
-            if (relations is not null && relations.Count > 0)
-            {
-                foreach (var relation in relations)
-                {
-                    if (relation.Value.Data[0].Type == type)
-                    {
-                        id = relation.Value.Data[0].Id;
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-        public Dictionary<ApiDataType, int> GetRelations()
-        {
-            var dic = new Dictionary<ApiDataType, int>();
-            var relations = Relations;
-            if (relations is not null)
-            {
-                foreach (var relation in relations)
-                {
-                    var data = relation.Value.Data;
-                    if (data is null) continue;
-                    if (data.Count == 0) continue;
-                    dic.TryAdd(data[0].Type, data[0].Id);
-                }
-            }
-            return dic;
-        }
+        public bool IsHidden => HasVersion && LatestVersion.IsHidden;
+        public bool HasVersion => LatestVersion is not null;
     }
 }
diff --git a/Ethereal.FAF.API.Client/Models/MapsVault/Mod.cs b/Ethereal.FAF.API.Client/Models/MapsVault/Mod.cs
@@ -0,0 +1,42 @@
+using beta.Models.API.Universal;
+
+namespace beta.Models.API.MapsVault
+{
+    public class Mod : Base.ApiUniversalData, IVaultEntity
+    {
+        public string Author => Attributes["author"];
+        public string Name => Attributes["displayName"];
+        public bool IsRecommended => bool.Parse(Attributes["recommended"]);
+        public DateTime UpdateTime => DateTime.Parse(Attributes["updateTime"]);
+        public DateTime CreateTime => DateTime.Parse(Attributes["createTime"]);
+        public string Uploader { get; set; }
+        public ApiUniversalSummary ReviewsSummary { get; set; }
+        public ModVersion[] Versions { get; set; }
+        public ModVersion LatestVersion { get; set; }
+
+        public bool IsHidden => HasVersion && LatestVersion.IsHidden;
+        public bool HasVersion => LatestVersion is not null;
+    }
+    public enum ModType
+    {
+        UI,
+        SIM,
+    }
+    public class ModVersion : Base.ApiUniversalData
+    {
+        public string Uid => Attributes["uid"];
+        public ModType ModType => Enum.Parse<ModType>(Attributes["type"]);
+        public int Version => int.Parse(Attributes["version"]);
+        public string Description => Attributes["description"];
+        public string DownloadUrl => Attributes["downloadUrl"];
+        public string Filename => Attributes["filename"];
+        public bool IsHidden => bool.Parse(Attributes["hidden"]);
+        public bool IsRanked => bool.Parse(Attributes["ranked"]);
+        public string ThumbnailUrl => Attributes["thumbnailUrl"];
+        public DateTime Created => DateTime.Parse(Attributes["createTime"]);
+        public DateTime Updated => DateTime.Parse(Attributes["updateTime"]);
+
+        public ApiUniversalStatistics Statistics { get; set; }
+        public ApiUniversalSummary Summary { get; set; }
+    }
+}
diff --git a/Ethereal.FAF.UI.Client/App.xaml b/Ethereal.FAF.UI.Client/App.xaml
@@ -38,8 +38,8 @@
                 </ResourceDictionary>
                 <ui:ControlsDictionary />
                 <ui:ThemesDictionary Theme="Dark" />
-                <ResourceDictionary Source="Resources/Dictionaries/VaultDictionary.xaml"/>
                 <ResourceDictionary Source="pack://application:,,,/Fonts;component/FontsDictionary.xaml"/>
+                <ResourceDictionary Source="Resources/Dictionaries/VaultDictionary.xaml"/>
 
                 <ResourceDictionary>
                     <Style x:Key="BorderPopup" TargetType="Border">
@@ -68,6 +68,8 @@
                         </Setter>
                     </Style>
                 </ResourceDictionary>
+
+                <ResourceDictionary Source="Resources/Dictionaries/CardsDictionary.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

diff --git a/Ethereal.FAF.UI.Client/App.xaml.cs b/Ethereal.FAF.UI.Client/App.xaml.cs
@@ -129,9 +129,6 @@ private void ConfigureServices(HostBuilderContext context, IServiceCollection se
             services.AddScoped<ModsViewModel>();
             services.AddScoped<ModsView>();
 
-            services.AddScoped<VaultViewModel>();
-            services.AddScoped<VaultView>();
-
             services.AddTransient<SelectServerVM>();
             services.AddTransient<SelectServerView>();
 
@@ -141,6 +138,11 @@ private void ConfigureServices(HostBuilderContext context, IServiceCollection se
             services.AddScoped<LoaderViewModel>();
             services.AddScoped<LoaderView>();
 
+            services.AddScoped<ProfileView>();
+
+            services.AddScoped<DataView>();
+            services.AddScoped<DataViewModel>();
+
             services.AddScoped<SelectGameLocationView>();
             services.AddScoped<SelectFaPatchLocationView>();
             services.AddScoped<SelectVaultLocationView>();

diff --git a/Ethereal.FAF.UI.Client/Ethereal.FAF.UI.Client.csproj b/Ethereal.FAF.UI.Client/Ethereal.FAF.UI.Client.csproj
@@ -77,5 +77,11 @@
     <Resource Include="Resources\Images\Flags\*.png" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Views\DataView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+
 
 </Project>