修改页面样式，修复网速的准确度

Common.py

@@ -54,18 +54,18 @@ def doClean():
 def getCurrentStatus():
     _disk = psutil.disk_usage("/")
     _mem  = psutil.virtual_memory()
-    _net  = psutil.net_io_counters()
     _delta= getTimeDelta(datetime.now(),network["currentTime"])
-    if getTimeDelta(datetime.now(), _do_move_time) > 3600:
+    _net  = psutil.net_io_counters()
-        p = threading.Thread(target=doClean)
-        p.setDaemon(True)
-        p.start()
     if 60 > _delta > 0:
         _inSpeed = (_net.bytes_recv - network["in"]["currentByte"])/_delta
         _outSpeed = (_net.bytes_sent - network["out"]["currentByte"])/_delta
     else:
         _outSpeed = 0
         _inSpeed = 0
+    if getTimeDelta(datetime.now(), _do_move_time) > 3600:
+        p = threading.Thread(target=doClean)
+        p.setDaemon(True)
+        p.start()
     updateNetwork()
     return {
         "memTotal": parseSize(_mem.total),

liveDownloader.py

@@ -32,8 +32,7 @@ def download(url):
                 Common.modifyLastDownloadStatus("Download >{}< Exceed MaxSize".format(path))
                 break
     except Exception as e:
-        Common.appendError("Download >{}< With Exception {}".format(path, datetime.strftime(datetime.now(), "%y%m%d %H%M"),
+        Common.appendError("Download >{}< With Exception {}".format(path, e.__str__()))
-                                                               e.__str__()))
     f.close()
     isDownload = False
     Common.modifyLastDownloadStatus("Download >{}< Finished".format(path))

static/index.js

@@ -16,35 +16,35 @@ function taskUpdate(){
                 $("#download").html(function(){
                     var ret = ""
                     res.data.download.reverse().forEach(function(obj){
-                        ret += "<tr><td>" + obj.datetime + "</td><td>" + obj.message + "</td></tr>"
+                        ret += "<tr><td class='time'>" + obj.datetime + "</td><td>" + obj.message + "</td></tr>"
                     })
                     return "<table>" + ret + "</table>"
                 })
                 $("#encode").html(function(){
                     var ret = ""
                     res.data.encode.reverse().forEach(function(obj){
-                        ret += "<tr><td>" + obj.datetime + "</td><td>" + obj.message + "</td></tr>"
+                        ret += "<tr><td class='time'>" + obj.datetime + "</td><td>" + obj.message + "</td></tr>"
                     })
                     return "<table>" + ret + "</table>"
                 })
                 $("#upload").html(function(){
                     var ret = ""
                     res.data.upload.reverse().forEach(function(obj){
-                        ret += "<tr><td>" + obj.datetime + "</td><td>" + obj.message + "</td></tr>"
+                        ret += "<tr><td class='time'>" + obj.datetime + "</td><td>" + obj.message + "</td></tr>"
                     })
                     return "<table>" + ret + "</table>"
                 })
                 $("#error").html(function(){
                     var ret = ""
                     res.data.error.reverse().forEach(function(obj){
-                        ret += "<tr><td>" + obj.datetime + "</td><td>" + obj.message + "</td></tr>"
+                        ret += "<tr><td class='time'>" + obj.datetime + "</td><td>" + obj.message + "</td></tr>"
                     })
                     return "<table>" + ret + "</table>"
                 })
                 $("#operation").html(function(){
                     var ret = ""
                     res.data.operation.reverse().forEach(function(obj){
-                        ret += "<tr><td>" + obj.datetime + "</td><td>" + obj.message + "</td></tr>"
+                        ret += "<tr><td class='time'>" + obj.datetime + "</td><td>" + obj.message + "</td></tr>"
                     })
                     return "<table>" + ret + "</table>"
                 })

templates/device.html

@@ -1,22 +1,22 @@
     <h1>机器状态</h1>
     <table>
         <tr>
-            <td>CPU使用率</td>
+            <td class='title'>CPU使用率</td>
             <td><progress id="cpuP" max="100" value="0"></progress></td>
             <td><span id="cpu"></span>%</td>
         </tr>
         <tr>
-            <td>内存使用率</td>
+            <td class='title'>内存使用率</td>
             <td><progress id="memUsageP" max="100" value="0"></progress></td>
             <td><span id="memUsed"></span>/<span id="memTotal"></span>(<span id="memUsage"></span>%)</td>
         </tr>
         <tr>
-            <td>磁盘使用率</td>
+            <td class='title'>磁盘使用率</td>
             <td><progress id="diskUsageP" max="100" value="0"></progress></td>
             <td><span id="diskUsed"></span>/<span id="diskTotal"></span>(<span id="diskUsage"></span>%)</td>
         </tr>
         <tr>
-            <td>网络速率</td>
+            <td class='title'>网络速率</td>
             <td>↓ <span id="inSpeed"></span>/s</td>
             <td>↑ <span id="outSpeed"></span>/s</td>
         </tr>

templates/head.html

@@ -4,4 +4,10 @@
         td{
             border: solid 1px lightgray;
         }
+        .title{
+            width: 6em;
+        }
+        .time{
+            width: 10em;
+        }
     </style>

templates/index.html

@@ -49,23 +49,23 @@
     <h1>当前状态</h1>
     <table>
         <tr>
-            <td>下载日志</td>
+            <td class='title'>下载日志</td>
             <td><span id="download"></span></td>
         </tr>
         <tr>
-            <td>转码日志<br>队列<span id="encodeQueueSize"></span></td>
+            <td class='title'>转码日志<br>队列<span id="encodeQueueSize"></span></td>
             <td><span id="encode"></span></td>
         </tr>
         <tr>
-            <td>上传日志<br>队列<span id="uploadQueueSize"></span></td>
+            <td class='title'>上传日志<br>队列<span id="uploadQueueSize"></span></td>
             <td><span id="upload"></span></td>
         </tr>
         <tr>
-            <td>错误日志</td>
+            <td class='title'>错误日志</td>
             <td><span id="error"></span></td>
         </tr>
         <tr>
-            <td>操作日志</td>
+            <td class='title'>操作日志</td>
             <td><span id="operation"></span></td>
         </tr>
     </table>