From 2977ab53b2bb50b0186f2a555e09896f36fc34e7 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Sat, 2 Feb 2019 00:33:32 +0100 Subject: [PATCH] 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. --- src/cli.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/cli.py b/src/cli.py index 802d465..9ab67be 100755 --- a/src/cli.py +++ b/src/cli.py @@ -6,9 +6,6 @@ from core import scan_folder, moveHome from video import Video from exceptions import InsufficientNameError -def moveHome(video): - print('Would have moved: {}'.format(video)) - def tweet(video): pass @@ -25,7 +22,7 @@ def prompt(name): @click.command() @click.argument('path') -@click.option('--daemon', '-d', daemon) +@click.option('--daemon', '-d') def main(path, daemon): videos, insufficient_name = scan_folder(path) @@ -33,22 +30,18 @@ def main(path, daemon): moveHome(video) while len(insufficient_name) >= 1: - for file in insufficient_name: + for i, file in enumerate(insufficient_name): try: manual_name = prompt(file) if manual_name is None: - insufficient_name.pop() + del insufficient_name[i] continue - try: - video = Video.fromguess(file, guessit(manual_name)) - moveHome(video) - insufficient_name.pop() + video = Video.fromguess(file, guessit(manual_name)) + moveHome(video) + del insufficient_name[i] - except InsufficientNameError: - continue - except KeyboardInterrupt: # Logger: Received interrupt, exiting parser. # should the class objects be deleted ?