blackteay/tiktok
1
0
Fork 0
mirror of https://github.com/imgyh/tiktok.git synced 2025-04-06 08:15:46 +08:00
Code Issues Projects Releases Wiki Activity

fix(tiktok): 缩短文件名长度,只使用数字字母汉字作为文件名

Browse Source 
fix #19
This commit is contained in:
imgyh 2023-03-29 18:59:41 +08:00
parent f2c1587e53
commit 99c62922ca
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TikTok.py
View File

@ -169,7 +169,7 @@ class TikTok(object):
if end - start > self.timeout: if end - start > self.timeout:
# raise RuntimeError("重复请求该接口" + str(self.timeout) + "s, 仍然未获取到数据") # raise RuntimeError("重复请求该接口" + str(self.timeout) + "s, 仍然未获取到数据")
print("[ 提示 ]:重复请求该接口" + str(self.timeout) + "s, 仍然未获取到数据") print("[ 提示 ]:重复请求该接口" + str(self.timeout) + "s, 仍然未获取到数据")
return {} return {},{}
# print("[ 警告 ]:接口未返回数据, 正在重新请求!\r") # print("[ 警告 ]:接口未返回数据, 正在重新请求!\r")
# 清空self.awemeDict # 清空self.awemeDict
@ -617,7 +617,7 @@ class TikTok(object):
try: try:
# 使用作品 创建时间+描述 当文件夹 # 使用作品 创建时间+描述 当文件夹
file_name = awemeDict["create_time"] + " " + self.utils.replaceStr(awemeDict["desc"]) file_name = awemeDict["create_time"] + "_" + self.utils.replaceStr(awemeDict["desc"])
aweme_path = os.path.join(savePath, file_name) aweme_path = os.path.join(savePath, file_name)
if not os.path.exists(aweme_path): if not os.path.exists(aweme_path):
os.mkdir(aweme_path) os.mkdir(aweme_path)
@ -723,10 +723,10 @@ class TikTok(object):
# print("[ 提示 ]:avatar 已存在为您跳过...\r\n") # print("[ 提示 ]:avatar 已存在为您跳过...\r\n")
pass pass
else: else:
self.isdwownload = False
try: try:
url = awemeDict["author"]["avatar"]["url_list"][0] url = awemeDict["author"]["avatar"]["url_list"][0]
if url != "": if url != "":
self.isdwownload = False
# task_id = self.progress.add_task("download", filename="[ 头像 ]:" + desc, start=False) # task_id = self.progress.add_task("download", filename="[ 头像 ]:" + desc, start=False)
# self.alltask.append(self.pool.submit(self.copy_url, task_id, url, avatar_path)) # self.alltask.append(self.pool.submit(self.copy_url, task_id, url, avatar_path))
self.alltask.append( self.alltask.append(

2
TikTokUtils.py
View File

@ -42,7 +42,7 @@ class Utils(object):
替换非法字符，缩短字符长度，使其能成为文件名 替换非法字符，缩短字符长度，使其能成为文件名
""" """
# 匹配 汉字 字母 数字 空格 # 匹配 汉字 字母 数字 空格
match = "([0-9A-Za-z\u4e00-\u9fa5 #_-]+)" match = "([0-9A-Za-z\u4e00-\u9fa5]+)"
result = re.findall(match, filenamestr) result = re.findall(match, filenamestr)