Add more fields parsed from worldjigsawpuzzle.org

Add first version of CVS parsing

Author: buffadin

Arctic.Puzzlers.Objects/CompetitionObjects/Competition.cs

@@ -5,6 +5,7 @@ public class Competition
         public Competition()
         {
             CompetitionGroups = new List<CompetitionGroup>();
+            CompetitionId = Guid.NewGuid();
         }
 
         public Guid CompetitionId { get; set; }

Arctic.Puzzlers.Objects/CompetitionObjects/CompetitionRound.cs

@@ -6,6 +6,8 @@ namespace Arctic.Puzzlers.Objects.CompetitionObjects
 {
     public class CompetitionRound
     {
+        public Guid RoundId { get; set; } = Guid.NewGuid();
+
         public string RoundName { get; set; } = string.Empty;
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public RoundType RoundType { get; set; }
@@ -14,6 +16,9 @@ public class CompetitionRound
         public List<ParticipantResult> Participants { get; set; } = new List<ParticipantResult>();
         public List<Puzzle> Puzzles { get; set; } = new List<Puzzle>();
         public DateTime Time { get; set; } = new DateTime();
+
+        public TimeSpan MaxTime { get; set; } = new TimeSpan();
+        public int NumberOfPieces { get; set; } = 0;
         public string Location { get; set; } = string.Empty;
         public string Url { get; set; } = string.Empty;
     }

Arctic.Puzzlers.Objects/Misc/CompetitionCSV.cs

@@ -3,13 +3,12 @@
     ////date, player(s) name event name, piece count, rank, time, and remaining pieces
     public class CompetitionCSV
     {
-        DateTime Date {  get; set; }
-        string PlayersName { get; set; } = string.Empty;
-        string EventName {  get; set; } = string.Empty;
-        long PieceCount { get; set; }
-
-        long Rank {  get; set; }
-        TimeSpan Time { get; set; }
+        public DateTime Date {  get; set; }
+        public string PlayersName { get; set; } = string.Empty;
+        public string EventName {  get; set; } = string.Empty;
+        public long PieceCount { get; set; }
 
+        public long Rank {  get; set; }
+        public TimeSpan Time { get; set; }
     }
 }

Arctic.Puzzlers.Objects/PuzzleObjects/Puzzle.cs

@@ -9,5 +9,6 @@ public class Puzzle
         [JsonConverter(typeof(BrandNameJsonConvert))]
         public BrandName BrandName { get; set; }
         public string? Name { get; set; }
+        public int Size { get; set; }
     }
 }

Arctic.Puzzlers.Parsers/CompetitionParsers/CompetitionRoundExtensions.cs

@@ -1,9 +1,4 @@
 using Arctic.Puzzlers.Objects.CompetitionObjects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Arctic.Puzzlers.Parsers.CompetitionParsers
 {

Arctic.Puzzlers.Parsers/CompetitionParsers/WorldJigsawPuzzleOrgParser.cs

@@ -3,6 +3,7 @@
 using Arctic.Puzzlers.Stores;
 using HtmlAgilityPack;
 using Microsoft.Extensions.Logging;
+using System.Diagnostics;
 using System.Globalization;
 using System.Text.RegularExpressions;
 using System.Xml.Linq;
@@ -42,12 +43,20 @@ public async Task Parse(string baseurl)
                         {
                             continue;
                         }
+
+                        var competitionName = competitionPage.DocumentNode.SelectNodes("//p[contains(@class,'nombre_campeonato')]");
                         var listOfRounds = competitionPage.DocumentNode.SelectNodes("//nav[contains(@class,'nav-underline')]/a");
+                        var competition = new Competition();
+                        if (competitionName != null && competitionName.Count() == 1)
+                        {
+                            competition.Name = competitionName[0].InnerText;
+                        }
+                       
 
                         var individualRounds = listOfRounds.Where(t => t.GetAttributeValue("href", "").ToLower().Contains("individual"));
                         var pairRounds = listOfRounds.Where(t => t.GetAttributeValue("href", "").ToLower().Contains("pairs"));
                         var teamRounds = listOfRounds.Where(t => t.GetAttributeValue("href", "").ToLower().Contains("teams"));
-                        var competition = new Competition();
+
                         competition.Url = competitionUrl;
                         if (individualRounds.Any())
                         {
@@ -184,7 +193,8 @@ private async Task<CompetitionGroup> AddRound(string baseUrl, IEnumerable<HtmlNo
 
                 competitionRound.RoundType = competitionRound.RoundName.ToLower() == "final"? RoundType.Final: competitionRound.RoundName.ToLower().StartsWith('s') ? RoundType.Semifinal : RoundType.Qualification;
                 var placeAndTime = doc.DocumentNode.SelectSingleNode("//p[@class='lead']").InnerText;
-
+                var date = doc.DocumentNode.SelectNodes("//span[contains(i/@class,'bi-calendar3')]");
+                var clock = doc.DocumentNode.SelectNodes("//span[contains(i/@class,'bi-clock')]");
                 if (!string.IsNullOrEmpty(placeAndTime))
                 {
                     var placeAndTimeList = placeAndTime.Split('.', 2);
@@ -194,9 +204,36 @@ private async Task<CompetitionGroup> AddRound(string baseUrl, IEnumerable<HtmlNo
                         if (DateTime.TryParseExact(datetimeString, "dd/MM/yyyy-HH:mm", CultureInfo.CurrentCulture, DateTimeStyles.None, out DateTime time))
                         {
                             competitionRound.Time = time;
-                        }
+                        }                       
                         competitionRound.Location = placeAndTimeList[1];
                     }
+                    else if(placeAndTimeList.Length == 1)
+                    {
+                        competitionRound.Location = placeAndTimeList[0];
+                    }
+                }
+
+                if (date != null && date.Count == 1 && clock != null && clock.Count == 1)
+                {
+                    var datetimestring = date[0].InnerText + "-" + clock[0].InnerText;
+                    datetimestring = datetimestring.Replace(" ", string.Empty);
+                    if (DateTime.TryParseExact(datetimestring, "dd/MM/yyyy-HH:mm", CultureInfo.CurrentCulture, DateTimeStyles.None, out DateTime timeFromText))
+                    {
+                        competitionRound.Time = timeFromText;
+                    }
+                }
+                
+
+                var maxTime = doc.DocumentNode.SelectNodes("//span[contains(i/@class,'bi-stopwatch')]");
+                if(maxTime != null && maxTime.Count == 1 && TimeSpan.TryParse(CleanUpString(maxTime[0].InnerText), out TimeSpan maxTimeSpan)) 
+                {
+                    competitionRound.MaxTime= maxTimeSpan;
+                }
+
+                var pieceCount = doc.DocumentNode.SelectNodes("//span[contains(i/@class,'bi-puzzle')]");
+                if (pieceCount != null && pieceCount.Count == 1 && int.TryParse(CleanUpString(pieceCount[0].InnerText), out int pieceCountOut))
+                {
+                    competitionRound.NumberOfPieces = pieceCountOut;
                 }
                 int namefield = 3;
                 int timefield = 7;
@@ -247,5 +284,12 @@ public bool TryResolveCompetitionUrl(string baseUrl, HtmlNode node, out string c
             currentUrl += node.GetAttributeValue("href", "");
             return true;
         }
+
+        private string CleanUpString(string value)
+        {
+            value = value.Replace("&nbsp;", string.Empty);
+            value = value.Replace(" ", string.Empty);
+            return value;
+        }
     }
 }

Arctic.Puzzlers.Stores/Filestore/JsonCompetitionStore.cs

@@ -115,5 +115,11 @@ public Task<List<Competition>> GetByName(string name)
             var results = m_competitionList.Where(t=> t.Name != null && t.Name.StartsWith(name, StringComparison.InvariantCultureIgnoreCase)).ToList();
             return Task.FromResult(results);
         }
+
+        public Task<Competition?> Get(Guid guid)
+        {
+            var results = m_competitionList.Where(t => t.Name != null && t.CompetitionId == guid).FirstOrDefault();
+            return Task.FromResult(results);
+        }
     }
 }

Arctic.Puzzlers.Stores/ICompetitionStore.cs

@@ -9,6 +9,7 @@ public interface ICompetitionStore
         public Task<List<Competition>> GetAll();
 
         public Task<List<Competition>> GetByName(string name);
+        public Task<Competition?> Get(Guid guid);
         public Task<List<PlayerCompetitionResult>> GetPlayerCompetitionResultByName(string name);
     }
 }

Arctic.Puzzlers.Stores/MemoryStore/MemoryCompetitionStore.cs

@@ -67,5 +67,10 @@ public Task<List<PlayerCompetitionResult>> GetPlayerCompetitionResultByName(stri
             }
             return Task.FromResult(results);
         }
+        public Task<Competition?> Get(Guid guid)
+        {
+            var results = m_competitionList.Where(t => t.Name != null && t.CompetitionId == guid).FirstOrDefault();
+            return Task.FromResult(results);
+        }
     }
 }

Arctic.Puzzlers.Webapi/Controllers/CompetitionController.cs

@@ -3,6 +3,8 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Globalization;
 using CsvHelper;
+using Arctic.Puzzlers.Objects.Misc;
+using Microsoft.VisualBasic;
 
 namespace Arctic.Puzzlers.Webapi.Controllers
 {
@@ -43,7 +45,7 @@ public async Task<ContentResult> GetAllCompetitions()
                 {
                     foreach (var round in competitionGroups.Rounds) {
                         html += "<br/> ";
-                        html += $"<a href=\"{baseurl}/api/Competition/CSV?Competitionname={result.Name}&RoundName={competitionGroups.ContestType + "-" + round.RoundName} \">{result.Name + " " + competitionGroups.ContestType + " " + round.RoundName} </a>";
+                        html += $"<a href=\"{baseurl}api/Competition/CSV?competition={result.CompetitionId}&round={round.RoundId} \">{result.Name + " " + competitionGroups.ContestType + " " + round.RoundName} </a>";
                     }
                 }
 
@@ -59,16 +61,49 @@ public async Task<ContentResult> GetAllCompetitions()
         [HttpGet]
         [Route("CSV")]
         [Produces("text/csv")]
-        public async Task<FileResult> GetCsv(string Competitionname, string RoundName)
+        public async Task<ActionResult> GetCsv(Guid competition, Guid round)
         {
 
-            var data = await m_store.GetByName(Competitionname);
-            using (var memoryStream = new MemoryStream())
+            var data = await m_store.Get(competition);
+            if(data == null)
+            {
+                return NotFound();
+            }
+            var groupData = data.CompetitionGroups.Where(t => t.Rounds.Any(t => t.RoundId == round)).FirstOrDefault();
+            if (groupData == null)
+            {
+                return NotFound();
+            }
+            var rounddata = groupData.Rounds.Where(t => t.RoundId == round).FirstOrDefault();
+            if(rounddata == null)
+            {
+                return NotFound();
+            }
+            var competitionCSVs = new List<CompetitionCSV>();
+
+            foreach(var result in rounddata.Participants)
             {
+                var playersName = string.Empty;
+                playersName = string.Join(";", result.Participants.Select(t=>t.FullName));
+                if (!string.IsNullOrEmpty(result.GroupName))
+                {
+                    playersName = result.GroupName + "(" + playersName + ")";
+                }
+                var competitionCSV = new CompetitionCSV()
+                {
+                    Date = rounddata.Time,
+                    EventName = data.Name + " " + groupData.ContestType + " " + rounddata.RoundName,
+                    PlayersName = playersName
+                };
+
+                competitionCSVs.Add(competitionCSV);
+            }
+            using (var memoryStream = new MemoryStream())
+            {               
                 using (var streamWriter = new StreamWriter(memoryStream))
                 using (var csvWriter = new CsvWriter(streamWriter, CultureInfo.InvariantCulture))
                 {
-                    csvWriter.WriteRecords(data);
+                    csvWriter.WriteRecords(competitionCSVs);
                 }
 
                 return File(memoryStream.ToArray(), "text/csv", $"Export-{DateTime.Now.ToString("s")}.csv");