From 78fe5582e6e990a2ef547ede4e6ec526523db2db Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Mon, 8 Apr 2019 21:13:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebMain.py        | 22 ++++++++++++++++++++--
 liveDownloader.py |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/WebMain.py b/WebMain.py
index ff679b5..2001edd 100644
--- a/WebMain.py
+++ b/WebMain.py
@@ -6,6 +6,7 @@ from flask import Flask, jsonify, request, redirect, render_template, Response
 import Common
 import threading
 from liveDownloader import run as RUN
+import psutil
 
 app = Flask("liveStatus")
 app.config['JSON_AS_ASCII'] = False
@@ -57,6 +58,7 @@ def finishUpload():
 
 @app.route("/stats", methods=["GET"])
 def getAllStats():
+    _disk = psutil.disk_usage("/")
     return jsonify({"message":"ok","code":200,"status":0,"data":{
         "download":Common.downloadStatus,
         "encode": Common.encodeStatus,
@@ -74,8 +76,24 @@ def getAllStats():
             "forceNotBroadcasting": Common.forceNotBroadcasting,
             "forceStopDownload": Common.forceStopDownload,
             "forceNotUpload": Common.forceNotUpload,
-            "forceNotEncode": Common.forceNotEncode,
-        }
+        },
+    }})
+
+
+@app.route("/stats/device", methods=["GET"])
+def getDeviceStatus():
+    _disk = psutil.disk_usage("/")
+    _mem  = psutil.virtual_memory()
+    return jsonify({"message":"ok","code":200,"status":0,"data":{
+        "status": {
+            "memTotal": Common.parseSize(_mem.total),
+            "memUsed": Common.parseSize(_mem.used),
+            "memUsage": _mem.percent,
+            "diskTotal": Common.parseSize(_disk.total),
+            "diskUsed": Common.parseSize(_disk.used),
+            "diskUsage": _disk.percent,
+            "cpu": psutil.cpu_percent(),
+        },
     }})
 
 
diff --git a/liveDownloader.py b/liveDownloader.py
index 703c844..036ea67 100644
--- a/liveDownloader.py
+++ b/liveDownloader.py
@@ -69,8 +69,8 @@ def encode():
 
 
 def upload(date=datetime.strftime(datetime.now(), "%Y_%m_%d")):
-    i = uploadQueue.get()
     appendUploadStatus("Upload Daemon Starting")
+    i = uploadQueue.get()
     while True:
         if forceNotUpload:
             modifyLastUploadStatus("设置了不上传，所以[{}]不会上传了".format(i))