Савельев Григорий

TagsCloud/Builders/CloudOptionsBuilder.cs

@@ -3,6 +3,7 @@
 using System.Reflection;
 using TagsCloud.Contracts;
 using TagsCloud.Entities;
+using TagsCloud.Options;
 using TagsCloudVisualization;
 
 namespace TagsCloud.Builders;

TagsCloud/Builders/InputOptionsBuilder.cs

@@ -1,5 +1,6 @@
 using TagsCloud.Contracts;
 using TagsCloud.Entities;
+using TagsCloud.Options;
 
 namespace TagsCloud.Builders;
 

TagsCloud/Builders/OutputOptionsBuilder.cs

@@ -5,6 +5,7 @@
 using SixLabors.ImageSharp.Formats.Png;
 using TagsCloud.Contracts;
 using TagsCloud.Entities;
+using TagsCloud.Options;
 
 namespace TagsCloud.Builders;
 

TagsCloud/Contracts/ICloudProcessor.cs

@@ -0,0 +1,10 @@
+using TagsCloudVisualization;
+
+namespace TagsCloud.Contracts;
+
+public interface ICloudProcessor
+{
+    void SetPositions(HashSet<WordTagGroup> wordGroups);
+    void SetFonts(HashSet<WordTagGroup> wordGroups);
+    void SetColors(HashSet<WordTagGroup> wordGroups);
+}

TagsCloud/Contracts/IFontMeasurer.cs

@@ -5,5 +5,5 @@ namespace TagsCloud.Contracts;
 public interface IFontMeasurer
 {
     MeasurerType Type { get; }
-    int GetFontSize(int count, int maxCount, int minCount, int maxSize, int minSize);
+    int GetFontSize(int wordFrequency, int minFrequency, int maxFrequency, int minFontSize, int maxFontSize);
 }

TagsCloud/Contracts/IInputProcessor.cs

@@ -0,0 +1,8 @@
+using TagsCloudVisualization;
+
+namespace TagsCloud.Contracts;
+
+public interface IInputProcessor
+{
+    HashSet<WordTagGroup> CollectWordGroupsFromFile(string filename);
+}

TagsCloud/Contracts/IOutputProcessor.cs

@@ -0,0 +1,8 @@
+using TagsCloudVisualization;
+
+namespace TagsCloud.Contracts;
+
+public interface IOutputProcessor
+{
+    void SaveVisualization(HashSet<WordTagGroup> wordGroups, string filename);
+}

TagsCloud/CustomAttributes/InjectionAttribute.cs

@@ -0,0 +1,14 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace TagsCloud.CustomAttributes;
+
+[AttributeUsage(AttributeTargets.Class)]
+public class InjectionAttribute : Attribute
+{
+    public InjectionAttribute(ServiceLifetime lifeTime)
+    {
+        LifeTime = lifeTime;
+    }
+
+    public ServiceLifetime LifeTime { get; }
+}

TagsCloud/Extensions/ServiceCollectionExtensions.cs

@@ -1,8 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using System.Reflection;
-using TagsCloud.Contracts;
-using TagsCloud.Conveyors;
-using TagsCloud.Processors;
+using TagsCloud.CustomAttributes;
 
 namespace TagsCloud.Extensions;
 
@@ -15,63 +14,18 @@ static ServiceCollectionExtensions()
         assemblyTypes = Assembly.GetExecutingAssembly().GetTypes();
     }
 
-    public static ServiceCollection AddProcessors(this ServiceCollection collection)
+    public static ServiceCollection AddAllInjections(this ServiceCollection collection)
     {
-        collection.AddSingleton<InputProcessor>();
-        collection.AddSingleton<CloudProcessor>();
-        collection.AddSingleton<OutputProcessor>();
+        var types = assemblyTypes
+            .Where(type => Attribute.IsDefined(type, typeof(InjectionAttribute)));
 
-        return collection;
-    }
-
-    public static ServiceCollection AddFilters(this ServiceCollection collection)
-    {
-        var filterType = typeof(IFilter);
-        var filters = GetTypesByInterface(filterType);
-
-        foreach (var filter in filters)
-            collection.AddSingleton(filterType, filter);
-
-        collection.AddSingleton<FilterConveyor>();
-
-        return collection;
-    }
-
-    public static ServiceCollection AddReaders(this ServiceCollection collection)
-    {
-        var readerType = typeof(IFileReader);
-        var readers = GetTypesByInterface(readerType);
-
-        foreach (var reader in readers)
-            collection.AddSingleton(readerType, reader);
+        foreach (var implementationType in types)
+        {
+            var attribute = implementationType.GetCustomAttribute<InjectionAttribute>();
+            var serviceType = implementationType.GetInterfaces().First();
+            collection.Add(new ServiceDescriptor(serviceType, implementationType, attribute!.LifeTime));
+        }
 
         return collection;
     }
-
-    public static ServiceCollection AddPainters(this ServiceCollection collection)
-    {
-        var painterType = typeof(IPainter);
-        var painters = GetTypesByInterface(painterType);
-
-        foreach (var painter in painters) collection.AddSingleton(painterType, painter);
-
-        return collection;
-    }
-
-    public static ServiceCollection AddMeasurers(this ServiceCollection collection)
-    {
-        var measurerType = typeof(IFontMeasurer);
-        var measurers = GetTypesByInterface(measurerType);
-
-        foreach (var measurer in measurers)
-            collection.AddSingleton(measurerType, measurer);
-
-        return collection;
-    }
-
-    private static IEnumerable<Type> GetTypesByInterface(Type interfaceType)
-    {
-        return assemblyTypes
-            .Where(type => type.GetInterfaces().Any(inter => inter == interfaceType));
-    }
 }

TagsCloud/FileReaders/CsvFileReader.cs

@@ -1,11 +1,14 @@
 using CsvHelper;
 using CsvHelper.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using System.Globalization;
 using TagsCloud.Contracts;
+using TagsCloud.CustomAttributes;
 using TagsCloud.Entities;
 
 namespace TagsCloud.FileReaders;
 
+[Injection(ServiceLifetime.Singleton)]
 public class CsvFileReader : IFileReader
 {
     public string SupportedExtension => "csv";
@@ -21,6 +24,6 @@ public IEnumerable<string> ReadContent(string filename, IPostFormatter postForma
         using var csv = new CsvReader(reader, configuration);
 
         foreach (var cell in csv.GetRecords<TableCell>())
-            yield return cell.Word;
+            yield return postFormatter is null ? cell.Word : postFormatter.Format(cell.Word);
     }
 }

TagsCloud/FileReaders/DocxFileReader.cs

@@ -1,9 +1,11 @@
+using Microsoft.Extensions.DependencyInjection;
 using TagsCloud.Contracts;
+using TagsCloud.CustomAttributes;
 using Xceed.Words.NET;
 
 namespace TagsCloud.FileReaders;
 
-// TODO: Implement this reader in future
+[Injection(ServiceLifetime.Singleton)]
 public class DocxFileReader : IFileReader
 {
     public string SupportedExtension => "docx";

TagsCloud/FileReaders/TxtFileReader.cs

@@ -1,7 +1,10 @@
+using Microsoft.Extensions.DependencyInjection;
 using TagsCloud.Contracts;
+using TagsCloud.CustomAttributes;
 
 namespace TagsCloud.FileReaders;
 
+[Injection(ServiceLifetime.Singleton)]
 public class TxtFileReader : IFileReader
 {
     public string SupportedExtension => "txt";

TagsCloud/Filters/ExcludedFilter.cs

@@ -1,8 +1,11 @@
+using Microsoft.Extensions.DependencyInjection;
 using TagsCloud.Contracts;
+using TagsCloud.CustomAttributes;
 using TagsCloudVisualization;
 
 namespace TagsCloud.Filters;
 
+[Injection(ServiceLifetime.Singleton)]
 public class ExcludedFilter : IFilter
 {
     public void Apply(HashSet<WordTagGroup> wordGroups, IFilterOptions options)

TagsCloud/Filters/SpeechPartFilter.cs

@@ -1,8 +1,11 @@
+using Microsoft.Extensions.DependencyInjection;
 using TagsCloud.Contracts;
+using TagsCloud.CustomAttributes;
 using TagsCloudVisualization;
 
 namespace TagsCloud.Filters;
 
+[Injection(ServiceLifetime.Singleton)]
 public class SpeechPartFilter : IFilter
 {
     public void Apply(HashSet<WordTagGroup> wordGroups, IFilterOptions options)

TagsCloud/FontMeasurers/LinearFontMeasurer.cs

@@ -1,15 +1,18 @@
+using Microsoft.Extensions.DependencyInjection;
 using TagsCloud.Contracts;
+using TagsCloud.CustomAttributes;
 using TagsCloud.Entities;
 
 namespace TagsCloud.FontMeasurers;
 
+[Injection(ServiceLifetime.Singleton)]
 public class LinearFontMeasurer : IFontMeasurer
 {
     public MeasurerType Type => MeasurerType.Linear;
 
-    public int GetFontSize(int count, int maxCount, int minCount, int maxSize, int minSize)
+    public int GetFontSize(int wordFrequency, int minFrequency, int maxFrequency, int minFontSize, int maxFontSize)
     {
-        var fontSize = minSize + (float)count / maxCount * (maxSize - minSize);
+        var fontSize = minFontSize + (float)wordFrequency / maxFrequency * (maxFontSize - minFontSize);
         return (int)fontSize;
     }
 }

TagsCloud/FontMeasurers/LogarithmicFontMeasurer.cs

@@ -1,17 +1,20 @@
+using Microsoft.Extensions.DependencyInjection;
 using TagsCloud.Contracts;
+using TagsCloud.CustomAttributes;
 using TagsCloud.Entities;
 
 namespace TagsCloud.FontMeasurers;
 
+[Injection(ServiceLifetime.Singleton)]
 public class LogarithmicFontMeasurer : IFontMeasurer
 {
     public MeasurerType Type => MeasurerType.Logarithmic;
 
-    public int GetFontSize(int count, int maxCount, int minCount, int maxSize, int minSize)
+    public int GetFontSize(int wordFrequency, int minFrequency, int maxFrequency, int minFontSize, int maxFontSize)
     {
-        var minLog = Math.Log(minCount);
-        var divisor = Math.Log(maxCount) - minLog;
-        var weight = divisor == 0 ? 1 : (Math.Log(count) - minLog) / divisor;
-        return (int)(minSize + (maxSize - minSize) * weight);
+        var minLog = Math.Log(minFrequency);
+        var divisor = Math.Log(maxFrequency) - minLog;
+        var weight = divisor == 0 ? 1 : (Math.Log(wordFrequency) - minLog) / divisor;
+        return (int)(minFontSize + (maxFontSize - minFontSize) * weight);
     }
 }

TagsCloud/Formatters/DefaultPostFormatter.cs

@@ -1,13 +1,24 @@
+using Microsoft.Extensions.DependencyInjection;
 using TagsCloud.Contracts;
+using TagsCloud.CustomAttributes;
 
 namespace TagsCloud.Formatters;
 
+[Injection(ServiceLifetime.Singleton)]
 public class DefaultPostFormatter : IPostFormatter
 {
-    private static readonly char[] separators = { ' ', '=', ';', ',', '.', ':', '!', '?' };
-
     public string Format(string input)
     {
-        return input.Split(separators, StringSplitOptions.RemoveEmptyEntries)[0].ToLower();
+        var idx = GetFirstNonLetterIndex(input);
+        return idx == -1 ? input : input[..idx];
+    }
+
+    private static int GetFirstNonLetterIndex(string line)
+    {
+        for (var i = 0; i < line.Length; i++)
+            if (!char.IsLetter(line[i]))
+                return i;
+
+        return -1;
     }
 }

TagsCloud/Entities/CloudProcessorOptions.cs → TagsCloud/Options/CloudProcessorOptions.cs

@@ -1,9 +1,10 @@
 using SixLabors.Fonts;
 using SixLabors.ImageSharp;
 using TagsCloud.Contracts;
+using TagsCloud.Entities;
 using TagsCloudVisualization;
 
-namespace TagsCloud.Entities;
+namespace TagsCloud.Options;
 
 public class CloudProcessorOptions : ICloudProcessorOptions
 {

TagsCloud/Entities/InputProcessorOptions.cs → TagsCloud/Options/InputProcessorOptions.cs

@@ -1,6 +1,7 @@
 using TagsCloud.Contracts;
+using TagsCloud.Entities;
 
-namespace TagsCloud.Entities;
+namespace TagsCloud.Options;
 
 public class InputProcessorOptions : IInputProcessorOptions
 {

TagsCloud/Entities/OutputProcessorOptions.cs → TagsCloud/Options/OutputProcessorOptions.cs

@@ -2,7 +2,7 @@
 using SixLabors.ImageSharp.Formats;
 using TagsCloud.Contracts;
 
-namespace TagsCloud.Entities;
+namespace TagsCloud.Options;
 
 public class OutputProcessorOptions : IOutputProcessorOptions
 {

TagsCloud/Painters/AllRandomPainter.cs

@@ -1,10 +1,13 @@
+using Microsoft.Extensions.DependencyInjection;
 using SixLabors.ImageSharp;
 using TagsCloud.Contracts;
+using TagsCloud.CustomAttributes;
 using TagsCloud.Entities;
 using TagsCloudVisualization;
 
 namespace TagsCloud.Painters;
 
+[Injection(ServiceLifetime.Singleton)]
 public class AllRandomPainter : IPainter
 {
     private readonly Random random = new();

TagsCloud/Painters/OneVsRestPainter.cs

@@ -1,10 +1,13 @@
+using Microsoft.Extensions.DependencyInjection;
 using SixLabors.ImageSharp;
 using TagsCloud.Contracts;
+using TagsCloud.CustomAttributes;
 using TagsCloud.Entities;
 using TagsCloudVisualization;
 
 namespace TagsCloud.Painters;
 
+[Injection(ServiceLifetime.Singleton)]
 public class OneVsRestPainter : IPainter
 {
     public ColoringStrategy Strategy => ColoringStrategy.OneVsRest;