20230527備份

FILE-RECORDER-SYS/FILE-RECORDER.vb

@@ -146,9 +146,22 @@ Public Class Form1
         If fbd.ShowDialog() = DialogResult.OK Then  '清除 DataGridView 中原本的資料
             資料夾位置_tb.Text = fbd.SelectedPath
             選取清單_dgv.Rows.Clear() : XX1 = 0 : MyModule1.計算結束()  '掃描該位置內所有檔案名稱
-            Dim files1() As String = IO.Directory.GetFiles(fbd.SelectedPath, "*.*", IO.SearchOption.AllDirectories)
-            For Each file As String In files1 : MyModule1.計算顯示1()
-                If 檔名_ch.Checked = True Then : 選取清單_dgv.Rows.Add(IO.Path.GetFileName(file)) : Else : 選取清單_dgv.Rows.Add(file) : End If : XX1 += 1
+
+            Dim files1() As String = IO.Directory.GetFiles(fbd.SelectedPath, "*.*", IO.SearchOption.TopDirectoryOnly)
+
+            For Each dir As String In IO.Directory.GetDirectories(fbd.SelectedPath)
+                If IO.Path.GetFileName(dir) = "System Volume Information" Or IO.Path.GetFileName(dir) = "$RECYCLE.BIN" Then Continue For
+                files1 = files1.Concat(IO.Directory.GetFiles(dir, "*.*", IO.SearchOption.AllDirectories)).ToArray()
+            Next
+
+            For Each file As String In files1
+                MyModule1.計算顯示1()
+                If 檔名_ch.Checked = True Then
+                    選取清單_dgv.Rows.Add(IO.Path.GetFileName(file))
+                Else
+                    選取清單_dgv.Rows.Add(file)
+                End If
+                XX1 += 1
             Next : MyModule1.計算結束()
         End If : 數量_lb.Text = "共 " & XX1 & " 個檔案"
     End Sub