windows下插入U盘,访问U盘时会出现错误

kazgu · Feb 17, 2019 · 620377f · 620377f
1 parent df8e09c
commit 620377f
Show file tree

Hide file tree

Showing 20 changed files with 15 additions and 7 deletions.
diff --git a/__pycache__/index.cpython-37.pyc b/__pycache__/index.cpython-37.pyc
diff --git a/config/__pycache__/config.cpython-37.pyc b/config/__pycache__/config.cpython-37.pyc
diff --git a/lib/__pycache__/extract.cpython-37.pyc b/lib/__pycache__/extract.cpython-37.pyc
diff --git a/lib/__pycache__/task.cpython-37.pyc b/lib/__pycache__/task.cpython-37.pyc
diff --git a/lib/__pycache__/writeRes.cpython-37.pyc b/lib/__pycache__/writeRes.cpython-37.pyc
diff --git a/route/PenetrationSend.py b/route/PenetrationSend.py
@@ -13,9 +13,13 @@ def PenetrationSendFunc():
     diskTotal = 0
     diskUsed = 0
     for i in io:
-        o = psutil.disk_usage(i.mountpoint)
-        diskTotal += o.total
-        diskUsed += o.used
+        #windows下插入U盘,访问U盘时会出现"设备未就绪"
+        try:
+            o = psutil.disk_usage(i.mountpoint)
+            diskTotal += o.total
+            diskUsed += o.used
+        except:
+            pass
     response = make_response(json.dumps({
         'cpu':psutil.cpu_percent(0.5),
         'memory':round(m.used/m.total, 3),

diff --git a/route/__pycache__/__init__.cpython-37.pyc b/route/__pycache__/__init__.cpython-37.pyc
diff --git a/route/__pycache__/controlPanel.cpython-37.pyc b/route/__pycache__/controlPanel.cpython-37.pyc
diff --git a/route/__pycache__/controlWin.cpython-37.pyc b/route/__pycache__/controlWin.cpython-37.pyc
diff --git a/route/__pycache__/echarts.cpython-37.pyc b/route/__pycache__/echarts.cpython-37.pyc
diff --git a/route/__pycache__/file.cpython-37.pyc b/route/__pycache__/file.cpython-37.pyc
diff --git a/route/__pycache__/linkButton.cpython-37.pyc b/route/__pycache__/linkButton.cpython-37.pyc
diff --git a/route/__pycache__/login.cpython-37.pyc b/route/__pycache__/login.cpython-37.pyc
diff --git a/route/__pycache__/plugins.cpython-37.pyc b/route/__pycache__/plugins.cpython-37.pyc
diff --git a/route/__pycache__/process.cpython-37.pyc b/route/__pycache__/process.cpython-37.pyc
diff --git a/route/__pycache__/setTask.cpython-37.pyc b/route/__pycache__/setTask.cpython-37.pyc
diff --git a/route/__pycache__/webssh.cpython-37.pyc b/route/__pycache__/webssh.cpython-37.pyc
diff --git a/route/echarts.py b/route/echarts.py
@@ -28,10 +28,14 @@ def GetPie():
         diskUsed = 0    #已用
         diskFree = 0    #剩余
         for i in io:
-            o = psutil.disk_usage(i.mountpoint)
-            diskTotal += int(o.total/(1024.0*1024.0*1024.0))
-            diskUsed += int(o.used/(1024.0*1024.0*1024.0))
-            diskFree += int(o.free/(1024.0*1024.0*1024.0))
+            try:
+                #若windows下插入U盘,访问U盘磁盘时,会出现"设备未就绪的错误"
+                o = psutil.disk_usage(i.mountpoint)
+                diskTotal += int(o.total/(1024.0*1024.0*1024.0))
+                diskUsed += int(o.used/(1024.0*1024.0*1024.0))
+                diskFree += int(o.free/(1024.0*1024.0*1024.0))
+            except:
+                pass
         resJson = []
         resJson.append({
                 'ttl':'CPU状态',

diff --git a/sqlitedb/__pycache__/sqlitedb.cpython-37.pyc b/sqlitedb/__pycache__/sqlitedb.cpython-37.pyc
diff --git a/sqlitedb/mange.db b/sqlitedb/mange.db