🔧 修复多图上传时复制链接错误的 Bug

Redns · Apr 9, 2022 · 737ffdc · 737ffdc
1 parent d88314c
commit 737ffdc
Show file tree

Hide file tree

Showing 7 changed files with 117 additions and 71 deletions.
diff --git a/Controllers/ImageController.cs b/Controllers/ImageController.cs
@@ -106,7 +106,9 @@ private async Task<ImageEntity> SaveImage(Stream fileReader, string filename, st
             using (FileStream fileWriter = System.IO.File.Create(unitFilePath))
             {
                 await fileReader.CopyToAsync(fileWriter);
+                await fileWriter.FlushAsync();
             }
+            await fileReader.FlushAsync();
             fileReader.Dispose();
 
             // 录入数据库
@@ -145,6 +147,7 @@ private async Task SaveFile(Stream fileReader, string dstDirPath)
             {
                 await fileReader.CopyToAsync(fileWriter);
             }
+            await fileReader.FlushAsync();
             fileReader.Dispose();
         }
 

diff --git a/Data/Access/OurDbContext.cs b/Data/Access/OurDbContext.cs
@@ -181,6 +181,36 @@ public async Task<bool> Remove(string id)
             return false;
         }
 
+
+        /// <summary>
+        /// 移除多个图片信息
+        /// </summary>
+        /// <param name="images"></param>
+        /// <returns></returns>
+        public async Task<bool> RemoveRangeAsync(List<ImageEntity> images)
+        {
+            if ((_context != null) && (_context.Images != null))
+            {
+                try
+                {
+                    images.ForEach(image =>
+                    {
+                        string imagePath = $"{GlobalValues.appSetting?.Data?.Resources?.Images?.Path}/{image.Name}";
+                        if (File.Exists(imagePath))
+                        {
+                            File.Delete(imagePath);
+                        }
+                    });
+                    _context.Images.RemoveRange(images);
+                    _ = _context.SaveChangesAsync();
+                    return true;
+                }
+                catch {}
+            }
+            return false;
+        }
+
+
         public void Dispose()
         {
             try

diff --git a/Data/Database/imagebed.sqlite b/Data/Database/imagebed.sqlite
diff --git a/Pages/Dashboard.razor b/Pages/Dashboard.razor
@@ -96,63 +96,69 @@
 
     async void RefreshDashboard(Object? source, ElapsedEventArgs? e)
     {
-        using var context = new OurDbContext();
-        using var sqlImageData = new SQLImageData(context);
-
-        List<ImageEntity> images = await sqlImageData.Get();
+        using (var context = new OurDbContext())
+        {
+            using (var sqlImageData = new SQLImageData(context))
+            {
+                List<ImageEntity> images = await sqlImageData.Get();
 
-        // 获取托管图片总数
-        HostImageNums = images.Count;
+                // 获取托管图片总数
+                HostImageNums = images.Count;
 
-        // 获取托管图片所占磁盘存储总量
-        double diskOccupancyKB = 0;
-        foreach(var image in images)
-        {
-            diskOccupancyKB += UnitNameGenerator.ParseFileSize(image.Size ?? "0B");
-        }
-        DiskOccupancy = $"{(diskOccupancyKB / 1024.0).ToString("f3")} MB";
+                // 获取托管图片所占磁盘存储总量
+                double diskOccupancyKB = 0;
+                images.ForEach(image =>
+                {
+                    diskOccupancyKB += UnitNameGenerator.ParseFileSize(image.Size ?? "0B");
+                });
+                DiskOccupancy = $"{(diskOccupancyKB / 1024.0).ToString("f3")} MB";
 
-        // 获取该进程占用的运行内存
-        Process mainProcess = Process.GetCurrentProcess();
-        mainProcess.Refresh();
-        RunningMemUsage = $"{mainProcess.WorkingSet64 / (1024*1024)} MB";
+                // 获取该进程占用的运行内存
+                Process mainProcess = Process.GetCurrentProcess();
+                mainProcess.Refresh();
+                RunningMemUsage = $"{mainProcess.WorkingSet64 / (1024*1024)} MB";
 
-        // 获取应用运行时长
-        TimeSpan SysRunningTimeSpan = DateTime.Now - mainProcess.StartTime;
-        SysRunningTime = $"{(int)SysRunningTimeSpan.TotalHours}:{((int)SysRunningTimeSpan.TotalMinutes) % 60}:{((int)SysRunningTimeSpan.TotalSeconds) % 60}";
+                // 获取应用运行时长
+                TimeSpan SysRunningTimeSpan = DateTime.Now - mainProcess.StartTime;
+                SysRunningTime = $"{(int)SysRunningTimeSpan.TotalHours}:{((int)SysRunningTimeSpan.TotalMinutes) % 60}:{((int)SysRunningTimeSpan.TotalSeconds) % 60}";
 
-        await InvokeAsync(new Action(() => { StateHasChanged(); }));
+                await InvokeAsync(new Action(() => { StateHasChanged(); }));
+            }
+        } 
     }
 
 
     async void RefreshChart()
     {
-        using var context2 = new OurDbContext();
-        using var sqlRecordData = new SQLRecordData(context2);
-
-        SysRecords.Clear();
-        foreach(var record in await sqlRecordData.Get())
+        using (var context = new OurDbContext())
         {
-            SysRecords.Add(new
-            {
-                date = record.Date,
-                type = "图片上传数量",
-                value = record.UploadImageNum
-            });
-
-            SysRecords.Add(new
+            using (var sqlRecordData = new SQLRecordData(context))
             {
-                date = record.Date,
-                type = "图片磁盘占用(MB)",
-                value = record.UploadImageSize
-            });
-
-            SysRecords.Add(new
-            {
-                date = record.Date,
-                type = "图片请求次数",
-                value = record.RequestNum
-            });
+                SysRecords.Clear();
+                foreach(var record in await sqlRecordData.Get())
+                {
+                    SysRecords.Add(new
+                    {
+                        date = record.Date,
+                        type = "图片上传数量",
+                        value = record.UploadImageNum
+                    });
+
+                    SysRecords.Add(new
+                    {
+                        date = record.Date,
+                        type = "图片磁盘占用(MB)",
+                        value = record.UploadImageSize
+                    });
+
+                    SysRecords.Add(new
+                    {
+                        date = record.Date,
+                        type = "图片请求次数",
+                        value = record.RequestNum
+                    });
+                }
+            }
         }
     }
 

diff --git a/Pages/Index.razor b/Pages/Index.razor
@@ -107,6 +107,7 @@
                 }
             }
         });
+        fileList.Clear();
         await JS.InvokeVoidAsync("CopyToClip", urls);
         _ = _message.Success("图片上传完成！");
     }

diff --git a/Pages/Pics.razor b/Pages/Pics.razor
@@ -25,10 +25,9 @@
             searchRunning = true;
 
             imagesShow.Clear();
-            foreach (var image in imagesAll.Where(image => (searchText == null) || (image.Name ?? "").Contains(searchText) || (image.Owner ?? "").Contains(searchText))) {
-                imagesShow.Add(image);
-            }
-
+            imagesShow.AddRange(imagesAll.Where(image => (searchText == null) || 
+                                               (image.Name ?? "").Contains(searchText) || 
+                                               (image.Owner ?? "").Contains(searchText)));
             searchRunning = false;
         }
     }
@@ -69,18 +68,22 @@
 
         async void UploadFinished()
         {
-            using var context = new OurDbContext();
-            using var sqlImageData = new SQLImageData(context);
-            imagesAll = await sqlImageData.Get();
-            OnSearch();
-
-            await _notice.Open(new NotificationConfig()
+            using (var context = new OurDbContext())
             {
-                Message = "图片导入完成",
-                Description = "图片已成功导入至服务器！"
-            }); 
-        }
+                using (var sqlImageData = new SQLImageData(context))
+                {
+                    imagesAll = await sqlImageData.Get();
+                    OnSearch();
+
+                    _ = _notice.Open(new NotificationConfig()
+                    {
+                        Message = "图片导入完成",
+                        Description = "图片已成功导入至服务器！"
+                    }); 
+                }
+            }
         }
+    }
     </SpaceItem>
     @if ((imagesSelected != null ) && (imagesSelected.Any()))
     {
@@ -91,17 +94,20 @@
 @code{
     async void RemoveSelectedImages()
     {
-        using var context = new OurDbContext();
-        using var sqlImageData = new SQLImageData(context);
-
-        foreach(var image in imagesSelected)
+        using (var context = new OurDbContext())
         {
-            await sqlImageData.Remove(image.Id);
-            imagesAll.Remove(image);
-        }
-        _message.Success("图片已删除!");
+            using (var sqlImageData = new SQLImageData(context))
+            {
+                _ = sqlImageData.RemoveRangeAsync(imagesSelected.ToList());
+                foreach(var image in imagesSelected)
+                {
+                    imagesAll.Remove(image);
+                }
+                _ = _message.Success("图片已删除!");
 
-        OnSearch();
+                OnSearch();
+            }
+        }
     }
 
 
@@ -126,8 +132,8 @@
         }
         FileOperator.CompressMulti(imageFullpaths.ToArray(), $"{GlobalValues.appSetting?.Data?.Resources?.Images?.Path}/Images.export");
 
-        await JS.InvokeVoidAsync("downloadFileFromStream", "Images.export", "api/image/Images.export");
-        await _message.Success("导出成功!");
+        _ = JS.InvokeVoidAsync("downloadFileFromStream", "Images.export", "api/image/Images.export");
+        _ = _message.Success("导出成功!");
     }
 
 

diff --git a/appsettings.json b/appsettings.json
@@ -3,7 +3,7 @@
     "Resources": {
       "Images": {
         "Path": "Data/Resources/Images",
-        "RenameFormat": 4
+        "RenameFormat": 1
       },
       "Database": {
         "Path": "Data Source=Data/Database/imagebed.sqlite;",
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,6 +107,7 @@ @@
                     }
                 }
             });
+            fileList.Clear();
             await JS.InvokeVoidAsync("CopyToClip", urls);
             _ = _message.Success("图片上传完成！");
         }
@@ Expand Down @@