From 493bd76f0e35d78d55f7cee9ff885031dfb24974 Mon Sep 17 00:00:00 2001
From: Jacob Zelek <jacob.zelek@me.com>
Date: Mon, 2 Nov 2020 20:39:41 -0800
Subject: [PATCH 01/12] Refactored to pass PEP8 rules

---
 generator | 81 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 32 deletions(-)

diff --git a/generator b/generator
index 2f70ed6..60cea15 100755
--- a/generator
+++ b/generator
@@ -22,80 +22,97 @@ from docopt import docopt
 from moviepy.editor import VideoFileClip
 from PIL import Image
 from click import progressbar
-import glob, os, random, shutil, math, tempfile
+import glob
+import os
+import random
+import shutil
+import math
+import tempfile
 
 
 TMP_FRAMES_PATH = tempfile.mkdtemp()
 
-def generate_video_thumbnail(args):
-    videoFileClip = VideoFileClip(args['<video>'])
+
+def generate_video_thumbnails(args):
+    filepath = args['<video>']
     interval = int(args['<interval>'])
     size = (int(args['<width>']), int(args['<height>']))
-    outputPrefix = get_output_prefix()
-    generate_frames(videoFileClip, interval, outputPrefix, size)
-
+    output_prefix = get_output_prefix()
     columns = int(args['<columns>'])
     output = args['<output>']
-    generate_sprite_from_frames(outputPrefix, columns, size, output)
 
-def generate_frames(videoFileClip, interval, outputPrefix, size):
-    print("Extracting", int(videoFileClip.duration / interval), "frames")
-    frameCount = 0
-    with progressbar(range(0, int(videoFileClip.duration), interval)) as items:
+    video_file_clip = VideoFileClip(filepath)
+    generate_frames(video_file_clip, interval, output_prefix, size)
+    generate_sprite_from_frames(output_prefix, columns, size, output)
+
+
+def generate_frames(video_file_clip, interval, output_prefix, size):
+    duration = video_file_clip.duration
+    print("Extracting", int(duration / interval), "frames")
+    frame_count = 0
+    with progressbar(range(0, int(duration), interval)) as items:
         for i in items:
-            extract_frame(videoFileClip, i, outputPrefix, size, frameCount)
-            frameCount += 1
+            extract_frame(video_file_clip, i, output_prefix, size, frame_count)
+            frame_count += 1
     print("Frames extracted.")
 
-def extract_frame(videoFileClip, moment, outputPrefix, size, frameCount):
-    output = outputPrefix + ("%05d.png" % frameCount)
-    videoFileClip.save_frame(output, t=int(moment))
+
+def extract_frame(video_file_clip, moment, output_prefix, size, frame_count):
+    output = output_prefix + ("%05d.png" % frame_count)
+    video_file_clip.save_frame(output, t=int(moment))
     resize_frame(output, size)
 
+
 def resize_frame(filename, size):
     image = Image.open(filename)
     image = image.resize(size, Image.ANTIALIAS)
     image.save(filename)
 
-def generate_sprite_from_frames(framesPath, columns, size, output):
-    framesMap = sorted(glob.glob(framesPath + "*.png"))
 
-    masterWidth = size[0] * columns
-    masterHeight = size[1] * int(math.ceil(float(len(framesMap)) / columns))
+def generate_sprite_from_frames(frames_path, columns, size, output):
+    frames_map = sorted(glob.glob(frames_path + "*.png"))
+
+    master_width = size[0] * columns
+    master_height = size[1] * int(math.ceil(float(len(frames_map)) / columns))
 
     line, column, mode = 0, 0, 'RGBA'
 
     try:
-        finalImage = Image.new(mode=mode, size=(masterWidth, masterHeight), color=(0,0,0,0))
-        finalImage.save(output)
+        final_image = Image.new(
+            mode=mode,
+            size=(master_width, master_height),
+            color=(0, 0, 0, 0)
+        )
+        final_image.save(output)
     except IOError:
         mode = 'RGB'
-        finalImage = Image.new(mode=mode, size=(masterWidth, masterHeight))
+        final_image = Image.new(mode=mode, size=(master_width, master_height))
 
-    for filename in framesMap:
-        with Image.open(filename) as image:              
+    for filename in frames_map:
+        with Image.open(filename) as image:
 
-            locationX = size[0] * column
-            locationY = size[1] * line
+            location_x = size[0] * column
+            location_y = size[1] * line
 
-            finalImage.paste(image, (locationX, locationY))
+            final_image.paste(image, (location_x, location_y))
 
             column += 1
-            
+
             if column == columns:
                 line += 1
                 column = 0
 
-    finalImage.save(output)
+    final_image.save(output)
     shutil.rmtree(TMP_FRAMES_PATH, ignore_errors=True)
     print("Saved!")
 
+
 def get_output_prefix():
     if not os.path.exists(TMP_FRAMES_PATH):
         os.makedirs(TMP_FRAMES_PATH)
     return TMP_FRAMES_PATH + os.sep + ("%032x_" % random.getrandbits(128))
 
+
 if __name__ == "__main__":
     arguments = docopt(__doc__, version='0.0.2')
-    generate_video_thumbnail(arguments)
-
+    generate_video_thumbnails(arguments)

From e9dd9ab7995bdf5ba2abebd819648f7c49dfb887 Mon Sep 17 00:00:00 2001
From: Jacob Zelek <jacob.zelek@me.com>
Date: Mon, 2 Nov 2020 21:21:13 -0800
Subject: [PATCH 02/12] Directory support added

---
 README.md | 10 ++++++++++
 generator | 45 ++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 27cbefb..aa2c829 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,7 @@ Options:
 ```
 
 ## Example
+**Single file**
 ```shell
 $ ./generator videos/27467_1_milkbots_wg_720p.mp4 2 126 73 10 thumbnails.jpg
 Extracting 5 frames
@@ -56,6 +57,15 @@ Frames extracted.
 Saved!
 ```
 
+**Directory**
+```shell
+$ ./generator videos/ 2 126 73 10 thumbnails/
+Extracting 5 frames
+  [####################################]  100%
+Frames extracted.
+Saved!
+```
+
 ![image](https://cloud.githubusercontent.com/assets/244265/11234316/b42913a6-8d94-11e5-865a-128ea8d801f7.png)
 
 
diff --git a/generator b/generator
index 60cea15..164862c 100755
--- a/generator
+++ b/generator
@@ -22,28 +22,63 @@ from docopt import docopt
 from moviepy.editor import VideoFileClip
 from PIL import Image
 from click import progressbar
+from collections import namedtuple
 import glob
 import os
 import random
 import shutil
 import math
 import tempfile
+import sys
 
 
 TMP_FRAMES_PATH = tempfile.mkdtemp()
 
 
 def generate_video_thumbnails(args):
-    filepath = args['<video>']
+    input_path = args['<video>']
     interval = int(args['<interval>'])
     size = (int(args['<width>']), int(args['<height>']))
     output_prefix = get_output_prefix()
     columns = int(args['<columns>'])
-    output = args['<output>']
+    output_path = args['<output>']
 
-    video_file_clip = VideoFileClip(filepath)
-    generate_frames(video_file_clip, interval, output_prefix, size)
-    generate_sprite_from_frames(output_prefix, columns, size, output)
+    file_paths = set()
+
+    if os.path.isdir(input_path):
+        # Ensure output path is also directory
+        if not os.path.isdir(output_path):
+            print(
+                "If input path is directory then "
+                "output path must be directory"
+            )
+            sys.exit(1)
+
+        # Strip seperator so contructing output is uniform
+        output_path = output_path.strip(os.sep)
+
+        # Add all files in directory for processing
+        for file_name in os.listdir(input_path):
+            file_path = os.path.join(input_path, file_name)
+            if os.path.isfile(file_path):
+                # Construct output path for thumbnail using
+                # the video files filename
+                single_output_path = \
+                    "{output_path}{seperator}{file_name}.png". \
+                    format(
+                        output_path=output_path,
+                        seperator=os.sep,
+                        file_name=os.path.basename(file_path)
+                    )
+                file_paths.add((file_path, single_output_path,))
+    else:
+        file_paths.add((input_path, output_path,))
+
+    # Process all files sequentially
+    for file_path in file_paths:
+        video_file_clip = VideoFileClip(file_path[0])
+        generate_frames(video_file_clip, interval, output_prefix, size)
+        generate_sprite_from_frames(output_prefix, columns, size, file_path[1])
 
 
 def generate_frames(video_file_clip, interval, output_prefix, size):

From 4f635b68cc4c09cb9f409a6727456e38dc5f2ae7 Mon Sep 17 00:00:00 2001
From: Jacob Zelek <jacob.zelek@me.com>
Date: Mon, 2 Nov 2020 22:02:20 -0800
Subject: [PATCH 03/12] Parallel processing

---
 README.md |  1 +
 generator | 51 +++++++++++++++++++++++++++++++++------------------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index aa2c829..6642ee4 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@ Options:
   <height>        Height of each thumbnail.
   <columns>       Total number of thumbnails per line.
   <output>        Output.
+  <parallelism>   Number of files to process in parallel
 ```
 
 ## Example
diff --git a/generator b/generator
index 164862c..5b2044a 100755
--- a/generator
+++ b/generator
@@ -16,6 +16,7 @@ Options:
   <height>        Height of each thumbnail.
   <columns>       Total number of thumbnails per line.
   <output>        Output.
+  <parallelism>   Number of files to process in parallel
 """
 
 from docopt import docopt
@@ -23,6 +24,7 @@ from moviepy.editor import VideoFileClip
 from PIL import Image
 from click import progressbar
 from collections import namedtuple
+from multiprocessing import Pool, cpu_count
 import glob
 import os
 import random
@@ -39,11 +41,11 @@ def generate_video_thumbnails(args):
     input_path = args['<video>']
     interval = int(args['<interval>'])
     size = (int(args['<width>']), int(args['<height>']))
-    output_prefix = get_output_prefix()
     columns = int(args['<columns>'])
     output_path = args['<output>']
+    parallelism = args.get('<parallelism>', cpu_count()*2-1)
 
-    file_paths = set()
+    work_units = []
 
     if os.path.isdir(input_path):
         # Ensure output path is also directory
@@ -70,26 +72,38 @@ def generate_video_thumbnails(args):
                         seperator=os.sep,
                         file_name=os.path.basename(file_path)
                     )
-                file_paths.add((file_path, single_output_path,))
+                work_units.append((file_path, single_output_path,
+                                   interval, size, columns,))
     else:
-        file_paths.add((input_path, output_path,))
+        work_units.append((input_path, output_path, interval, size, columns,))
 
-    # Process all files sequentially
-    for file_path in file_paths:
-        video_file_clip = VideoFileClip(file_path[0])
-        generate_frames(video_file_clip, interval, output_prefix, size)
-        generate_sprite_from_frames(output_prefix, columns, size, file_path[1])
+    # Limit the number of parallel jobs if lower number of files
+    parallelism = min(parallelism, len(work_units))
+
+    # Process all files in parallel
+    with Pool(parallelism) as p:
+        p.map(process_file, work_units)
 
 
-def generate_frames(video_file_clip, interval, output_prefix, size):
+def process_file(work_unit):
+    input_file, output_file, interval, size, columns = work_unit
+    video_file_clip = VideoFileClip(input_file)
+    output_prefix = get_output_prefix()
+    file_name = os.path.basename(input_file)
+    generate_frames(file_name, video_file_clip, interval, output_prefix, size)
+    generate_sprite_from_frames(output_prefix, columns, size, output_file)
+
+
+def generate_frames(file_name, video_file_clip, interval, output_prefix, size):
     duration = video_file_clip.duration
-    print("Extracting", int(duration / interval), "frames")
     frame_count = 0
-    with progressbar(range(0, int(duration), interval)) as items:
-        for i in items:
-            extract_frame(video_file_clip, i, output_prefix, size, frame_count)
-            frame_count += 1
-    print("Frames extracted.")
+    total_frames = int(duration / interval)
+    for i in range(0, int(duration), interval):
+        print("[{file_name}] Extracting frame {current}/{total}".
+              format(file_name=file_name, current=frame_count+1,
+                     total=total_frames+1))
+        extract_frame(video_file_clip, i, output_prefix, size, frame_count)
+        frame_count += 1
 
 
 def extract_frame(video_file_clip, moment, output_prefix, size, frame_count):
@@ -138,8 +152,9 @@ def generate_sprite_from_frames(frames_path, columns, size, output):
                 column = 0
 
     final_image.save(output)
-    shutil.rmtree(TMP_FRAMES_PATH, ignore_errors=True)
-    print("Saved!")
+    shutil.rmtree(frames_path, ignore_errors=True)
+    output_file = os.path.basename(output)
+    print("[{output_file}] Saved".format(output_file=output_file))
 
 
 def get_output_prefix():

From e3355f49e2d55bc77cf811a132dd533c9cc96b4d Mon Sep 17 00:00:00 2001
From: Jacob Zelek <jacob.zelek@me.com>
Date: Mon, 2 Nov 2020 22:07:43 -0800
Subject: [PATCH 04/12] Documentation update

---
 README.md | 25 +++++++++++++++----------
 generator |  2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 6642ee4..34797d9 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ $ ./generator --help
 Video Thumbnail Generator
 
 Usage:
-  ./generator <video> <interval> <width> <height> <columns> <output>
+  ./generator <video> <interval> <width> <height> <columns> <output> <parallelism>
   ./generator (-h | --help)
   ./generator --version
 
@@ -51,20 +51,25 @@ Options:
 ## Example
 **Single file**
 ```shell
-$ ./generator videos/27467_1_milkbots_wg_720p.mp4 2 126 73 10 thumbnails.jpg
-Extracting 5 frames
-  [####################################]  100%
-Frames extracted.
+$ ./generator samples/sample.mp4 60 300 200 2 output/sample.mp4.png
+[sample.mp4] Extracting frame 1/3
+[sample.mp4] Extracting frame 2/3
+[sample.mp4] Extracting frame 3/3
+[sample.mp4.png] Savedacted.
 Saved!
 ```
 
 **Directory**
 ```shell
-$ ./generator videos/ 2 126 73 10 thumbnails/
-Extracting 5 frames
-  [####################################]  100%
-Frames extracted.
-Saved!
+$ ./generator samples/ 60 300 200 2 output/
+[sample copy.mp4] Extracting frame 1/3
+[sample.mp4] Extracting frame 1/3
+[sample copy.mp4] Extracting frame 2/3
+[sample.mp4] Extracting frame 2/3
+[sample copy.mp4] Extracting frame 3/3
+[sample.mp4] Extracting frame 3/3
+[sample copy.mp4.png] Saved
+[sample.mp4.png] Saved
 ```
 
 ![image](https://cloud.githubusercontent.com/assets/244265/11234316/b42913a6-8d94-11e5-865a-128ea8d801f7.png)
diff --git a/generator b/generator
index 5b2044a..2e5780b 100755
--- a/generator
+++ b/generator
@@ -3,7 +3,7 @@
 """Video Thumbnail Generator
 
 Usage:
-  ./generator <video> <interval> <width> <height> <columns> <output>
+  ./generator <video> <interval> <width> <height> <columns> <output> <parallelism>
   ./generator (-h | --help)
   ./generator --version
 

From 71ca66802dd8a30ce8e3f2a8c9043927fe3c53d2 Mon Sep 17 00:00:00 2001
From: Jacob Zelek <jacob.zelek@outlook.com>
Date: Mon, 14 Dec 2020 02:58:47 -0800
Subject: [PATCH 05/12] Parallelism opt is now optional, bug fix for output
 path

---
 generator | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/generator b/generator
index 2e5780b..21493cd 100755
--- a/generator
+++ b/generator
@@ -3,20 +3,20 @@
 """Video Thumbnail Generator
 
 Usage:
-  ./generator <video> <interval> <width> <height> <columns> <output> <parallelism>
+  ./generator <video> <interval> <width> <height> <columns> <output> [<parallelism>]
   ./generator (-h | --help)
   ./generator --version
 
 Options:
-  -h --help     Show this screen.
-  --version     Show version.
+  -h --help       Show this screen.
+  --version       Show version.
   <video>         Video filepath.
   <interval>      Interval em seconds between frames.
   <width>         Width of each thumbnail.
   <height>        Height of each thumbnail.
   <columns>       Total number of thumbnails per line.
   <output>        Output.
-  <parallelism>   Number of files to process in parallel
+  [<parallelism>] Number of files to process in parallel.
 """
 
 from docopt import docopt
@@ -43,7 +43,7 @@ def generate_video_thumbnails(args):
     size = (int(args['<width>']), int(args['<height>']))
     columns = int(args['<columns>'])
     output_path = args['<output>']
-    parallelism = args.get('<parallelism>', cpu_count()*2-1)
+    parallelism = args.get('[<parallelism>]', cpu_count()*2-1)
 
     work_units = []
 
@@ -57,7 +57,7 @@ def generate_video_thumbnails(args):
             sys.exit(1)
 
         # Strip seperator so contructing output is uniform
-        output_path = output_path.strip(os.sep)
+        output_path = output_path.rstrip(os.sep)
 
         # Add all files in directory for processing
         for file_name in os.listdir(input_path):
@@ -65,13 +65,10 @@ def generate_video_thumbnails(args):
             if os.path.isfile(file_path):
                 # Construct output path for thumbnail using
                 # the video files filename
-                single_output_path = \
-                    "{output_path}{seperator}{file_name}.png". \
-                    format(
-                        output_path=output_path,
-                        seperator=os.sep,
-                        file_name=os.path.basename(file_path)
-                    )
+                single_output_path = os.path.join(
+                    output_path, os.path.basename(file_path) + ".png"
+                )
+
                 work_units.append((file_path, single_output_path,
                                    interval, size, columns,))
     else:

From 2cdccec80062c2f6cff75bccb0f9df007f11b875 Mon Sep 17 00:00:00 2001
From: Jacob Zelek <jacob.zelek@outlook.com>
Date: Mon, 14 Dec 2020 03:00:14 -0800
Subject: [PATCH 06/12] Bug fix - cast parallelism input to int

---
 generator | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generator b/generator
index 21493cd..996cc5c 100755
--- a/generator
+++ b/generator
@@ -75,7 +75,7 @@ def generate_video_thumbnails(args):
         work_units.append((input_path, output_path, interval, size, columns,))
 
     # Limit the number of parallel jobs if lower number of files
-    parallelism = min(parallelism, len(work_units))
+    parallelism = min(int(parallelism), len(work_units))
 
     # Process all files in parallel
     with Pool(parallelism) as p:

From 7a0cf18c94738fa54c594f6b0105b255d6953ac9 Mon Sep 17 00:00:00 2001
From: Jacob Zelek <jacob.zelek@outlook.com>
Date: Thu, 17 Dec 2020 03:34:00 -0800
Subject: [PATCH 07/12] Using processes instead of process pool map to solve
 mem issue

---
 generator | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/generator b/generator
index 996cc5c..34cbdb2 100755
--- a/generator
+++ b/generator
@@ -24,7 +24,7 @@ from moviepy.editor import VideoFileClip
 from PIL import Image
 from click import progressbar
 from collections import namedtuple
-from multiprocessing import Pool, cpu_count
+from multiprocessing import cpu_count, Queue, Process
 import glob
 import os
 import random
@@ -45,7 +45,8 @@ def generate_video_thumbnails(args):
     output_path = args['<output>']
     parallelism = args.get('[<parallelism>]', cpu_count()*2-1)
 
-    work_units = []
+    work_queue = Queue()
+    work_units = 0
 
     if os.path.isdir(input_path):
         # Ensure output path is also directory
@@ -69,20 +70,35 @@ def generate_video_thumbnails(args):
                     output_path, os.path.basename(file_path) + ".png"
                 )
 
-                work_units.append((file_path, single_output_path,
-                                   interval, size, columns,))
+                work_queue.put((file_path, single_output_path,
+                                interval, size, columns,))
+                work_units += 1
     else:
-        work_units.append((input_path, output_path, interval, size, columns,))
+        work_queue.put((input_path, output_path, interval, size, columns,))
+        work_units += 1
 
     # Limit the number of parallel jobs if lower number of files
-    parallelism = min(int(parallelism), len(work_units))
+    parallelism = min(int(parallelism), work_units)
 
-    # Process all files in parallel
-    with Pool(parallelism) as p:
-        p.map(process_file, work_units)
+    # Start worker processes
+    processes = []
+    for i in range(parallelism):
+        p = Process(target=worker, args=(work_queue,))
+        p.start()
+        processes.append(p)
+
+    # Block until all processes complete
+    for p in processes:
+        p.join()
 
 
-def process_file(work_unit):
+def worker(queue):
+    work_unit = queue.get()
+
+    # If no work unit then quit
+    if not work_unit:
+        return
+
     input_file, output_file, interval, size, columns = work_unit
     video_file_clip = VideoFileClip(input_file)
     output_prefix = get_output_prefix()

From 8d1223b646e742a62b04aa1ffae80570a4e8ec75 Mon Sep 17 00:00:00 2001
From: Jacob Zelek <jacob.zelek@outlook.com>
Date: Thu, 17 Dec 2020 06:28:48 -0800
Subject: [PATCH 08/12] Bug fix - worker was only taking one item and
 terminating after

---
 generator | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/generator b/generator
index 34cbdb2..2376f4b 100755
--- a/generator
+++ b/generator
@@ -93,18 +93,19 @@ def generate_video_thumbnails(args):
 
 
 def worker(queue):
-    work_unit = queue.get()
+    while True:
+        work_unit = queue.get()
 
-    # If no work unit then quit
-    if not work_unit:
-        return
+        # If no work unit then quit
+        if not work_unit:
+            return
 
-    input_file, output_file, interval, size, columns = work_unit
-    video_file_clip = VideoFileClip(input_file)
-    output_prefix = get_output_prefix()
-    file_name = os.path.basename(input_file)
-    generate_frames(file_name, video_file_clip, interval, output_prefix, size)
-    generate_sprite_from_frames(output_prefix, columns, size, output_file)
+        input_file, output_file, interval, size, columns = work_unit
+        video_file_clip = VideoFileClip(input_file)
+        output_prefix = get_output_prefix()
+        file_name = os.path.basename(input_file)
+        generate_frames(file_name, video_file_clip, interval, output_prefix, size)
+        generate_sprite_from_frames(output_prefix, columns, size, output_file)
 
 
 def generate_frames(file_name, video_file_clip, interval, output_prefix, size):

From 81dd25829f28fadbc06b296498bb9c29b5ffdd0c Mon Sep 17 00:00:00 2001
From: Jacob Zelek <jacob.zelek@outlook.com>
Date: Thu, 17 Dec 2020 06:31:25 -0800
Subject: [PATCH 09/12] Update doc to indicate parallelism arg is optional

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 34797d9..c138ed3 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ $ ./generator --help
 Video Thumbnail Generator
 
 Usage:
-  ./generator <video> <interval> <width> <height> <columns> <output> <parallelism>
+  ./generator <video> <interval> <width> <height> <columns> <output> [<parallelism>]
   ./generator (-h | --help)
   ./generator --version
 
@@ -45,7 +45,7 @@ Options:
   <height>        Height of each thumbnail.
   <columns>       Total number of thumbnails per line.
   <output>        Output.
-  <parallelism>   Number of files to process in parallel
+  [<parallelism>]   Number of files to process in parallel
 ```
 
 ## Example

From 7ca81d03bd567fa22690000b2cd3bb4b3d8be0df Mon Sep 17 00:00:00 2001
From: Jacob Zelek <jacob.zelek@outlook.com>
Date: Sat, 26 Dec 2020 15:23:13 -0800
Subject: [PATCH 10/12] Fix for Queue when empty

---
 generator | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/generator b/generator
index 2376f4b..5b37e60 100755
--- a/generator
+++ b/generator
@@ -94,18 +94,27 @@ def generate_video_thumbnails(args):
 
 def worker(queue):
     while True:
-        work_unit = queue.get()
+        try:
+            work_unit = queue.get(False)
 
-        # If no work unit then quit
-        if not work_unit:
-            return
+            # If no work unit then quit
+            if not work_unit:
+                break
+        except:
+            break
 
         input_file, output_file, interval, size, columns = work_unit
-        video_file_clip = VideoFileClip(input_file)
-        output_prefix = get_output_prefix()
-        file_name = os.path.basename(input_file)
-        generate_frames(file_name, video_file_clip, interval, output_prefix, size)
-        generate_sprite_from_frames(output_prefix, columns, size, output_file)
+
+        try:
+            video_file_clip = VideoFileClip(input_file)
+            output_prefix = get_output_prefix()
+            file_name = os.path.basename(input_file)
+            generate_frames(file_name, video_file_clip,
+                            interval, output_prefix, size)
+            generate_sprite_from_frames(output_prefix, columns,
+                                        size, output_file)
+        except:
+            print("Error occurred with file: {}".format(file_name))
 
 
 def generate_frames(file_name, video_file_clip, interval, output_prefix, size):

From ebe573910a5f1aae69b5d6ba2b662a8e12682b6f Mon Sep 17 00:00:00 2001
From: Jacob Zelek <jacob.zelek@outlook.com>
Date: Sat, 26 Dec 2020 15:27:04 -0800
Subject: [PATCH 11/12] Skip over thumbnails that already exist

---
 generator | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/generator b/generator
index 5b37e60..35d8faa 100755
--- a/generator
+++ b/generator
@@ -100,11 +100,17 @@ def worker(queue):
             # If no work unit then quit
             if not work_unit:
                 break
+        # Handle exception when no more items in queue
         except:
             break
 
         input_file, output_file, interval, size, columns = work_unit
 
+        # Skip over any thumbnails that exist already
+        if os.path.exists(output_file):
+            print("[{}] Already exists, skipping".format(output_file))
+            continue
+
         try:
             video_file_clip = VideoFileClip(input_file)
             output_prefix = get_output_prefix()
@@ -114,7 +120,7 @@ def worker(queue):
             generate_sprite_from_frames(output_prefix, columns,
                                         size, output_file)
         except:
-            print("Error occurred with file: {}".format(file_name))
+            print("[{}] Error occurred with file".format(file_name))
 
 
 def generate_frames(file_name, video_file_clip, interval, output_prefix, size):

From 1c8342440b7b09f9a72ff3158dfa14df376942ca Mon Sep 17 00:00:00 2001
From: Jacob Zelek <jacob.zelek@outlook.com>
Date: Wed, 30 Dec 2020 14:28:08 -0800
Subject: [PATCH 12/12] Only display file name and not full path in stdout

---
 generator | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/generator b/generator
index 35d8faa..6e0f5d1 100755
--- a/generator
+++ b/generator
@@ -106,21 +106,24 @@ def worker(queue):
 
         input_file, output_file, interval, size, columns = work_unit
 
+        file_name = os.path.basename(input_file)
+
         # Skip over any thumbnails that exist already
         if os.path.exists(output_file):
-            print("[{}] Already exists, skipping".format(output_file))
+            print("[{file_name}] Already exists, skipping".format(
+                file_name=file_name))
             continue
 
         try:
             video_file_clip = VideoFileClip(input_file)
             output_prefix = get_output_prefix()
-            file_name = os.path.basename(input_file)
             generate_frames(file_name, video_file_clip,
                             interval, output_prefix, size)
             generate_sprite_from_frames(output_prefix, columns,
                                         size, output_file)
         except:
-            print("[{}] Error occurred with file".format(file_name))
+            print("[{file_name}] Error occurred with file".format(
+                file_name=file_name))
 
 
 def generate_frames(file_name, video_file_clip, interval, output_prefix, size):