[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;
 		}
 	}
 }