Allow a instuffient name to be thrown. Also, pop was not the correct way to remove elements from the list, del on a index is now used.
This commit is contained in:
		
							
								
								
									
										15
									
								
								src/cli.py
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								src/cli.py
									
									
									
									
									
								
							| @@ -6,9 +6,6 @@ from core import scan_folder, moveHome | |||||||
| from video import Video | from video import Video | ||||||
| from exceptions import InsufficientNameError | from exceptions import InsufficientNameError | ||||||
|  |  | ||||||
| def moveHome(video): |  | ||||||
|     print('Would have moved: {}'.format(video)) |  | ||||||
|  |  | ||||||
| def tweet(video): | def tweet(video): | ||||||
|     pass |     pass | ||||||
|  |  | ||||||
| @@ -25,7 +22,7 @@ def prompt(name): | |||||||
|  |  | ||||||
| @click.command() | @click.command() | ||||||
| @click.argument('path') | @click.argument('path') | ||||||
| @click.option('--daemon', '-d', daemon) | @click.option('--daemon', '-d') | ||||||
| def main(path, daemon): | def main(path, daemon): | ||||||
|     videos, insufficient_name = scan_folder(path) |     videos, insufficient_name = scan_folder(path) | ||||||
|  |  | ||||||
| @@ -33,21 +30,17 @@ def main(path, daemon): | |||||||
|         moveHome(video) |         moveHome(video) | ||||||
|  |  | ||||||
|     while len(insufficient_name) >= 1: |     while len(insufficient_name) >= 1: | ||||||
|         for file in insufficient_name: |         for i, file in enumerate(insufficient_name): | ||||||
|             try: |             try: | ||||||
|                 manual_name = prompt(file) |                 manual_name = prompt(file) | ||||||
|                  |                  | ||||||
|                 if manual_name is None: |                 if manual_name is None: | ||||||
|                     insufficient_name.pop() |                     del insufficient_name[i] | ||||||
|                     continue |                     continue | ||||||
|                  |                  | ||||||
|                 try: |  | ||||||
|                 video = Video.fromguess(file, guessit(manual_name)) |                 video = Video.fromguess(file, guessit(manual_name)) | ||||||
|                 moveHome(video) |                 moveHome(video) | ||||||
|                     insufficient_name.pop() |                 del insufficient_name[i] | ||||||
|  |  | ||||||
|                 except InsufficientNameError: |  | ||||||
|                     continue  |  | ||||||
|  |  | ||||||
|             except KeyboardInterrupt: |             except KeyboardInterrupt: | ||||||
|                 # Logger: Received interrupt, exiting parser. |                 # Logger: Received interrupt, exiting parser. | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user