| 
														
															@@ -162,10 +162,10 @@ class Publish: 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         today = time.strftime("%Y%m%d", time.localtime()) 
														 | 
														
														 | 
														
															         today = time.strftime("%Y%m%d", time.localtime()) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         # videos 目录下的所有视频文件夹 
														 | 
														
														 | 
														
															         # videos 目录下的所有视频文件夹 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         files = os.listdir(cls.local_file_path) 
														 | 
														
														 | 
														
															         files = os.listdir(cls.local_file_path) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        for f in files: 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        for fv in files: 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             try: 
														 | 
														
														 | 
														
															             try: 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 # 单个视频文件夹 
														 | 
														
														 | 
														
															                 # 单个视频文件夹 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                fi_d = os.path.join(cls.local_file_path, f) 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                fi_d = os.path.join(cls.local_file_path, fv) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 # 确认为视频文件夹 
														 | 
														
														 | 
														
															                 # 确认为视频文件夹 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 if os.path.isdir(fi_d): 
														 | 
														
														 | 
														
															                 if os.path.isdir(fi_d): 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     Common.logger(log_type).info('dir = {}'.format(fi_d)) 
														 | 
														
														 | 
														
															                     Common.logger(log_type).info('dir = {}'.format(fi_d)) 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -258,5 +258,5 @@ class Publish: 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     Common.logger(log_type).error('file not a dir = {}'.format(fi_d)) 
														 | 
														
														 | 
														
															                     Common.logger(log_type).error('file not a dir = {}'.format(fi_d)) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             except Exception as e: 
														 | 
														
														 | 
														
															             except Exception as e: 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 # 删除视频文件夹 
														 | 
														
														 | 
														
															                 # 删除视频文件夹 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                shutil.rmtree("./videos/" + f + "/") 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                shutil.rmtree("./videos/" + fv + "/") 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 Common.logger(log_type).exception('upload_and_publish error', e) 
														 | 
														
														 | 
														
															                 Common.logger(log_type).exception('upload_and_publish error', e) 
														 |