Browse Source

fix public publish folder

Melon 1 năm trước cách đây
mục cha
commit
873c09e419
3 tập tin đã thay đổi với 38 bổ sung15 xóa
  1. 1 1
      fisp/MainWindow.xaml
  2. 1 1
      fisp/MainWindow.xaml.cs
  3. 36 13
      fisp/PackageHandler.cs

+ 1 - 1
fisp/MainWindow.xaml

@@ -59,7 +59,7 @@
                             </StackPanel>
                             <StackPanel Margin="8" Orientation="Horizontal">
                                 <TextBlock VerticalAlignment="Center" Text="Package Name:" FontSize="14" FontWeight="Normal"/>
-                                <TextBox x:Name="PackageName" Margin="6" BorderBrush="Transparent" BorderThickness="0" IsReadOnly="true" Text="0.0.0.0" Foreground="YellowGreen" FontSize="18" TextChanged="OnPackageNameChanged"/>
+                                <TextBox x:Name="PackageName" Margin="6" Width="140" BorderBrush="Transparent" BorderThickness="0" IsReadOnly="true" Text="0.0.0.0" Foreground="YellowGreen" FontSize="18" TextChanged="OnPackageNameChanged"/>
                             </StackPanel>
                             <StackPanel Orientation="Horizontal">
                                 <Button x:Name="PackageButton" Width="96" Height="48" Content="PACKAGE" FontSize="16" FontWeight="Bold" IsEnabled="False" Margin="8" Click="OnPackageClick"></Button>

+ 1 - 1
fisp/MainWindow.xaml.cs

@@ -108,7 +108,7 @@ namespace fisp
                     PackageHandler.CopyDirectory(_packageHandler.DistFolder, folder);
                     Directory.Delete(Path.Combine(folder, "assets"), true);
                 }
-                var task = publisher.UploadDir(_packageHandler.DistFolder, _packageHandler.FullBuildName);
+                var task = publisher.UploadDir(folder, _packageHandler.FullBuildName);
                 task.UploadingProgress += (s, e) =>
                 {
                     Dispatcher.Invoke(() =>

+ 36 - 13
fisp/PackageHandler.cs

@@ -241,23 +241,15 @@ namespace fisp
             archive.CreateEntryFromFile(path, entryName);
         }
 
+        /// <summary>
+        /// 创建空文件夹
+        /// </summary>
+        /// <param name="folder"></param>
         public static void CreateCleanFolder(string folder)
         {
             if (Directory.Exists(folder))
             {
-                // 清空文件夹中的所有文件
-                string[] files = Directory.GetFiles(folder);
-                foreach (string file in files)
-                {
-                    File.Delete(file);
-                }
-
-                // 清空文件夹中的所有子文件夹
-                string[] subfolders = Directory.GetDirectories(folder);
-                foreach (string subfolder in subfolders)
-                {
-                    Directory.Delete(subfolder, true);
-                }
+                ClearFolder(folder);
             }
             else
             {
@@ -265,6 +257,37 @@ namespace fisp
             }
         }
 
+        /// <summary>
+        /// 清空文件夹
+        /// </summary>
+        /// <param name="folder"></param>
+        public static void ClearFolder(string folder)
+        {
+            if (!Directory.Exists(folder))
+            {
+                return;
+            }
+
+            // 清空文件夹中的所有文件
+            string[] files = Directory.GetFiles(folder);
+            foreach (string file in files)
+            {
+                File.Delete(file);
+            }
+
+            // 清空文件夹中的所有子文件夹
+            string[] subfolders = Directory.GetDirectories(folder);
+            foreach (string subfolder in subfolders)
+            {
+                Directory.Delete(subfolder, true);
+            }
+        }
+
+        /// <summary>
+        /// 复制文件夹
+        /// </summary>
+        /// <param name="sourceDirectory"></param>
+        /// <param name="targetDirectory"></param>
         public static void CopyDirectory(string sourceDirectory, string targetDirectory)
         {
             // 创建目标文件夹