Merge pull request #175 from dotnet-campus/t/lindexi/SyncTool

尝试加上更多发布命令

Author: walterlv

.github/workflows/BuildSyncTool.yml

@@ -0,0 +1,77 @@
+name: BuildSyncTool
+
+on: [push]
+
+jobs:
+  Build_win-x86:
+
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.0.x
+
+      - name: Build with dotnet
+        run: dotnet publish --configuration Release -r win-x86 /p:PublishSingleFile=true --self-contained true SyncTool/SyncTool.csproj
+
+      - uses: actions/upload-artifact@v4
+        with: 
+          name: SyncTool_win-x86
+          path: SyncTool/bin/Release/net8.0/win-x86/publish
+
+  Build_win-x64:
+
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.0.x
+
+      - name: Build with dotnet
+        run: dotnet publish --configuration Release -r win-x64 /p:PublishSingleFile=true --self-contained true SyncTool/SyncTool.csproj
+
+      - uses: actions/upload-artifact@v4
+        with: 
+          name: SyncTool_win-x64
+          path: SyncTool/bin/Release/net8.0/win-x64/publish
+
+  Build_linux-x64:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.0.x
+
+      - name: Build with dotnet
+        run: dotnet publish --configuration Release -r linux-x64 /p:PublishSingleFile=true --self-contained true SyncTool/SyncTool.csproj
+
+      - uses: actions/upload-artifact@v4
+        with: 
+          name: SyncTool_linux-x64
+          path: SyncTool/bin/Release/net8.0/linux-x64/publish
+
+  Build_linux-arm64:
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.0.x
+
+      - name: Build with dotnet
+        run: dotnet publish --configuration Release -r linux-arm64 /p:PublishSingleFile=true --self-contained true SyncTool/SyncTool.csproj
+
+      - uses: actions/upload-artifact@v4
+        with: 
+          name: SyncTool_linux-arm64
+          path: SyncTool/bin/Release/net8.0/linux-arm64/publish

SyncTool/Client/SyncOptions.cs

@@ -299,6 +299,14 @@ async Task RemoveRedundantFolder(List<SyncFolderPathInfo> syncFolderPathInfoList
                     return;
                 }
 
+                if (!Directory.Exists(folder))
+                {
+                    // 如果文件夹不存在了，可能是之前删除了，不再继续
+                    // 什么情况可能导致文件夹不存在？如有这样的路径 A\B\C 结构
+                    // 之前进入到 A\B 时，将 B 删除了，那么 A\B\C 就会不存在
+                    continue;
+                }
+
                 if (Directory.EnumerateFiles(folder, "*", SearchOption.AllDirectories).Any())
                 {
                     // 如果存在文件，则不是空文件夹，不能删除
@@ -340,6 +348,13 @@ async Task RemoveRedundantFolder(List<SyncFolderPathInfo> syncFolderPathInfoList
                     }
                 }
             }
+
+            foreach (var syncFolderPathInfo in syncFolderPathInfoList)
+            {
+                var folderPath = Path.Join(syncFolder, syncFolderPathInfo.RelativePath);
+                // 重新创建，防止误删空文件夹
+                Directory.CreateDirectory(folderPath);
+            }
         }
 
         async Task<string> DownloadFile(SyncFileInfo remoteSyncFileInfo)