Merge pull request Jack-Cherish#61 from chess99/master

Jack-Cherish · web-flow · commit a165412b1dbb · 2018-10-23T10:55:58.000+08:00
douyin - 'favorite' subfolder for favorite videos
diff --git a/douyin/douyin_appsign.py b/douyin/douyin_appsign.py
@@ -221,12 +221,32 @@ def run(self):
 			None
 		"""
 		self.hello()
-		user_id = input('请输入ID(例如792279162或Empty_1996或95006183):')
-		watermark_flag = bool(int(input('是否下载带水印的视频(0-否,1-是):')))
-		type_flag = input('p-上传的, f-喜欢的:')
+
+		user_id = input('请输入ID (例如 792279162 或 Empty_1996 或 95006183 ):')
+		user_id = user_id if user_id else '95006183'
+		
+		watermark_flag = input('是否下载带水印的视频 ( 0-否-默认, 1-是 ):')
+		watermark_flag = watermark_flag if watermark_flag!='' else '0'
+		watermark_flag = bool(int(watermark_flag))
+
+		type_flag = input('f-收藏的-默认, p-上传的:')
+		type_flag = type_flag if type_flag!='' else 'f'
+
+		save_dir = input('保存路径 ( 栗如"E:/Download/", 默认"./Download/"):')
+		save_dir = save_dir if save_dir else "./Download/"
+
 		video_names, video_urls, share_urls, nickname = self.get_video_urls(user_id, type_flag)
-		if nickname not in os.listdir():
-			os.mkdir(nickname)
+		nickname_dir = os.path.join(save_dir, nickname)
+
+		if not os.path.exists(save_dir):
+			os.makedirs(save_dir)
+		if nickname not in os.listdir(save_dir):
+			os.mkdir(nickname_dir)
+
+		if type_flag == 'f':
+			if 'favorite' not in os.listdir(nickname_dir):
+				os.mkdir(os.path.join(nickname_dir, 'favorite'))
+
 		print('视频下载中:共有%d个作品!\n' % len(video_urls))
 		for num in range(len(video_urls)):
 			print('  解析第%d个视频链接 [%s] 中，请稍后!\n' % (num + 1, share_urls[num]))
@@ -236,10 +256,13 @@ def run(self):
 				video_name = video_names[num].replace('/', '')
 			else:
 				video_name = video_names[num]
-			if os.path.isfile(os.path.join(nickname, video_name)):
+			video_path = os.path.join(nickname_dir, video_name) if type_flag!='f' else os.path.join(nickname_dir, 'favorite', video_name)
+			print(video_path)
+
+			if os.path.isfile(video_path):
 				print('视频已存在')
 			else:
-				self.video_downloader(video_urls[num], os.path.join(nickname, video_name), watermark_flag)
+				self.video_downloader(video_urls[num], video_path, watermark_flag)
 			print('\n')
 		print('下载完成!')
 
