open-source/123pan
1
0
Fork 0
mirror of https://github.com/Bao-qing/123pan.git synced 2025-11-13 12:16:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 递归下载

Browse Source
This commit is contained in:
qing 2024-09-27 12:29:46 +08:00
parent 4634208049
commit 4c26f5cab8
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
android.py
View File

@ -121,7 +121,7 @@ class Pan123:
lenth_now = 0 lenth_now = 0
total = -1 total = -1
while lenth_now < total or total == -1: while lenth_now < total or total == -1:
base_url = "https://www.123pan.com/b/api/file/list/new" base_url = "https://www.123pan.com/api/file/list/new"
# print(self.headerLogined) # print(self.headerLogined)
# sign = getSign("/b/api/file/list/new") # sign = getSign("/b/api/file/list/new")
# print(sign) # print(sign)
@ -139,7 +139,7 @@ class Pan123:
"OnlyLookAbnormalFile": 0, "OnlyLookAbnormalFile": 0,
} }
try: try:
a = requests.get(base_url, headers=self.header_logined, params=params, timeout=10) # , verify=False) a = requests.get(base_url, headers=self.header_logined, params=params, timeout=30) # , verify=False)
except: except:
print("连接失败") print("连接失败")
return -1, [] return -1, []
@ -151,6 +151,7 @@ class Pan123:
# print(a.text) # print(a.text)
# print(a.headers) # print(a.headers)
print("code = 2 Error:" + str(res_code_getdir)) print("code = 2 Error:" + str(res_code_getdir))
print(text["message"])
return res_code_getdir, [] return res_code_getdir, []
lists_page = text["data"]["InfoList"] lists_page = text["data"]["InfoList"]
lists += lists_page lists += lists_page
@ -299,7 +300,7 @@ class Pan123:
data_count = data_count + len(i) data_count = data_count + len(i)
# 实时进度条进度 # 实时进度条进度
now_jd = (data_count / content_size) * 100 now_jd = (data_count / content_size) * 100
# %% 表示% # "%%" 表示%
# 测速 # 测速
time1 = time.time() time1 = time.time()
pass_time = time1 - time_temp pass_time = time1 - time_temp
@ -345,20 +346,16 @@ class Pan123:
for i in self.dir_list: for i in self.dir_list:
self.get_all_things(i) self.get_all_things(i)
def download_dir(self,file_number,download_path_root="download"): def download_dir(self,file_detail,download_path_root="download"):
file_detail = self.list[file_number] # file_detail = self.list[file_number]
self.name_dict[file_detail["FileId"]] = file_detail["FileName"]
if file_detail["Type"] != 1: if file_detail["Type"] != 1:
print("不是文件夹") print("不是文件夹")
return return
self.file_list = [] all_list = self.get_dir_by_id(file_detail["FileId"], save=False)[1]
self.dir_list = [file_detail["FileId"]] for i in all_list[::-1]:
self.name_dict = {file_detail["FileId"]:file_detail["FileName"]} if i["Type"] == 0: # 直接开始下载
self.get_all_things(file_detail["FileId"])
# print(self.file_list)
# print(self.dir_list)
# print(self.name_dict)
for i in self.file_list:
AbsPath = i["AbsPath"] AbsPath = i["AbsPath"]
for key,value in self.name_dict.items(): for key,value in self.name_dict.items():
AbsPath = AbsPath.replace(str(key),value) AbsPath = AbsPath.replace(str(key),value)
@ -366,7 +363,9 @@ class Pan123:
download_path = download_path.replace("/"+str(i["FileId"]),"") download_path = download_path.replace("/"+str(i["FileId"]),"")
self.download_from_url(i["DownloadUrl"],i["FileName"],download_path) self.download_from_url(i["DownloadUrl"],i["FileName"],download_path)
self.download_mode = 1 else:
self.download_dir(i,download_path_root)
def recycle(self): def recycle(self):
recycle_id = 0 recycle_id = 0
@ -833,7 +832,8 @@ if __name__ == "__main__":
if sure == "2": if sure == "2":
pan.download(int(command[9:]) - 1) pan.download(int(command[9:]) - 1)
elif sure == "1": elif sure == "1":
pan.download_dir(int(command[9:]) - 1) file_detail = pan.list[int(command[9:]) - 1]
pan.download_dir(file_detail)
else: else:
pan.download(int(command[9:]) - 1) pan.download(int(command[9:]) - 1)