重构

Author: stulzq

README.md

@@ -1,30 +1,10 @@
-# 博客园快捷发布工具 
+# dotNet 博客园工具 
 
 [![](https://img.shields.io/nuget/v/dotnet-cnblog.svg?style=flat-square&label=nuget)](https://www.nuget.org/packages/dotnet-cnblog)
 
-## 一.准备环境
+## 1.安装
 
-安装.NET Core SDK: https://www.microsoft.com/net/learn/get-started/windows
-
-.NET Core SDK 2.1：[点我下载](https://download.microsoft.com/download/8/8/5/88544F33-836A-49A5-8B67-451C24709A8F/dotnet-sdk-2.1.300-win-gs-x64.exe)
-
->运行本程序必须需要.NET Core 2.1或者更高版本
-
-## 二.第一种安装方法
-
-.NET Core Global Tool 是 .NET Core 2.1的新特性，类似于NPM，可以直接从NUGET安装我们编写的工具。
-
-### 1.安装
-
-打开cmd，执行命令，便可以直接安装本工具：
-
-````shell
-dotnet tool install -g dotnet-cnblog
-````
-
-![install](./assets/install.gif)
-
-### 2.配置
+## 2.配置
 
 第一次运行需要配置博客ID，账号密码等，按照提示输入即可，对信息采用tea加密算法进行加密存储。
 
@@ -41,7 +21,7 @@ dotnet tool install -g dotnet-cnblog
 
 ![add_path](./assets/add_path.png)
 
-### 3.重置配置
+### 重置配置
 
 使用下面的命令重置配置:
 ````shell
@@ -50,7 +30,7 @@ dotnet-cnblog reset
 
 ![reset](./assets/reset.png)
 
-### 4.使用
+## 3.使用
 
 使用命令对Markdown文件里的图片进行解析，并上传到博客园，并且转换内容保存到新的文件中。
 
@@ -59,37 +39,11 @@ dotnet-cnblog <markdown文件路径>
 ````
 ![test](./assets/test.gif)
 
-## 三.第二种安装方法
-
-### 1.编译Release包
-
-进入`shell`文件夹，运行`publish.bat`
-
->可能会引起杀毒软件误报，请允许。
-
-若出现 error NETSDK1053: Pack as tool does not support self contained. 则表示未完成，
-
-> 解决办法：进入`项目根目录\CnBlogPublishTool`文件夹，修改dotnet-cnblog.csproj，
-          删除`<PackAsTool>true</PackAsTool>`这条语句即可。
-
-
-### 2.创建快捷方式
-
-进入 `项目根目录\Publish` 文件夹，选中 `dotnet-cnblog.exe`，【右键菜单】->【创建快捷方式】
-
-然后进入 `项目根目录\shell` 文件夹，运行`deploy.bat`
-
-### 3.使用
-
-选中一个MarkDown文件，【右键菜单】->【发送到】->【dotnet-cnblog】，便会开始解析图片并自动上传到博客园。
-
-第一次使用会让您配置博客ID和博客园的用户名密码，密码采用tea加密存储，请放心使用。
-
-## 四.使用演示
+## 4.使用演示
 
 ![ys](./assets/ys.gif)
 
-## 五.说明
+## 5.说明
 
 - 程序未加过多的容错机制，请勿暴力测试。比如发送一个非MarkDown文件到程序。
 

assets/install.gif

@@ -0,0 +1,4 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=cnblog/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Cnblogs/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Dotnetcnblog/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

dotnet-cnblogs-tool.sln.DotSettings

@@ -0,0 +1,12 @@
+using MetaWeblogClient;
+
+namespace Dotnetcnblog.Command
+{
+    public class CommandContext
+    {
+        public string AppConfigFilePath { get; set; }
+        public byte[] EncryptKey => new byte[] { 21, 52, 33, 78, 52, 45 };
+        public BlogConnectionInfo ConnectionInfo { get; set; }
+
+    }
+}

src/dotnet-cnblogs/Command/CommandContext.cs

@@ -0,0 +1,16 @@
+namespace Dotnetcnblog.Command
+{
+    public class CommandContextStore
+    {
+        private static CommandContext _context;
+        public static void Set(CommandContext context)
+        {
+            _context = context;
+        }
+
+        public static CommandContext Get()
+        {
+            return _context;
+        }
+    }
+}

src/dotnet-cnblogs/Command/CommandContextStore.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.IO;
+using System.Linq;
+using Dotnetcnblog.TagHandlers;
+using Dotnetcnblog.Utils;
+using McMaster.Extensions.CommandLineUtils;
+using Console = Colorful.Console;
+
+namespace Dotnetcnblog.Command
+{
+    [Command(Name = "proc", Description = "处理文件")]
+    public class CommandProcessFile : ICommand
+    {
+        private static readonly Dictionary<string, string> ReplaceDic = new Dictionary<string, string>();
+
+
+        [Option("-f|--file", Description = "需要处理的文件路径")]
+        [Required]
+        public string FilePath { get; set; }
+
+        public int OnExecute(CommandLineApplication app)
+        {
+            if (app.Options.Count == 1 && app.Options[0].ShortName == "h")
+            {
+                app.ShowHelp();
+            }
+
+            Execute(CommandContextStore.Get());
+            return 0;
+        }
+
+        public void Execute(CommandContext context)
+        {
+            try
+            {
+                if (!File.Exists(FilePath))
+                {
+                    ConsoleHelper.PrintError($"文件不存在：{FilePath}");
+                }
+                else
+                {
+                    var fileDir = new FileInfo(FilePath).DirectoryName;
+                    var fileContent = File.ReadAllText(FilePath);
+                    var imgHandler = new ImageHandler();
+                    var imgList = imgHandler.Process(fileContent);
+
+                    ConsoleHelper.PrintMsg($"提取图片成功，共 {imgList.Count} 个。");
+
+                    //循环上传图片
+                    foreach (var img in imgList)
+                    {
+                        if (img.StartsWith("http"))
+                        {
+                            ConsoleHelper.PrintMsg($"图片跳过：{img} ");
+                            continue;
+                        }
+
+                        try
+                        {
+                            var imgPhyPath = Path.Combine(fileDir!, img);
+                            if (File.Exists(imgPhyPath))
+                            {
+                                var imgUrl = ImageUploadHelper.Upload(imgPhyPath);
+                                if (!ReplaceDic.ContainsKey(img)) ReplaceDic.Add(img, imgUrl);
+                                ConsoleHelper.PrintMsg($"{img} 上传成功. {imgUrl}");
+                            }
+                            else
+                            {
+                                ConsoleHelper.PrintMsg($"{img} 未发现文件.");
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            Console.WriteLine(e.Message);
+                        }
+                    }
+
+                    //替换
+                    fileContent = ReplaceDic.Keys.Aggregate(fileContent, (current, key) => current.Replace(key, ReplaceDic[key]));
+
+                    var newFileName = FilePath.Substring(0, FilePath.LastIndexOf('.')) + "-cnblog" + Path.GetExtension(FilePath);
+                    File.WriteAllText(newFileName, fileContent, FileEncodingType.GetType(FilePath));
+
+                    ConsoleHelper.PrintMsg($"处理完成！文件保存在：{newFileName}");
+                }
+            }
+            catch (Exception e)
+            {
+                ConsoleHelper.PrintError(e.Message);
+            }
+        }
+    }
+}

src/dotnet-cnblogs/Command/CommandProcessFile.cs

@@ -0,0 +1,22 @@
+using System.IO;
+using Dotnetcnblog.Utils;
+using McMaster.Extensions.CommandLineUtils;
+
+namespace Dotnetcnblog.Command
+{
+    [Command(Name = "reset", Description = "重置配置")]
+    public class CommandReset : ICommand
+    {
+        public int OnExecute(CommandLineApplication app)
+        {
+            Execute(CommandContextStore.Get());
+            return 0;
+        }
+
+        public void Execute(CommandContext context)
+        {
+            File.Delete(context.AppConfigFilePath);
+            ConsoleHelper.PrintMsg("配置重置成功！");
+        }
+    }
+}

src/dotnet-cnblogs/Command/CommandReset.cs

@@ -0,0 +1,47 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Dotnetcnblog.Utils;
+using McMaster.Extensions.CommandLineUtils;
+using MetaWeblogClient;
+using Newtonsoft.Json;
+using Console = Colorful.Console;
+
+namespace Dotnetcnblog.Command
+{
+    [Command(Name = "set", Description = "设置配置")]
+    public class CommandSetConfig : ICommand
+    {
+
+        public int OnExecute(CommandLineApplication app)
+        {
+            Execute(CommandContextStore.Get());
+            return 0;
+        }
+
+        public void Execute(CommandContext context)
+        {
+            ConsoleHelper.PrintMsg("请输入博客ID：（如：https://www.cnblogs.com/stulzq 的博客id为 stulzq ）");
+            var blogId = Console.ReadLine();
+
+            ConsoleHelper.PrintMsg("请输入用户名：");
+            var userName = Console.ReadLine();
+
+            ConsoleHelper.PrintMsg("请输入密  码：");
+            var pwd = Console.ReadLine();
+
+            var config = new BlogConnectionInfo(
+                "https://www.cnblogs.com/" + blogId,
+                "https://rpc.cnblogs.com/metaweblog/" + blogId,
+                blogId,
+                userName,
+                Convert.ToBase64String(TeaHelper.Encrypt(Encoding.UTF8.GetBytes(pwd), context.EncryptKey)));
+
+            File.WriteAllText(context.AppConfigFilePath, JsonConvert.SerializeObject(config));
+
+            ConsoleHelper.PrintMsg("配置设置成功！");
+        }
+    }
+}

src/dotnet-cnblogs/Command/CommandSetConfig.cs

@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Dotnetcnblog.Command
+{
+    public interface ICommand
+    {
+        void Execute(CommandContext context);
+    }
+}