[FIX]#66

格式化代码

Author: zlzforever

src/DotnetSpider.Broker.Test/NodeHubTest.cs

@@ -4,9 +4,7 @@
 using Microsoft.AspNetCore.SignalR;
 using Moq;
 using Moq.EntityFrameworkCore;
-using System;
 using System.Collections.Generic;
-using System.Text;
 using Xunit;
 
 namespace DotnetSpider.Broker.Test

src/DotnetSpider.Broker/Controllers/JobController.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace DotnetSpider.Broker.Controllers
 {

src/DotnetSpider.Broker/Data/JobStatus.cs

@@ -7,7 +7,7 @@ namespace DotnetSpider.Broker.Data
 	/// <summary>
 	/// 爬虫状态
 	/// </summary>
-	[System.Flags]
+	[Flags]
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum Status
 	{

src/DotnetSpider.Broker/Migrations/BrokerDbContextModelSnapshot.cs

@@ -4,7 +4,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace DotnetSpider.Broker.Migrations
 {

src/DotnetSpider.Core.Test/HttpExecuteRecordTest.cs

@@ -11,7 +11,7 @@ public void Record()
 		{
 			if (Env.IsWindows)
 			{
-				var result = HttpClientDownloader.Default.GetAsync("http://localhost:30013").Result;
+				var result = DotnetSpider.Downloader.Downloader.Default.GetAsync("http://localhost:30013").Result;
 				if (result.StatusCode == HttpStatusCode.OK)
 				{
 					Env.HubServiceTaskApiUrl = "http://localhost:30013/api/v1.0/task";

src/DotnetSpider.Core.Test/SpiderTest.cs

@@ -243,7 +243,7 @@ public void FastExit()
 
 		internal class TestDownloader : DotnetSpider.Downloader.Downloader
 		{
-			protected override Response DowloadContent(Request request)
+			protected override Response DownloadContent(Request request)
 			{
 				return new Response() { Request = request, Content = "aabbcccdefg下载人数100", TargetUrl = request.Url };
 			}
@@ -259,7 +259,7 @@ protected override void Handle(Page page)
 
 		internal class FileDownloader : DotnetSpider.Downloader.Downloader
 		{
-			protected override Response DowloadContent(Request request)
+			protected override Response DownloadContent(Request request)
 			{
 				return new Response { Request = request };
 			}

src/DotnetSpider.Core/AppBase.cs

@@ -1,9 +1,7 @@
 using DotnetSpider.Core.Infrastructure;
 using Microsoft.Extensions.Logging;
 using Serilog;
-using Serilog.Sinks.SystemConsole.Themes;
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace DotnetSpider.Core
@@ -13,27 +11,6 @@ namespace DotnetSpider.Core
 	/// </summary>
 	public abstract class AppBase : Named, IAppBase
 	{
-		public static SystemConsoleTheme ConsoleLogTheme { get; set; } = new SystemConsoleTheme(
-			new Dictionary<ConsoleThemeStyle, SystemConsoleThemeStyle>
-			{
-				[ConsoleThemeStyle.Text] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.Gray },
-				[ConsoleThemeStyle.SecondaryText] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.DarkGray },
-				[ConsoleThemeStyle.TertiaryText] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.DarkGray },
-				[ConsoleThemeStyle.Invalid] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.Yellow },
-				[ConsoleThemeStyle.Null] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.White },
-				[ConsoleThemeStyle.Name] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.White },
-				[ConsoleThemeStyle.String] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.White },
-				[ConsoleThemeStyle.Number] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.White },
-				[ConsoleThemeStyle.Boolean] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.White },
-				[ConsoleThemeStyle.Scalar] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.White },
-				[ConsoleThemeStyle.LevelVerbose] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.Cyan },
-				[ConsoleThemeStyle.LevelDebug] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.DarkGray },
-				[ConsoleThemeStyle.LevelInformation] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.White },
-				[ConsoleThemeStyle.LevelWarning] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.Yellow },
-				[ConsoleThemeStyle.LevelError] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.Red },
-				[ConsoleThemeStyle.LevelFatal] = new SystemConsoleThemeStyle { Foreground = ConsoleColor.Red }
-			});
-
 		private string _identity = Guid.NewGuid().ToString("N");
 		private ILoggerFactory _loggerFactory;
 
@@ -54,11 +31,12 @@ public string Identity
 
 				if (string.IsNullOrWhiteSpace(value))
 				{
-					throw new ArgumentException($"{nameof(Identity)} should not be empty or null.");
+					throw new ArgumentException($"{nameof(Identity)} should not be empty or null");
 				}
+
 				if (value.Length > Env.IdentityMaxLength)
 				{
-					throw new ArgumentException($"Length of identity should less than {Env.IdentityMaxLength}.");
+					throw new ArgumentException($"Length of identity should less than {Env.IdentityMaxLength}");
 				}
 
 				_identity = value;
@@ -73,12 +51,12 @@ public string Identity
 		/// <summary>
 		/// start time of spider.
 		/// </summary>
-		protected DateTime StartTime { get; private set; }
+		public DateTime StartTime { get; private set; }
 
 		/// <summary>
 		/// end time of spider.
 		/// </summary>
-		protected DateTime ExitTime { get; private set; }
+		public DateTime ExitTime { get; private set; }
 
 		/// <summary>
 		/// 运行记录接口
@@ -115,7 +93,7 @@ public void Run(params string[] arguments)
 
 			var loggerConfiguration = new LoggerConfiguration()
 				.MinimumLevel.Verbose()
-				.WriteTo.Console(theme: ConsoleLogTheme)
+				.WriteTo.Console(theme: SerilogConsoleTheme.ConsoleLogTheme)
 				.WriteTo.RollingFile("dotnetspider.log");
 
 			if (Env.HubServiceLog)
@@ -131,14 +109,17 @@ public void Run(params string[] arguments)
 
 			if (ExecuteRecord == null)
 			{
-				ExecuteRecord = string.IsNullOrWhiteSpace(Env.HubServiceUrl) ? (IExecuteRecord)new NullExecuteRecord() : new HttpExecuteRecord();
+				ExecuteRecord = string.IsNullOrWhiteSpace(Env.HubServiceUrl)
+					? (IExecuteRecord) new NullExecuteRecord()
+					: new HttpExecuteRecord();
 				ExecuteRecord.Logger = Logger;
 			}
 
 			if (!ExecuteRecord.Add(TaskId, Name, Identity))
 			{
-				Logger.LogError($"Add execute record: {Identity} failed.");
+				Logger.LogError($"Add execute record: {Identity} failed");
 			}
+
 			try
 			{
 				StartTime = DateTime.Now;
@@ -148,7 +129,7 @@ public void Run(params string[] arguments)
 			{
 				ExitTime = DateTime.Now;
 				ExecuteRecord.Remove(TaskId, Name, Identity);
-				Logger.LogInformation($"Consume: {(ExitTime - StartTime).TotalSeconds} seconds.");
+				Logger.LogInformation($"Consume: {(ExitTime - StartTime).TotalSeconds} seconds");
 				PrintInfo.PrintLine();
 			}
 		}
@@ -159,4 +140,4 @@ public void Run(params string[] arguments)
 
 		public abstract void Exit(Action action = null);
 	}
-}
+}

src/DotnetSpider.Core/Env.cs

@@ -277,13 +277,13 @@ internal static void Reload()
 
 			HostName = Dns.GetHostName();
 
-			var interf = NetworkInterface.GetAllNetworkInterfaces().FirstOrDefault(i =>
+			var networkInterface = NetworkInterface.GetAllNetworkInterfaces().FirstOrDefault(i =>
 				(i.NetworkInterfaceType == NetworkInterfaceType.Ethernet ||
 				 i.NetworkInterfaceType == NetworkInterfaceType.Wireless80211) && i.OperationalStatus == OperationalStatus.Up);
 
-			if (interf != null)
+			if (networkInterface != null)
 			{
-				var unicastAddresses = interf.GetIPProperties().UnicastAddresses;
+				var unicastAddresses = networkInterface.GetIPProperties().UnicastAddresses;
 				Ip = unicastAddresses.FirstOrDefault(a =>
 						a.IPv4Mask?.ToString() != "255.255.255.255" && a.Address.AddressFamily == AddressFamily.InterNetwork)?.Address
 					.ToString();

src/DotnetSpider.Core/IAppBase.cs

@@ -3,7 +3,7 @@
 	/// <summary>
 	/// 标准任务接口
 	/// </summary>
-	public interface IAppBase : IRunable, IIdentity, ITask, INamed
+	public interface IAppBase : IRunnable, IIdentity, ITask, INamed
 	{
 	}
 }

src/DotnetSpider.Core/INamed.cs

@@ -26,8 +26,7 @@ public abstract class Named : INamed
 		protected Named()
 		{
 			var type = GetType();
-			var nameAttribute = type.GetCustomAttributes(typeof(TaskName), true).FirstOrDefault() as TaskName;
-			Name = nameAttribute != null ? nameAttribute.Name : type.Name;
+			Name = type.GetCustomAttributes(typeof(TaskName), true).FirstOrDefault() is TaskName nameAttribute ? nameAttribute.Name : type.Name;
 		}
 	}
 }

src/DotnetSpider.Core/IRunable.cs src/DotnetSpider.Core/IRunnable.cs

@@ -2,7 +2,7 @@
 
 namespace DotnetSpider.Core
 {
-	public interface IRunable : IControllable
+	public interface IRunnable : IControllable
 	{
 		/// <summary>
 		/// 运行程序

src/DotnetSpider.Core/Infrastructure/Adsl.cs

@@ -17,7 +17,7 @@ private struct Rasconn
 		private static extern uint RasHangUp(IntPtr hrasconn);
 
 		[DllImport("wininet.dll")]
-		private static extern int InternetDial(IntPtr hwnd, [In]string lpszConnectionid, uint dwFlags, ref int lpdwConnection, uint dwReserved);
+		private static extern int InternetDial(IntPtr hwnd, [In]string lpszConnectionId, uint dwFlags, ref int lpdwConnection, uint dwReserved);
 
 		[DllImport("Rasapi32.dll", EntryPoint = "RasEnumConnectionsA", SetLastError = true)]
 		private static extern int RasEnumConnections
@@ -34,7 +34,7 @@ ref int lpcConnections // number of connections written to buffer
 		/// <returns></returns>
 		public int Connect(string adslName)
 		{
-			int lpdwConnection = 0;
+			var lpdwConnection = 0;
 			return InternetDial(IntPtr.Zero, adslName, 2, ref lpdwConnection, 0);
 		}
 
@@ -43,19 +43,19 @@ public int Connect(string adslName)
 		/// </summary>
 		public void Disconnect()
 		{
-			var intprt = GetAdslIntPrt();
-			RasHangUp(intprt);
+			var intPrt = GetAdslIntPrt();
+			RasHangUp(intPrt);
 		}
 
 		private IntPtr GetAdslIntPrt()
 		{
-			Rasconn lprasConn = new Rasconn
+			var lprasConn = new Rasconn
 			{
 				Hrasconn = IntPtr.Zero
 			};
 
 
-			int lpcConnections = 0;
+			var lpcConnections = 0;
 #if !NETSTANDARD
 			var lpcb = Marshal.SizeOf(typeof(Rasconn));
 #else
@@ -64,12 +64,7 @@ private IntPtr GetAdslIntPrt()
 
 			var nRet = RasEnumConnections(ref lprasConn, ref lpcb, ref lpcConnections);
 
-			if (nRet != 0)
-			{
-				return IntPtr.Zero;
-			}
-
-			return lprasConn.Hrasconn;
+			return nRet != 0 ? IntPtr.Zero : lprasConn.Hrasconn;
 		}
 	}
 }

src/DotnetSpider.Core/Infrastructure/AutomicInteger.cs

@@ -57,7 +57,7 @@ public int Dec()
 		/// <returns>更新成功时返回true</returns>
 		public bool CompareAndSet(int expectedValue, int newValue)
 		{
-			int original = Interlocked.CompareExchange(ref _value, newValue, expectedValue);
+			var original = Interlocked.CompareExchange(ref _value, newValue, expectedValue);
 			return original == expectedValue;
 		}
 

src/DotnetSpider.Core/Infrastructure/AutomicLong.cs

@@ -57,7 +57,7 @@ public long Dec()
 		/// <returns>更新成功时返回true</returns>
 		public bool CompareAndSet(long expectedValue, long newValue)
 		{
-			long original = Interlocked.CompareExchange(ref _value, newValue, expectedValue);
+			var original = Interlocked.CompareExchange(ref _value, newValue, expectedValue);
 			return original == expectedValue;
 		}
 

src/DotnetSpider.Core/Infrastructure/BloomFilter.cs

@@ -12,7 +12,7 @@ namespace DotnetSpider.Core.Infrastructure
 	/// </summary>
 	public class BloomFilter
 	{
-		private readonly BitArray _bitset;
+		private readonly BitArray _bitSet;
 		private readonly int _bitSetSize;
 		private readonly double _bitsPerElement;
 		private readonly int _expectedNumberOfFilterElements; // expected (maximum) number of elements to be added
@@ -41,7 +41,7 @@ public BloomFilter(double c, int n, int k)
 			_bitsPerElement = c;
 			_bitSetSize = (int)Math.Ceiling(c * n);
 			_numberOfAddedElements = 0;
-			_bitset = new BitArray(_bitSetSize);
+			_bitSet = new BitArray(_bitSetSize);
 		}
 
 		/// <summary>
@@ -83,7 +83,7 @@ public BloomFilter(double falsePositiveProbability, int expectedNumberOfElements
 		public BloomFilter(int bitSetSize, int expectedNumberOfFilterElements, int actualNumberOfFilterElements, BitArray filterData)
 			: this(bitSetSize, expectedNumberOfFilterElements)
 		{
-			_bitset = filterData;
+			_bitSet = filterData;
 			_numberOfAddedElements = actualNumberOfFilterElements;
 		}
 
@@ -185,7 +185,7 @@ public override bool Equals(object obj)
 			{
 				return false;
 			}
-			if (_bitset != other._bitset && (_bitset == null || !Equals(_bitset, other._bitset)))
+			if (_bitSet != other._bitSet && (_bitSet == null || !Equals(_bitSet, other._bitSet)))
 			{
 				return false;
 			}
@@ -200,7 +200,7 @@ public override bool Equals(object obj)
 		public override int GetHashCode()
 		{
 			int hash = 7;
-			hash = 61 * hash + (_bitset != null ? HashBytes(_bitset) : 0);
+			hash = 61 * hash + (_bitSet != null ? HashBytes(_bitSet) : 0);
 			hash = 61 * hash + _expectedNumberOfFilterElements;
 			hash = 61 * hash + _bitSetSize;
 			hash = 61 * hash + _k;
@@ -265,7 +265,7 @@ public int GetK()
 		/// </summary>
 		public void Clear()
 		{
-			_bitset.SetAll(false);
+			_bitSet.SetAll(false);
 			_numberOfAddedElements = 0;
 		}
 
@@ -288,7 +288,7 @@ public void Add(byte[] bytes)
 			int[] hashes = CreateHashes(bytes, _k);
 			foreach (int hash in hashes)
 			{
-				_bitset.Set(Math.Abs(hash % _bitSetSize), true);
+				_bitSet.Set(Math.Abs(hash % _bitSetSize), true);
 			}
 			_numberOfAddedElements++;
 		}
@@ -339,7 +339,7 @@ public bool Contains(object element)
 		public bool Contains(byte[] bytes)
 		{
 			int[] hashes = CreateHashes(bytes, _k);
-			return hashes.All(hash => _bitset.Get(Math.Abs(hash % _bitSetSize)));
+			return hashes.All(hash => _bitSet.Get(Math.Abs(hash % _bitSetSize)));
 		}
 
 		/// <summary>
@@ -361,7 +361,7 @@ public bool ContainsAll(IEnumerable<object> c)
 		/// <returns>true if the bit is set, false if it is not.</returns>
 		public bool GetBit(int bit)
 		{
-			return _bitset.Get(bit);
+			return _bitSet.Get(bit);
 		}
 
 		/// <summary>
@@ -371,7 +371,7 @@ public bool GetBit(int bit)
 		/// <param name="value">If true, the bit is set. If false, the bit is cleared.</param>
 		public void SetBit(int bit, bool value)
 		{
-			_bitset.Set(bit, value);
+			_bitSet.Set(bit, value);
 		}
 
 		/// <summary>
@@ -380,7 +380,7 @@ public void SetBit(int bit, bool value)
 		/// <returns>bit set representing the Bloom filter.</returns>
 		public BitArray GetBitSet()
 		{
-			return _bitset;
+			return _bitSet;
 		}
 
 		/// <summary>