Add asset_width, asset_height and asset_framerate columns to the asset table of the database

The new columns are used to set asset specific size and playback options overriding the bookmark
item's values per asset.

Author: wgergely

README.md

@@ -7,7 +7,7 @@
   <img src="https://img.shields.io/badge/Python-3.8%2B-lightgrey">
   <img src="https://img.shields.io/badge/Python-PySide2-lightgrey">
   <img src="https://img.shields.io/badge/Platform-Windows-lightgrey">
-  <img src="https://img.shields.io/badge/Version-v0.8.3-green">
+  <img src="https://img.shields.io/badge/Version-v0.8.4-green">
 </p> 
 
 <p align="center">

bookmarks/__init__.py

@@ -76,7 +76,7 @@
 .. |label3| image:: https://img.shields.io/badge/Platform-Windows-lightgrey
    :height: 18
 
-.. |label4| image:: https://img.shields.io/badge/Version-v0.8.3-green
+.. |label4| image:: https://img.shields.io/badge/Version-v0.8.4-green
    :height: 18
 
 .. |image1| image:: ./images/active_bookmark.png
@@ -100,7 +100,7 @@
 __email__ = '[email protected]'
 
 #: Project version
-__version__ = '0.8.3'
+__version__ = '0.8.4'
 
 #: Project version
 __version_info__ = __version__.split('.')

bookmarks/database.py

@@ -142,6 +142,18 @@
             'sql': 'INT',
             'type': int
         },
+        'asset_framerate': {
+            'sql': 'REAL',
+            'type': float
+        },
+        'asset_width': {
+            'sql': 'INT',
+            'type': int
+        },
+        'asset_height': {
+            'sql': 'INT',
+            'type': int
+        },
         'url1': {
             'sql': 'TEXT',
             'type': str

bookmarks/editor/asset_properties.py

@@ -173,8 +173,8 @@ class AssetPropertyEditor(base.BasePropertyEditor):
             }
         },
         2: {
-            'name': 'Cut',
-            'icon': 'todo',
+            'name': 'Settings',
+            'icon': 'bookmark',
             'color': common.color(common.color_dark_background),
             'groups': {
                 0: {
@@ -221,6 +221,33 @@ class AssetPropertyEditor(base.BasePropertyEditor):
                         'description': 'The frame this asset ends at, e.g. \'1575\'.',
                     },
                 },
+                2: {
+                    0: {
+                        'name': 'Asset frame-rate',
+                        'key': 'asset_framerate',
+                        'validator': base.float_validator,
+                        'widget': ui.LineEdit,
+                        'placeholder': 'Frame-rate, e.g. \'23.976\'',
+                        'description': 'The frame-rate of the asset, e.g. '
+                                       '\'25.0\'',
+                    },
+                    1: {
+                        'name': 'Asset width',
+                        'key': 'asset_width',
+                        'validator': base.int_validator,
+                        'widget': ui.LineEdit,
+                        'placeholder': 'Width in pixels',
+                        'description': 'The asset\'s output width in pixels, e.g. \'1920\''
+                    },
+                    2: {
+                        'name': 'Asset height',
+                        'key': 'asset_height',
+                        'validator': base.int_validator,
+                        'widget': ui.LineEdit,
+                        'placeholder': 'Height in pixels',
+                        'description': 'The asset\'s output height in pixels, e.g. \'1080\''
+                    },
+                },
             },
         },
         3: {
@@ -359,6 +386,29 @@ def init_data(self):
         self._set_completer()
         self._disable_shotgun()
 
+    def init_db_data(self):
+        super().init_db_data()
+
+        # Asset frame-rate, width and height overrides
+        db = database.get(self.server, self.job, self.root)
+        for k in ('asset_framerate', 'asset_width', 'asset_height'):
+            # Skip items that don't have editors
+            if not hasattr(self, f'{k}_editor'):
+                raise RuntimeError(f'No editor for {k}!')
+
+            v = db.value(self.db_source(), k, database.AssetTable)
+            # If the value is not set, we'll use the bookmark item's value instead as a
+            # placeholder for the text editor
+            if not v:
+                source = f'{self.server}/{self.job}/{self.root}'
+                _v = db.value(source, k.replace('asset_', ''), database.BookmarkTable)
+                if _v is None:
+                    continue
+                getattr(self, f'{k}_editor').setPlaceholderText(f'{_v}')
+
+
+
+
     def _disable_shotgun(self):
         sg_properties = shotgun.SGProperties(
             self.server,

bookmarks/editor/base.py

@@ -330,7 +330,6 @@ def _add_row(self, v, grp, _grp):
             if k is not None:
                 setattr(self, f'{_k}_editor', editor)
             else:
-                print(_name)
                 setattr(self, f'{_name}_editor', editor)
 
             if hasattr(editor, 'setAlignment'):

bookmarks/editor/bookmark_properties.py

@@ -91,14 +91,13 @@ class BookmarkPropertyEditor(base.BasePropertyEditor):
                 },
                 2: {
                     0: {
-                        'name': 'Framerate',
+                        'name': 'Frame-rate',
                         'key': 'framerate',
                         'validator': base.float_validator,
                         'widget': ui.LineEdit,
-                        'placeholder': 'Framerate, e.g. \'23.976\'',
-                        'description': 'The framerate of the bookmark, eg, '
-                                       '\'25.0\'.\n\nUsed by Bookmarks to control the '
-                                       'format of scenes inside hosts, e.g. Maya.'
+                        'placeholder': 'Frame-rate, e.g. \'23.976\'',
+                        'description': 'The frame-rate of the bookmark, e.g. '
+                                       '\'25.0\'.'
                     },
                     1: {
                         'name': 'Width',

bookmarks/external/ffmpeg.py

@@ -248,22 +248,25 @@ def _output_path_from_seq(seq, ext):
     return f'{seq.group(1).rstrip(".").rstrip("_").rstrip()}.{ext}'
 
 
-def _get_framerate(server, job, root, fallback_framerate=24.0):
+def _get_framerate(fallback_framerate=24.0):
     """Get the currently set frame-rate from the bookmark item database.
 
     Returns:
-        float: The current framerate.
+        float: The current frame-rate set in the active context.
 
     """
-    db = database.get(server, job, root)
-    v = db.value(
-        db.source(),
-        'framerate',
-        database.BookmarkTable
-    )
+    if not all(common.active('root', args=True)):
+        return fallback_framerate
+
+    db = database.get(*common.active('root', args=True))
 
-    if not v:  # use the fallback value when not set
+    bookmark_framerate = db.value(common.active('root', path=True),'framerate', database.BookmarkTable)
+    asset_framerate = db.value(common.active('asset', path=True),'asset_framerate', database.AssetTable)
+
+    v = asset_framerate or bookmark_framerate or fallback_framerate
+    if not isinstance(v, (int, float)) or v < 1.0:
         return fallback_framerate
+
     return v
 
 
@@ -399,7 +402,7 @@ def convert(
     input_path = _input_path_from_seq(seq)
     cmd = preset.format(
         BIN=ffmpeg_bin,
-        FRAMERATE=_get_framerate(server, job, root),
+        FRAMERATE=_get_framerate(),
         STARTFRAME=startframe,
         INPUT=input_path,
         OUTPUT=output_path,

bookmarks/external/ffmpeg_widget.py

@@ -66,6 +66,18 @@ def init_data(self):
         if not isinstance(data, dict):
             return
 
+        # Add no-timecode option
+        self._data[len(self._data)] = {
+            QtCore.Qt.DisplayRole: 'No timecode',
+            QtCore.Qt.DecorationRole: None,
+            QtCore.Qt.SizeHintRole: self.row_size,
+            QtCore.Qt.StatusTipRole: 'No timecode',
+            QtCore.Qt.AccessibleDescriptionRole: 'No timecode',
+            QtCore.Qt.WhatsThisRole: 'No timecode',
+            QtCore.Qt.ToolTipRole: 'No timecode',
+            QtCore.Qt.UserRole: None,
+        }
+
         template = common.settings.value('ffmpeg/timecode_preset')
         for v in data[tokens.FFMpegTCConfig].values():
             if template == v['name']:
@@ -100,8 +112,7 @@ class TimecodeComboBox(QtWidgets.QComboBox):
     def __init__(self, parent=None):
         super().__init__(parent=parent)
         self.setView(QtWidgets.QListView())
-        model = TimecodeModel()
-        self.setModel(model)
+        self.setModel(TimecodeModel())
 
 
 class PresetComboBox(QtWidgets.QComboBox):
@@ -139,10 +150,17 @@ def init_data(self):
 
         """
         db = database.get(*common.active('root', args=True))
-        width = db.value(db.source(), 'width', database.BookmarkTable)
-        height = db.value(db.source(), 'width', database.BookmarkTable)
+        bookmark_width = db.value(db.source(), 'width', database.BookmarkTable)
+        bookmark_height = db.value(db.source(), 'width', database.BookmarkTable)
+        asset_width = db.value(common.active('asset', path=True), 'asset_width', database.AssetTable)
+        asset_height = db.value(common.active('asset', path=True), 'asset_height', database.AssetTable)
+
+        width = asset_width or bookmark_width or None
+        height = asset_height or bookmark_height or None
+
         if all((width, height)):
             self.addItem(f'Project | {int(height)}p', userData=(width, height))
+            self.addItem(f'Project | {int(height * 0.5)}p', userData=(int(width * 0.5), int(height * 0.5)))
 
         self.blockSignals(True)
         for v in ffmpeg.SIZE_PRESETS.values():
@@ -179,14 +197,6 @@ class FFMpegWidget(base.BasePropertyEditor):
                         'placeholder': None,
                         'description': 'Set the output video size.',
                     },
-                    2: {
-                        'name': 'Add timecode',
-                        'key': 'ffmpeg_add_timecode',
-                        'validator': None,
-                        'widget': functools.partial(QtWidgets.QCheckBox, 'Add Timecode'),
-                        'placeholder': None,
-                        'description': 'Add an informative bar and a timecode.',
-                    },
                     3: {
                         'name': 'Timecode preset',
                         'key': 'ffmpeg_timecode_preset',
@@ -272,7 +282,7 @@ def save_changes(self):
             v['preset'] == preset
         )
 
-        if self.ffmpeg_add_timecode_editor.isChecked():
+        if self.ffmpeg_timecode_preset_editor.currentData():
             destination = f'{seq.group(1).strip().strip("_").strip(".")}' \
                           f'{seq.group(3).strip().strip("_").strip(".")}_tc.' \
                           f'{ext}'
@@ -307,15 +317,12 @@ def save_changes(self):
             return
 
         timecode_preset = self.ffmpeg_timecode_preset_editor.currentData()
-        if not timecode_preset:
-            common.close_message()
-            raise RuntimeError('No timecode preset was selected.')
 
         mov = ffmpeg.convert(
             source_image_paths[0],
             self.ffmpeg_preset_editor.currentData(),
             size=self.ffmpeg_size_editor.currentData(),
-            timecode=self.ffmpeg_add_timecode_editor.isChecked(),
+            timecode=bool(timecode_preset),
             timecode_preset=timecode_preset,
             output_path=destination,
             parent=self