From 83af0df5d48d6ce7775cfa169935058fadb90587 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Tue, 22 Oct 2019 21:46:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=99=86=E5=BB=B6=E8=BF=9F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Common.py         | 10 ++++++----
 WebMain.py        |  2 +-
 liveDownloader.py |  2 --
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Common.py b/Common.py
index 1ca03e0..ab4817c 100644
--- a/Common.py
+++ b/Common.py
@@ -1,6 +1,6 @@
 import os
 import queue
-from datetime import datetime
+from datetime import datetime, timedelta
 from glob import glob
 
 import psutil
@@ -38,7 +38,7 @@ config = {
     "enc": "ffmpeg -i {f} -c:v copy -c:a copy -f mp4 {t} -y"
 }
 doCleanTime = datetime.now()
-loginTime = datetime.now()
+loginTime = datetime.now() - timedelta(days=3)
 _clean_flag = None
 delay = 30
 b = Bilibili()
@@ -299,8 +299,8 @@ def appendError(obj):
     errors = errors[-config["elc"]:]
 
 
-def loginBilibili():
-    if "dlO" not in config or config["dlO"] is False or forceNotUpload is False:
+def loginBilibili(force=False):
+    if force or config["dlO"] is False or forceNotUpload is False:
         global loginTime
         if getTimeDelta(datetime.now(), loginTime) < 86400 * 3:
             return True
@@ -381,6 +381,8 @@ def uploadVideo(name):
     global isUpload
     if not os.path.exists(name):
         Common.appendError("Upload File Not Exist {}".format(name))
+    loginBilibili()
+    doClean()
     if forceNotUpload is False:
         isUpload = True
         b.preUpload(VideoPart(name, os.path.basename(name)))
diff --git a/WebMain.py b/WebMain.py
index 7f68bb5..b7119bc 100644
--- a/WebMain.py
+++ b/WebMain.py
@@ -204,7 +204,7 @@ def getUploadStats():
 
 @app.route("/account/reLogin", methods=["POST"])
 def accountRelogin():
-    Common.loginBilibili()
+    Common.loginBilibili(True)
     return jsonify({"message":"ok","code":200,"status":0,"data":{}})
 
 
diff --git a/liveDownloader.py b/liveDownloader.py
index a22d427..7b2f9f1 100644
--- a/liveDownloader.py
+++ b/liveDownloader.py
@@ -57,10 +57,8 @@ def encode():
 def upload():
     date=datetime.strftime(datetime.now(), "%Y_%m_%d")
     Common.appendUploadStatus("Upload Daemon Starting")
-    Common.loginBilibili()
     i = Common.uploadQueue.get()
     while True:
-        Common.doClean()
         if i is True:
             Common.publishVideo(date)
             break