Various local code changes

Author: wgergely

bookmarks/external/ffmpeg.py

@@ -396,7 +396,7 @@ def convert(
         tc = ''
 
     # Get all properties and construct the ffmpeg command
-    input_path=_input_path_from_seq(seq)
+    input_path = _input_path_from_seq(seq)
     cmd = preset.format(
         BIN=ffmpeg_bin,
         FRAMERATE=_get_framerate(server, job, root),
@@ -435,7 +435,8 @@ def convert(
             if common.message_widget.isVisible():
                 common.message_widget.title_label.setText('Making movie...')
                 common.message_widget.body_label.setText(
-                    f'Converting frame {int(match.group(1))} of {int(endframe)}')
+                    f'Converting frame {int(match.group(1))} of {int(endframe)}'
+                )
                 QtWidgets.QApplication.instance().processEvents()
 
         # Verify the output

bookmarks/items/asset_items.py

@@ -330,13 +330,15 @@ def item_generator(self, path):
                 entry.path.replace('\\', '/'),
                 section='links/asset'
             )
+
             for link in links:
                 v = f'{path}/{entry.name}/{link}'
                 _entry = common.get_entry_from_path(v)
                 if not _entry:
                     log.error(f'Could not get entry from link {v}')
                     continue
                 yield _entry
+
             if links:
                 continue
 

bookmarks/items/delegate.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Item delegate used to draw bookmark, asset and file items.
 
 Defines :class:`ItemDelegate`, the base delegate class, subclasses and helper functions.
@@ -844,7 +843,7 @@ def draw_gradient_background(*args):
     painter.drawRect(rect)
 
 
-class ItemDelegate(QtWidgets.QAbstractItemDelegate):
+class ItemDelegate(QtWidgets.QStyledItemDelegate):
     """The main delegate used to represent lists derived from `base.BaseItemView`.
 
     """
@@ -915,12 +914,6 @@ def setModelData(self, editor, model, index):
         db = database.get(*source_path[0:3])
         db.set_value(k, 'description', common.sanitize_hashtags(v))
 
-    def paint(self, painter, option, index):
-        """Paints an item.
-
-        """
-        raise NotImplementedError('Abstract method must be implemented by subclass.')
-
     def get_rectangles(self, index):
         """Return all rectangles needed to paint an item.
 

bookmarks/items/task_items.py

@@ -18,6 +18,7 @@
 from .. import common
 from .. import contextmenu
 from .. import images
+from .. import log
 from ..tokens import tokens
 
 
@@ -49,28 +50,28 @@ class TaskItemViewDelegate(delegate.ItemDelegate):
 
     def paint(self, painter, option, index):
         """The main paint method.
-        
+
         """
         args = self.get_paint_arguments(painter, option, index)
         self.paint_background(*args)
         self.paint_name(*args)
 
     def get_description_rect(self, *args, **kwargs):
         """Get description rectangle.
-        
+
         """
         return QtCore.QRect()
 
     def get_text_segments(self, *args, **kwargs):
         """Get text segments.
-        
+
         """
         return []
 
     @delegate.save_painter
     def paint_background(self, *args):
         """Paints the background.
-        
+
         """
         rectangles, painter, option, index, selected, focused, active, archived, \
             favourite, hover, font, metrics, cursor_position = args
@@ -117,7 +118,7 @@ def paint_background(self, *args):
     def paint_name(self, *args):
         """Paints the name and the number of files available for the given
         task item.
-        
+
         """
         rectangles, painter, option, index, selected, focused, active, archived, \
             favourite, hover, font, metrics, cursor_position = args
@@ -163,7 +164,6 @@ def paint_name(self, *args):
         rect = rect.marginsRemoved(QtCore.QMargins(o * 2, 0, o, 0))
 
         text = index.data(QtCore.Qt.DisplayRole)
-        width = 0
         width = common.draw_aliased_text(
             painter, font, rect, text, QtCore.Qt.AlignVCenter | QtCore.Qt.AlignLeft,
             color
@@ -235,6 +235,24 @@ def data_type(self):
         """
         return common.FileItem
 
+    def item_generator(self, path):
+        try:
+            it = os.scandir(path)
+        except OSError as e:
+            log.error(e)
+            return
+
+        # Get folders from the root of the bookmark item
+        for entry in it:
+            if self._interrupt_requested:
+                return
+            if entry.name.startswith('.'):
+                continue
+            if not entry.is_dir():
+                continue
+
+            yield entry
+
     @common.status_bar_message('Loading task folders...')
     @models.initdata
     @common.error
@@ -243,23 +261,29 @@ def init_data(self):
         """Collects the data needed to populate the task item model.
 
         """
+        p = self.source_path()
+        k = self.task()
+        t = self.data_type()
+
+        if not p or not all(p) or not k or t is None:
+            return
+
+        data = common.get_data(p, k, t)
+        source = '/'.join(p)
+
         flags = (
                 QtCore.Qt.ItemIsSelectable |
                 QtCore.Qt.ItemIsEnabled
         )
-        data = self.model_data()
+
         source_path = self.source_path()
         if not source_path or not all(source_path):
             return
         _source_path = '/'.join(source_path)
 
         config = tokens.get(*source_path[0:3])
 
-        entries = sorted(
-            ([f for f in os.scandir(_source_path)]), key=lambda x: x.name
-        )
-
-        for entry in entries:
+        for entry in self.item_generator(source):
             if entry.name.startswith('.'):
                 continue
             if not entry.is_dir():
@@ -269,6 +293,7 @@ def init_data(self):
 
             idx = len(data)
             description = config.get_description(entry.name)
+
             data[idx] = common.DataDict(
                 {
                     QtCore.Qt.DisplayRole: entry.name,
@@ -300,9 +325,9 @@ def init_data(self):
                     common.ThumbnailLoaded: True,
                     #
                     common.SortByNameRole: entry.name.lower(),
-                    common.SortByLastModifiedRole: 0,
-                    common.SortBySizeRole: 0,
-                    common.SortByTypeRole: entry.name,
+                    common.SortByLastModifiedRole: entry.name.lower(),
+                    common.SortBySizeRole: entry.name.lower(),
+                    common.SortByTypeRole: entry.name.lower(),
                     #
                     common.IdRole: idx,
                     #
@@ -343,43 +368,6 @@ def file_count(self, source):
                 break
         return count
 
-    @classmethod
-    def item_generator(cls, path):
-        """Used to iterate over all files in a given folder.
-
-        Yields:
-            DirEntry:   A DirEntry instance.
-
-        """
-        try:
-            it = os.scandir(path)
-        except:
-            return
-
-        n = 0
-        while True:
-            n += 1
-            if n > 999:
-                return
-
-            try:
-                entry = next(it)
-
-                if entry.name.startswith('.'):
-                    continue
-
-                if entry.is_symlink():
-                    continue
-
-                if not entry.is_dir():
-                    yield entry
-            except OSError:
-                continue
-            except StopIteration:
-                return
-
-            yield from cls.item_generator(entry.path)
-
 
 class TaskItemView(views.ThreadedItemView):
     """The view responsible for displaying the available data-keys.
@@ -512,10 +500,10 @@ def eventFilter(self, widget, event):
 
         if event.type() == QtCore.QEvent.Paint:
             painter = QtGui.QPainter()
-            painter.begin(self)
+            painter.begin(widget)
             painter.setPen(QtCore.Qt.NoPen)
             painter.setBrush(common.color(common.color_separator))
-            painter.drawRect(self.rect())
+            painter.drawRect(widget.rect())
             painter.end()
             return super().eventFilter(widget, event)
 

bookmarks/items/views.py

@@ -243,8 +243,7 @@ class ListsWidget(QtWidgets.QStackedWidget):
     def __init__(self, parent=None):
         super().__init__(parent=parent)
         self.setObjectName('BrowserStackedWidget')
-        self.animation = QtCore.QParallelAnimationGroup(self)
-        self.animation.finished.connect(self.animation_finished)
+
         common.signals.tabChanged.connect(self.setCurrentIndex)
 
     def setCurrentIndex(self, idx):
@@ -280,11 +279,18 @@ def setCurrentIndex(self, idx):
         if current_index == idx:
             return
 
-        a = self.animation.animationAt(0)
-        if a and a.currentTime() < a.totalDuration():
-            return
+        @QtCore.Slot()
+        def animation_finished(a):
+            anim = a.animationAt(1)
+            if not anim:
+                return
+            if isinstance(anim.targetObject(), QtWidgets.QWidget):
+                _idx = self.indexOf(anim.targetObject())
+                super(ListsWidget, self).setCurrentIndex(_idx)
+                common.signals.tabChanged.emit(_idx)
 
-        self.animation.clear()
+        animation = QtCore.QParallelAnimationGroup()
+        animation.finished.connect(functools.partial(animation_finished, animation))
 
         duration = 200
         # Create animation for outgoing widget
@@ -320,23 +326,13 @@ def setCurrentIndex(self, idx):
         in_op.setStartValue(0.0)
         in_op.setEndValue(1.0)
 
-        self.animation.addAnimation(out_anim)
-        self.animation.addAnimation(in_anim)
-        self.animation.addAnimation(out_op)
-        self.animation.addAnimation(in_op)
+        animation.addAnimation(out_anim)
+        animation.addAnimation(in_anim)
+        animation.addAnimation(out_op)
+        animation.addAnimation(in_op)
 
+        animation.start()
         self.widget(idx).show()
-        self.animation.start()
-
-    @QtCore.Slot()
-    def animation_finished(self):
-        anim = self.animation.animationAt(1)
-        if not anim:
-            return
-        if isinstance(anim.targetObject(), QtWidgets.QWidget):
-            idx = self.indexOf(anim.targetObject())
-            super().setCurrentIndex(idx)
-            common.signals.tabChanged.emit(idx)
 
     def showEvent(self, event):
         """Event handler.
@@ -497,8 +493,8 @@ class BaseItemView(QtWidgets.QTableView):
     resized = QtCore.Signal(QtCore.QRect)
 
     ThumbnailContextMenu = ThumbnailsContextMenu
-    Delegate = NotImplementedError
-    ContextMenu = NotImplementedError
+    Delegate = delegate.ItemDelegate
+    ContextMenu = None
 
     def __init__(self, icon='icon_bw', parent=None):
         super().__init__(parent=parent)
@@ -590,6 +586,7 @@ def __init__(self, icon='icon_bw', parent=None):
         self.delayed_reset_row_layout_timer.setSingleShot(True)
 
         self.setItemDelegate(self.Delegate(parent=self))
+
         self.init_model()
         self._connect_signals()
 

bookmarks/scripts/sg_sync.py

@@ -41,6 +41,7 @@
 import functools
 import json
 import os
+import shutil
 import time
 import zipfile
 
@@ -768,6 +769,21 @@ def process_entities(
                     print(f'Patching {root}/{task_path}')
                     self.patch_asset(asset_template_path, f'{root}/{task_path}')
 
+                    # Check if the audio file exists
+                    audio_file_path = f"{bookmark_root}/{entity['code']}.wav"
+
+                    if os.path.exists(audio_file_path):
+                        print(f'Copying audio file {entity["code"]}.wav to {root}/{task_path}/audio/{entity["code"]}.wav')
+                        task_audio_dir = os.path.join(f'{root}', task_path, 'audio')
+                        destination_audio_path = os.path.join(task_audio_dir, f"{entity['code']}.wav")
+
+                        # Create 'audio' folder if it doesn't exist
+                        if not os.path.exists(task_audio_dir):
+                            os.makedirs(task_audio_dir)
+
+                        # Copy the audio file
+                        shutil.copy2(audio_file_path, destination_audio_path)
+
         # Update the .link files for Bookmarks
         if self.sg_sync_sync_data_to_bookmarks_editor.isChecked():
             common.message_widget.title_label.setText(f'Adding asset links...')