From 02dbd4ea8331948eaeb9865eb407f65c5c5f8d75 Mon Sep 17 00:00:00 2001
From: ForgQi <34411314+ForgQi@users.noreply.github.com>
Date: Sat, 26 May 2018 01:08:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Engine/upload.py | 27 +++++++++++++++------------
 requirements.txt |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Engine/upload.py b/Engine/upload.py
index b69d29c..9153b68 100644
--- a/Engine/upload.py
+++ b/Engine/upload.py
@@ -122,12 +122,6 @@ class Upload(Enginebase):
             logger.info('开始上传' + title_)
             upload.send_keys(videopath)  # send_keys
 
-            time.sleep(1)
-            if self.is_element_exist(driver, r'//*[@id="app"]/div[3]/div/div/div/div/div'):
-                sb = driver.find_element_by_xpath(r'//*[@id="app"]/div[3]/div/div/div/div/div')
-
-                sb.click()
-
             while True:
                 info = driver.find_elements_by_xpath(
                     '//*[@id="item"]/div/div[2]/div[3]/div[1]/div[1]/div/div/div[2]/div[1]/div[3]')
@@ -152,9 +146,11 @@ class Upload(Enginebase):
                     break
             logger.info('上传%s\n个数%s' % (title_, len(info)))
 
-            js = "var q=document.getElementsByClassName('content-header-right')[0].scrollIntoView();"
-            driver.execute_script(js)
-
+            # js = "var q=document.getElementsByClassName('content-header-right')[0].scrollIntoView();"
+            # driver.execute_script(js)
+            if self.is_element_exist(driver, r'//*[@id="app"]/div[3]/div/div/div/div/div'):
+                sb = driver.find_element_by_xpath(r'//*[@id="app"]/div[3]/div/div/div/div/div')
+                sb.click()
             # 点击模板
             driver.find_element_by_xpath(r'//*[@id="item"]/div/div[2]/div[3]/div[2]/div[1]/div[2]/div[1]').click()
             driver.find_element_by_xpath(r'//*[@id="item"]/div/div[2]/div[3]/div[2]/div[1]/div[3]/div[1]').click()
@@ -164,6 +160,10 @@ class Upload(Enginebase):
                 '//*[@id="item"]/div/div[2]/div[3]/div[2]/div[2]/div[1]/div[1]/div[3]/div/div[1]/div/input')
             Input.send_keys(link)
 
+            # 选择分区
+            # driver.find_element_by_xpath(r'//*[@id="item"]/div/div[2]/div[3]/div[2]/div[2]/div[1]/div[2]/div[2]/div[1]/div[3]/div').click()
+            # driver.find_element_by_xpath(r'//*[@id="item"]/div/div[2]/div[3]/div[2]/div[2]/div[1]/div[2]/div[2]/div[1]/div[3]/div[2]/div[6]').click()
+
             # 稿件标题
             title = driver.find_element_by_xpath(
                 '//*[@id="item"]/div/div[2]/div[3]/div[2]/div[2]/div[1]/div[3]/div[2]/div[1]/div/input')
@@ -171,10 +171,13 @@ class Upload(Enginebase):
             title.send_keys(Keys.BACKSPACE)
             title.send_keys(title_)
 
+            # js = "var q=document.getElementsByClassName('content-tag-list')[0].scrollIntoView();"
+            # driver.execute_script(js)
+
             # 输入相关游戏
-            # text_1 = driver.find_element_by_xpath(
-            #     '//*[@id="item"]/div/div[2]/div[3]/div[2]/div[2]/div[1]/div[5]/div/div/div[1]/div[2]/div/div/input')
-            text_1 = driver.find_element_by_css_selector(r'#item > div > div.upload-step-two-container > div.step-2-col-right > div.content-container > div.content-body > div.content-normal-container > div.content-desc-container > div > div > div:nth-child(1) > div.content-input-box-container > div > div > input[type="text"]')
+            text_1 = driver.find_element_by_xpath(
+                '//*[@id="item"]/div/div[2]/div[3]/div[2]/div[2]/div[1]/div[5]/div/div/div[1]/div[2]/div/div/input')
+            # text_1 = driver.find_element_by_css_selector(r'#item > div > div.upload-step-two-container > div.step-2-col-right > div.content-container > div.content-body > div.content-normal-container > div.content-desc-container > div > div > div:nth-child(1) > div.content-input-box-container > div > div > input[type="text"]')
             text_1.send_keys('星际争霸2')
             # 简介
             text_2 = driver.find_element_by_xpath(
diff --git a/requirements.txt b/requirements.txt
index ffb44f1..b5f7a9f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 selenium==3.8.1
 psutil==5.4.3
-youtube_dl==2018.1.14
+youtube_dl==2018.5.18
 Requests==2.18.4