即使停用也检查存储设备插拔

bigbrobro · May 26, 2016 · c628373 · c628373
1 parent c5b7e81
commit c628373
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 27 deletions.
diff --git a/.vs/USBCopyer/v14/.suo b/.vs/USBCopyer/v14/.suo
diff --git a/USBCopyer/Host.cs b/USBCopyer/Host.cs
@@ -20,6 +20,7 @@ public partial class Host : Form
         public string[] blackid;
         public FileStream logf;
         public StreamWriter logw;
+        //public Dictionary<string,Thread> copyThread = new Dictionary<string,Thread>(); //正在复制文件的线程 分区号=>线程
         public Host()
         {
             InitializeComponent();
@@ -142,7 +143,7 @@ private void ExitXToolStripMenuItem_Click(object sender, EventArgs e)
 
         protected override void DefWndProc(ref Message m)
         {
-            if (m.Msg == 0x0219 && EnableToolStripMenuItem.Checked)
+            if (m.Msg == 0x0219)
             {
                 string disk = string.Empty;
                 if(m.WParam.ToInt32() == 0x8000) {
@@ -157,37 +158,40 @@ protected override void DefWndProc(ref Message m)
                             ManagementObject diskinfo = new ManagementObject("win32_logicaldisk.deviceid=\""+disk+"\"");
                             string diskser = diskinfo.Properties["VolumeSerialNumber"].Value.ToString();
                             msg(disk + " - " + diskser, "存储设备已插入");
-                            if (blackid.Contains(diskser))
+                            if(EnableToolStripMenuItem.Checked)
                             {
-                                log("黑名单磁盘序列号号：" + diskser + " 取消复制！");
-                                return;
-                            }
-                            if (blackdisk.Contains(disk.Substring(0, 1)))
-                            {
-                                log("黑名单分区号：" + disk + " 取消复制！");
-                                return;
-                            }
-                            Thread th = new Thread(() =>
-                            {
-                                if(Properties.Settings.Default.sleep > 0)
+                                if (blackid.Contains(diskser))
                                 {
-                                    log("延迟复制：将在 " + Properties.Settings.Default.sleep + "秒后进行复制");
-                                    Thread.Sleep(Properties.Settings.Default.sleep * 1000);
-                                    if(!Directory.Exists(disk + "\\"))
-                                    {
-                                        log("在延迟复制期间存储设备已拔出，复制取消：" + disk + " - " + diskser,1);
-                                        return;
-                                    }
+                                    log("黑名单磁盘序列号：" + diskser + " 取消复制！");
+                                    return;
                                 }
-                                if(Properties.Settings.Default.autorm && Directory.Exists(dir + diskser))
+                                if (blackdisk.Contains(disk.Substring(0, 1)))
                                 {
-                                    log("清空输出目录：" + dir + diskser);
-                                    Directory.Delete(dir + diskser, true);
+                                    log("黑名单分区号：" + disk + " 取消复制！");
+                                    return;
                                 }
-                                CopyDirectory(disk + "\\", dir + diskser);
-                                log("设备数据复制完成：" + disk + " - " + diskser);
-                            });
-                            th.Start();
+                                Thread th = new Thread(() =>
+                                {
+                                    if(Properties.Settings.Default.sleep > 0)
+                                    {
+                                        log("延迟复制：将在 " + Properties.Settings.Default.sleep + "秒后进行复制");
+                                        Thread.Sleep(Properties.Settings.Default.sleep * 1000);
+                                        if(!Directory.Exists(disk + "\\"))
+                                        {
+                                            log("在延迟复制期间存储设备已拔出，复制取消：" + disk + " - " + diskser,1);
+                                            return;
+                                        }
+                                    }
+                                    if(Properties.Settings.Default.autorm && Directory.Exists(dir + diskser))
+                                    {
+                                        log("清空输出目录：" + dir + diskser);
+                                        Directory.Delete(dir + diskser, true);
+                                    }
+                                    CopyDirectory(disk + "\\", dir + diskser);
+                                    log("设备数据复制完成：" + disk + " - " + diskser);
+                                });
+                                th.Start();
+                            }
                         }
                     }
                 }

diff --git a/USBCopyer/bin/Release/USBCopyer.exe b/USBCopyer/bin/Release/USBCopyer.exe
diff --git a/USBCopyer/bin/Release/USBCopyer.pdb b/USBCopyer/bin/Release/USBCopyer.pdb
diff --git a/USBCopyer/obj/Release/USBCopyer.exe b/USBCopyer/obj/Release/USBCopyer.exe
diff --git a/USBCopyer/obj/Release/USBCopyer.pdb b/USBCopyer/obj/Release/USBCopyer.pdb