From 86e4aa483f39fcf0cdb930bc297af0fc8a287c9d Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Thu, 18 Apr 2019 10:37:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E7=BC=96=E7=A0=81=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Common.py         |  2 ++
 WebMain.py        | 16 ++++++++++++++++
 liveDownloader.py | 13 +++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/Common.py b/Common.py
index 9bb2a11..ad6328f 100644
--- a/Common.py
+++ b/Common.py
@@ -98,6 +98,8 @@ forceNotDownload = False
 forceNotBroadcasting = False
 forceNotUpload = False
 forceNotEncode = False
+forceStartEncodeThread = False
+forceStartUploadThread = False
 
 uploadQueue = queue.Queue()
 encodeQueue = queue.Queue()
diff --git a/WebMain.py b/WebMain.py
index 3f6ae5e..e95e7fd 100644
--- a/WebMain.py
+++ b/WebMain.py
@@ -72,6 +72,22 @@ def toggleForceNotBroadcast():
     }})
 
 
+@app.route("/force/start/encode", methods=["POST"])
+def toggleForceStartEncodeThread():
+    Common.forceStartEncodeThread = True
+    Common.appendOperation("强制运行编码线程")
+    return jsonify({"message":"ok","code":200,"status":0,"data":{
+    }})
+
+
+@app.route("/force/start/upload", methods=["POST"])
+def toggleForceStartEncodeThread():
+    Common.forceStartUploadThread = True
+    Common.appendOperation("强制运行上传线程")
+    return jsonify({"message":"ok","code":200,"status":0,"data":{
+    }})
+
+
 @app.route("/encode/insert", methods=["POST"])
 def insertEncode():
     if "filename" in request.form and os.path.exists(request.form["filename"]):
diff --git a/liveDownloader.py b/liveDownloader.py
index 7d95f2c..f3aa933 100644
--- a/liveDownloader.py
+++ b/liveDownloader.py
@@ -174,3 +174,16 @@ def run():
                 _count_error = 0
             except Exception as e:
                 Common.appendError(e.__str__())
+            if Common.forceStartEncodeThread:
+                if not et.is_alive():
+                    et = threading.Thread(target=encode, args=())
+                    et.setDaemon(True)
+                    et.start()
+                Common.forceStartEncodeThread = False
+            if Common.forceStartUploadThread:
+                if not ut.is_alive():
+                    d = datetime.strftime(datetime.now(), "%Y_%m_%d")
+                    ut = threading.Thread(target=upload, args=(d,))
+                    ut.setDaemon(True)
+                    ut.start()
+                Common.forceStartEncodeThread = False