From bd2546dec34e9dc146df15d2b61620bdc67e0a8a Mon Sep 17 00:00:00 2001
From: ForgQi <34411314+ForgQi@users.noreply.github.com>
Date: Wed, 6 Jun 2018 16:44:31 +0800
Subject: [PATCH] 5.1

---
 bin/Engine/__init__.py | 11 ++++++++---
 bin/Engine/download.py |  2 +-
 bin/Engine/upload.py   |  3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bin/Engine/__init__.py b/bin/Engine/__init__.py
index 4287220..94375a6 100644
--- a/bin/Engine/__init__.py
+++ b/bin/Engine/__init__.py
@@ -41,10 +41,10 @@ class Enginebase(object):
         url = {}
         for n in self.urlpath:
             u = root_url[n] + self.urlpath[n]
+            url[n] = u
             cu = root_url.get(n + '_check')
             if cu:
                 url[n + '_check'] = cu + self.urlpath[n]
-            url[n] = u
         # print(url)
         return url
 
@@ -67,10 +67,15 @@ class Enginebase(object):
         return now
 
 
-if __name__ == '__main__':
+# if __name__ == '__main__':
     # for k in links_id.copy():
         # pd = Enginebase(dictionary=links_id, key=k, suffix='mp4')
         # pd.is_recursion(None)
         # if k == '星际2Scarlett噶姐虫族天梯第一视角':
         #     break
-    print(links_id)
+    # n = 'Twitch'
+    # cu = root_url.get(n + '_check')
+    # url = {}
+    # if cu:
+    #     url[n + '_check'] = cu
+    # print(url)
diff --git a/bin/Engine/download.py b/bin/Engine/download.py
index 1bf332d..9eb0f1f 100644
--- a/bin/Engine/download.py
+++ b/bin/Engine/download.py
@@ -68,7 +68,7 @@ class Downloadbase(Enginebase):
 
     def run(self, event):
         file_name = self.file_name
-        event.dict_['url'] = self.url[self.__class__.__name__]
+        # event.dict_['url'] = self.url[self.__class__.__name__]
         # if event.dict_.get('file_name'):
         #     event.dict_['file_name'] += [file_name]
         # else:
diff --git a/bin/Engine/upload.py b/bin/Engine/upload.py
index 7cb8ca0..e4f984b 100644
--- a/bin/Engine/upload.py
+++ b/bin/Engine/upload.py
@@ -252,7 +252,8 @@ class Upload(Enginebase):
 
     def start(self, event):
         # try:
-        url_ = event.dict_['url']
+        # url_ = event.dict_['url']
+        url_ = list(self.url.values())[0]
         if self.filter_file():
             logger.info('准备上传' + self.file_name)
             self.upload(self.file_list, link=url_)