From e4c7b81fa338bfc1bb5b7adc6f0788ee55d3228e Mon Sep 17 00:00:00 2001
From: g1879 <g1879@qq.com>
Date: Thu, 28 May 2020 17:01:00 +0800
Subject: [PATCH] =?UTF-8?q?download()=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=A1=E6=81=AF=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrissionPage/session_page.py | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/DrissionPage/session_page.py b/DrissionPage/session_page.py
index 6ad4963..502bb8d 100644
--- a/DrissionPage/session_page.py
+++ b/DrissionPage/session_page.py
@@ -109,8 +109,17 @@ class SessionPage(object):
         self._url_available = True if self._response and self._response.status_code == 200 else False
         return self._url_available
 
-    def download(self, file_url: str, goal_path: str = None, rename: str = None, **kwargs) -> tuple:
-        """下载一个文件，生成的response不写入self._response，是临时的"""
+    def download(self, file_url: str, goal_path: str = None, rename: str = None, show_msg: bool = False,
+                 **kwargs) -> tuple:
+        """下载一个文件
+        生成的response不写入self._response，是临时的
+        :param file_url: 文件url
+        :param goal_path: 存放路径url
+        :param rename: 重命名
+        :param kwargs: 连接参数
+        :param show_msg: 是否显示下载信息
+        :return: 元组，bool和状态信息（成功时信息为文件名）
+        """
         goal_path = goal_path or OptionsManager().get_value('paths', 'global_tmp_path')
         if not goal_path:
             raise IOError('No path specified.')
@@ -121,7 +130,8 @@ class SessionPage(object):
 
         r = self._make_response(file_url, mode='get', **kwargs)
         if not r:
-            print('Invalid link')
+            if show_msg:
+                print('Invalid link')
             return False, 'Invalid link'
         # -------------------获取文件名-------------------
         # header里有文件名，则使用它，否则在url里截取，但不能保证url包含文件名
@@ -135,8 +145,9 @@ class SessionPage(object):
         # 避免和现有文件重名
         file_full_name = avoid_duplicate_name(goal_path, file_full_name)
         # 打印要下载的文件
-        print_txt = file_full_name if file_name == file_full_name else f'{file_name} -> {file_full_name}'
-        print(print_txt)
+        if show_msg:
+            print_txt = file_full_name if file_name == file_full_name else f'{file_name} -> {file_full_name}'
+            print(print_txt)
         # -------------------开始下载-------------------
         # 获取远程文件大小
         file_size = int(r.headers['Content-Length']) if 'Content-Length' in r.headers else None
@@ -166,7 +177,8 @@ class SessionPage(object):
                 full_path.unlink()
             r.close()
         # -------------------显示并返回值-------------------
-        print(info, '\n')
+        if show_msg:
+            print(info, '\n')
         info = file_full_name if download_status else info
         return download_status, info