更新文件: getwebdavlist.exe, webdav_simulator.arm64, getalist.exe, getwebdavlist.py, webdav_simulator.amd64 等13个文件

get115list.py

@@ -7,12 +7,25 @@ import time
 import traceback
 import os
 import re
+import sys
+import traceback
 
 count=0
+failcount=0
+
+fullscan=True
 
 def walk_dir(fs,f,replaceroot):
     dirlist=list()
-    file_list = fs.listdir_attr()
+    try:
+        file_list = fs.listdir_attr()
+    except KeyboardInterrupt:
+        print("get ctrl+c, exit")
+        sys.exit(1)
+    except:
+        traceback.print_exc()
+        time.sleep(1)
+        return
     filetype_re=re.compile(r'\.(png|jpg|jpeg|bmp|gif|doc|nfo|flac|mp3|wma|ape|cue|wav|dst|dff|dts|ac3|eac3|txt)$')
     for file_obj in file_list:
         if not file_obj.is_directory:
@@ -31,11 +44,18 @@ def walk_dir(fs,f,replaceroot):
             dirlist.append(file_obj.path)
     for dirItem in dirlist:
         fs.chdir(dirItem)
-        # global count
-        # count=count+1
-        # if count%4==0:
-        #     time.sleep(1)
-        walk_dir(fs,f,replaceroot)
+        global count
+        count=count+1
+        if count%3==0:
+            time.sleep(1)
+        try:
+            walk_dir(fs,f,replaceroot)
+        except KeyboardInterrupt:
+            print("get ctrl+c, exit")
+            sys.exit(1)
+        except:
+            traceback.print_exc()
+            time.sleep(1)
     return
 
 def main():
@@ -53,8 +73,19 @@ def main():
         shareUrl = "https://115.com/s/" + shareUrl
 
     print("cookie:"+args.cookie+", shareurl:"+shareUrl)
+    cidre = re.compile(r'cid=([0-9]+)')
+    matches = cidre.findall(shareUrl)
+    cid = None
+    if len(matches)>0:
+        cid=int(matches[0])
+        shareUrl = cidre.sub("", shareUrl).replace("?&","?").replace("&&","&")
+
     fs = client.get_share_fs(shareUrl)
 
+    #if cid != None:
+    #    fs.chdir(cid)
+
+
     count=0
     f=open(args.output, mode="a", encoding="utf-8")
     walk_dir(fs,f,args.replaceroot)