feat(plugins/duplicatiplugin): parsedResult 区分 Success,Warning,Fatal

yiyungent · Jan 19, 2024 · 5cb5d83 · 5cb5d83
1 parent 98b0b67
commit 5cb5d83
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 19 deletions.
diff --git a/plugins/DuplicatiPlugin/Controllers/SendController.cs b/plugins/DuplicatiPlugin/Controllers/SendController.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -64,19 +64,36 @@ await botClient.SendTextMessageAsync(
                 if (settings.Telegram != null && settings.Telegram.Enable)
                 {
                     var botClient = new TelegramBotClient(settings.Telegram.BotToken);
-                    string badge = "🔴";
-                    switch (jsonModel.ParsedResult)
+                    string badge = string.Empty;
+                    string badgeStr = string.Empty;
+                    string extraInfo = string.Empty;
+                    switch (jsonModel.ParsedResult.Trim())
                     {
                         case "Success":
                             badge = "✅";
+                            badgeStr = "Success";
                             break;
-                        default:
+                        case "Warning":
+                            badge = "⚠️";
+                            badgeStr = "Warning";
+                            extraInfo = duplicatiStr;
+                            break;
+                        case "Fatal":
                             badge = "🔴";
+                            badgeStr = "Fatal";
+                            extraInfo = duplicatiStr;
+                            break;
+                        default:
+                            badge = "❓";
+                            badgeStr = jsonModel.ParsedResult.Trim();
+                            extraInfo = duplicatiStr;
                             break;
                     }
                     string temp = $"Duplicati: {jsonModel.OperationName} \r\n"
                                   + $"{jsonModel.BackupName} \r\n"
-                                  + $"{badge}";
+                                  + $"{badge} {badgeStr}";
+                    temp += string.IsNullOrEmpty(extraInfo) ? string.Empty : $"\r\n{extraInfo}";
+
                     // 发送
                     await botClient.SendTextMessageAsync(
                         chatId: settings.Telegram.ChatId,
@@ -89,7 +106,7 @@ await botClient.SendTextMessageAsync(
                 Utils.LogUtil.Exception(ex);
 
                 return Ok("fail");
-            } 
+            }
             #endregion
 
             #region 保存数据库, key 做来源区分

diff --git a/plugins/DuplicatiPlugin/DuplicatiPlugin.csproj b/plugins/DuplicatiPlugin/DuplicatiPlugin.csproj
@@ -1,22 +1,42 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<EnableDynamicLoading>true</EnableDynamicLoading>
-	</PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <PackageId>PluginCore.Plugins.DuplicatiPlugin</PackageId>
+    <Version>0.2.2</Version>
+    <FileVersion>0.2.2.0</FileVersion>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <Company>yiyun</Company>
+    <Authors>yiyun</Authors>
+    <Description>PluginCore Plugin: DuplicatiPlugin</Description>
+    <Copyright>Copyright (c) 2023-present yiyun</Copyright>
+    <RepositoryUrl>https://github.com/yiyungent/KnifeHub</RepositoryUrl>
+    <PackageLicenseUrl>https://github.com/yiyungent/KnifeHub/blob/main/LICENSE</PackageLicenseUrl>
+    <PackageTags>PluginCore PluginCore.Plugins</PackageTags>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+  </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0">
+    <!--<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0">
 			<ExcludeAssets>runtime</ExcludeAssets>
-		</PackageReference>
+		</PackageReference>-->
+    <FrameworkReference Include="Microsoft.AspNetCore.App">
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </FrameworkReference>
+    <PackageReference Include="PluginCore.IPlugins.AspNetCore" Version="0.1.1">
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
 		<!--<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5">
 			<ExcludeAssets>runtime</ExcludeAssets>
 		</PackageReference>-->
 		<PackageReference Include="Dapper" Version="2.0.123" />
 		<PackageReference Include="Telegram.Bot" Version="18.0.0" />
-		<PackageReference Include="PluginCore.IPlugins.AspNetCore" Version="0.0.1">
-			<ExcludeAssets>runtime</ExcludeAssets>
-		</PackageReference>
 		<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
 	</ItemGroup>
 

diff --git a/plugins/DuplicatiPlugin/Models/DuplicatiMessageModel.cs b/plugins/DuplicatiPlugin/Models/DuplicatiMessageModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -17,6 +17,11 @@ public class DuplicatiMessageModel
 
         public string BackupName { get; set; }
 
+        /// <summary>
+        /// Success
+        /// Warning
+        /// Fatal
+        /// </summary>
         public string ParsedResult { get; set; }
 
         public string LocalPath { get; set; }

diff --git a/plugins/DuplicatiPlugin/README.md b/plugins/DuplicatiPlugin/README.md
@@ -33,7 +33,7 @@
 --send-http-url=替换为你的链接
 ```
 
-### 2. 方式2: 全局设置 Duplicati
+### 2. 方式2: 全局设置 Duplicati (推荐)
 
 - [右键复制本链接, 然后再替换其中内容](/api/Duplicati/replace-your-key/apply)
 
@@ -66,5 +66,5 @@
 > 本项目基于 [TelegramBots/Telegram.Bot: .NET Client for Telegram Bot API](https://github.com/TelegramBots/Telegram.Bot)
 
 <!-- Matomo Image Tracker-->
-<img referrerpolicy="no-referrer-when-downgrade" src="https://matomo.moeci.com/matomo.php?idsite=2&amp;rec=1&amp;action_name=Plugins.DuplicatiPlugin-v0.2.1.README" style="border:0" alt="" />
+<img referrerpolicy="no-referrer-when-downgrade" src="https://matomo.moeci.com/matomo.php?idsite=2&amp;rec=1&amp;action_name=PluginCore.Plugins..DuplicatiPlugin-v0.2.2.README" style="border:0" alt="" />
 <!-- End Matomo -->
diff --git a/plugins/DuplicatiPlugin/info.json b/plugins/DuplicatiPlugin/info.json
@@ -3,6 +3,6 @@
 	"DisplayName": "Duplicati插件",
 	"Description": "Duplicati插件",
 	"Author": "yiyun",
-	"Version": "0.2.1",
+	"Version": "0.2.2",
 	"SupportedVersions": [ "0.0.1" ]
 }