From 8b319f45377133e7f13af4ff4934289baa5b0aaa Mon Sep 17 00:00:00 2001 From: hxz393 Date: Thu, 12 Dec 2024 18:42:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=202.8.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/operations.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/operations.py b/src/operations.py index 9d2da44..cdfd1bd 100644 --- a/src/operations.py +++ b/src/operations.py @@ -297,13 +297,12 @@ def creat_user_dir(self, folder_name: str) -> str: self.check_condition(not folder_name, message='必须输入转存目录') # 对原始输入进行分割 link_org_sep = self.link_list_org[self.completed_task_count].split() - # 建立自定义目录实际上有两个条件，除了原始输入用空格能分为两个元素以上外，还要求第一个元素不是网盘链接 - if len(link_org_sep) > 1: - custom_folder = link_org_sep[0] - folder_name = f'{folder_name}/{custom_folder}' if 'https://pan.baidu.com/' not in custom_folder else f'{folder_name}/{self.completed_task_count + 1}' - # 此处用替换处理目标目录名非法字符，不报错了 - folder_name = folder_name.translate(str.maketrans({char: '_' for char in INVALID_CHARS})) - self.handle_create_dir(folder_name) + # 建立自定义目录，如果没有指定则用行数代替 + custom_folder = link_org_sep[0] + folder_name = f'{folder_name}/{custom_folder}' if 'pan.baidu.com' not in custom_folder else f'{folder_name}/{self.completed_task_count + 1}' + # 此处用替换处理目标目录名非法字符，不报错了 + folder_name = folder_name.translate(str.maketrans({char: '_' for char in INVALID_CHARS})) + self.handle_create_dir(folder_name) return folder_name