From dadbe640ee43e9dc82f483257a0925fc084b2d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E5=8F=B6=E9=A5=AD=E5=9B=A2?= Date: Wed, 29 Aug 2012 19:09:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xfdown.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xfdown.py b/xfdown.py index 0a7be04..0129ac1 100755 --- a/xfdown.py +++ b/xfdown.py @@ -283,11 +283,15 @@ def __chosetask(self): self.main() def __getdownload(self): - _print ("请输入要下载的任务序号,数字之间用空格或其他字符分隔.\n输入A下载所有任务:") + _print ("请输入要下载的任务序号,数字之间用空格或其他字符分隔.或者使用-来选择连续任务\n输入A下载所有任务:") _print ("(数字后跟p只打印下载命令而不下载，比如1p2p3)") target=raw_input("dl # ").strip() if target.upper()=="A": lists=zip(range(1,len(self.filehash)+1) , ['']* len(self.filehash)) + elif '-' in target: + ran = target.split('-') + nums = range(int(ran[0]),int(ran[1])+1) + lists = zip(nums , [''] * len(nums)) else: lists=self.__RE.findall(target) if lists==[]: @@ -303,6 +307,10 @@ def __deltask(self): target=raw_input("dt # ").strip() if target.upper()=="A": lists=zip(range(1,len(self.filehash)+1) , ['']* len(self.filehash)) + elif '-' in target: + ran = target.split('-') + nums = range(int(ran[0]),int(ran[1])+1) + lists = zip(nums , [''] * len(nums)) else: lists=self.__RE.findall(target) if lists==[]: From 7b03d720f5d5dfabcad3cb0eaf96453abb756255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E5=8F=B6=E9=A5=AD=E5=9B=A2?= Date: Wed, 29 Aug 2012 22:05:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E8=BF=9E?= =?UTF-8?q?=E7=BB=AD=E6=95=B0=E6=8D=AE=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xfdown.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xfdown.py b/xfdown.py index 0129ac1..3ae9339 100755 --- a/xfdown.py +++ b/xfdown.py @@ -289,8 +289,10 @@ def __getdownload(self): if target.upper()=="A": lists=zip(range(1,len(self.filehash)+1) , ['']* len(self.filehash)) elif '-' in target: - ran = target.split('-') - nums = range(int(ran[0]),int(ran[1])+1) + nums = [] + for i in target.split(' '): + ran = i.split('-') + nums.extend(range(int(ran[0]),int(ran[1])+1)) lists = zip(nums , [''] * len(nums)) else: lists=self.__RE.findall(target) @@ -308,8 +310,10 @@ def __deltask(self): if target.upper()=="A": lists=zip(range(1,len(self.filehash)+1) , ['']* len(self.filehash)) elif '-' in target: - ran = target.split('-') - nums = range(int(ran[0]),int(ran[1])+1) + nums = [] + for i in target.split(): + ran = target.split('-') + nums.extend(range(int(ran[0]),int(ran[1])+1)) lists = zip(nums , [''] * len(nums)) else: lists=self.__RE.findall(target)