v2022.3.15.0

Author: LAB02 Research

src/DeepLClient/Controls/TextPage.cs

@@ -214,7 +214,7 @@ private void TbSource_TextChanged(object sender, EventArgs e)
             LblCharacters.Text = TbSource.Text.Length.ToString();
             LblCost.Text = SubscriptionManager.CalculateCost(TbSource.Text.Length, false);
         }
-        
+
         /// <summary>
         /// Shows the dragdrop effect when hovering a file or text.
         /// </summary>
@@ -300,7 +300,7 @@ private void CopyToClipboard(bool force = false)
             {
                 // copy the text
                 var cleanText = TbTranslated.Text.Trim();
-                
+
                 // copy it to the clipboard if not empty and configured as such
                 if (string.IsNullOrWhiteSpace(cleanText) || (!force && !Variables.AppSettings.CopyTranslationToClipboard)) return;
 
@@ -327,7 +327,7 @@ private void CopyToClipboard(bool force = false)
                 Log.Fatal(ex, "[TEXT] Error while copying to clipboard: {err}", ex.Message);
             }
         }
-        
+
         /// <summary>
         /// Resets and hides the detected source language info
         /// </summary>

src/DeepLClient/Controls/TextPage.resx

@@ -61,7 +61,7 @@
   <data name="resource.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAIJJREFUOE+1kNENgCAMBRnYPRjAARyBDwdxFWABLVhMpRQU8ZKLTX15ARTFOTeD
+        vAAADrwBlbxySQAAAIJJREFUOE+1kNENgCAMBRnYPRjAARyBDwdxFWABLVhMpRQU8ZKLTX15ARTFOTeD
         e0ODcU4I4ChSzXwu6AIan9xb0sQjvdV7v8BXh7mrANTW2inMvQWX4wvwbUVYni0KoWSxAB5jvS0a0Cy4
         4fokFWShaAwAdGZUfyL/FuTvIUjurdQBaE0luFgHKUIAAAAASUVORK5CYII=
 </value>

src/DeepLClient/Controls/UrlPage.Designer.cs

@@ -184,26 +184,26 @@ internal async void ExecuteTranslation()
                 LblState.Visible = true;
 
                 // get the content
-                var (success, isReadable, sourceText, error) = await UrlManager.GetReadableContentAsync(url, isLocal);
-                if (!success)
+                var webpageResult = await UrlManager.GetReadableContentAsync(url, isLocal);
+                if (!webpageResult.Success)
                 {
-                    LblState.Text = !string.IsNullOrEmpty(error)
-                        ? $"something went wrong while trying to fetch your webpage:\r\n\r\n{error}"
+                    LblState.Text = !string.IsNullOrEmpty(webpageResult.Error)
+                        ? $"something went wrong while trying to fetch your webpage:\r\n\r\n{webpageResult.Error}"
                         : "something went wrong while trying to fetch your webpage";
                     return;
                 }
 
                 // check it
-                if (string.IsNullOrWhiteSpace(sourceText))
+                if (string.IsNullOrWhiteSpace(webpageResult.Content))
                 {
                     LblState.Text = "your webpage doesn't seem to contain any text";
                     return;
                 }
 
                 // do we have enough chars left?
-                if (await SubscriptionManager.CharactersWillExceedLimitAsync(sourceText.Length))
+                if (await SubscriptionManager.CharactersWillExceedLimitAsync(webpageResult.Content.Length))
                 {
-                    using var limit = new LimitExceeded(sourceText.Length);
+                    using var limit = new LimitExceeded(webpageResult.Content.Length);
                     var ignoreLimit = limit.ShowDialog();
                     if (ignoreLimit != DialogResult.OK)
                     {
@@ -213,7 +213,7 @@ internal async void ExecuteTranslation()
                 }
 
                 // readable?
-                if (!isReadable) PbWarning.Visible = true;
+                if (!webpageResult.IsReadable) PbWarning.Visible = true;
 
                 // fetch the source language
                 string sourceLanguage = null;
@@ -250,21 +250,24 @@ internal async void ExecuteTranslation()
 
                 // don't use formality, send the text as-is to DeepL for translation
                 var translatedText = await Variables.Translator.TranslateTextAsync(
-                    sourceText,
+                    webpageResult.Content,
                     sourceLanguage,
                     targetLanguage,
                     options);
-
-                // hide info
-                LblState.Text = string.Empty;
-                LblState.Visible = false;
-
+                
                 // set the cost
                 LblCharacters.Text = translatedText.Text.Length.ToString();
                 LblCost.Text = SubscriptionManager.CalculateCost(translatedText.Text.Length, false);
 
+                // wrap it in html for styling
+                var source = UrlManager.WrapContentInHtml(translatedText.Text, webpageResult.Title);
+
                 // set the translated text
-                WebView.NavigateToString(translatedText.Text);
+                WebView.NavigateToString(source);
+
+                // hide info
+                LblState.Text = string.Empty;
+                LblState.Visible = false;
 
                 // store the selected languages
                 SettingsManager.StoreSelectedLanguages(CbSourceLanguage, CbTargetLanguage);
@@ -318,7 +321,7 @@ private void ClearWebpageInterface(bool clearStateLabel = true)
 
             WebView.NavigateToString(string.Empty);
         }
-        
+
         /// <summary>
         /// Shows the dragdrop effect when hovering a file or text.
         /// </summary>
@@ -405,7 +408,7 @@ private void ProcessDrop(DragEventArgs e)
 
                 // set the value
                 TbUrl.Text = value;
-                
+
                 // enable auto detect
                 CbSourceLanguage.SelectedItem = Variables.SourceLanguages.GetEntry("AUTO DETECT");
 
@@ -417,7 +420,7 @@ private void ProcessDrop(DragEventArgs e)
                 Log.Fatal(ex, "[URL] Error while processing dropped content: {err}", ex.Message);
             }
         }
-        
+
         /// <summary>
         /// Copies the current webview text to clipboard
         /// </summary>
@@ -430,12 +433,8 @@ private async void CopySourceToClipboard(bool force = false)
                 var cleanText = await WebView.ExecuteScriptAsync("document.body.innerText");
                 if (string.IsNullOrWhiteSpace(cleanText)) return;
 
-                // trim
+                // clean it up
                 cleanText = UrlManager.CleanText(cleanText.Trim());
-                
-                // optionally remove start & end quotes
-                if (cleanText.StartsWith("\"")) cleanText = cleanText.Remove(0, 1);
-                if (cleanText.EndsWith("\"")) cleanText = cleanText.Remove(cleanText.Length - 1, 1);
 
                 // copy it to the clipboard if not empty and configured as such
                 if (string.IsNullOrWhiteSpace(cleanText) || (!force && !Variables.AppSettings.CopyTranslationToClipboard)) return;
@@ -629,7 +628,7 @@ private async void BtnOpenInBrowser_Click(object sender, EventArgs e)
 
                 // prepare a temp file
                 var tempFile = Path.Combine(Variables.WebPagesCachePath, $"{Guid.NewGuid().ToString().Replace("-", "")}.html");
-                
+
                 // write the source to it
                 await File.WriteAllTextAsync(tempFile, source);
 

src/DeepLClient/Controls/UrlPage.cs

@@ -75,7 +75,7 @@
   <data name="resource.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAIJJREFUOE+1kNENgCAMBRnYPRjAARyBDwdxFWABLVhMpRQU8ZKLTX15ARTFOTeD
+        vAAADrwBlbxySQAAAIJJREFUOE+1kNENgCAMBRnYPRjAARyBDwdxFWABLVhMpRQU8ZKLTX15ARTFOTeD
         e0ODcU4I4ChSzXwu6AIan9xb0sQjvdV7v8BXh7mrANTW2inMvQWX4wvwbUVYni0KoWSxAB5jvS0a0Cy4
         4fokFWShaAwAdGZUfyL/FuTvIUjurdQBaE0luFgHKUIAAAAASUVORK5CYII=
 </value>

src/DeepLClient/Controls/UrlPage.resx

@@ -8,7 +8,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <ApplicationIcon>Resources\icon_white_32.ico</ApplicationIcon>
     <Title>DeepL Translator</Title>
-    <Version>2023.3.14.0</Version>
+    <Version>2023.3.15.0</Version>
     <Authors>LAB02 RESEARCH</Authors>
     <Description>Front-end client for DeepL translation services.</Description>
   </PropertyGroup>

src/DeepLClient/DeepLClient.csproj

@@ -6,8 +6,10 @@
 using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
+using AngleSharp.Dom;
 using Serilog;
-using static System.Net.Mime.MediaTypeNames;
+using DeepLClient.Models;
+using Newtonsoft.Json;
 
 namespace DeepLClient.Managers
 {
@@ -19,33 +21,35 @@ internal static class UrlManager
         /// <param name="url"></param>
         /// <param name="isLocaLFile"></param>
         /// <returns></returns>
-        internal static async Task<(bool success, bool isReadable, string content, string error)> GetReadableContentAsync(string url, bool isLocaLFile = false)
+        internal static async Task<WebpageResult> GetReadableContentAsync(string url, bool isLocaLFile = false)
         {
+            var webpageResult = new WebpageResult();
+
             try
             {
                 // fetch the content if it's a local file, otherwise download it
                 var reader = isLocaLFile 
                     ? new Reader(url, await File.ReadAllTextAsync(url)) 
                     : new Reader(url);
-
+                
                 // get the article
                 var article = await reader.GetArticleAsync();
-
+                
                 // readable?
                 if (!article.IsReadable)
                 {
                     // nope
                     Log.Warning("[URL] Fetching readable text failed: {url}", url);
-                    return (true, false, article.Content, "unable to determine what part of the site is relevant text");
+                    return webpageResult.SetReadableFailed(article.Content, article.Title);
                 }
-
-                // yep
-                return (true, true, article.Content, string.Empty);
+                
+                // done
+                return webpageResult.SetSuccess(article.Content, article.Title);
             }
             catch (UriFormatException ex)
             {
                 Log.Fatal(ex, "[URL] Unable to parse host '{url}': {err}", url, ex.Message);
-                return (false, false, string.Empty, "provided url is in the wrong format");
+                return webpageResult.SetFailed("provided url is in the wrong format");
             }
             catch (HttpRequestException ex)
             {
@@ -57,25 +61,25 @@ internal static class UrlManager
 
                     return exc.SocketErrorCode switch
                     {
-                        SocketError.HostNotFound => (false, false, string.Empty, "the remote host address wasn't found"),
-                        SocketError.AccessDenied => (false, false, string.Empty, "access denied by the remote host"),
-                        SocketError.TimedOut => (false, false, string.Empty, "the host didn't respond"),
-                        SocketError.HostDown => (false, false, string.Empty, "the remote host is offline"),
-                        SocketError.HostUnreachable or SocketError.NetworkUnreachable => (false, false, string.Empty, "the remote host couldn't be reached"),
-                        SocketError.NotConnected => (false, false, string.Empty, "no internet connection"), 
-                        _ => (false, false, string.Empty, $"error trying to contact the host: {exc.SocketErrorCode.ToString().ToLower()}")
+                        SocketError.HostNotFound => webpageResult.SetFailed("the remote host address wasn't found"),
+                        SocketError.AccessDenied => webpageResult.SetFailed("access denied by the remote host"),
+                        SocketError.TimedOut => webpageResult.SetFailed("the host didn't respond"),
+                        SocketError.HostDown => webpageResult.SetFailed("the remote host is offline"),
+                        SocketError.HostUnreachable or SocketError.NetworkUnreachable => webpageResult.SetFailed("the remote host couldn't be reached"),
+                        SocketError.NotConnected => webpageResult.SetFailed("no internet connection"), 
+                        _ => webpageResult.SetFailed($"error trying to contact the host: {exc.SocketErrorCode.ToString().ToLower()}")
                     };
                 }
 
                 var statusCode = ex.StatusCode.ToString();
-                return !string.IsNullOrWhiteSpace(statusCode) 
-                    ? (false, false, string.Empty, $"error trying to contact the host: {statusCode}") 
-                    : (false, false, string.Empty, "unknown error trying to contact the host");
+                return !string.IsNullOrWhiteSpace(statusCode)
+                    ? webpageResult.SetFailed($"error trying to contact the host: {statusCode}")
+                    : webpageResult.SetFailed("unknown error trying to contact the host");
             }
             catch (Exception ex)
             {
                 Log.Fatal(ex, "[URL] Unable to process host '{url}': {err}", url, ex.Message);
-                return (false, false, string.Empty, "unknown error trying to contact the host");
+                return webpageResult.SetFailed("unknown error trying to contact the host");
             }
         }
 
@@ -88,6 +92,9 @@ internal static string CleanText(string rawText)
         {
             if (string.IsNullOrEmpty(rawText)) return string.Empty;
 
+            if (rawText.StartsWith("\"")) rawText = rawText.Remove(0, 1);
+            if (rawText.EndsWith("\"")) rawText = rawText.Remove(rawText.Length - 1, 1);
+
             rawText = rawText.Replace("\\n\\n", Environment.NewLine);
             rawText = rawText.Replace("\\n", Environment.NewLine);
             rawText = rawText.Replace("\\\"", "\"");
@@ -115,5 +122,29 @@ internal static bool IsLocalOrNetworkFile(string value)
             if (string.IsNullOrWhiteSpace(value)) return false;
             return value.Substring(1, 2) == ":\\" || value[..2] == "\\\\";
         }
+
+        /// <summary>
+        /// Wraps the provided content into a reading mode html page, and adds the title
+        /// </summary>
+        /// <param name="content"></param>
+        /// <param name="title"></param>
+        /// <returns></returns>
+        internal static string WrapContentInHtml(string content, string title)
+        {
+            var htmlContent = new StringBuilder();
+            htmlContent.AppendLine("<html>");
+            htmlContent.AppendLine("<head>");
+            htmlContent.AppendLine($"<title>{title}</title>");
+            htmlContent.AppendLine("<style>");
+            htmlContent.AppendLine("a:link, a:visited, a:hover, a:active { color: #6590fd }");
+            htmlContent.AppendLine("</style>");
+            htmlContent.AppendLine("</head>");
+            htmlContent.AppendLine("<body style=\"background-color: #3f3f46; color: #f1f1f1;\">");
+            htmlContent.AppendLine(content);
+            htmlContent.AppendLine("</body>");
+            htmlContent.AppendLine("</html>");
+
+            return htmlContent.ToString();
+        }
     }
 }

src/DeepLClient/Managers/UrlManager.cs

@@ -0,0 +1,49 @@
+namespace DeepLClient.Models
+{
+    public static class WebpageResultExtensions
+    {
+        public static WebpageResult SetReadableFailed(this WebpageResult webpageResult, string content, string title)
+        {
+            webpageResult.Success = true;
+            webpageResult.IsReadable = false;
+            webpageResult.Content = content;
+            webpageResult.Title = title;
+            webpageResult.Error = "unable to determine what part of the site is relevant text";
+
+            return webpageResult;
+        }
+
+        public static WebpageResult SetSuccess(this WebpageResult webpageResult, string content, string title)
+        {
+            webpageResult.Success = true;
+            webpageResult.IsReadable = true;
+            webpageResult.Content = content;
+            webpageResult.Title = title;
+
+            return webpageResult;
+        }
+
+        public static WebpageResult SetFailed(this WebpageResult webpageResult, string error)
+        {
+            webpageResult.Success = false;
+            webpageResult.IsReadable = false;
+            webpageResult.Error = error;
+
+            return webpageResult;
+        }
+    }
+
+    public class WebpageResult
+    {
+        public WebpageResult()
+        {
+            //
+        }
+
+        public bool Success { get; set; }
+        public bool IsReadable { get; set; }
+        public string Content { get; set; } = string.Empty;
+        public string Title { get; set; } = string.Empty;
+        public string Error { get; set; } = string.Empty;
+    }
+}