Merge pull request #3158 from OpenShot/update-image-cache

Updating image cache logic and icons

Author: jonoomph

src/blender/icons/blinds.png

@@ -76,13 +76,14 @@ def __init__(self, *args, mode=None):
             reroute_output()
         except ImportError as ex:
             tb = traceback.format_exc()
+            log.error('OpenShotApp::Import Error: %s' % str(ex))
             QMessageBox.warning(None, "Import Error",
                                 "Module: %(name)s\n\n%(tb)s" % {"name": ex.name, "tb": tb})
             # Stop launching and exit
             raise
             sys.exit()
-        except Exception:
-            raise
+        except Exception as ex:
+            log.error('OpenShotApp::Init Error: %s' % str(ex))
             sys.exit()
 
         # Log some basic system info

src/blender/icons/blur.png

@@ -64,7 +64,7 @@ def GenerateThumbnail(file_path, thumb_path, thumbnail_frame, width, height, mas
         os.mkdir(parent_path)
 
     # Save thumbnail image and close readers
-    reader.GetFrame(thumbnail_frame).Thumbnail(thumb_path, width, height, mask, overlay, "#000", False, "png", 100, rotate)
+    reader.GetFrame(thumbnail_frame).Thumbnail(thumb_path, width, height, mask, overlay, "#000", False, "png", 85, rotate)
     reader.Close()
     clip.Close()
 
@@ -82,10 +82,13 @@ def find_free_port(self):
         """Find the first available socket port"""
         s = socket.socket()
         s.bind(('', 0))
-        return s.getsockname()[1]
+        socket_port = s.getsockname()[1]
+        s.close()
+        return socket_port
 
     def kill(self):
         self.running = False
+        log.info('Shutting down thumbnail server: %s' % str(self.server_address))
         self.thumbServer.shutdown()
 
     def run(self):
@@ -96,6 +99,10 @@ def run(self):
         self.thumbServer = httpThumbnailServer(self.server_address, httpThumbnailHandler)
         self.thumbServer.serve_forever(0.5)
 
+    def __init__(self):
+        Thread.__init__(self)
+        self.server_address = None
+
 
 class httpThumbnailHandler(BaseHTTPRequestHandler):
     """ This class handles HTTP requests to the HTTP thumbnail server above."""