Exception Download Validation

cloupid · May 4, 2016 · 14c650b · 14c650b
1 parent a1faba1
commit 14c650b
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 9 deletions.
diff --git a/src/Java2Dotnet.Spider.Common/net45/Java2Dotnet.Spider.Common.csproj b/src/Java2Dotnet.Spider.Common/net45/Java2Dotnet.Spider.Common.csproj
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE;DEBUG;NET_45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

diff --git a/src/Java2Dotnet.Spider.Core/net45/Java2Dotnet.Spider.Core.csproj b/src/Java2Dotnet.Spider.Core/net45/Java2Dotnet.Spider.Core.csproj
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE;DEBUG;NET_45;TEST</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

diff --git a/src/Java2Dotnet.Spider.Extension/Configuration/DownloadValidation.cs b/src/Java2Dotnet.Spider.Extension/Configuration/DownloadValidation.cs
@@ -9,7 +9,8 @@ public abstract class DownloadValidation
 		[Flags]
 		public enum Types
 		{
-			Contains
+			Contains,
+			Exception
 		}
 
 		public abstract Types Type { get; internal set; }
@@ -26,7 +27,7 @@ public class ContainsDownloadValidation : DownloadValidation
 		public override bool Validate(Page page, out DownloadValidationResult result)
 		{
 			string rawText = page.Content;
-			if(string.IsNullOrEmpty(rawText))
+			if (string.IsNullOrEmpty(rawText))
 			{
 				throw new SpiderExceptoin("Download failed or response is null.");
 			}
@@ -42,4 +43,35 @@ public override bool Validate(Page page, out DownloadValidationResult result)
 			}
 		}
 	}
+
+	public class ExceptionDownloadValidation : DownloadValidation
+	{
+		public override Types Type { get; internal set; } = Types.Exception;
+
+		public string ExceptionMessage { get; set; } = string.Empty;
+
+		public override bool Validate(Page page, out DownloadValidationResult result)
+		{
+			string rawText = page.Content;
+			if (string.IsNullOrEmpty(rawText))
+			{
+				throw new SpiderExceptoin("Download failed or response is null.");
+			}
+			if (page.Exception != null)
+			{
+				if (string.IsNullOrEmpty(ExceptionMessage))
+				{
+					result = Result;
+					return false;
+				}
+				if (page.Exception.Message.Contains(ExceptionMessage))
+				{
+					result = Result;
+					return false;
+				}
+			}
+			result = DownloadValidationResult.Success;
+			return true;
+		}
+	}
 }
diff --git a/src/Java2Dotnet.Spider.Extension/net45/Java2Dotnet.Spider.Extension.csproj b/src/Java2Dotnet.Spider.Extension/net45/Java2Dotnet.Spider.Extension.csproj
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE;DEBUG;NET_45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

diff --git a/src/Java2Dotnet.Spider.Monitor/Java2Dotnet.Spider.Monitor.csproj b/src/Java2Dotnet.Spider.Monitor/Java2Dotnet.Spider.Monitor.csproj
@@ -22,7 +22,7 @@
     </SccProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>

diff --git a/src/Java2Dotnet.Spider.Redial/net45/Java2Dotnet.Spider.Redial.csproj b/src/Java2Dotnet.Spider.Redial/net45/Java2Dotnet.Spider.Redial.csproj
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE;DEBUG;NET_45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

diff --git a/src/Java2Dotnet.Spider.Test/net45/Java2Dotnet.Spider.Test.csproj b/src/Java2Dotnet.Spider.Test/net45/Java2Dotnet.Spider.Test.csproj
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE;DEBUG;NET_45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

diff --git a/src/Java2Dotnet.Spider.Validation/net45/Java2Dotnet.Spider.Validation.csproj b/src/Java2Dotnet.Spider.Validation/net45/Java2Dotnet.Spider.Validation.csproj
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE;DEBUG;NET_45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>