瀏覽代碼

Merge branch 'feature/translation_error_safety' into release/v2.13.0

Scrublord1336 6 年之前
父節點
當前提交
8570814c5e

+ 3 - 1
src/XUnity.AutoTranslator.Plugin.Core/Web/BaiduTranslateEndpoint.cs

@@ -67,7 +67,9 @@ namespace XUnity.AutoTranslator.Plugin.Core.Web
             }
 
             translated = lineBuilder.ToString();
-            return true;
+
+            var success = !string.IsNullOrEmpty( translated );
+            return success;
          }
          catch( Exception )
          {

+ 3 - 1
src/XUnity.AutoTranslator.Plugin.Core/Web/ExciteTranslateEndpoint.cs

@@ -34,7 +34,9 @@ namespace XUnity.AutoTranslator.Plugin.Core.Web
          {
             string extracted = result.GetBetween( "class=\"inputText\">", "</p>" );
             translated = RestSharp.Contrib.HttpUtility.HtmlDecode( extracted ?? string.Empty );
-            return true;
+
+            var success = !string.IsNullOrEmpty( translated );
+            return success;
          }
          catch
          {

+ 3 - 1
src/XUnity.AutoTranslator.Plugin.Core/Web/GoogleTranslateEndpoint.cs

@@ -304,7 +304,9 @@ namespace XUnity.AutoTranslator.Plugin.Core.Web
             }
 
             translated = lineBuilder.ToString();
-            return true;
+
+            var success = !string.IsNullOrEmpty( translated );
+            return success;
          }
          catch
          {

+ 28 - 26
src/XUnity.AutoTranslator.Plugin.Core/Web/GoogleTranslateHackEndpoint.cs

@@ -11,14 +11,14 @@ using XUnity.AutoTranslator.Plugin.Core.Extensions;
 
 namespace XUnity.AutoTranslator.Plugin.Core.Web
 {
-    public class GoogleTranslateHackEndpoint : KnownHttpEndpoint
-    {
-        private static readonly string HttpsServicePointTemplateUrl = "https://translate.google.com/m?hl=pl&sl={0}&tl={1}&ie=UTF-8&q={2}";
+   public class GoogleTranslateHackEndpoint : KnownHttpEndpoint
+   {
+      private static readonly string HttpsServicePointTemplateUrl = "https://translate.google.com/m?hl=pl&sl={0}&tl={1}&ie=UTF-8&q={2}";
 
-        public GoogleTranslateHackEndpoint()
-        {
-            ServicePointManager.ServerCertificateValidationCallback += Security.AlwaysAllowByHosts( "translate.google.com" );
-        }
+      public GoogleTranslateHackEndpoint()
+      {
+         ServicePointManager.ServerCertificateValidationCallback += Security.AlwaysAllowByHosts( "translate.google.com" );
+      }
 
       public override void ApplyHeaders( WebHeaderCollection headers )
       {
@@ -27,25 +27,27 @@ namespace XUnity.AutoTranslator.Plugin.Core.Web
          headers[ HttpRequestHeader.AcceptCharset ] = "UTF-8";
       }
 
-        public override bool TryExtractTranslated(string result, out string translated)
-        {
-            try
-            {
+      public override bool TryExtractTranslated( string result, out string translated )
+      {
+         try
+         {
 
-                String extracted = result.GetBetween( "class=\"t0\">", "</div>");
-                translated = RestSharp.Contrib.HttpUtility.HtmlDecode( extracted ?? string.Empty );
-                return true;
-            }
-            catch
-            {
-                translated = null;
-                return false;
-            }
-        }
+            String extracted = result.GetBetween( "class=\"t0\">", "</div>" );
+            translated = RestSharp.Contrib.HttpUtility.HtmlDecode( extracted ?? string.Empty );
 
-        public override string GetServiceUrl(string untranslatedText, string from, string to)
-        {
-            return string.Format(HttpsServicePointTemplateUrl, from, to, WWW.EscapeURL(untranslatedText));
-        }
-    }
+            var success = !string.IsNullOrEmpty( translated );
+            return success;
+         }
+         catch
+         {
+            translated = null;
+            return false;
+         }
+      }
+
+      public override string GetServiceUrl( string untranslatedText, string from, string to )
+      {
+         return string.Format( HttpsServicePointTemplateUrl, from, to, WWW.EscapeURL( untranslatedText ) );
+      }
+   }
 }

+ 3 - 1
src/XUnity.AutoTranslator.Plugin.Core/Web/GoogleTranslateLegitimateEndpoint.cs

@@ -51,7 +51,9 @@ namespace XUnity.AutoTranslator.Plugin.Core.Web
             }
 
             translated = lineBuilder.ToString();
-            return true;
+
+            var success = !string.IsNullOrEmpty( translated );
+            return success;
          }
          catch
          {

+ 3 - 1
src/XUnity.AutoTranslator.Plugin.Core/Web/WatsonTranslateEndpoint.cs

@@ -53,7 +53,9 @@ namespace XUnity.AutoTranslator.Plugin.Core.Web
                lineBuilder.Append( token );
             }
             translated = lineBuilder.ToString();
-            return true;
+
+            var success = !string.IsNullOrEmpty( translated );
+            return success;
          }
          catch( Exception )
          {

+ 3 - 1
src/XUnity.AutoTranslator.Plugin.Core/Web/YandexTranslateEndpoint.cs

@@ -50,7 +50,9 @@ namespace XUnity.AutoTranslator.Plugin.Core.Web
                lineBuilder.Append( token );
 
                translated = lineBuilder.ToString();
-               return true;
+
+               var success = !string.IsNullOrEmpty( translated );
+               return success;
             }
             else
             {