Merge branch 'develop' into build-improvements

Signed-off-by: tedwaine <59868698+tedwaine@users.noreply.github.com>

Author: tedwaine

CMakeLists.txt

@@ -216,7 +216,7 @@ if (USE_VCPKG)
     message(FATAL_ERROR "Failed to ensurepip.")
   else()
     execute_process(
-      COMMAND "${Python_EXECUTABLE}" -m pip install setuptools sphinx breathe sphinx-rtd-theme OpenTimelineIO-Plugins importlib_metadata zipp numpy
+      COMMAND "${Python_EXECUTABLE}" -m pip install setuptools sphinx breathe sphinx-rtd-theme OpenTimelineIO-Plugins importlib_metadata zipp numpy fileseq
       RESULT_VARIABLE PIP_RESULT
     )
     if(PIP_RESULT)

include/xstudio/ui/canvas/stroke.hpp

@@ -77,6 +77,8 @@ namespace ui {
             bool fade(const float fade_amount);
 
             [[nodiscard]] float opacity() const { return _opacity; }
+            void set_opacity(const float o) { _opacity = o; }
+            void set_colour(const utility::ColourTriplet &c) { _colour = c; }
             [[nodiscard]] float thickness() const { return _thickness; }
             [[nodiscard]] float softness() const { return _softness; }
             [[nodiscard]] float size_sensitivity() const { return _size_sensitivity; }

src/plugin/media_metadata/ffprobe/src/ffprobe_lib.cpp

@@ -444,7 +444,7 @@ nlohmann::json populate_stream(AVFormatContext *avfc, int index, MediaStream *is
     result["profile"] = nullptr;
     if (profile = avcodec_profile_name(par->codec_id, par->profile))
         result["profile"] = profile;
-    else if (par->profile != FF_PROFILE_UNKNOWN) {
+    else if (par->profile != AV_PROFILE_UNKNOWN) {
         result["profile"] = std::to_string(par->profile);
     }
 

src/plugin/python_plugins/annotations_exporter/annotations_exporter.py

@@ -159,7 +159,7 @@ def attribute_changed(self, attr, role):
         if attr == self.scope:
             if self.scope.value() in ["Current Media", "Current Frame"]:
                 self.user_name.set_value(
-                    self.connection.api.session.viewed_container.playhead.on_screen_media.name
+                    self.current_playhead().on_screen_media.name
                 )
             elif self.scope.value() == "Current Playlist / Timeline":
                 self.user_name.set_value(
@@ -232,7 +232,7 @@ def do_export(self, scope, export_type, user_name, output_folder, file_type, res
         elif scope == "Current Media":
 
             self.export_media_annotations(
-                self.connection.api.session.viewed_container.playhead.on_screen_media
+                self.current_playhead().on_screen_media
                 )
 
         elif scope == "Current Playlist / Timeline":
@@ -254,7 +254,7 @@ def do_export(self, scope, export_type, user_name, output_folder, file_type, res
             gp_file_path = self.__output_folder + "/greasePencil.xml"
             self.make_greaspencil_xml_file(
                 gp_file_path,
-                self.connection.api.session.viewed_container.playhead.on_screen_media.media_source().rate.fps()
+                self.current_playhead().on_screen_media.media_source().rate.fps()
                 )
             # now we zip the folder
             final_name = shutil.make_archive(self.__output_folder + "/" + self.user_name.value(), 'zip', __tmp_folder)
@@ -314,8 +314,8 @@ def export_frame(self, idx, frame, duration, bookmark, media):
 
     def export_bookmark_on_current_frame(self):
 
-        m = self.connection.api.session.viewed_container.playhead.on_screen_media
-        current_frame = self.connection.api.session.viewed_container.playhead.attributes['Media Logical Frame'].value()
+        m = self.current_playhead().on_screen_media
+        current_frame = self.current_playhead().attributes['Media Logical Frame'].value()
         bookmarks = m.ordered_bookmarks()
         bookmark = None
         for bm in bookmarks:

src/plugin/python_plugins/filesystem_browser/README.md

@@ -0,0 +1,68 @@
+# Filesystem Browser Plugin for xStudio
+
+A high-performance, multi-threaded filesystem browser for xStudio, designed to handle large directories and image sequences efficiently.
+
+## Features
+
+- **Fast Multi-threaded Scanning**: Uses a thread pool and BFS algorithm to scan directories quickly without freezing the UI.
+- **Image Sequence Detection**: Automatically detects and groups file sequences (e.g., `shot_001.1001.exr` -> `shot_001.####.exr`). Supports exclusion of specific extensions (e.g., `.mov`, `.mp4`) via configuration.
+- **Smart Filtering**:
+  - **Text Filter**: Supports "AND" logic (space-separated terms). E.g., `comp exr` finds files matchings both "comp" and "exr".
+  - **Time Filter**: Filter by modification time (Last 1 day, 1 week, etc.).
+  - **Version Filter**: Filter to show only the latest version or latest 2 versions of a shot.
+- **Navigation**:
+  - Native Directory Picker integration.
+  - Path completion/suggestions.
+  - History tracking (via sticky attributes).
+- **Playback Integration**:
+  - **Double-Click**: Loads media and immediately starts playback using the playlist's playhead logic.
+  - **Context Menu**: 
+    - **Replace**: Replaces the currently viewed media with the selected item.
+    - **Compare with**: Loads the selected item and sets up an A/B comparison with the current media.
+
+## Usage
+
+1.  **Open the Browser**: 
+    - Go to `View` -> `Panels` -> `Filesystem Browser`.
+    - Or use the hotkey **'B'**.
+2.  **Navigation**:
+    - Enter a path in the text field or click the folder icon to browse.
+    - **Double-click** a folder to navigate into it.
+    - **Quick Access (▼)**: Click the arrow next to the path field to open the Quick Access list.
+      - **History**: Shows recently visited directories.
+      - **Pinned**: Shows your pinned locations for easy access.
+      - **Pinning**: Click the "Pin" icon (📌) next to any item to pin or unpin it. Pinned items appear at the top in gold.
+
+## Configuration
+
+### Environment Variables
+
+- `XSTUDIO_BROWSER_PINS`: Pre-define a list of pinned directories.
+  - Format: JSON list of objects or simple path string (colon-separated on Unix, semicolon on Windows).
+  - Example (JSON): `'[{"name": "Show", "path": "/jobs/show"}, "/home/user"]'`
+  - Example (Simple): `/jobs/show:/home/user`
+
+3.  **Loading Media**:
+    - **Double-click** a file/sequence to load it into the current or new playlist.
+    - **Right-click** for advanced actions (Replace, Compare).
+
+## Logic & Performance
+
+- **Scanning**: The scanner runs in a background thread, reporting partial results to the UI to keep it responsive. 
+- **Sequences**: Uses the `fileseq` library (for robust sequence parsing.
+
+## Testing
+
+A benchmark script is included to test the scanner performance:
+
+```bash
+python scanner_benchmark.py --threads 2 /shots/MYSHOW/MYSHOT
+```
+
+This allows you to test the scanning performance at different thread speeds for the specified directory.
+
+```bash
+python test_scanner.py
+```
+Unit test for scanner.
+

src/plugin/python_plugins/filesystem_browser/__init__.py

@@ -0,0 +1 @@
+from .filesystem_browser import create_plugin_instance

src/plugin/python_plugins/filesystem_browser/config.json

@@ -0,0 +1,42 @@
+{
+    "extensions": [
+        ".mov",
+        ".mp4",
+        ".mkv",
+        ".exr",
+        ".jpg",
+        ".jpeg",
+        ".png",
+        ".dpx",
+        ".tiff",
+        ".tif",
+        ".wav",
+        ".mp3",
+        ".pdf"
+    ],
+    "ignore_dirs": [
+        ".git",
+        ".quarantine",
+        "eryx_unreal_plugin",
+        ".DS_Store"
+    ],
+    "root_ignore_dirs": [
+        "/Applications",
+        "/bin",
+        "/cores",
+        "/dev",
+        "/etc",
+        "/Library",
+        "/opt",
+        "/private",
+        "/sbin",
+        "/System",
+        "/usr",
+        "/var",
+        "/proc",
+        "/sys",
+        "/snap"
+    ],
+    "max_recursion_depth": 6,
+    "auto_scan_threshold": 4
+}