General Updates 15 (#225)

+ Fix Octicons spelling error + Update README.md + Fix response json parsing + Update Package.appxmanifest + Update azure-pipelines-release.yml - Delete src/FluentHub.Octokit.Generation/Properties directory Co-authored-by: ジュピター <[email protected]>
0x5bfa · Aug 10, 2022 · 80f4de3 · 80f4de3
1 parent a34feeb
commit 80f4de3
Show file tree

Hide file tree

Showing 36 changed files with 312 additions and 493 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
   FluentHub
 </h1>
 <p align="center">
-  A stylish yet wonderfully powerful GitHub client
+  A stylish yet powerful GitHub client.
 </p>
 
 <p align="center">

diff --git a/builds/azure-pipelines-release.yml b/builds/azure-pipelines-release.yml
@@ -32,9 +32,9 @@ jobs:
       targetType: 'inline'
       script: |
         [xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\FluentHub.Uwp\Package.appxmanifest
-        $xmlDoc.Package.Identity.Name="FluentHubDev"
+        $xmlDoc.Package.Identity.Name="FluentHubSideload"
         $xmlDoc.Package.Identity.Publisher="FluentHub Team"
-        $xmlDoc.Package.Properties.DisplayName="FluentHub Dev"
+        $xmlDoc.Package.Properties.DisplayName="FluentHub"
         $xmlDoc.Package.Applications.Application.VisualElements.DisplayName="FluentHub Dev"
         $xmlDoc.Save('$(Build.SourcesDirectory)\src\FluentHub.Uwp\Package.appxmanifest')
       failOnStderr: true

diff --git a/src/FluentHub.Octokit.Generation/Properties/launchSettings.json b/src/FluentHub.Octokit.Generation/Properties/launchSettings.json
diff --git a/src/FluentHub.Octokit/Queries/Repositories/TreeQueries.cs b/src/FluentHub.Octokit/Queries/Repositories/TreeQueries.cs
@@ -30,7 +30,6 @@ public async Task<List<TreeEntry>> GetAllAsync(string name, string owner, string
 
         public async Task<(List<TreeEntry> Files, List<Commit> Commits)> GetWithObjectNameAsync(string name, string owner, string refs, string path)
         {
-            #region objectQuery
             var queryToGetFileInfo = new Query()
                 .Repository(name, owner)
                 .Object(expression: refs + ":" + path)
@@ -43,15 +42,14 @@ public async Task<List<TreeEntry>> GetAllAsync(string name, string owner, string
                     Type = x.Type,
                 })
                 .Compile();
-            #endregion
 
             var response1 = await App.Connection.Run(queryToGetFileInfo);
 
             List<Commit> items = new();
 
             var fragments = GetCommitFragmentList(response1.ToList());
 
-            var request3 = new GraphQLRequest
+            var request2 = new GraphQLRequest
             {
                 Query = @$"
 query {{
@@ -67,11 +65,41 @@ ... on Commit {{
 }}",
             };
 
-            var response3 = await App.GraphQLHttpClient.SendQueryAsync<DynamicClass>(request3);
+            var response2 = await App.GraphQLHttpClient.SendQueryAsync<object>(request2);
             List<Commit> zippedData = new();
 
-            Parse(0, response3.Data["repository"] as JToken, zippedData);
-            var str = ParsedJsonString.ToString();
+            var json = response2.Data as JToken;
+            var errors = json["errors"];
+
+            if (errors is not null)
+            {
+                (List<TreeEntry> Files, List<Commit> Commits) pre = (response1.ToList(), zippedData);
+
+                return pre;
+            }
+
+            var target = json
+                .Children<JProperty>().FirstOrDefault(x => x.Name == "repository").Value
+                .Children<JProperty>().FirstOrDefault(x => x.Name == "ref").Value
+                .Children<JProperty>().FirstOrDefault(x => x.Name == "target").Value;
+
+            for (int index = 0; index < response1.ToList().Count; index++)
+            {
+                var history = target.Children<JProperty>().FirstOrDefault(x => x.Name == $"history{index}").Value;
+
+                var item = history.Children<JProperty>().FirstOrDefault(x => x.Name == "nodes").Value.Children().FirstOrDefault();
+
+                var properties = item.Children<JProperty>();
+                var message = properties.FirstOrDefault(x => x.Name == "message").Value.ToString();
+                var committedDate = properties.FirstOrDefault(x => x.Name == "committedDate").Value.ToString();
+
+                zippedData.Add(new()
+                {
+                    Message = message,
+                    CommittedDate = DateTimeOffset.Parse(committedDate),
+                    CommittedDateHumanized = DateTimeOffset.Parse(committedDate).Humanize()
+                });
+            }
 
             (List<TreeEntry> Files, List<Commit> Commits) results = (response1.ToList(), zippedData);
 
@@ -96,115 +124,5 @@ private string GetCommitFragmentList(List<TreeEntry> files)
 
             return fragments;
         }
-
-        private class DynamicClass : DynamicObject
-        {
-            private Dictionary<string, dynamic> dicProperties = new Dictionary<string, dynamic>();
-
-            public override bool TrySetMember(SetMemberBinder binder, object value)
-            {
-                this.dicProperties[binder.Name] = value;
-                return true;
-            }
-
-            public override bool TryGetMember(GetMemberBinder binder, out object result)
-            {
-                return this.dicProperties.TryGetValue(binder.Name, out result);
-            }
-
-            public object this[string propertyName]
-            {
-                get
-                {
-                    object result;
-                    this.dicProperties.TryGetValue(propertyName, out result);
-                    return result;
-                }
-            }
-
-            public int PropX { get; set; }
-        }
-
-        StringBuilder ParsedJsonString { get; set; } = new();
-
-        private void Parse(int padding, JToken jtoken, List<Commit> commits)
-        {
-            if (jtoken is JValue)
-            {
-                JValue jvalue = (JValue)jtoken;
-                string str = $"value = {jvalue.Value}";
-                ParsedJsonString.AppendLine(str.PadLeft(str.Length + padding));
-            }
-            else if (jtoken is JObject)
-            {
-                bool elementAlreadyAdded = false;
-
-                foreach (KeyValuePair<string, JToken> kvp in (JObject)jtoken)
-                {
-                    if (kvp.Value is JValue)
-                    {
-                        JValue jvalue = (JValue)kvp.Value;
-                        string str = $"name = {kvp.Key}, value = {jvalue.Value}";
-
-                        if (elementAlreadyAdded is false)
-                        {
-                            commits.Add(new Commit() { });
-                            elementAlreadyAdded = true;
-                        }
-
-                        switch (kvp.Key)
-                        {
-                            case "message":
-                                commits.Last().Message = jvalue.Value.ToString();
-                                break;
-                            case "committedDate":
-                                DateTimeOffset.TryParse(jvalue.Value.ToString(), out var dto);
-                                commits.Last().CommittedDate = dto;
-                                commits.Last().CommittedDateHumanized = dto.Humanize();
-                                break;
-                        }
-
-                        ParsedJsonString.AppendLine(str.PadLeft(str.Length + padding));
-                    }
-                    else if (kvp.Value is JObject)
-                    {
-                        string str = $"name = {kvp.Key}";
-                        ParsedJsonString.AppendLine(str.PadLeft(str.Length + padding));
-                        Parse(padding + 2, kvp.Value, commits);
-                    }
-                    else if (kvp.Value is JArray)
-                    {
-                        string str = $"name = {kvp.Key}";
-                        ParsedJsonString.AppendLine(str.PadLeft(str.Length + padding));
-                        JArray jarray = (JArray)kvp.Value;
-                        int index = 1;
-
-                        foreach (JToken token in jarray)
-                        {
-                            string idx = $"array index {index}";
-                            ParsedJsonString.AppendLine(idx.PadLeft(idx.Length + padding + 1));
-                            Parse(padding + 2, token, commits);
-                            index++;
-                        }
-                    }
-                }
-            }
-            else if (jtoken is JArray)
-            {
-                JArray jarray = (JArray)jtoken;
-                int index = 1;
-                foreach (JToken token in jarray)
-                {
-                    string str = $"array index {index}";
-                    ParsedJsonString.AppendLine(str.PadLeft(str.Length + padding + 1));
-                    Parse(padding + 2, token, commits);
-                    index++;
-                }
-            }
-            else
-            {
-                ParsedJsonString.AppendLine(jtoken.ToString());
-            }
-        }
     }
 }