mirror of
https://github.com/narrrl/proton-drive-linux.git
synced 2026-11-19 10:05:03 +01:00
feat(gui,fuse,core): video thumbnails in file views
My files, Shared, Trash and the launcher now ask the daemon for video thumbnails, not only image ones. Grid tiles with a video thumbnail show a small play badge. A `.ts` file is a video from 1 MiB up and a TypeScript source below that. One rule in pdfs-core (`is_video_file_name`) decides it for the file icon, the thumbnail gate, the launcher icon and preview, and the opener's `@media` / `@text` classes. The daemon also checks the MPEG-TS sync byte before it runs ffmpeg, so a large TypeScript bundle gets no retries. A video thumbnail no longer downloads the whole file into memory (B283): - the server thumbnail is tried first, at no content cost; - files up to 24 MiB come whole; - larger ones bring a 16 MiB head, plus the MP4/MOV `moov` box when it lies past the head, into a sparse staging file that ffmpeg reads. The 256 MiB cap is gone. Without ffmpeg, a video answers "no thumbnail" at once. The folder thumbnail build includes videos.
This commit is contained in:
1 parent
b49631e18f
commit
0183f17435
23 files changed
+4883
-3995
No files matched your search
@@ -1728,8 +1728,9 @@ fn repaint_thumbnail_build(ui: &Rc<Ui>, status: &ThumbnailBuildStatus) {
|
||||
let text = if status.scanning {
|
||||
ui.browser.thumbnail_progress.pulse();
|
||||
let folders = ngettext_f("{n} folder", "{n} folders", status.folders_scanned, &[]);
|
||||
let images = ngettext_f("{n} image", "{n} images", status.images_found, &[]);
|
||||
// Translators: {root} is a folder path or "Proton Drive"; {folders} and {images} are counts such as "3 folders" and "12 images".
|
||||
// Translators: a count of images and videos that can have a thumbnail.
|
||||
let images = ngettext_f("{n} file", "{n} files", status.images_found, &[]);
|
||||
// Translators: {root} is a folder path or "Proton Drive"; {folders} and {images} are counts such as "3 folders" and "12 files".
|
||||
gettext_f(
|
||||
"Scanning {root}… {folders}, {images}",
|
||||
&[("root", root), ("folders", &folders), ("images", &images)],
|
||||
@@ -1743,7 +1744,7 @@ fn repaint_thumbnail_build(ui: &Rc<Ui>, status: &ThumbnailBuildStatus) {
|
||||
ui.browser
|
||||
.thumbnail_progress
|
||||
.set_fraction(fraction.clamp(0.0, 1.0));
|
||||
// Translators: {root} is a folder path or "Proton Drive"; {done} and {total} are image counts.
|
||||
// Translators: {root} is a folder path or "Proton Drive"; {done} and {total} are counts of images and videos.
|
||||
gettext_f(
|
||||
"Building thumbnails in {root}… {done} of {total}",
|
||||
&[
|
||||
@@ -1756,17 +1757,17 @@ fn repaint_thumbnail_build(ui: &Rc<Ui>, status: &ThumbnailBuildStatus) {
|
||||
ui.browser.thumbnail_progress.set_fraction(1.0);
|
||||
let available = status.completed.saturating_sub(status.failed);
|
||||
match status.failed {
|
||||
// Translators: {root} is a folder path or "Proton Drive".
|
||||
// Translators: {root} is a folder path or "Proton Drive"; {n} counts images and videos.
|
||||
0 => ngettext_f(
|
||||
"Thumbnails ready for {n} image in {root}",
|
||||
"Thumbnails ready for {n} images in {root}",
|
||||
"Thumbnails ready for {n} file in {root}",
|
||||
"Thumbnails ready for {n} files in {root}",
|
||||
available,
|
||||
&[("root", root)],
|
||||
),
|
||||
// Translators: {root} is a folder path or "Proton Drive"; {failed} is how many images could not get a thumbnail.
|
||||
// Translators: {root} is a folder path or "Proton Drive"; {failed} is how many images and videos could not get a thumbnail.
|
||||
failed => ngettext_f(
|
||||
"Thumbnails ready for {n} image in {root}; {failed} unavailable",
|
||||
"Thumbnails ready for {n} images in {root}; {failed} unavailable",
|
||||
"Thumbnails ready for {n} file in {root}; {failed} unavailable",
|
||||
"Thumbnails ready for {n} files in {root}; {failed} unavailable",
|
||||
available,
|
||||
&[("root", root), ("failed", &failed.to_string())],
|
||||
),
|
||||
@@ -2765,6 +2766,11 @@ pub(crate) fn icon_base_for(entry: &DirEntry) -> &'static str {
|
||||
if entry.is_dir {
|
||||
return "folder";
|
||||
}
|
||||
// Every video type, including a `.ts` recording, which by its name alone
|
||||
// is TypeScript.
|
||||
if pdfs_core::control::is_video_file_name(&entry.name, Some(entry.size)) {
|
||||
return "video-x-generic";
|
||||
}
|
||||
let ext = entry
|
||||
.name
|
||||
.rsplit('.')
|
||||
@@ -2775,7 +2781,6 @@ pub(crate) fn icon_base_for(entry: &DirEntry) -> &'static str {
|
||||
"png" | "jpg" | "jpeg" | "gif" | "webp" | "bmp" | "svg" | "heic" | "tiff" => {
|
||||
"image-x-generic"
|
||||
}
|
||||
"mp4" | "mkv" | "mov" | "avi" | "webm" | "m4v" => "video-x-generic",
|
||||
"mp3" | "flac" | "wav" | "ogg" | "opus" | "m4a" => "audio-x-generic",
|
||||
"pdf" | "doc" | "docx" | "odt" => "x-office-document",
|
||||
"xls" | "xlsx" | "ods" | "csv" => "x-office-spreadsheet",
|
||||
@@ -3122,7 +3127,7 @@ fn listing_summary(files: usize, folders: usize, file_bytes: u64) -> String {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::{
|
||||
MoveTarget, badge_for, copy_target_allowed, hit_location, listing_summary,
|
||||
MoveTarget, badge_for, copy_target_allowed, hit_location, icon_base_for, listing_summary,
|
||||
move_target_allowed, show_thumbnail_build_progress, sort_entries,
|
||||
};
|
||||
use pdfs_core::config::{FileSort, FilesView};
|
||||
@@ -3149,6 +3154,32 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn every_video_type_gets_the_video_icon() {
|
||||
const MIB: u64 = 1024 * 1024;
|
||||
for name in [
|
||||
"clip.mp4",
|
||||
"clip.MKV",
|
||||
"broadcast.m2ts",
|
||||
"camera.mts",
|
||||
"old.flv",
|
||||
] {
|
||||
assert_eq!(
|
||||
icon_base_for(&entry(name, false, 10, 0)),
|
||||
"video-x-generic",
|
||||
"{name}"
|
||||
);
|
||||
}
|
||||
assert_eq!(
|
||||
icon_base_for(&entry("recording.ts", false, 900 * MIB, 0)),
|
||||
"video-x-generic"
|
||||
);
|
||||
assert_eq!(
|
||||
icon_base_for(&entry("app.ts", false, 4096, 0)),
|
||||
"text-x-generic"
|
||||
);
|
||||
}
|
||||
|
||||
fn names(entries: &[DirEntry]) -> Vec<&str> {
|
||||
entries.iter().map(|e| e.name.as_str()).collect()
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
//! Shared thumbnails for ordinary Drive image files.
|
||||
//! Shared thumbnails for ordinary Drive image and video files.
|
||||
//!
|
||||
//! The Photos gallery has timeline-specific batching and aspect-ratio state.
|
||||
//! File listings need a smaller, reusable surface: one loader backs My files,
|
||||
@@ -6,7 +6,7 @@
|
||||
//! so a replaced image never flashes its previous contents.
|
||||
|
||||
use crate::*;
|
||||
use pdfs_core::control::{FileThumbRequest, is_thumbnail_image_name};
|
||||
use pdfs_core::control::{FileThumbRequest, is_thumbnail_media_name, is_video_file_name};
|
||||
|
||||
const THUMB_BATCH: usize = 32;
|
||||
const THUMB_CACHE_MAX: usize = 256;
|
||||
@@ -125,6 +125,18 @@ pub(crate) fn file_thumbnail_widget(size: i32, fallback_size: i32) -> gtk4::Over
|
||||
.build();
|
||||
picture.add_css_class("file-thumbnail");
|
||||
|
||||
// Over a video's frame, so it does not pass for a photo.
|
||||
let play = gtk4::Image::builder()
|
||||
.icon_name("media-playback-start-symbolic")
|
||||
.pixel_size(16)
|
||||
.halign(gtk4::Align::Center)
|
||||
.valign(gtk4::Align::Center)
|
||||
.can_target(false)
|
||||
.visible(false)
|
||||
.build();
|
||||
play.add_css_class("photo-video-badge");
|
||||
play.add_css_class("photo-video-badge-small");
|
||||
|
||||
let overlay = gtk4::Overlay::new();
|
||||
overlay.set_width_request(size);
|
||||
overlay.set_height_request(size);
|
||||
@@ -133,9 +145,21 @@ pub(crate) fn file_thumbnail_widget(size: i32, fallback_size: i32) -> gtk4::Over
|
||||
overlay.set_overflow(gtk4::Overflow::Hidden);
|
||||
overlay.set_child(Some(&fallback));
|
||||
overlay.add_overlay(&picture);
|
||||
overlay.add_overlay(&play);
|
||||
overlay
|
||||
}
|
||||
|
||||
/// The play badge [`file_thumbnail_widget`] puts after `picture`.
|
||||
fn play_badge(picture: >k4::Picture) -> Option<gtk4::Image> {
|
||||
picture
|
||||
.next_sibling()
|
||||
.and_downcast::<gtk4::Image>()
|
||||
.filter(|image| image.has_css_class("photo-video-badge"))
|
||||
}
|
||||
|
||||
/// Marks a play badge to show once its video's frame is painted.
|
||||
const VIDEO_BADGE: &str = "video";
|
||||
|
||||
/// Resize an existing thumbnail surface. Grid rows are recycled, so changing
|
||||
/// these requests in place and rebinding the model is enough to implement the
|
||||
/// status-bar zoom without downloading or decoding an image again.
|
||||
@@ -179,6 +203,16 @@ pub(crate) fn bind_file_thumbnail(
|
||||
fallback.set_visible(true);
|
||||
picture.set_visible(false);
|
||||
picture.set_paintable(gtk4::gdk::Paintable::NONE);
|
||||
// List rows are too small for a badge; their icon says video already.
|
||||
let video = !entry.is_dir && is_video_file_name(&entry.name, Some(entry.size));
|
||||
if let Some(play) = play_badge(&picture) {
|
||||
play.set_visible(false);
|
||||
play.set_widget_name(if video && !symbolic_fallback {
|
||||
VIDEO_BADGE
|
||||
} else {
|
||||
""
|
||||
});
|
||||
}
|
||||
|
||||
// The widget name is a cheap binding token. List factories recycle their
|
||||
// children; a reply for the previous entry must not paint into the new one.
|
||||
@@ -186,7 +220,10 @@ pub(crate) fn bind_file_thumbnail(
|
||||
picture.set_widget_name(&key);
|
||||
remove_waiter(ui, &picture);
|
||||
|
||||
if entry.is_dir || !is_image_name(&entry.name) || entry.uid.is_empty() {
|
||||
if entry.is_dir
|
||||
|| !is_thumbnail_media_name(&entry.name, Some(entry.size))
|
||||
|| entry.uid.is_empty()
|
||||
{
|
||||
return;
|
||||
}
|
||||
if let Some(texture) = ui.file_thumbs.textures.borrow().get(&key) {
|
||||
@@ -214,12 +251,6 @@ pub(crate) fn bind_file_thumbnail(
|
||||
schedule_file_thumbs(ui);
|
||||
}
|
||||
|
||||
/// Whether the file name denotes an image format for which Proton or the local
|
||||
/// decoder can reasonably provide a thumbnail.
|
||||
pub(crate) fn is_image_name(name: &str) -> bool {
|
||||
is_thumbnail_image_name(name)
|
||||
}
|
||||
|
||||
fn thumbnail_key(uid: &str, modified: i64) -> String {
|
||||
format!("{uid}:{modified}")
|
||||
}
|
||||
@@ -238,6 +269,9 @@ fn paint(picture: >k4::Picture, key: &str, texture: >k4::gdk::Texture) {
|
||||
}
|
||||
picture.set_paintable(Some(texture));
|
||||
picture.set_visible(true);
|
||||
if let Some(play) = play_badge(picture) {
|
||||
play.set_visible(play.widget_name() == VIDEO_BADGE);
|
||||
}
|
||||
if let Some(overlay) = picture.parent().and_downcast::<gtk4::Overlay>()
|
||||
&& let Some(fallback) = overlay.child().and_downcast::<gtk4::Image>()
|
||||
{
|
||||
@@ -413,7 +447,11 @@ fn retry_file_thumbs(ui: &Rc<Ui>, items: Vec<FileThumbRequest>) {
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::{ReplyDisposition, is_image_name, reply_disposition};
|
||||
use super::{ReplyDisposition, reply_disposition};
|
||||
|
||||
fn is_image_name(name: &str) -> bool {
|
||||
pdfs_core::control::is_thumbnail_image_name(name)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn image_extensions_are_case_insensitive_and_specific() {
|
||||
|
||||
@@ -10,7 +10,7 @@ use std::time::Duration;
|
||||
use adw::prelude::*;
|
||||
use gtk4::{gio, glib};
|
||||
|
||||
use super::row::{fill_slot, thumb_slot};
|
||||
use super::row::{content_type_for, fill_slot, thumb_slot};
|
||||
use super::thumbs::Thumbs;
|
||||
use crate::{Hit, dates, gettext, human_bytes, pgettext};
|
||||
|
||||
@@ -235,7 +235,7 @@ impl Preview {
|
||||
let content_type = if hit.is_dir() {
|
||||
glib::GString::from("inode/directory")
|
||||
} else {
|
||||
gio::functions::content_type_guess(Some(hit.name()), None).0
|
||||
content_type_for(hit.name(), hit.size())
|
||||
};
|
||||
self.kind
|
||||
.set_label(&gio::functions::content_type_get_description(&content_type));
|
||||
|
||||
@@ -6,7 +6,7 @@ use std::path::{Path, PathBuf};
|
||||
use std::rc::Rc;
|
||||
|
||||
use adw::prelude::*;
|
||||
use gtk4::{gdk, gio};
|
||||
use gtk4::{gdk, gio, glib};
|
||||
|
||||
use super::highlight;
|
||||
use super::thumbs::Thumbs;
|
||||
@@ -53,7 +53,7 @@ pub(crate) fn fill_slot(slot: >k4::Overlay, hit: &Hit, thumbs: &Rc<Thumbs>, mo
|
||||
let Some(picture) = fallback.next_sibling().and_downcast::<gtk4::Picture>() else {
|
||||
return;
|
||||
};
|
||||
fallback.set_from_gicon(&icon_for(hit.name(), hit.is_dir()));
|
||||
fallback.set_from_gicon(&icon_for(hit.name(), hit.is_dir(), hit.size()));
|
||||
fallback.set_visible(true);
|
||||
picture.set_visible(false);
|
||||
picture.set_paintable(gdk::Paintable::NONE);
|
||||
@@ -63,7 +63,7 @@ pub(crate) fn fill_slot(slot: >k4::Overlay, hit: &Hit, thumbs: &Rc<Thumbs>, mo
|
||||
/// The desktop's own full-colour icon for a file name, so results look like
|
||||
/// the user's file manager. Folders are Proton's purple ones while the Proton
|
||||
/// theme is on, as in the app's browser.
|
||||
pub(crate) fn icon_for(name: &str, is_dir: bool) -> gio::Icon {
|
||||
pub(crate) fn icon_for(name: &str, is_dir: bool, size: u64) -> gio::Icon {
|
||||
if is_dir {
|
||||
let folder = if proton_theme_active() {
|
||||
"pdfs-proton-folder"
|
||||
@@ -72,8 +72,21 @@ pub(crate) fn icon_for(name: &str, is_dir: bool) -> gio::Icon {
|
||||
};
|
||||
return gio::ThemedIcon::new(folder).upcast();
|
||||
}
|
||||
let (content_type, _uncertain) = gio::functions::content_type_guess(Some(name), None);
|
||||
gio::functions::content_type_get_icon(&content_type)
|
||||
gio::functions::content_type_get_icon(&content_type_for(name, size))
|
||||
}
|
||||
|
||||
/// The content type of a file named `name` of `size` bytes, guessed from the
|
||||
/// name. GIO takes every `.ts` for TypeScript (or Qt translations); a
|
||||
/// recording's size says otherwise (see
|
||||
/// [`is_video_file_name`](pdfs_core::control::is_video_file_name)).
|
||||
pub(crate) fn content_type_for(name: &str, size: u64) -> glib::GString {
|
||||
let transport_stream = std::path::Path::new(name)
|
||||
.extension()
|
||||
.is_some_and(|extension| extension.eq_ignore_ascii_case("ts"));
|
||||
if transport_stream && pdfs_core::control::is_video_file_name(name, Some(size)) {
|
||||
return glib::GString::from("video/mp2t");
|
||||
}
|
||||
gio::functions::content_type_guess(Some(name), None).0
|
||||
}
|
||||
|
||||
/// The sync badge of a Drive file, as in the app's browser: pinned, cached,
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
//! matches the file's;
|
||||
//! 2. for local images, decoding the file itself, and writing the result back
|
||||
//! to that cache for the next time and for every other application;
|
||||
//! 3. for Drive images, the daemon's `FileThumbs`, batched after a short quiet
|
||||
//! period.
|
||||
//! 3. for Drive images and videos, the daemon's `FileThumbs`, batched after a
|
||||
//! short quiet period.
|
||||
//!
|
||||
//! Workers hand back `gdk::Texture`s, never a `Pixbuf`, which may not cross
|
||||
//! threads. Each job carries the render epoch it was queued in, and workers
|
||||
@@ -30,7 +30,9 @@ use gtk4::gdk_pixbuf::Pixbuf;
|
||||
use gtk4::prelude::*;
|
||||
use gtk4::{gdk, glib};
|
||||
|
||||
use pdfs_core::control::{FileThumbRequest, Request, Response, is_thumbnail_image_name};
|
||||
use pdfs_core::control::{
|
||||
FileThumbRequest, Request, Response, is_thumbnail_image_name, is_thumbnail_media_name,
|
||||
};
|
||||
|
||||
use crate::{Hit, spawn_request};
|
||||
|
||||
@@ -165,7 +167,13 @@ impl Thumbs {
|
||||
// The widget name binds the picture to one key: a late reply for
|
||||
// another hit must not paint into it.
|
||||
picture.set_widget_name(&key);
|
||||
if hit.is_dir() || !is_thumbnail_image_name(hit.name()) {
|
||||
// A video's frame comes from the daemon, which has ffmpeg's help; a
|
||||
// local video has only what another application cached.
|
||||
let thumbnailed = match hit {
|
||||
Hit::Drive(drive) => is_thumbnail_media_name(&drive.name, Some(drive.size)),
|
||||
Hit::Local(_) => is_thumbnail_image_name(hit.name()),
|
||||
};
|
||||
if hit.is_dir() || !thumbnailed {
|
||||
return;
|
||||
}
|
||||
if matches!(hit, Hit::Drive(drive) if drive.uid.is_empty()) {
|
||||
|
||||
@@ -94,7 +94,7 @@ pub(crate) fn icon_name(hit: &Hit) -> String {
|
||||
let name = hit.name();
|
||||
if is_image(name) {
|
||||
"image-x-generic"
|
||||
} else if is_media(name) {
|
||||
} else if is_media(name) || pdfs_core::control::is_video_file_name(name, Some(hit.size())) {
|
||||
"video-x-generic"
|
||||
} else if is_document(name) {
|
||||
"text-x-generic"
|
||||
|
||||
Reference in new issue
Block a user