Implement poesieland/poesieland.github.io#125, skip ci

Author: postb99

src/Toolbox/Charts/ChartDataFileGenerator.cs

@@ -472,38 +472,36 @@ public void GeneratePoemsOfYearByDayRadarChartDataFile(Root data, int year)
     /// and categorizes them by seasons or a general context.
     /// This method processes the given poems from the Root object and distinguishes regular,
     /// variable, and undefined metrics. It outputs:
-    /// - A pie chart file "poems-verse-length-pie.js" when a general context is used (seasonId is null).
+    /// - A pie chart file "poems-verse-length-pie.js" when a general context is used (seasonId is null, forSonnet is falsy).
+    /// - A bar chart file "metrique_variable-bar.js" when a general context is used (seasonId is null, forSonnet is falsy).
     /// - A bar chart file "poems-verse-length-bar.js" when a specific season is selected.
-    /// - A bar chart file "metrique_variable-bar.js" when a general context is used (seasonId is null).
+    /// - A pie chart file "sonnet-verse-length-pie.js" when forSonnet is true.
     /// </summary>
     /// <param name="data">The root object containing seasons and poems data.</param>
     /// <param name="seasonId">An optional season identifier to filter poems by season. If null, all seasons are included.</param>
-    public void GeneratePoemMetricBarAndPieChartDataFile(Root data, int? seasonId)
+    /// <param name="forSonnet">A flag indicating that only poems of type sonnet are taken into account.</param>
+    public void GeneratePoemMetricBarAndPieChartDataFile(Root data, int? seasonId, bool? forSonnet = false)
     {
-        var isGeneral = seasonId is null;
+        var isGeneral = seasonId is null && forSonnet != true;
         var rootDir = Path.Combine(Directory.GetCurrentDirectory(),
             configuration[Constants.CHART_DATA_FILES_ROOT_DIR]!);
-        var fileName = isGeneral ? "poems-verse-length-pie.js" : "poems-verse-length-bar.js";
-        var subDir = isGeneral ? "general" : $"season-{seasonId}";
-        var chartId = isGeneral ? "poemVerseLengthPie" : $"season{seasonId}VerseLengthBar";
+        var fileName = seasonId is not null ? "poems-verse-length-bar.js" : forSonnet == true ? "sonnet-verse-length-pie.js" : "poems-verse-length-pie.js";
+        var subDir = seasonId is not null ? $"season-{seasonId}" : forSonnet == true ? "taxonomy" : "general";
+        var chartId = seasonId is not null ?  $"season{seasonId}VerseLengthBar" : forSonnet == true ? "sonnetVerseLengthPie" : "poemVerseLengthPie";
         using var streamWriter = new StreamWriter(Path.Combine(rootDir, subDir, fileName));
         var chartDataFileHelper = new ChartDataFileHelper(streamWriter,
-            isGeneral ? ChartType.Pie : ChartType.Bar, 1);
+            seasonId is not null ? ChartType.Bar : ChartType.Pie, 1);
         chartDataFileHelper.WriteBeforeData();
         var regularMetricData = new Dictionary<int, int>();
         var variableMetricData = new Dictionary<string, int>();
-        var nbUndefinedVerseLength = 0;
         var poems = seasonId is not null
             ? data.Seasons.First(x => x.Id == seasonId).Poems
+            : forSonnet == true ? data.Seasons.SelectMany(x => x.Poems).Where(x => x.PoemType == "sonnet")
             : data.Seasons.SelectMany(x => x.Poems);
 
         foreach (var poem in poems)
         {
-            if (string.IsNullOrEmpty(poem.VerseLength))
-            {
-                nbUndefinedVerseLength++;
-            }
-            else if (poem.HasVariableMetric)
+            if (poem.HasVariableMetric)
             {
                 if (isGeneral)
                 {
@@ -563,14 +561,10 @@ public void GeneratePoemMetricBarAndPieChartDataFile(Root data, int? seasonId)
             variableMetricChartData.Add(new(verseLength, variableMetricData[verseLength], "rgba(72, 149, 239, 1)"));
         }
 
-        var undefinedVerseLengthChartData = new ColoredDataLine
-        ("Pas de données pour l\\'instant", nbUndefinedVerseLength, "rgb(211, 211, 211)"
-        );
-
-        // General pie chart or Season's bar chart
+        // General/for sonnet pie chart vs Season's bar chart
         var dataLines = new List<DataLine>();
 
-        if (isGeneral)
+        if (seasonId is null || forSonnet == true)
         {
             var metrics = configuration.GetSection(Constants.METRIC_SETTINGS).Get<MetricSettings>()!.Metrics;
             var coloredDataLines = new List<ColoredDataLine>();
@@ -591,9 +585,7 @@ public void GeneratePoemMetricBarAndPieChartDataFile(Root data, int? seasonId)
         {
             dataLines.AddRange(regularMetricChartData);
             dataLines.AddRange(variableMetricChartData);
-            if (nbUndefinedVerseLength > 0)
-                dataLines.Add(undefinedVerseLengthChartData);
-
+  
             chartDataFileHelper.WriteData(dataLines, true);
 
             chartDataFileHelper.WriteAfterData(chartId, ["Poèmes"],
@@ -1635,7 +1627,6 @@ private void GenerateTopMostCategoriesListing(IEnumerable<Poem> poems, string fi
         streamWriter.Close();
     }
 
-
     /// <summary>
     /// Retrieves the top most represented months from the provided dictionary of month-day data.
     /// The method aggregates the data by month, ranks the months by their total occurrences,

src/Toolbox/Program.cs

@@ -139,8 +139,8 @@ private static async Task<bool> PerformActionAsync(MenuItem menuChoice)
             case MainMenuSettings.MenuChoices.GeneratePoemsLengthBarChartDataFile:
                 GeneratePoemsLengthPieChartDataFile();
                 break;
-            case MainMenuSettings.MenuChoices.GeneratePoemVersesLengthBarChartDataFile:
-                GeneratePoemMetricPieChartDataFile();
+            case MainMenuSettings.MenuChoices.GeneratePoemMetricBarAndPieChartDataFiles:
+                GeneratePoemMetricPieChartDataFile(null);
                 break;
             case MainMenuSettings.MenuChoices.GenerateSeasonCategoriesPieChartDataFile:
                 GenerateSeasonCategoriesPieChart(menuChoice);
@@ -393,10 +393,15 @@ private static void GeneratePoemsLengthPieChartDataFile()
         Console.WriteLine("Poems length pie chart data file OK");
     }
 
-    private static void GeneratePoemMetricPieChartDataFile()
+    private static void GeneratePoemMetricPieChartDataFile(int? seasonId)
     {
         _chartDataFileGenerator.GeneratePoemMetricBarAndPieChartDataFile(_data, null);
-        Console.WriteLine("Poem verses length pie chart data file OK");
+        _chartDataFileGenerator.GeneratePoemMetricBarAndPieChartDataFile(_data, null, forSonnet: true);
+        if (seasonId is not null)
+        {
+            _chartDataFileGenerator.GeneratePoemMetricBarAndPieChartDataFile(_data, seasonId);
+        }
+        Console.WriteLine("Poem metric pie chart data files OK");
     }
 
     private static void GenerateSeasonCategoriesPieChart(MenuItem menuChoice)
@@ -453,8 +458,7 @@ private static void GenerateDependantChartDataFilesAndCheckQuality(int seasonId,
         GeneratePoemsLengthPieChartDataFile();
 
         // General and season's metric
-        GeneratePoemMetricPieChartDataFile();
-        _chartDataFileGenerator.GeneratePoemMetricBarAndPieChartDataFile(_data, seasonId);
+        GeneratePoemMetricPieChartDataFile(seasonId);
 
         // Season categories' pie
         _chartDataFileGenerator.GenerateSeasonCategoriesPieChartDataFile(_data, seasonId);

src/Toolbox/Settings/MainMenuSettings.cs

@@ -25,7 +25,7 @@ public enum MenuChoices
         GenerateSeasonCategoriesPieChartAskSeasonId = 421,
         GeneratePoemsRadarChartDataFile = 430,
         GeneratePoemsRadarChartAskCategory = 431,
-        GeneratePoemVersesLengthBarChartDataFile = 440,
+        GeneratePoemMetricBarAndPieChartDataFiles = 440,
         GenerateAllSeasonsPoemIntervalBarChartDataFile = 450,
         GenerateBubbleChartDataFile = 460,
         GenerateLineChartDataFile = 470,

src/Toolbox/appsettings.json

@@ -109,7 +109,7 @@
           },
           {
             "Key": 440,
-            "Label": "Poem metric (bar and pie chart)"
+            "Label": "Poem metric (bar and pie charts)"
           },
           {
             "Key": 450,