diff --git a/get115list.exe b/get115list.exe index 730f739..21ccbc7 100644 Binary files a/get115list.exe and b/get115list.exe differ diff --git a/get115list.py b/get115list.py index 095c0e8..d442b61 100644 --- a/get115list.py +++ b/get115list.py @@ -18,6 +18,7 @@ fullscan=True def walk_dir(fs,f,replaceroot): dirlist=list() try: + #print("try listdir") file_list = fs.listdir_attr() except KeyboardInterrupt: print("get ctrl+c, exit") @@ -26,19 +27,23 @@ def walk_dir(fs,f,replaceroot): 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)$') + #filetype_re=re.compile(r'\.(png|jpg|jpeg|bmp|gif|doc|nfo|flac|mp3|wma|ape|cue|wav|dst|dff|dts|ac3|eac3|txt|db|pdf)$') + filetype_re=re.compile(r'\.(png|jpg|jpeg|bmp|gif|doc|nfo|txt|db|pdf)$') for file_obj in file_list: if not file_obj.is_directory: path = file_obj.path if filetype_re.search(path) != None or "BDMV" in path: continue + size=int(file_obj.size) + if size>0 and size<4096: + continue paths = path.split("/") if replaceroot!="": if len(paths)>=3: path=os.path.join("/",replaceroot,*paths[2:]) - print(path+"\t"+str(file_obj.size)) - f.write(path+"\t"+str(file_obj.size)+"\n") + print(f"{path}\t{file_obj.size}") + f.write(f"{path}\t{file_obj.size}\n") f.flush() else: dirlist.append(file_obj.path) diff --git a/getalist.exe b/getalist.exe index e389a1d..6b54696 100644 Binary files a/getalist.exe and b/getalist.exe differ diff --git a/getalist.py b/getalist.py index f65c1b6..2cb772a 100644 --- a/getalist.py +++ b/getalist.py @@ -59,7 +59,7 @@ def walk(headers:dict, api_url:str, current_path="/", output_file=None, replacer print(f"contentlist len:{len(items)}") # items=client.list(current_path) - filetype_re=re.compile(r'\.(png|jpg|jpeg|bmp|gif|doc|nfo|flac|mp3|wma|ape|cue|wav|dst|dff|dts|ac3|eac3|txt)$') + filetype_re=re.compile(r'\.(png|jpg|jpeg|bmp|gif|doc|nfo|flac|mp3|wma|ape|cue|wav|dst|dff|dts|ac3|eac3|txt|db|pdf)$') # print(items) for item in items: full_path = f"{current_path}/{item['name']}".replace("//", "/") @@ -102,7 +102,9 @@ def walk(headers:dict, api_url:str, current_path="/", output_file=None, replacer if filetype_re.search(full_path) != None or "BDMV" in full_path: continue # size = client.info(full_path).get('size', 0) - size = item["size"] + size = int(item["size"]) + if size>0 and size<4096: + continue if replaceroot!=None: if replaceroot=="": full_path=os.path.join("/",*full_path.split("/")[2:]) diff --git a/getwebdavlist.exe b/getwebdavlist.exe index 8c49abc..f4f25ce 100644 Binary files a/getwebdavlist.exe and b/getwebdavlist.exe differ diff --git a/getwebdavlist.py b/getwebdavlist.py index a9b0f7f..94674ba 100644 --- a/getwebdavlist.py +++ b/getwebdavlist.py @@ -29,7 +29,7 @@ def walk(client, current_path="/", output_file=None, replaceroot=None, lastpath= if failcount>10: sys.exit(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)$') + filetype_re=re.compile(r'\.(png|jpg|jpeg|bmp|gif|doc|nfo|flac|mp3|wma|ape|cue|wav|dst|dff|dts|ac3|eac3|txt|db|pdf)$') # print(items) for item in items[1:]: full_path = f"{current_path}/{item}".replace("//", "/") @@ -63,7 +63,9 @@ def walk(client, current_path="/", output_file=None, replaceroot=None, lastpath= else: if filetype_re.search(full_path) != None or "BDMV" in full_path: continue - size = client.info(full_path).get('size', 0) + size = int(client.info(full_path).get('size', 0)) + if size>0 and size<4096: + continue if replaceroot!=None: if replaceroot=="": full_path=os.path.join("/",*full_path.split("/")[2:]) diff --git a/run.bat b/run.bat index 7a572f9..ad4f9fd 100644 --- a/run.bat +++ b/run.bat @@ -1,3 +1,3 @@ @echo off -webdav_simulator.exe --alist_config "http://192.168.1.2:5678/,,#http://192.168.1.3:5678,alist-1234-5678," "xy115-all.txt.xz#xy-dy.txt.xz#xy-dsj.txt.xz" +webdav_simulator.exe --alist_config "http://192.168.1.2:5678/,,#http://192.168.1.3:5678,alist-1234-5678," "xy115-all.txt.xz#xy-dy.txt.xz#xy-dsj.txt.xz#xy115-music.txt.xz" diff --git a/run.sh b/run.sh index 7bb43ce..0fe1938 100644 --- a/run.sh +++ b/run.sh @@ -18,4 +18,12 @@ cd "${progdir}" mkdir tmp chmod 777 tmp export TMPDIR=tmp -./webdav_simulator.amd64 --alist_config "http://192.168.1.2:5678,,#http://192.168.1.3:5678,alist-1234-5678," "xy115-all.txt.xz#xy-dy.txt.xz#xy-dsj.txt.xz" +unset LD_PRELOAD +machine=$(uname -m) +if [[ "$machine" == *"arm"* || "$machine" == *"aarch"* ]]; then + arch="arm64" +else + arch="amd64" +fi +echo "arch:$arch" +./webdav_simulator.$arch --alist_config "http://192.168.1.2:5678,,#http://192.168.1.3:5678,alist-1234-5678," "xy115-all.txt.xz#xy-dy.txt.xz#xy-dsj.txt.xz#xy115-music.txt.xz" diff --git a/webdav_simulator.amd64 b/webdav_simulator.amd64 index eaad533..7d9e8b3 100644 Binary files a/webdav_simulator.amd64 and b/webdav_simulator.amd64 differ diff --git a/webdav_simulator.arm64 b/webdav_simulator.arm64 index d490581..6a52ec3 100644 Binary files a/webdav_simulator.arm64 and b/webdav_simulator.arm64 differ diff --git a/webdav_simulator.exe b/webdav_simulator.exe index 10cb5d8..92d7ce3 100644 Binary files a/webdav_simulator.exe and b/webdav_simulator.exe differ diff --git a/whoosh_index/MAIN_u3baw4lts4z2wa9m.seg b/whoosh_index/MAIN_u3baw4lts4z2wa9m.seg new file mode 100644 index 0000000..9da9923 Binary files /dev/null and b/whoosh_index/MAIN_u3baw4lts4z2wa9m.seg differ diff --git a/whoosh_index/_MAIN_6.toc b/whoosh_index/_MAIN_6.toc new file mode 100644 index 0000000..b088e07 Binary files /dev/null and b/whoosh_index/_MAIN_6.toc differ diff --git a/whoosh_index/md5list.json b/whoosh_index/md5list.json index 9acafe6..737d9be 100644 --- a/whoosh_index/md5list.json +++ b/whoosh_index/md5list.json @@ -10,8 +10,13 @@ "time": 1747616619.0 }, "xy-dsj.txt.xz": { - "md5": "375b6dd8a1eccb2ac32a90d9d1b1e925", + "md5": "a3eae61092809e8ab8a6f35e20abf31c", "size": 1815364, "time": 1747948825.0 + }, + "xy115-music.txt.xz": { + "md5": "7eaf2fb042fd5ef690b1560831a76b4b", + "size": 2431968, + "time": 1747999250.0 } } \ No newline at end of file diff --git a/xy-dsj.txt.xz b/xy-dsj.txt.xz index 6ca01fd..05390e0 100644 Binary files a/xy-dsj.txt.xz and b/xy-dsj.txt.xz differ diff --git a/xy115-music.txt.xz b/xy115-music.txt.xz new file mode 100644 index 0000000..b966a7e Binary files /dev/null and b/xy115-music.txt.xz differ