使用随机设备，优化显示，优化大量文件的文件夹处理

android.py

@@ -1,12 +1,12 @@
 import hashlib
 import json
 import os
+import random
 import re
 import time
-
 import uuid
-import requests
 
+import requests
 
 
 class Pan123:
@@ -18,10 +18,112 @@ class Pan123:
             authorization="",
             input_pwd=True,
     ):
+
+        self.all_device_type = [
+            "MI-ONE PLUS", "MI-ONE C1", "MI-ONE", "2012051", "2012053", "2012052", "2012061", "2012062", "2013012",
+            "2013021", "2012121", "2013061", "2013062", "2013063", "2014215", "2014218", "2014216", "2014719",
+            "2014716", "2014726", "2015015", "2015561", "2015562", "2015911", "2015201", "2015628", "2015105",
+            "2015711", "2016070", "2016089", "MDE2", "MDT2", "MCE16", "MCT1", "M1804D2SE", "M1804D2ST", "M1804D2SC",
+            "M1803E1A", "M1803E1T", "M1803E1C", "M1807E8S", "M1807E8A", "M1805E2A", "M1808D2TE", "M1808D2TT",
+            "M1808D2TC", "M1808D2TG", "M1902F1A", "M1902F1T", "M1902F1C", "M1902F1G", "M1908F1XE", "M1903F2A",
+            "M1903F2G", "M1903F10G", "M1903F11G", "M1904F3BG", "M2001J2E", "M2001J2G", "M2001J2I", "M2001J1E",
+            "M2001J1G", "M2002J9E", "M2002J9G", "M2002J9S", "M2002J9R", "M2007J1SC", "M2007J3SY", "M2007J3SP",
+            "M2007J3SG", "M2007J3SI", "M2007J17G", "M2007J17I", "M2102J2SC", "M2011K2C", "M2011K2G", "M2102K1AC",
+            "M2102K1C", "M2102K1G", "M2101K9C", "M2101K9G", "M2101K9R", "M2101K9AG", "M2101K9AI", "2107119DC",
+            "2109119DG", "2109119DI", "M2012K11G", "M2012K11AI", "M2012K11I", "21081111RG", "2107113SG", "2107113SI",
+            "2107113SR", "21091116I", "21091116UI", "2201123C", "2201123G", "2112123AC", "2112123AG", "2201122C",
+            "2201122G", "2207122MC", "2203129G", "2203129I", "2206123SC", "2206122SC", "2203121C", "22071212AG",
+            "22081212UG", "22081212R", "A201XM", "2211133C", "2211133G", "2210132C", "2210132G", "2304FPN6DC",
+            "2304FPN6DG", "2210129SG", "2306EPN60G", "2306EPN60R", "XIG04", "23078PND5G", "23088PND5R", "A301XM",
+            "23127PN0CC", "23127PN0CG", "23116PN5BC", "2311BPN23C", "24031PN0DC", "24030PN60G", "24053PY09I",
+            "2406APNFAG", "XIG06", "2407FPN8EG", "2407FPN8ER", "A402XM", "2014616", "2014619", "2014618", "2014617",
+            "2015011", "2015021", "2015022", "2015501", "2015211", "2015212", "2015213", "MCE8", "MCT8", "M1910F4G",
+            "M1910F4S", "M2002F4LG", "2016080", "MDE5", "MDT5", "MDE5S", "M1803D5XE", "M1803D5XA", "M1803D5XT",
+            "M1803D5XC", "M1810E5E", "M1810E5A", "M1810E5GG", "2106118C", "M2011J18C", "22061218C", "2308CPXD0C",
+            "24072PX77C", "2405CPX3DC", "2405CPX3DG", "2016001", "2016002", "2016007", "MDE40", "MDT4", "MDI40",
+            "M1804E4A", "M1804E4T", "M1804E4C", "M1904F3BC", "M1904F3BT", "M1906F9SC", "M1910F4E", "2109119BC",
+            "2109119BC", "2209129SC", "23046PNC9C", "24053PY09C", "M1901F9E", "M1901F9T", "MDG2", "MDI2", "M1804D2SG",
+            "M1804D2SI", "M1805D1SG", "M1906F9SH", "M1906F9SI", "A0101", "2015716", "MCE91", "M1806D9W", "M1806D9E",
+            "M1806D9PE", "21051182C", "21051182G", "M2105K81AC", "M2105K81C", "22081281AC", "23043RP34C", "23043RP34G",
+            "23043RP34I", "23046RP50C", "2307BRPDCC", "24018RPACC", "24018RPACG", "2013022", "2013023", "2013029",
+            "2013028", "2014011", "2014501", "2014813", "2014112", "2014811", "2014812", "2014821", "2014817",
+            "2014818", "2014819", "2014502", "2014512", "2014816", "2015811", "2015812", "2015810", "2015817",
+            "2015818", "2015816", "2016030", "2016031", "2016032", "2016037", "2016036", "2016035", "2016033",
+            "2016090", "2016060", "2016111", "2016112", "2016117", "2016116", "MAE136", "MAT136", "MAG138", "MAI132",
+            "MDE1", "MDT1", "MDG1", "MDI1", "MEE7", "MET7", "MEG7", "MCE3B", "MCT3B", "MCG3B", "MCI3B", "M1804C3DE",
+            "M1804C3DT", "M1804C3DC", "M1804C3DG", "M1804C3DI", "M1805D1SE", "M1805D1ST", "M1805D1SC", "M1805D1SI",
+            "M1804C3CE", "M1804C3CT", "M1804C3CC", "M1804C3CG", "M1804C3CI", "M1810F6LE", "M1810F6LT", "M1810F6LG",
+            "M1810F6LI", "M1903C3EE", "M1903C3ET", "M1903C3EC", "M1903C3EG", "M1903C3EI", "M1908C3IE", "M1908C3IC",
+            "M1908C3IG", "M1908C3II", "M1908C3KE", "M1908C3KG", "M1908C3KI", "M2001C3K3I", "M2004J19C", "M2004J19G",
+            "M2004J19I", "M2004J19AG", "M2006C3LC", "M2006C3LG", "M2006C3LVG", "M2006C3LI", "M2006C3LII", "M2006C3MG",
+            "M2006C3MT", "M2006C3MNG", "M2006C3MII", "M2010J19SG", "M2010J19SI", "M2010J19SR", "M2010J19ST",
+            "M2010J19SY", "M2010J19SL", "21061119AG", "21061119AL", "21061119BI", "21061119DG", "21121119SG",
+            "21121119VL", "22011119TI", "22011119UY", "22041219G", "22041219I", "22041219NY", "220333QAG", "220333QBI",
+            "220333QNY", "220333QL", "220233L2C", "220233L2G", "220233L2I", "22071219AI", "23053RN02A", "23053RN02I",
+            "23053RN02L", "23053RN02Y", "23077RABDC", "23076RN8DY", "23076RA4BR", "XIG03", "A401XM", "23076RN4BI",
+            "23076RA4BC", "22120RN86C", "22120RN86G", "22120RN86H", "2212ARNC4L", "22126RN91Y", "2404ARN45A",
+            "2404ARN45I", "24049RN28L", "24040RN64Y", "2406ERN9CI", "23106RN0DA", "2311DRN14I", "23100RN82L",
+            "23108RN04Y", "23124RN87C", "23124RN87I", "23124RN87G", "2409BRN2CA", "2409BRN2CI", "2409BRN2CL",
+            "2409BRN2CY", "2411DRN47C", "2014018", "2013121", "2014017", "2013122", "2014022", "2014021", "2014715",
+            "2014712", "2014915", "2014912", "2014916", "2014911", "2014910", "2015052", "2015051", "2015712",
+            "2015055", "2015056", "2015617", "2015611", "2015112", "2015116", "2015161", "2016050", "2016051",
+            "2016101", "2016130", "2016100", "MBE6A5", "MBT6A5", "MEI7", "MEE7S", "MET7S", "MEC7S", "M1803E7SG",
+            "MEI7S", "MDE6", "MDT6", "MDG6", "MDI6", "MDE6S", "MDT6S", "MDG6S", "MDI6S", "M1806E7TG", "M1806E7TI",
+            "M1901F7E", "M1901F7T", "M1901F7C", "M1901F7G", "M1901F7I", "M1901F7BE", "M1901F7S", "M1908C3JE",
+            "M1908C3JC", "M1908C3JG", "M1908C3JI", "M1908C3XG", "M1908C3JGG", "M1906G7E", "M1906G7T", "M1906G7G",
+            "M1906G7I", "M2010J19SC", "M2007J22C", "M2003J15SS", "M2003J15SI", "M2003J15SG", "M2007J22G", "M2007J22R",
+            "M2007J17C", "M2003J6A1G", "M2003J6A1R", "M2003J6A1I", "M2003J6B1I", "M2003J6B2G", "M2101K7AG", "M2101K7AI",
+            "M2101K7BG", "M2101K7BI", "M2101K7BNY", "M2101K7BL", "M2103K19C", "M2103K19I", "M2103K19G", "M2103K19Y",
+            "M2104K19J", "22021119KR", "A101XM", "M2101K6G", "M2101K6T", "M2101K6R", "M2101K6P", "M2101K6I",
+            "M2104K10AC", "2109106A1I", "21121119SC", "2201117TG", "2201117TI", "2201117TL", "2201117TY", "21091116AC",
+            "21091116AI", "22041219C", "2201117SG", "2201117SI", "2201117SL", "2201117SY", "22087RA4DI", "22031116BG",
+            "21091116C", "2201116TG", "2201116TI", "2201116SC", "2201116SG", "2201116SR", "2201116SI", "21091116UC",
+            "21091116UG", "22041216C", "22041216UC", "22095RA98C", "23021RAAEG", "23027RAD4I", "23028RA60L",
+            "23021RAA2Y", "22101317C", "22111317G", "22111317I", "23076RA4BC", "2303CRA44A", "2303ERA42L", "23030RAC7Y",
+            "2209116AG", "22101316C", "22101316G", "22101316I", "22101316UCP", "22101316UG", "22101316UP", "22101316UC",
+            "22101320C", "23054RA19C", "23049RAD8C", "23129RAA4G", "23129RA5FL", "23124RA7EO", "2312DRAABC",
+            "2312DRAABI", "2312DRAABG", "23117RA68G", "2312DRA50C", "2312DRA50G", "2312DRA50I", "XIG05", "23090RA98C",
+            "23090RA98G", "23090RA98I", "24040RA98R", "2406ERN9CC", "2311FRAFDC", "24094RAD4C", "24094RAD4G",
+            "24094RAD4I", "24090RA29C", "24090RA29G", "24090RA29I", "24115RA8EC", "24115RA8EG", "24115RA8EI",
+            "M2004J7AC", "M2004J7BC", "M2003J15SC", "24069RA21C", "M1903F10A", "M1903F10C", "M1903F10I", "M1903F11A",
+            "M1903F11C", "M1903F11I", "M1903F11A", "M2001G7AE", "M2001G7AC", "M2001G7AC", "M1912G7BE", "M1912G7BC",
+            "M2001J11C", "M2001J11C", "M2006J10C", "M2007J3SC", "M2012K11AC", "M2012K11C", "M2012K10C", "22021211RC",
+            "22041211AC", "22011211C", "21121210C", "22081212C", "22041216I", "23013RK75C", "22127RK46C", "22122RK93C",
+            "23078RKD5C", "23113RKC6C", "23117RK66C", "2311DRK48C", "2407FRK8EC", "2016020", "2016021", "M1803E6E",
+            "M1803E6T", "M1803E6C", "M1803E6G", "M1803E6I", "M1810F6G", "M1810F6I", "M1903C3GG", "M1903C3GI",
+            "220733SG", "220733SH", "220733SL", "220733SFG", "220733SFH", "23028RN4DG", "23028RN4DH", "23026RN54G",
+            "23028RNCAG", "23028RNCAH", "23129RN51X", "23129RN51H", "2312CRNCCL", "24048RN6CG", "24048RN6CI",
+            "24044RN32L", "2409BRN2CG", "22081283C", "22081283G", "23073RPBFC", "23073RPBFG", "23073RPBFL",
+            "2405CRPFDC", "2405CRPFDG", "2405CRPFDI", "2405CRPFDL", "24074RPD2C", "24074RPD2G", "24074RPD2I",
+            "24075RP89G", "24076RP19G", "24076RP19I", "M1805E10A", "M2004J11G", "M2012K11AG", "M2104K10I", "22021211RG",
+            "22021211RI", "21121210G", "23049PCD8G", "23049PCD8I", "23013PC75G", "24069PC21G", "24069PC21I",
+            "23113RKC6G", "M1912G7BI", "M2007J20CI", "M2007J20CG", "M2007J20CT", "M2102J20SG", "M2102J20SI",
+            "21061110AG", "2201116PG", "2201116PI", "22041216G", "22041216UG", "22111317PG", "22111317PI", "22101320G",
+            "22101320I", "23122PCD1G", "23122PCD1I", "2311DRK48G", "2311DRK48I", "2312FRAFDI", "M2004J19PI",
+            "M2003J6CI", "M2010J19CG", "M2010J19CT", "M2010J19CI", "M2103K19PG", "M2103K19PI", "22041219PG",
+            "22041219PI", "2201117PG", "2201117PI", "21091116AG", "22031116AI", "22071219CG", "22071219CI",
+            "2207117BPG", "2404APC5FG", "2404APC5FI", "23128PC33I", "24066PC95I", "2312FPCA6G", "23076PC4BI",
+            "M2006C3MI", "211033MI", "220333QPG", "220333QPI", "220733SPH", "2305EPCC4G", "2302EPCC4H", "22127PC95G",
+            "22127PC95H", "2312BPC51X", "2312BPC51H", "2310FPCA4G", "2310FPCA4I", "2405CPCFBG", "24074PCD2I", "FYJ01QP",
+            "21051191C"
+        ]
+        self.all_os_versions = [
+            "Android_7.1.2", "Android_8.0.0", "Android_8.1.0", "Android_9.0", "Android_10", "Android_11", "Android_12",
+            "Android_13", "Android_6.0.1", "Android_5.1.1", "Android_4.4.4", "Android_4.3", "Android_4.2.2",
+            "Android_4.1.2",
+        ]
+        # 随机生成设备信息
+        self.devicetype = random.choice(self.all_device_type)
+        self.osversion = random.choice(self.all_os_versions)
+
         self.download_mode = 1
         self.cookies = None
         self.recycle_list = None
-        self.list = None
+        self.list = []
+        self.total = 0
+        self.parent_file_name_list = []
+        self.all_file = False
+        self.file_page = 0
         self.file_list = []
         self.dir_list = []
         self.name_dict = {}
@@ -39,17 +141,18 @@ class Pan123:
             self.password = pass_word
             self.authorization = authorization
         self.header_logined = {
-            "user-agent": "123pan/v2.4.0(Android_7.1.2;Xiaomi)",
+            "user-agent": "123pan/v2.4.0(" + self.osversion + ";Xiaomi)",
             "authorization": self.authorization,
             "accept-encoding": "gzip",
             # "authorization": "",
             "content-type": "application/json",
-            "osversion": "Android_7.1.2",
+            "osversion": self.osversion,
             "loginuuid": str(uuid.uuid4().hex),
             "platform": "android",
-            "devicetype": "M2101K9C",
+            "devicetype": self.devicetype,
-            "x-channel": "1004",
             "devicename": "Xiaomi",
+            # "x-channel": "1004",
+
             # "Content-Length": "65",
             "host": "www.123pan.com",
             "app-version": "61",
@@ -106,21 +209,32 @@ class Pan123:
                 "userName": self.user_name,
                 "passWord": self.password,
                 "authorization": self.authorization,
+                "deviceType": self.devicetype,
+                "osVersion": self.osversion,
             }
 
             f.write(json.dumps(save_list))
         print("账号已保存")
 
-    def get_dir(self,save=True):
+    def get_dir(self, save=True):
-        return self.get_dir_by_id(self.parent_file_id,save)
+        return self.get_dir_by_id(self.parent_file_id, save)
 
-    def get_dir_by_id(self, file_id,save=True):
+    # 按页（非123页数）读取文件
+    # all = True 强制获取所有文件
+    def get_dir_by_id(self, file_id, save=True, all=False, limit=100):
+        get_pages = 3
         res_code_getdir = 0
-        page = 1
+        page = self.file_page * get_pages + 1
+        lenth_now = len(self.list)
+        if all:
+            # 强制获取所有文件
+            page = 1
+            lenth_now = 0
         lists = []
-        lenth_now = 0
+
         total = -1
-        while lenth_now < total or total == -1:
+        times = 0
+        while (lenth_now < total or total == -1) and (times < get_pages or all):
             base_url = "https://www.123pan.com/api/file/list/new"
             # print(self.headerLogined)
             # sign = getSign("/b/api/file/list/new")
@@ -128,7 +242,7 @@ class Pan123:
             params = {
                 # sign[0]: sign[1],
                 "driveId": 0,
-                "limit": 100,
+                "limit": limit,
                 "next": 0,
                 "orderBy": "file_id",
                 "orderDirection": "desc",
@@ -158,22 +272,41 @@ class Pan123:
             total = text["data"]["Total"]
             lenth_now += len(lists_page)
             page += 1
-        file_num = 0
+            times += 1
-        for i in lists:
+            if times % 5 == 0:
-            i["FileNum"] = file_num
+                print("警告：文件夹内文件过多：" + str(lenth_now) + "/" + str(total))
-            file_num += 1
+                print("为防止对服务器造成影响，暂停10秒")
+                print("请耐心等待！")
+                time.sleep(10)
+
+        if lenth_now < total:
+            print("文件夹内文件过多：" + str(lenth_now) + "/" + str(total))
+            self.all_file = False
+        else:
+            self.all_file = True
+        self.total = total
+        self.file_page += 1
+        # 编号
+        # file_num = 0
+        # for i in lists:
+        #     i["FileNum"] = file_num
+        #     file_num += 1
         if save:
-            self.list = lists
+            # 合并list
+            self.list = self.list + lists
+
         return res_code_getdir, lists
 
     def show(self):
         print("--------------------")
         for i in self.list:
             file_size = i["Size"]
-            if file_size > 1048576:
+            if file_size > 1073741824:
-                download_size_print = str(round(file_size / 1048576, 2)) + "M"
+                download_size_print = str(round(file_size / 1073741824, 2)).ljust(6) + " GB"
+            elif file_size > 1048576:
+                download_size_print = str(round(file_size / 1048576, 2)).ljust(6) + " MB"
             else:
-                download_size_print = str(round(file_size / 1024, 2)) + "K"
+                download_size_print = str(round(file_size / 1024, 2)).ljust(6) + " KB"
 
             if i["Type"] == 0:
                 print(
@@ -191,7 +324,9 @@ class Pan123:
                     i["FileName"],
                     "\033[0m",
                 )
-
+        if not self.all_file:
+            print("剩余" + str(self.total - len(self.list)) + "个文件未获取")
+            print("输入more继续获取")
         print("--------------------")
 
     # fileNumber 从0开始，0为第一个文件，传入时需要减一 ！！！
@@ -244,7 +379,7 @@ class Pan123:
 
         return redirect_url
 
-    def download(self, file_number,download_path="download"):
+    def download(self, file_number, download_path="download"):
         file_detail = self.list[file_number]
         if file_detail["Type"] == 1:
             print("开始下载")
@@ -257,11 +392,10 @@ class Pan123:
             return
         self.download_from_url(down_load_url, file_name, download_path)
 
-
     def download_from_url(self, url, file_name, download_path="download"):
-        if os.path.exists(download_path+"/"+file_name):
+        if os.path.exists(download_path + "/" + file_name):
             if self.download_mode == 4:
-                print("文件 " + file_name +"已跳过")
+                print("文件 " + file_name + "已跳过")
                 return
             print("文件 " + file_name + " 已存在，是否要覆盖？")
             sure_download = input("输入1覆盖，2跳过，3全部覆盖，4全部跳过：")
@@ -274,7 +408,7 @@ class Pan123:
                 print("已跳过")
                 return
             else:
-                os.remove(download_path+"/"+file_name)
+                os.remove(download_path + "/" + file_name)
 
         if not os.path.exists(download_path):
             print("文件夹不存在，创建文件夹")
@@ -293,7 +427,7 @@ class Pan123:
         time_temp = time1
         data_count_temp = 0
         # 以.123pan后缀下载，下载完成重命名，防止下载中断
-        with open(download_path+"/"+file_name+".123pan", "wb") as f:
+        with open(download_path + "/" + file_name + ".123pan", "wb") as f:
             for i in down.iter_content(1024):
                 f.write(i)
                 done_block = int((data_count / content_size) * 50)
@@ -328,13 +462,13 @@ class Pan123:
                     print("\r [%s%s] %d%%  %s" % (50 * "█", "", 100, ""), end="")
             print("\nok")
 
-        os.rename(download_path+"/"+file_name+".123pan", download_path+"/"+file_name)
+        os.rename(download_path + "/" + file_name + ".123pan", download_path + "/" + file_name)
 
-    def get_all_things(self,id):
+    def get_all_things(self, id):
         # print(id)
         # print(self.dir_list)
         self.dir_list.remove(id)
-        all_list = self.get_dir_by_id(id,save=False)[1]
+        all_list = self.get_dir_by_id(id, save=False)[1]
 
         for i in all_list:
             if i["Type"] == 0:
@@ -346,26 +480,25 @@ class Pan123:
         for i in self.dir_list:
             self.get_all_things(i)
 
-    def download_dir(self,file_detail,download_path_root="download"):
+    def download_dir(self, file_detail, download_path_root="download"):
         # file_detail = self.list[file_number]
         self.name_dict[file_detail["FileId"]] = file_detail["FileName"]
         if file_detail["Type"] != 1:
             print("不是文件夹")
             return
 
-        all_list = self.get_dir_by_id(file_detail["FileId"], save=False)[1]
+        all_list = self.get_dir_by_id(file_detail["FileId"], save=False, all=True, limit=100)[1]
         for i in all_list[::-1]:
-            if i["Type"] == 0: # 直接开始下载
+            if i["Type"] == 0:  # 直接开始下载
                 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)
                 download_path = download_path_root + AbsPath
-                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)
 
             else:
-                self.download_dir(i,download_path_root)
+                self.download_dir(i, download_path_root)
-
 
     def recycle(self):
         recycle_id = 0
@@ -674,16 +807,32 @@ class Pan123:
         if not dir_num.isdigit():
             if dir_num == "..":
                 if len(self.parent_file_list) > 1:
+                    # 没有获取全部文件
+                    self.all_file = False
+                    # 重置文件页数
+                    self.file_page = 0
+
                     self.parent_file_list.pop()
                     self.parent_file_id = self.parent_file_list[-1]
+                    # 清空当前文件列表
+                    self.list = []
+                    self.parent_file_name_list.pop()
                     self.get_dir()
                     self.show()
                 else:
                     print("已经是根目录")
                 return
             if dir_num == "/":
+                # 没有获取全部文件
+                self.all_file = False
+                # 重置文件页数
+                self.file_page = 0
+
                 self.parent_file_id = 0
                 self.parent_file_list = [0]
+                # 清空当前文件列表
+                self.list = []
+                self.parent_file_name_list = []
                 self.get_dir()
                 self.show()
                 return
@@ -696,15 +845,31 @@ class Pan123:
         if self.list[dir_num]["Type"] != 1:
             print("不是文件夹")
             return
+
+        # 没有获取全部文件
+        self.all_file = False
+        # 重置文件页数
+        self.file_page = 0
+
         self.parent_file_id = self.list[dir_num]["FileId"]
         self.parent_file_list.append(self.parent_file_id)
+        self.parent_file_name_list.append(self.list[dir_num]["FileName"])
+        # 清空当前文件列表
+        self.list = []
         self.get_dir()
         self.show()
 
     def cdById(self, file_id):
+        # 没有获取全部文件
+        self.all_file = False
+        # 重置文件页数
+        self.file_page = 0
+        # 清空当前文件列表
+        self.list = []
         self.parent_file_id = file_id
         self.parent_file_list.append(self.parent_file_id)
-        self.get_dir()
+        # self.parent_file_name_list.append(self.list[dir_num]["FileName"])
+        # self.get_dir()
         self.get_dir()
         self.show()
 
@@ -723,6 +888,12 @@ class Pan123:
             pass_word = text["passWord"]
             authorization = text["authorization"]
 
+            # 读取设备信息
+            deviceType = text["deviceType"]
+            osVersion = text["osVersion"]
+            self.devicetype = deviceType
+            self.osversion = osVersion
+
         except:  # FileNotFoundError or json.decoder.JSONDecodeError:
             print("获取配置失败，重新输入")
 
@@ -731,6 +902,7 @@ class Pan123:
                     user_name = input("userName:")
                     pass_word = input("passWord:")
                     authorization = ""
+
                 else:
                     raise Exception("禁止输入模式下，没有账号或密码")
 
@@ -792,8 +964,8 @@ if __name__ == "__main__":
     pan = Pan123(readfile=True, input_pwd=True)
     pan.show()
     while True:
-        #pan.get_all_things()
+        # pan.get_all_things()
-        command = input("\033[91m >\033[0m")
+        command = input("\033[91m " + "/" + "/".join(pan.parent_file_name_list) + ">\033[0m")
         if command == "ls":
             pan.show()
         if command == "re":
@@ -806,7 +978,8 @@ if __name__ == "__main__":
                 print("输入错误")
                 continue
             if pan.list[int(command) - 1]["Type"] == 1:
-                pan.cdById(pan.list[int(command) - 1]["FileId"])
+                # pan.cdById(pan.list[int(command) - 1]["FileId"])
+                pan.cd(command)
             else:
                 size = pan.list[int(command) - 1]["Size"]
                 if size > 1048576:
@@ -909,3 +1082,7 @@ if __name__ == "__main__":
             print("读取成功")
             pan.get_dir()
             pan.show()
+        elif command == "more":
+            # 继续加载文件
+            pan.get_dir()
+            pan.show()