fix(plugins/memosplus/): 当MemosApi出错时,可能同步时误删GitHub对应文件

yiyungent · Mar 15, 2023 · b54fd31 · b54fd31
1 parent 21d030a
commit b54fd31
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 23 deletions.
diff --git a/plugins/MemosPlus/MemosPlus.cs b/plugins/MemosPlus/MemosPlus.cs
@@ -49,12 +49,23 @@ public async Task ExecuteAsync()
                 var settings = PluginSettingsModelFactory.Create<SettingsModel>(nameof(MemosPlus));
 
                 #region 备份到 GitHub
-                // TODO: 备份到 GitHub
+                // 备份到 GitHub
                 if (settings.Backup.EnableBackupToGitHub)
                 {
                     MemosUtil memosUtil = new MemosUtil(settings.Memos.BaseUrl);
                     int offset = 0;
-                    var list = memosUtil.List(memosSession: settings.Memos.MemosSession, offset: 0, limit: 20);
+                    bool isErrorMemosApi = false;
+                    var list = new List<MemoItemModel>();
+                    try
+                    {
+                        list = memosUtil.List(memosSession: settings.Memos.MemosSession, offset: 0, limit: 20);
+                    }
+                    catch (System.Exception ex)
+                    {
+                        // 只要 memosUtil.List 出现一次 异常, 就标记放弃删除 GitHub 文件, 防止因为没有记录 而误删除 GitHub 文件
+                        isErrorMemosApi = true;
+                        System.Console.WriteLine(ex.ToString());
+                    }
                     GitHubUtil gitHubUtil = new GitHubUtil();
                     settings.GitHub.RepoTargetDirPath = settings.GitHub.RepoTargetDirPath.Trim().TrimEnd('/');
 
@@ -106,35 +117,56 @@ public async Task ExecuteAsync()
                             }
                         }
                         offset = offset + list.Count;
-                        list = memosUtil.List(memosSession: settings.Memos.MemosSession, offset: offset, limit: 20);
+                        try
+                        {
+                            list = memosUtil.List(memosSession: settings.Memos.MemosSession, offset: offset, limit: 20);
+                        }
+                        catch (System.Exception ex)
+                        {
+                            isErrorMemosApi = true;
+                            System.Console.WriteLine(ex.ToString());
+                        }
                     }
-                    // 清理不存在的文件: 对于存放 memos 的文件夹, 清理 memos 中已删除的对应文件
-                    List<string> githubExistFilePaths = gitHubUtil.Files(
-                        repoOwner: settings.GitHub.RepoOwner,
-                        repoName: settings.GitHub.RepoName,
-                        repoBranch: settings.GitHub.RepoBranch,
-                        repoTargetDirPath: $"{settings.GitHub.RepoTargetDirPath}/",
-                        accessToken: settings.GitHub.AccessToken);
-                    // 对于 GitHub 存在 但 memos 并没有此对应文件, 就需要删除
-                    List<string> deletedFilePaths = githubExistFilePaths.Where(m => !memoFilePaths.Contains(m)).ToList();
-                    foreach (var deletedFilePath in deletedFilePaths)
-                    {
+
+                    #region 清理不存在的文件
+                    if (!isErrorMemosApi) {
+                        // 清理不存在的文件: 对于存放 memos 的文件夹, 清理 memos 中已删除的对应文件
                         try
                         {
-                            gitHubUtil.Delete(
+                            List<string> githubExistFilePaths = gitHubUtil.Files(
                                 repoOwner: settings.GitHub.RepoOwner,
                                 repoName: settings.GitHub.RepoName,
                                 repoBranch: settings.GitHub.RepoBranch,
-                                repoTargetFilePath: deletedFilePath,
-                                accessToken: settings.GitHub.AccessToken
-                            );
+                                repoTargetDirPath: $"{settings.GitHub.RepoTargetDirPath}/",
+                                accessToken: settings.GitHub.AccessToken);
+                            // 对于 GitHub 存在 但 memos 并没有此对应文件, 就需要删除
+                            List<string> deletedFilePaths = githubExistFilePaths.Where(m => !memoFilePaths.Contains(m)).ToList();
+                            foreach (var deletedFilePath in deletedFilePaths)
+                            {
+                                try
+                                {
+                                    gitHubUtil.Delete(
+                                        repoOwner: settings.GitHub.RepoOwner,
+                                        repoName: settings.GitHub.RepoName,
+                                        repoBranch: settings.GitHub.RepoBranch,
+                                        repoTargetFilePath: deletedFilePath,
+                                        accessToken: settings.GitHub.AccessToken
+                                    );
+                                }
+                                catch (System.Exception ex)
+                                {
+                                    System.Console.WriteLine($"删除失败: {deletedFilePath}");
+                                    System.Console.WriteLine(ex.ToString());
+                                }
+                            }
                         }
                         catch (System.Exception ex)
                         {
-                            System.Console.WriteLine($"删除失败: {deletedFilePath}");
                             System.Console.WriteLine(ex.ToString());
                         }
                     }
+                    #endregion
+
                 }
                 #endregion
 

diff --git a/plugins/MemosPlus/MemosPlus.csproj b/plugins/MemosPlus/MemosPlus.csproj
@@ -9,8 +9,8 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<PackageId>PluginCore.MemosPlus</PackageId>
-		<Version>0.1.5</Version>
-		<FileVersion>0.1.5.0</FileVersion>
+		<Version>0.1.6</Version>
+		<FileVersion>0.1.6.0</FileVersion>
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<Company>yiyun</Company>
 		<Authors>yiyun</Authors>

diff --git a/plugins/MemosPlus/README.md b/plugins/MemosPlus/README.md
@@ -40,7 +40,7 @@
 
 
 <!-- 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.MemosPlus-v0.1.5.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=Plugins.MemosPlus-v0.1.6.README" style="border:0" alt="" />
 <!-- 
 ### 其它
 

diff --git a/plugins/MemosPlus/info.json b/plugins/MemosPlus/info.json
@@ -3,6 +3,6 @@
 	"DisplayName": "memos+",
 	"Description": "提升 memos 体验",
 	"Author": "yiyun",
-	"Version": "0.1.5",
+	"Version": "0.1.6",
 	"SupportedVersions": [ "0.0.1" ]
 }