From 1bd87200177c21763a567c9f361d521667c7d346 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 May 2019 01:16:54 +0200 Subject: [PATCH 1/3] not video/image components can be loaded again --- pype/standalonepublish/widgets/widget_drop_frame.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pype/standalonepublish/widgets/widget_drop_frame.py b/pype/standalonepublish/widgets/widget_drop_frame.py index 4e99f697cb..de0acac238 100644 --- a/pype/standalonepublish/widgets/widget_drop_frame.py +++ b/pype/standalonepublish/widgets/widget_drop_frame.py @@ -243,12 +243,12 @@ class DropDataFrame(QtWidgets.QFrame): filepath = data['files'][0] ext = data['ext'] output = {} - probe_data = self.load_data_with_probe(filepath) if ( ext in self.presets['extensions']['image_file'] or ext in self.presets['extensions']['video_file'] ): + probe_data = self.load_data_with_probe(filepath) if 'frameRate' not in data: # default value frameRate = 25 @@ -268,13 +268,8 @@ class DropDataFrame(QtWidgets.QFrame): output['startFrame'] = startFrame output['endFrame'] = endFrame - file_info = None - if 'file_info' in data: - file_info = data['file_info'] - elif ext in ['.mov']: - file_info = probe_data.get('codec_name') - - output['file_info'] = file_info + if (ext == '.mov') and ('file_info' not in data): + output['file_info'] = probe_data.get('codec_name') return output From 15c448acb2566f38d203ba62c690b8a6707d9557 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 May 2019 01:21:57 +0200 Subject: [PATCH 2/3] file_info moved back (is important) --- pype/standalonepublish/widgets/widget_drop_frame.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pype/standalonepublish/widgets/widget_drop_frame.py b/pype/standalonepublish/widgets/widget_drop_frame.py index de0acac238..949f93feeb 100644 --- a/pype/standalonepublish/widgets/widget_drop_frame.py +++ b/pype/standalonepublish/widgets/widget_drop_frame.py @@ -244,6 +244,10 @@ class DropDataFrame(QtWidgets.QFrame): ext = data['ext'] output = {} + file_info = None + if 'file_info' in data: + file_info = data['file_info'] + if ( ext in self.presets['extensions']['image_file'] or ext in self.presets['extensions']['video_file'] @@ -268,8 +272,10 @@ class DropDataFrame(QtWidgets.QFrame): output['startFrame'] = startFrame output['endFrame'] = endFrame - if (ext == '.mov') and ('file_info' not in data): - output['file_info'] = probe_data.get('codec_name') + if (ext == '.mov') and (not file_info): + file_info = probe_data.get('codec_name') + + output['file_info'] = file_info return output From 3bf7f73c7de7daa2a690d856b0596553defd1c68 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 22 May 2019 01:22:28 +0200 Subject: [PATCH 3/3] extention is lowered so looking is not case sensitive --- pype/standalonepublish/widgets/widget_drop_frame.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pype/standalonepublish/widgets/widget_drop_frame.py b/pype/standalonepublish/widgets/widget_drop_frame.py index 949f93feeb..c792813a22 100644 --- a/pype/standalonepublish/widgets/widget_drop_frame.py +++ b/pype/standalonepublish/widgets/widget_drop_frame.py @@ -241,7 +241,7 @@ class DropDataFrame(QtWidgets.QFrame): def get_file_data(self, data): filepath = data['files'][0] - ext = data['ext'] + ext = data['ext'].lower() output = {} file_info = None