Added Flatpak PDFium library lookup (#834)
Build and Release / Determine run mode (push) Waiting to run
Build and Release / Read metadata (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-apple-darwin, osx-arm64, macos-latest, aarch64-apple-darwin, dmg,app,updater, dmg) (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-pc-windows-msvc.exe, win-arm64, windows-latest, aarch64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-unknown-linux-gnu, linux-arm64, ubuntu-22.04-arm, aarch64-unknown-linux-gnu, appimage,updater, appimage) (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-apple-darwin, osx-x64, macos-latest, x86_64-apple-darwin, dmg,app,updater, dmg) (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-pc-windows-msvc.exe, win-x64, windows-latest, x86_64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-unknown-linux-gnu, linux-x64, ubuntu-22.04, x86_64-unknown-linux-gnu, appimage,updater, appimage) (push) Blocked by required conditions
Build and Release / Prepare & create release (push) Blocked by required conditions
Build and Release / Publish release (push) Blocked by required conditions

This commit is contained in:
Thorsten Sommer authored and GitHub committed 2026-07-05 18:32:36 +02:00
1 parent a1d2ff32fc
commit 590b1e4021
4 files changed
+72 -15

No files matched your search

+50 -10
View File
@@ -24,7 +24,9 @@ use tokio::sync::broadcast;
use tokio::time;
use crate::api_token::APIToken;
use crate::dotnet::{cleanup_dotnet_server, start_dotnet_server, stop_dotnet_server};
use crate::environment::{is_prod, is_dev, CONFIG_DIRECTORY, DATA_DIRECTORY};
use crate::environment::{
is_prod, is_dev, is_flatpak, CONFIG_DIRECTORY, DATA_DIRECTORY, FLATPAK_LIBRARY_DIRECTORY,
};
use crate::log::switch_to_file_logging;
use crate::pdfium::PDFIUM_LIB_PATH;
use crate::qdrant_edge_database::{start_qdrant_edge_database, stop_qdrant_edge_database};
@@ -974,7 +976,7 @@ fn set_pdfium_path<R: tauri::Runtime>(path_resolver: &PathResolver<R>) {
}
};
match select_pdfium_library_directory(&resource_dir) {
match select_pdfium_library_directory(&resource_dir, is_flatpak()) {
Some(path) => {
*PDFIUM_LIB_PATH.lock().unwrap() = Some(path.to_string_lossy().to_string());
}
@@ -984,11 +986,23 @@ fn set_pdfium_path<R: tauri::Runtime>(path_resolver: &PathResolver<R>) {
}
}
fn select_pdfium_library_directory(resource_dir: &Path) -> Option<PathBuf> {
let candidate_paths = [
resource_dir.join("resources").join("libraries"),
resource_dir.join("libraries"),
];
fn select_pdfium_library_directory(resource_dir: &Path, include_flatpak_library_directory: bool) -> Option<PathBuf> {
select_pdfium_library_directory_for(resource_dir, include_flatpak_library_directory, Path::new(FLATPAK_LIBRARY_DIRECTORY))
}
fn select_pdfium_library_directory_for(
resource_dir: &Path,
include_flatpak_library_directory: bool,
flatpak_library_directory: &Path,
) -> Option<PathBuf> {
let mut candidate_paths = Vec::new();
if include_flatpak_library_directory {
candidate_paths.push(flatpak_library_directory.to_path_buf());
}
candidate_paths.push(resource_dir.join("resources").join("libraries"));
candidate_paths.push(resource_dir.join("libraries"));
for path in candidate_paths {
let pdfium_library_path = Pdfium::pdfium_platform_library_name_at_path(&path);
@@ -1022,7 +1036,7 @@ mod tests {
create_pdfium_library_in(&libraries);
assert_eq!(
select_pdfium_library_directory(temp_dir.path()),
select_pdfium_library_directory(temp_dir.path(), false),
Some(resources_libraries)
);
}
@@ -1036,7 +1050,7 @@ mod tests {
create_pdfium_library_in(&libraries);
assert_eq!(
select_pdfium_library_directory(temp_dir.path()),
select_pdfium_library_directory(temp_dir.path(), false),
Some(libraries)
);
}
@@ -1047,7 +1061,33 @@ mod tests {
fs::create_dir_all(temp_dir.path().join("resources").join("libraries")).unwrap();
fs::create_dir_all(temp_dir.path().join("libraries")).unwrap();
assert_eq!(select_pdfium_library_directory(temp_dir.path()), None);
assert_eq!(select_pdfium_library_directory(temp_dir.path(), false), None);
}
#[test]
fn pdfium_library_directory_prefers_flatpak_library_directory_when_flatpak() {
let temp_dir = tempfile::tempdir().unwrap();
let flatpak_library_directory = temp_dir.path().join("app").join("lib");
let resources_libraries = temp_dir.path().join("resources").join("libraries");
create_pdfium_library_in(&flatpak_library_directory);
create_pdfium_library_in(&resources_libraries);
assert_eq!(
select_pdfium_library_directory_for(temp_dir.path(), true, &flatpak_library_directory),
Some(flatpak_library_directory)
);
}
#[test]
fn pdfium_library_directory_skips_flatpak_library_directory_when_not_flatpak() {
let temp_dir = tempfile::tempdir().unwrap();
let flatpak_library_directory = temp_dir.path().join("app").join("lib");
create_pdfium_library_in(&flatpak_library_directory);
assert_eq!(
select_pdfium_library_directory_for(temp_dir.path(), false, &flatpak_library_directory),
None
);
}
fn create_pdfium_library_in(path: &Path) {