diff --git a/src/upscaler.py b/src/upscaler.py index f9392ba..5bc9ee2 100755 --- a/src/upscaler.py +++ b/src/upscaler.py @@ -4,7 +4,7 @@ Name: Video2X Upscaler Author: K4YT3X Date Created: December 10, 2018 -Last Modified: May 29, 2020 +Last Modified: June 4, 2020 Description: This file contains the Upscaler class. Each instance of the Upscaler class is an upscaler on an image or @@ -50,7 +50,7 @@ language.install() _ = language.gettext # version information -UPSCALER_VERSION = '4.2.0' +UPSCALER_VERSION = '4.2.1' # these names are consistent for # - driver selection in command line @@ -469,9 +469,12 @@ class Upscaler: self.current_input_file, output_path = self.processing_queue.get() # get file type - input_file_mime_type = magic.from_file(str(self.current_input_file.absolute()), mime=True) - input_file_type = input_file_mime_type.split('/')[0] - input_file_subtype = input_file_mime_type.split('/')[1] + try: + input_file_mime_type = magic.from_file(str(self.current_input_file.absolute()), mime=True) + input_file_type = input_file_mime_type.split('/')[0] + input_file_subtype = input_file_mime_type.split('/')[1] + except magic.magic.MagicException: + input_file_type = input_file_subtype = None # in case python-magic fails to detect file type # try guessing file mime type with mimetypes diff --git a/src/video2x_gui.py b/src/video2x_gui.py index 94ba316..652fc80 100755 --- a/src/video2x_gui.py +++ b/src/video2x_gui.py @@ -4,7 +4,7 @@ Creator: Video2X GUI Author: K4YT3X Date Created: May 5, 2020 -Last Modified: May 26, 2020 +Last Modified: June 4, 2020 """ # local imports @@ -32,7 +32,7 @@ from PyQt5.QtGui import * from PyQt5.QtWidgets import * import magic -GUI_VERSION = '2.5.0' +GUI_VERSION = '2.5.1' LEGAL_INFO = f'''Video2X GUI Version: {GUI_VERSION}\\ Upscaler Version: {UPSCALER_VERSION}\\ @@ -131,9 +131,12 @@ class InputTableModel(QAbstractTableModel): # if path is single file # determine file type elif file_path.is_file(): - input_file_mime_type = magic.from_file(str(file_path.absolute()), mime=True) - input_file_type = input_file_mime_type.split('/')[0] - input_file_subtype = input_file_mime_type.split('/')[1] + try: + input_file_mime_type = magic.from_file(str(file_path.absolute()), mime=True) + input_file_type = input_file_mime_type.split('/')[0] + input_file_subtype = input_file_mime_type.split('/')[1] + except magic.magic.MagicException: + input_file_type = input_file_subtype = None # in case python-magic fails to detect file type # try guessing file mime type with mimetypes @@ -890,9 +893,12 @@ class Video2XMainWindow(QMainWindow): if input_path.is_file(): # generate suffix automatically - input_file_mime_type = magic.from_file(str(input_path.absolute()), mime=True) - input_file_type = input_file_mime_type.split('/')[0] - input_file_subtype = input_file_mime_type.split('/')[1] + try: + input_file_mime_type = magic.from_file(str(input_path.absolute()), mime=True) + input_file_type = input_file_mime_type.split('/')[0] + input_file_subtype = input_file_mime_type.split('/')[1] + except magic.magic.MagicException: + input_file_type = input_file_subtype = None # in case python-magic fails to detect file type # try guessing file mime type with mimetypes