异常信息不应该用.结尾

Author: 邹嵩

nuget/DotnetSpider.Core.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>DotnetSpider2.Core</id>
-    <version>2.4.2-beta7</version>
+    <version>2.4.3</version>
     <authors>[email protected];Walterwhatwater;xiaohuan0204</authors>
     <owners>[email protected]</owners>
     <iconUrl>https://github.com/zlzforever/DotnetSpider/blob/master/images/icon.png?raw=true</iconUrl>

nuget/DotnetSpider.Extension.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>DotnetSpider2.Extension</id>
-    <version>2.4.2-beta7</version>
+    <version>2.4.3</version>
     <authors>[email protected];Walterwhatwater;xiaohuan0204</authors>
     <owners>[email protected]</owners>
     <iconUrl>https://github.com/zlzforever/DotnetSpider/blob/master/images/icon.png?raw=true</iconUrl>
@@ -13,7 +13,7 @@
     <description>A .NET Standard web crawling library similar to WebMagic and Scrapy. It is a lightweight ,efficient and fast high-level web crawling &amp; scraping framework for .NET</description>
     <dependencies>
       <group targetFramework=".NETStandard2.0">
-        <dependency id="DotnetSpider2.Core" version="2.4.2-beta7" />
+        <dependency id="DotnetSpider2.Core" version="2.4.3" />
         <dependency id="Dapper" version="1.50.2"/>
         <dependency id="MailKit" version="2.0.1"/>
         <dependency id="MongoDB.Driver" version="2.5.0"/>
@@ -28,7 +28,7 @@
         <dependency id="MessagePack" version="1.7.3.4"/>
       </group>
       <group targetFramework=".NETFramework4.5" >
-        <dependency id="DotnetSpider2.Core" version="2.4.2-beta7" />
+        <dependency id="DotnetSpider2.Core" version="2.4.3" />
         <dependency id="Dapper" version="1.50.2"/> 
         <dependency id="MailKit" version="2.0.1"/>
         <dependency id="MongoDB.Driver" version="2.5.0"/>

src/DotnetSpider.Core/Downloader/AfterDownloadCompleteHandler.Extensions.cs

@@ -370,7 +370,7 @@ public RetryWhenContainsHandler(params string[] contents)
 		{
 			if (contents == null || contents.Length == 0)
 			{
-				throw new SpiderException("contents should not be empty/null.");
+				throw new SpiderException("contents should not be empty/null");
 			}
 
 			_contents = contents;
@@ -468,7 +468,7 @@ public RedialWhenExceptionThrowHandler(string exceptionMessage)
 		{
 			if (string.IsNullOrWhiteSpace(exceptionMessage))
 			{
-				throw new SpiderException("exceptionMessage should not be null or empty.");
+				throw new SpiderException("exceptionMessage should not be null or empty");
 			}
 
 			_exceptionMessage = exceptionMessage;
@@ -521,10 +521,10 @@ public class RedialAndUpdateCookiesWhenContainsHandler : AfterDownloadCompleteHa
 		/// <param name="contents">包含的内容(specified contents)</param>
 		public RedialAndUpdateCookiesWhenContainsHandler(ICookieInjector cookieInjector, params string[] contents)
 		{
-			_cookieInjector = cookieInjector ?? throw new SpiderException("cookieInjector should not be null.");
+			_cookieInjector = cookieInjector ?? throw new SpiderException("cookieInjector should not be null");
 			if (contents == null || contents.Length == 0)
 			{
-				throw new SpiderException("contents should not be null or empty.");
+				throw new SpiderException("contents should not be null or empty");
 			}
 
 			_contents = contents;
@@ -616,7 +616,7 @@ public override void Handle(ref Page page, IDownloader downloader, ISpider spide
 
 			if (begin < 0)
 			{
-				throw new SpiderException($"Cutout failed, can not find begin string: {_startPart}.");
+				throw new SpiderException($"Cutout failed, can not find begin string: {_startPart}");
 			}
 
 			int end = rawText.IndexOf(_endPart, begin, StringComparison.Ordinal);
@@ -629,7 +629,7 @@ public override void Handle(ref Page page, IDownloader downloader, ISpider spide
 
 			if (begin < 0 || length < 0)
 			{
-				throw new SpiderException("Cutout failed. Please check your settings.");
+				throw new SpiderException("Cutout failed. Please check your settings");
 			}
 
 			string newRawText = rawText.Substring(begin, length).Trim();

src/DotnetSpider.Core/Downloader/HttpClientPool.cs

@@ -43,11 +43,11 @@ public HttpClientElement GetHttpClient(ISpider spider, IDownloader downloader, C
 		{
 			if (cookieContainer == null)
 			{
-				throw new SpiderException($"{nameof(cookieContainer)} should not be null.");
+				throw new SpiderException($"{nameof(cookieContainer)} should not be null");
 			}
 			if (downloader == null)
 			{
-				throw new SpiderException($"{nameof(downloader)} should not be null.");
+				throw new SpiderException($"{nameof(downloader)} should not be null");
 			}
 			var newCookieContainer = GenerateNewCookieContainer(spider, downloader, cookieContainer, cookieInjector);
 

src/DotnetSpider.Core/Infrastructure/BlockingQueue.cs

@@ -402,7 +402,7 @@ public class QueueTimeoutException : SpiderException
 		/// <summary>
 		/// 构造方法
 		/// </summary>
-		public QueueTimeoutException() : base("Queue method timed out on wait.")
+		public QueueTimeoutException() : base("Queue method timed out on wait")
 		{
 		}
 	}

src/DotnetSpider.Core/Infrastructure/Database/DatabaseExtensions.cs

@@ -29,11 +29,11 @@ public static DbConnection CreateDbConnection(this ConnectionStringSettings conn
 		{
 			if (connectionStringSettings == null)
 			{
-				throw new SpiderException("ConnectionStringSetting is null.");
+				throw new SpiderException("ConnectionStringSetting is null");
 			}
 			if (string.IsNullOrWhiteSpace(connectionStringSettings.ConnectionString) || string.IsNullOrWhiteSpace(connectionStringSettings.ProviderName))
 			{
-				throw new SpiderException("ConnectionStringSetting is incorrect.");
+				throw new SpiderException("ConnectionStringSetting is incorrect");
 			}
 
 			var factory = DbProviderFactories.GetFactory(connectionStringSettings.ProviderName);
@@ -64,7 +64,7 @@ public static DbConnection CreateDbConnection(this ConnectionStringSettings conn
 				}
 			}
 
-			throw new SpiderException($"Create or open DbConnection failed: {connectionStringSettings.ConnectionString}.");
+			throw new SpiderException($"Create or open DbConnection failed: {connectionStringSettings.ConnectionString}");
 		}
 
 		/// <summary>
@@ -128,7 +128,7 @@ public static DbConnection CreateDbConnection(Database source, string connectStr
 				}
 			}
 
-			throw new SpiderException("Create connection failed.");
+			throw new SpiderException("Create connection failed");
 		}
 
 		/// <summary>

src/DotnetSpider.Core/Infrastructure/Database/DbProviderFactories.cs

@@ -114,11 +114,11 @@ public static DbProviderFactory GetFactory(string providerInvariantName)
 				Configs.TryGetValue(providerInvariantName, out var factory);
 				if (factory == null)
 				{
-					throw new SpiderException("Provider not found.");
+					throw new SpiderException("Provider not found");
 				}
 				return factory;
 			}
-			throw new SpiderException("Provider not found.");
+			throw new SpiderException("Provider not found");
 		}
 
 		/// <summary>

src/DotnetSpider.Core/Pipeline/BaseFilePipeline.cs

@@ -37,7 +37,7 @@ protected void InitFolder(string interval)
 		{
 			if (string.IsNullOrWhiteSpace(interval))
 			{
-				throw new SpiderException("Interval path should not be null.");
+				throw new SpiderException("Interval path should not be null");
 			}
 			if (!interval.EndsWith(Env.PathSeperator))
 			{

src/DotnetSpider.Core/Processor/TargetUrlsExtractor.Extensions.cs

@@ -267,7 +267,7 @@ protected PaginationTargetUrlsExtractor(string paginationStr, ITargetUrlsExtract
 		{
 			if (string.IsNullOrWhiteSpace(paginationStr))
 			{
-				throw new SpiderException("paginationStr should not be null or empty.");
+				throw new SpiderException("paginationStr should not be null or empty");
 			}
 
 			PaginationStr = paginationStr;

src/DotnetSpider.Core/Proxy/HttpProxyPool.cs

@@ -31,7 +31,7 @@ public class HttpProxyPool : IHttpProxyPool
 		/// <param name="reuseInterval">代理不被再次使用的间隔</param>
 		public HttpProxyPool(IProxySupplier supplier, int reuseInterval = 500)
 		{
-			_supplier = supplier ?? throw new SpiderException("IProxySupplier should not be null.");
+			_supplier = supplier ?? throw new SpiderException("IProxySupplier should not be null");
 
 			_reuseInterval = reuseInterval;
 
@@ -69,7 +69,7 @@ public UseSpecifiedUriWebProxy GetProxy()
 				Thread.Sleep(1000);
 			}
 
-			throw new SpiderException("Get proxy timeout.");
+			throw new SpiderException("Get proxy timeout");
 		}
 
 		/// <summary>

src/DotnetSpider.Core/Redial/InternetDetector/DefaultInternetDetector.cs

@@ -30,7 +30,7 @@ public DefaultInternetDetector(string url = "www.baidu.com", int timeout = 10)
 			Timeout = timeout;
 			if (!Uri.TryCreate(_url, UriKind.RelativeOrAbsolute, out var _))
 			{
-				throw new SpiderException($"{url} is not a correct uri.");
+				throw new SpiderException($"{url} is not a correct uri");
 			}
 			_url = url;
 		}

src/DotnetSpider.Core/Redial/Redialer/AdslRedialer.cs

@@ -37,7 +37,7 @@ public AdslRedialer(string configPath)
 			}
 			else
 			{
-				throw new SpiderException($"Unfound adsl config: {path}.");
+				throw new SpiderException($"Unfound adsl config: {path}");
 			}
 		}
 

src/DotnetSpider.Core/Scheduler/DuplicateRemovedScheduler.cs

@@ -96,7 +96,7 @@ public virtual void Init(ISpider spider)
 			}
 			else
 			{
-				throw new SpiderException("Scheduler already init.");
+				throw new SpiderException("Scheduler already init");
 			}
 		}
 

src/DotnetSpider.Core/Selector/Selectable.cs

@@ -127,7 +127,7 @@ public override ISelectable Select(ISelector selector)
 				}
 				return new Selectable(resluts);
 			}
-			throw new SpiderException("Selector is null.");
+			throw new SpiderException("Selector is null");
 		}
 
 		/// <summary>
@@ -151,7 +151,7 @@ public override ISelectable SelectList(ISelector selector)
 				return new Selectable(resluts);
 			}
 
-			throw new SpiderException("Selector is null.");
+			throw new SpiderException("Selector is null");
 		}
 
 		/// <summary>

src/DotnetSpider.Core/Spider.cs

@@ -274,7 +274,7 @@ public int EmptySleepTime
 				}
 				else
 				{
-					throw new SpiderException("Sleep time should be large than 0.");
+					throw new SpiderException("Sleep time should be large than 0");
 				}
 			}
 		}
@@ -938,7 +938,7 @@ protected virtual void InitComponent(params string[] arguments)
 
 			if (PageProcessors == null || PageProcessors.Count == 0)
 			{
-				throw new SpiderException("Count of PageProcessor is zero.");
+				throw new SpiderException("Count of PageProcessor is zero");
 			}
 
 			InitPipelines(arguments);
@@ -1260,7 +1260,7 @@ protected void CheckIfRunning()
 		{
 			if (Stat == Status.Running)
 			{
-				throw new SpiderException("Spider is running.");
+				throw new SpiderException("Spider is running");
 			}
 		}
 

src/DotnetSpider.Extension/CommonSpider.cs

@@ -192,7 +192,7 @@ protected override void BuildStartRequestsFinished()
 				}
 				if (!ifBuildFinished)
 				{
-					var msg = "Init status set failed.";
+					var msg = "Init status set failed";
 					Logger.Log(Identity, msg, Level.Error);
 					throw new SpiderException(msg);
 				}
@@ -212,7 +212,7 @@ protected override void BuildStartRequestsFinished()
 				}
 				if (!ifRemoveInitLocker)
 				{
-					var msg = "Remove init locker failed.";
+					var msg = "Remove init locker failed";
 					Logger.Log(Identity, msg, Level.Error);
 					throw new SpiderException(msg);
 				}

src/DotnetSpider.Extension/Downloader/AfterDownloadCompleteHandler.cs

@@ -30,7 +30,7 @@ public DownloadCache(BaseEntityPipeline pipeline)
 
 			if (_pipeline == null)
 			{
-				throw new SpiderException("StorageCache's pipeline unfound.");
+				throw new SpiderException("StorageCache's pipeline unfound");
 			}
 			_pipeline.AddEntity(new EntityDefine<DownloadCacheData>());
 			_pipeline.Init();

src/DotnetSpider.Extension/Downloader/WebDriverCookieInjector.cs

@@ -105,7 +105,7 @@ protected override CookieCollection GetCookies(ISpider spider)
 		{
 			if (string.IsNullOrEmpty(User) || string.IsNullOrEmpty(Password) || UserSelector == null || PasswordSelector == null)
 			{
-				throw new SpiderException("Arguments of WebDriverCookieInjector are incorrect.");
+				throw new SpiderException("Arguments of WebDriverCookieInjector are incorrect");
 			}
 			var cookies = new Dictionary<string, string>();
 

src/DotnetSpider.Extension/EntitySpider.cs

@@ -145,7 +145,7 @@ protected override void InitPipelines(params string[] arguments)
 
 				if (entityProcessors.Count != 0 && entityPipelines.Count == 0)
 				{
-					throw new SpiderException("You may miss a entity pipeline.");
+					throw new SpiderException("You may miss a entity pipeline");
 				}
 				foreach (var processor in entityProcessors)
 				{

src/DotnetSpider.Extension/Infrastructure/SelectorUtil.cs

@@ -120,7 +120,7 @@ public static ISelector ToSelector(this ISelectorAttribute selector)
 						}
 					default:
 						{
-							throw new SpiderException($"Selector {selector} unsupoort.");
+							throw new SpiderException($"Selector {selector} unsupoort");
 						}
 				}
 			}

src/DotnetSpider.Extension/Infrastructure/WebDriverUtil.cs

@@ -71,7 +71,7 @@ public string Proxy
 						}
 					}
 
-					throw new SpiderException("Proxy string should be like 192.168.1.100:8080.");
+					throw new SpiderException("Proxy string should be like 192.168.1.100:8080");
 				}
 			}
 		}