Merge pull request #16 from hmlendea/code-quality

Improved the code quality
hmlendea · Apr 12, 2022 · 1bdf5d0 · 1bdf5d0
2 parents e167971 + da71198
commit 1bdf5d0
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/Controllers/TransliterationController.cs b/Controllers/TransliterationController.cs
@@ -32,6 +32,7 @@ public ActionResult Get(
             {
                 string decodedText = HttpUtility.UrlDecode(text);
                 string transliteratedText = transliterationService.Transliterate(text, language).Result; // TODO: Broken async
+
                 return Ok(transliteratedText);
             }
             catch (ArgumentException ex)

diff --git a/Program.cs b/Program.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 

diff --git a/Service/HttpRequestManager.cs b/Service/HttpRequestManager.cs
@@ -78,8 +78,6 @@ public async Task<string> Post(
 
         public async Task<string> RetrieveCookies(string url)
         {
-            Uri uri = new Uri(url);
-
             HttpRequestMessage request = new HttpRequestMessage()
             {
                 RequestUri = new Uri(url),
@@ -94,7 +92,7 @@ public async Task<string> RetrieveCookies(string url)
 
                 string cook = string.Empty;
 
-                foreach (var cookie in cookies.GetCookies(uri))
+                foreach (var cookie in cookies.GetCookies(request.RequestUri))
                 {
                     cook += cookie.ToString() + ";";
                 }

diff --git a/Service/TransliterationService.cs b/Service/TransliterationService.cs
@@ -54,7 +54,6 @@ public TransliterationService(
         public async Task<string> Transliterate(string text, string language)
         {
             string normalisedText = NormaliseText(text);
-
             string cacheKey = GetCacheId(normalisedText, language);
 
             if (cache.ContainsKey(cacheKey))
@@ -191,7 +190,7 @@ string GetCacheId(string text, string language)
         string GetSha256FromString(string strData)
         {
             byte[] message = Encoding.ASCII.GetBytes(strData);
-            SHA256Managed hashString = new SHA256Managed();
+            SHA256 hashString = SHA256.Create();
             string hex = "";
 
             byte[] hashValue = hashString.ComputeHash(message);

diff --git a/Service/Transliterators/MarathiTransliterator.cs b/Service/Transliterators/MarathiTransliterator.cs
@@ -119,6 +119,7 @@ public string Transliterate(string text)
             transliteratedText = transliteratedText.Replace("ॻ", "g");
             transliteratedText = transliteratedText.Replace("ॐ", "om");
             transliteratedText = transliteratedText.Replace("ऽ", "'");
+
             transliteratedText = Regex.Replace(transliteratedText, "e.a", "a");
 
             return transliteratedText.ToTitleCase();

diff --git a/Service/Transliterators/PodolakTransliterator.cs b/Service/Transliterators/PodolakTransliterator.cs
@@ -37,14 +37,12 @@ private string GetUrl(string language)
         {
             const string url = "https://podolak.net/en/transliteration";
 
-            if (language == "cu")
-            {
-                return $"{url}/old-church-slavonic";
-            }
-            else
+            if (!language.Equals("cu"))
             {
                 throw new ArgumentException($"Unsupported language \"{language}\"");
             }
+
+            return $"{url}/old-church-slavonic";
         }
 
         private string ExtractResultFromResponse(string response)