Moved progress bar from indexing folder content to parsing found videos.
This commit is contained in:
		
							
								
								
									
										51
									
								
								src/core.py
									
									
									
									
									
								
							
							
						
						
									
										51
									
								
								src/core.py
									
									
									
									
									
								
							| @@ -224,38 +224,37 @@ def scan_folder(path): | |||||||
|     for _ in os.listdir(path): |     for _ in os.listdir(path): | ||||||
|         content_count += 1 |         content_count += 1 | ||||||
|  |  | ||||||
|     with click.progressbar(length=content_count, label='Collecting videos') as bar: |     # non-existing | ||||||
|         # non-existing |     if not os.path.exists(path): | ||||||
|         if not os.path.exists(path): |         try: | ||||||
|             try: |             video = Video.fromname(path) | ||||||
|                 video = Video.fromname(path) |         except: | ||||||
|             except: |             logging.exception('Unexpected error while collecting non-existing path %s', path) | ||||||
|                 logging.exception('Unexpected error while collecting non-existing path %s', path) |             errored_paths.append(path) | ||||||
|                 errored_paths.append(path) |  | ||||||
|  |  | ||||||
|             video.subtitle_languages |= set(search_external_subtitles(video.name, directory=path).values()) |         video.subtitle_languages |= set(search_external_subtitles(video.name, directory=path).values()) | ||||||
|          |          | ||||||
|             refine(video) |         refine(video) | ||||||
|             videos.append(video) |         videos.append(video) | ||||||
|             # Increment bar to full ? |         # Increment bar to full ? | ||||||
|  |  | ||||||
|         # directories |     # directories | ||||||
|         if os.path.isdir(path): |     if os.path.isdir(path): | ||||||
|             try: |         try: | ||||||
|                 scanned_videos = scan_videos(path) |             scanned_videos = scan_videos(path) | ||||||
|             except: |         except: | ||||||
|                 print('Unexpected error while collecting directory path %s', path) |             print('Unexpected error while collecting directory path %s', path) | ||||||
|                 logging.exception('Unexpected error while collecting directory path %s', path) |             logging.exception('Unexpected error while collecting directory path %s', path) | ||||||
|                 errored_paths.append(path) |             errored_paths.append(path) | ||||||
|  |  | ||||||
|             for video in scanned_videos: |         with click.progressbar(scanned_videos, label='Parsing found videos', item_show_function=lambda v: os.path.split(v.name)[1] if v is not None else '') as bar: | ||||||
|                 video.subtitle_languages |= set(search_external_subtitles(video.name, |             for v in bar: | ||||||
|  |                 v.subtitle_languages |= set(search_external_subtitles(v.name, | ||||||
|                                                                           directory=path).values()) |                                                                           directory=path).values()) | ||||||
|                 refine(video) |                 refine(v) | ||||||
|                 videos.append(video) |                 videos.append(v) | ||||||
|                 bar.update(1) |  | ||||||
|  |  | ||||||
|         return videos |     return videos | ||||||
|  |  | ||||||
| def main(): | def main(): | ||||||
|     path = '/mnt/rescue/' |     path = '/mnt/rescue/' | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user