2.6.8

2023-09-12 00:55:44 +08:00
parent f18ede2c7a
commit 3b8de89309
28 changed files with 615 additions and 451 deletions
@@ -11,12 +11,12 @@ Public Module ModBase
 #Region "声明"

    '下列版本信息由更新器自动修改
-    Public Const VersionBaseName As String = "2.6.7" '不含分支前缀的显示用版本名
-    Public Const VersionStandardCode As String = "2.6.7." & VersionBranchCode '标准格式的四段式版本号
+    Public Const VersionBaseName As String = "2.6.8" '不含分支前缀的显示用版本名
+    Public Const VersionStandardCode As String = "2.6.8." & VersionBranchCode '标准格式的四段式版本号
 #If BETA Then
-    Public Const VersionCode As Integer = 302 'Release
+    Public Const VersionCode As Integer = 304 'Release
 #Else
-    Public Const VersionCode As Integer = 303 'Snapshot
+    Public Const VersionCode As Integer = 305 'Snapshot
 #End If
    '自动生成的版本信息
    Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName
@@ -1242,23 +1242,7 @@ Re:
    Public Function ExtractFile(CompressFilePath As String, DestDirectory As String, Optional Encode As Encoding = Nothing) As Boolean
        Try
            Directory.CreateDirectory(DestDirectory)
-            If CompressFilePath.EndsWith(".zip") OrElse CompressFilePath.EndsWith(".jar") OrElse CompressFilePath.EndsWith(".mrpack") Then
-                '以 zip 方式解压
-                Using stream As New FileStream(CompressFilePath, FileMode.Open)
-                    Using archive As New ZipArchive(stream, ZipArchiveMode.Read, False, If(Encode, Encoding.GetEncoding("GB18030")))
-                        For Each entry As ZipArchiveEntry In archive.Entries
-                            Dim destinationPath As String = IO.Path.Combine(DestDirectory, entry.FullName)
-                            If destinationPath.EndsWith("\") OrElse destinationPath.EndsWith("/") Then
-                                Directory.CreateDirectory(destinationPath)
-                            Else
-                                If File.Exists(destinationPath) Then File.Delete(destinationPath)
-                                entry.ExtractToFile(destinationPath, True)
-                            End If
-                        Next
-                    End Using
-                End Using
-                Return True
-            ElseIf CompressFilePath.EndsWith(".gz") Then
+            If CompressFilePath.EndsWith(".gz") Then
                '以 gz 方式解压
                Dim stream As New GZipStream(New FileStream(CompressFilePath, FileMode.Open, FileAccess.ReadWrite), CompressionMode.Decompress)
                Dim decompressedFile As New FileStream(DestDirectory & GetFileNameFromPath(CompressFilePath).ToLower.Replace(".tar", "").Replace(".gz", ""), FileMode.OpenOrCreate, FileAccess.Write)
@@ -1271,7 +1255,19 @@ Re:
                stream.Close()
                Return True
            Else
-                Return False
+                '以 zip 方式解压
+                Using Archive = ZipFile.Open(CompressFilePath, ZipArchiveMode.Read, If(Encode, Encoding.GetEncoding("GB18030")))
+                    For Each Entry As ZipArchiveEntry In Archive.Entries
+                        Dim DestinationPath As String = IO.Path.Combine(DestDirectory, Entry.FullName)
+                        If DestinationPath.EndsWith("\") OrElse DestinationPath.EndsWith("/") Then
+                            Continue For '不创建空文件夹
+                        Else
+                            Directory.CreateDirectory(GetPathFromFullPath(DestinationPath))
+                            Entry.ExtractToFile(DestinationPath, True)
+                        End If
+                    Next
+                End Using
+                Return True
            End If
        Catch ex As Exception
            Log(ex, "尝试解压文件失败")
@@ -1301,7 +1297,7 @@ Re:
        Next
        Temp = Directory.GetDirectories(Path)
        For Each str As String In Temp
-            DeleteDirectory(str)
+            DeleteDirectory(str, IgnoreIssue)
        Next
        Try
            Directory.Delete(Path, True)
@@ -1578,7 +1574,7 @@ Re:
    ''' 为字符串进行 XML 转义。
    ''' </summary>
    Public Function EscapeXML(Str As String) As String
-        Return Str.Replace("&", "&amp;").Replace("<", "&lt;").Replace(">", "&gt;").Replace("'", "&apos;").Replace("""", "&quot;")
+        Return Str.Replace("&", "&amp;").Replace("<", "&lt;").Replace(">", "&gt;").Replace("'", "&apos;").Replace("""", "&quot;").Replace(vbCrLf, "&#xa;")
    End Function

    '正则
@@ -437,10 +437,6 @@
                            For Each Loader In Loaders
                                Loader.Abort()
                            Next
-                            '从列表删除
-                            SyncLock LoaderTaskbarLock
-                                If LoaderTaskbar.Contains(Me) Then LoaderTaskbar.Remove(Me)
-                            End SyncLock
                        End Sub)
        End Sub

@@ -571,6 +567,7 @@ Restart:
        If FrmSpeedLeft IsNot Nothing Then FrmSpeedLeft.TaskRemove(Loader)
        SyncLock LoaderTaskbarLock
            LoaderTaskbar.Add(Loader)
+            Log($"[Taskbar] {Loader.Name} 已加入任务列表")
        End SyncLock
    End Sub
    Public Sub LoaderTaskbarProgressRefresh()
@@ -585,16 +582,13 @@ Restart:
                    If Loader.Show AndAlso Loader.State = LoadState.Loading Then IsAllDownloadTaskCompleted = False
                Next
                '若单个任务已中止或全部任务已完成，则刷新并移除
-                Dim RemovedTask As New List(Of LoaderBase)
-                For i = 0 To LoaderTaskbar.Count - 1
-                    If (IsAllDownloadTaskCompleted OrElse LoaderTaskbar(i).State = LoadState.Aborted) AndAlso LoaderTaskbar(i).Show Then
-                        If FrmSpeedLeft IsNot Nothing Then FrmSpeedLeft.TaskRefresh(LoaderTaskbar(i))
-                        RemovedTask.Add(LoaderTaskbar(i))
+                For Each Task In LoaderTaskbar.ToList()
+                    If (IsAllDownloadTaskCompleted OrElse Task.State = LoadState.Aborted OrElse Task.State = LoadState.Waiting) AndAlso Task.Show Then
+                        If FrmSpeedLeft IsNot Nothing Then FrmSpeedLeft.TaskRefresh(Task)
+                        LoaderTaskbar.Remove(Task)
+                        Log($"[Taskbar] {Task.Name} 已移出任务列表")
                    End If
                Next
-                For Each Task In RemovedTask
-                    LoaderTaskbar.Remove(Task)
-                Next
            End SyncLock
            '更新平滑后的进度
            If NewProgress <= 0 OrElse NewProgress >= 1 OrElse LoaderTaskbarProgress > NewProgress Then
@@ -625,8 +619,9 @@ Restart:
        Try
            Dim Total As Double = 0, Count As Integer = 0
            SyncLock LoaderTaskbarLock
-                For i = 0 To LoaderTaskbar.Count - 1
-                    Total += LoaderTaskbar(i).Progress
+                For Each Task In LoaderTaskbar.ToList
+                    If Not Task.Show Then Continue For
+                    Total += Task.Progress
                    Count += 1 '避免多线程影响导致计数出错
                Next
            End SyncLock
@@ -28,7 +28,7 @@ Public Class MyBitmap
    Public Shared Widening Operator CType(Image As MyBitmap) As ImageSource
        Dim Bitmap = Image.Pic
        Dim rect = New System.Drawing.Rectangle(0, 0, Bitmap.Width, Bitmap.Height)
-        Dim bitmapData = Bitmap.LockBits(rect, System.Drawing.Imaging.ImageLockMode.ReadWrite, System.Drawing.Imaging.PixelFormat.Format32bppArgb)
+        Dim bitmapData = Bitmap.LockBits(rect, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb)
        Try
            Dim size = rect.Width * rect.Height * 4
            Return BitmapSource.Create(Bitmap.Width, Bitmap.Height, Bitmap.HorizontalResolution, Bitmap.VerticalResolution, PixelFormats.Bgra32, Nothing, bitmapData.Scan0, size, bitmapData.Stride)
@@ -104,45 +104,27 @@ Public Class MyBitmap
        End Using
    End Sub

-    ''' <summary>
-    ''' 获取旋转的图片，这个方法不会导致原对象改变且会返回一个新的对象。图片长宽必须相等。
-    ''' </summary>
-    ''' <param name="angle">旋转角度（单位为角度）。</param>
-    Public Function Rotation(angle As Double) As System.Drawing.Bitmap
-        Dim img As System.Drawing.Image = Me.Pic
-        Dim bitSize As Single = img.Width
-        Dim bmp As New System.Drawing.Bitmap(CInt(bitSize), CInt(bitSize), img.PixelFormat)
-        bmp.SetResolution(img.HorizontalResolution, img.VerticalResolution)
-        Using g As System.Drawing.Graphics = System.Drawing.Graphics.FromImage(bmp)
-            g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor
-            g.TranslateTransform(bitSize / 2, bitSize / 2)
-            g.RotateTransform(angle)
-            g.TranslateTransform(-bitSize / 2, -bitSize / 2)
-            g.DrawImage(img, New System.Drawing.Rectangle(0, 0, img.Width, img.Width))
-        End Using
-        Return bmp
-    End Function
-
    ''' <summary>
    ''' 获取裁切的图片，这个方法不会导致原对象改变且会返回一个新的对象。
    ''' </summary>
-    Public Function Clip(rect As System.Drawing.Rectangle) As System.Drawing.Bitmap
-        Dim img As System.Drawing.Image = Pic
-        Dim bmp As New System.Drawing.Bitmap(rect.Width, rect.Height, img.PixelFormat)
-        bmp.SetResolution(img.HorizontalResolution, img.VerticalResolution)
+    Public Function Clip(X As Integer, Y As Integer, Width As Integer, Height As Integer) As MyBitmap
+        Dim bmp As New System.Drawing.Bitmap(Width, Height, Pic.PixelFormat)
+        bmp.SetResolution(Pic.HorizontalResolution, Pic.VerticalResolution)
        Using g As System.Drawing.Graphics = System.Drawing.Graphics.FromImage(bmp)
            g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor
-            g.DrawImageUnscaled(img, rect.X, rect.Y)
+            g.TranslateTransform(-X, -Y)
+            g.DrawImage(Pic, New System.Drawing.Rectangle(0, 0, Pic.Width, Pic.Height))
        End Using
        Return bmp
    End Function

    ''' <summary>
-    ''' 获取左右翻转的图片，这个方法不会导致原对象改变。
+    ''' 获取旋转或翻转后的图片，这个方法不会导致原对象改变且会返回一个新的对象。
    ''' </summary>
-    Public Function LeftRightFilp() As System.Drawing.Bitmap
+    Public Function RotateFlip(Type As System.Drawing.RotateFlipType) As MyBitmap
        Dim bmp As New System.Drawing.Bitmap(Pic)
-        bmp.RotateFlip(System.Drawing.RotateFlipType.RotateNoneFlipX)
+        bmp.SetResolution(Pic.HorizontalResolution, Pic.VerticalResolution)
+        bmp.RotateFlip(Type)
        Return bmp
    End Function

@@ -152,7 +134,7 @@ Public Class MyBitmap
    Public Sub Save(FilePath As String)
        Dim encoder As BitmapEncoder = New PngBitmapEncoder()
        encoder.Frames.Add(BitmapFrame.Create(Me))
-        Using fileStream = New System.IO.FileStream(FilePath, FileMode.Create)
+        Using fileStream As New FileStream(FilePath, FileMode.Create)
            encoder.Save(fileStream)
        End Using
    End Sub