Video Player (#149)

* Basic Video Player

* Fixes and Comments

* Fixed Bug Where Video's Audio did not stop when switching to a Image.

* Redo on VideoPlayer. Now with rounded corners.

* Fixed size not being correct when first starting video player.

* Ruff Check Fix

* Fixed Sizing Issue, and added Autoplay option in right click menu.

* Autoplay Toggle and Fixed Issue with video not stoping after closing library.

* Ruff Format

* Suggested Changes Done

* Commented out useless code that cause first warning.

* Fixed Album Art Error

* Might have found solution to Autoplay Inconsistency

* Ruff Format

* Finally Fixed Autoplay Inconsistency

* Fixed Merge Conficts

* Requested Changes and Ruff Format

* Test for new check

* Fix for PySide App Test

* More typing fixes and a few other changes.

* Ruff Format

* MyPy Fix

* MyPy Fix

* Ruff Format

* MyPy Fix

* MyPy and Ruff Fix

* Code Clean-Up and Requests completed.

* Conflict Fixes

* MyPy Fix

* Confict Fix

It appears one of the commits from main fixed the autoplay issue.

Author: DrRetro2033

.github/workflows/apprun.yaml

@@ -32,7 +32,8 @@ jobs:
             libxcb-render-util0 \
             libxcb-xinerama0 \
             libopengl0 \
-            libxcb-cursor0
+            libxcb-cursor0 \
+            libpulse0
 
       - name: Install dependencies
         run: |

tagstudio/resources/pause.svg

@@ -8,6 +8,7 @@ class SettingItems(str, enum.Enum):
     LAST_LIBRARY = "last_library"
     LIBS_LIST = "libs_list"
     WINDOW_SHOW_LIBS = "window_show_libs"
+    AUTOPLAY = "autoplay_videos"
 
 
 class Theme(str, enum.Enum):

tagstudio/resources/play.svg

@@ -1,6 +1,6 @@
 # Resource object code (Python 3)
 # Created by: object code
-# Created by: The Resource Compiler for Qt version 6.6.3
+# Created by: The Resource Compiler for Qt version 6.5.1
 # WARNING! All changes made in this file will be lost!
 
 from PySide6 import QtCore
@@ -16232,15 +16232,15 @@
 \x00\x00\x00\x00\x00\x02\x00\x00\x00\x05\x00\x00\x00\x02\
 \x00\x00\x00\x00\x00\x00\x00\x00\
 \x00\x00\x00\x96\x00\x00\x00\x00\x00\x01\x00\x03\xca\xbe\
-\x00\x00\x01\x8a\xfb\xb4\xd6\xbe\
+\x00\x00\x01\x8f\x10b\x06\xcd\
 \x00\x00\x00b\x00\x00\x00\x00\x00\x01\x00\x03\xb8\x1a\
-\x00\x00\x01\x8a\xfb\xc6t\x9f\
+\x00\x00\x01\x8f\x10b\x06\xca\
 \x00\x00\x00\xca\x00\x00\x00\x00\x00\x01\x00\x03\xe4\x99\
-\x00\x00\x01\x8a\xfb\xb4\xc1\x95\
+\x00\x00\x01\x8f\x10b\x06\xc8\
 \x00\x00\x00\x12\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x01\x8a\xfb\xc6\x86\xda\
+\x00\x00\x01\x8f\x10b\x06\xce\
 \x00\x00\x00H\x00\x00\x00\x00\x00\x01\x00\x00\x22\x83\
-\x00\x00\x01\x8e\xfd%\xc3\xc7\
+\x00\x00\x01\x8f\x10b\x06\xcc\
 "
 
 def qInitResources():

tagstudio/resources/volume_muted.svg

@@ -41,6 +41,7 @@
 from src.qt.widgets.text_box_edit import EditTextBox
 from src.qt.widgets.text_line_edit import EditTextLine
 from src.qt.widgets.item_thumb import ItemThumb
+from src.qt.widgets.video_player import VideoPlayer
 
 
 # Only import for type checking/autocompletion, will not be imported at runtime.
@@ -90,7 +91,8 @@ def __init__(self, library: Library, driver: "QtDriver"):
 
         self.preview_img.addAction(self.open_file_action)
         self.preview_img.addAction(self.open_explorer_action)
-
+        self.preview_vid = VideoPlayer(driver)
+        self.preview_vid.hide()
         self.thumb_renderer = ThumbRenderer()
         self.thumb_renderer.updated.connect(
             lambda ts, i, s: (self.preview_img.setIcon(i))
@@ -110,7 +112,9 @@ def __init__(self, library: Library, driver: "QtDriver"):
 
         image_layout.addWidget(self.preview_img)
         image_layout.setAlignment(self.preview_img, Qt.AlignmentFlag.AlignCenter)
-
+        image_layout.addWidget(self.preview_vid)
+        image_layout.setAlignment(self.preview_vid, Qt.AlignmentFlag.AlignCenter)
+        self.image_container.setMinimumSize(*self.img_button_size)
         self.file_label = FileOpenerLabel("Filename")
         self.file_label.setWordWrap(True)
         self.file_label.setTextInteractionFlags(
@@ -378,6 +382,9 @@ def update_image_size(self, size: tuple[int, int], ratio: float = None):
         self.img_button_size = (int(adj_width), int(adj_height))
         self.preview_img.setMaximumSize(adj_size)
         self.preview_img.setIconSize(adj_size)
+        self.preview_vid.resizeVideo(adj_size)
+        self.preview_vid.setMaximumSize(adj_size)
+        self.preview_vid.setMinimumSize(adj_size)
         # self.preview_img.setMinimumSize(adj_size)
 
         # if self.preview_img.iconSize().toTuple()[0] < self.preview_img.size().toTuple()[0] + 10:
@@ -460,14 +467,19 @@ def update_widgets(self):
                     pass
                 for i, c in enumerate(self.containers):
                     c.setHidden(True)
-
+            self.preview_img.show()
+            self.preview_vid.stop()
+            self.preview_vid.hide()
             self.selected = list(self.driver.selected)
             self.add_field_button.setHidden(True)
 
         # 1 Selected Item
         elif len(self.driver.selected) == 1:
             # 1 Selected Entry
             if self.driver.selected[0][0] == ItemType.ENTRY:
+                self.preview_img.show()
+                self.preview_vid.stop()
+                self.preview_vid.hide()
                 item: Entry = self.lib.get_entry(self.driver.selected[0][1])
                 # If a new selection is made, update the thumbnail and filepath.
                 if not self.selected or self.selected != self.driver.selected:
@@ -513,6 +525,18 @@ def update_widgets(self):
                             success, frame = video.read()
                             frame = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
                             image = Image.fromarray(frame)
+                            if success:
+                                self.preview_img.hide()
+                                self.preview_vid.play(
+                                    filepath, QSize(image.width, image.height)
+                                )
+                                self.resizeEvent(
+                                    QResizeEvent(
+                                        QSize(image.width, image.height),
+                                        QSize(image.width, image.height),
+                                    )
+                                )
+                                self.preview_vid.show()
 
                         # Stats for specific file types are displayed here.
                         if filepath.suffix.lower() in (
@@ -579,6 +603,9 @@ def update_widgets(self):
 
         # Multiple Selected Items
         elif len(self.driver.selected) > 1:
+            self.preview_img.show()
+            self.preview_vid.stop()
+            self.preview_vid.hide()
             if self.selected != self.driver.selected:
                 self.file_label.setText(f"{len(self.driver.selected)} Items Selected")
                 self.file_label.setCursor(Qt.CursorShape.ArrowCursor)