MindWorkAI/AI-Studio
MindWorkAI/AI-Studio
1
0
Fork 0
mirror of https://github.com/MindWorkAI/AI-Studio.git synced 2026-08-24 20:52:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added Flatpak PDFium library lookup

Browse Source
This commit is contained in:
Thorsten Sommer 2026-07-05 18:17:16 +02:00
parent a1d2ff32fc
commit 7392d03393
Signed by untrusted user who does not match committer: tsommer
GPG Key ID: 371BBA77A02C0108
2 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
runtime/src/app_window.rs
View File

@ -24,7 +24,9 @@ use tokio::sync::broadcast;
use tokio::time; use tokio::time;
use crate::api_token::APIToken; use crate::api_token::APIToken;
use crate::dotnet::{cleanup_dotnet_server, start_dotnet_server, stop_dotnet_server}; 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::log::switch_to_file_logging;
use crate::pdfium::PDFIUM_LIB_PATH; use crate::pdfium::PDFIUM_LIB_PATH;
use crate::qdrant_edge_database::{start_qdrant_edge_database, stop_qdrant_edge_database}; 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) => { Some(path) => {
*PDFIUM_LIB_PATH.lock().unwrap() = Some(path.to_string_lossy().to_string()); *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> { fn select_pdfium_library_directory(resource_dir: &Path, include_flatpak_library_directory: bool) -> Option<PathBuf> {
let candidate_paths = [ select_pdfium_library_directory_for(resource_dir, include_flatpak_library_directory, Path::new(FLATPAK_LIBRARY_DIRECTORY))
resource_dir.join("resources").join("libraries"), }
resource_dir.join("libraries"),
]; 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 { for path in candidate_paths {
let pdfium_library_path = Pdfium::pdfium_platform_library_name_at_path(&path); let pdfium_library_path = Pdfium::pdfium_platform_library_name_at_path(&path);
@ -1022,7 +1036,7 @@ mod tests {
create_pdfium_library_in(&libraries); create_pdfium_library_in(&libraries);
assert_eq!( assert_eq!(
select_pdfium_library_directory(temp_dir.path()), select_pdfium_library_directory(temp_dir.path(), false),
Some(resources_libraries) Some(resources_libraries)
); );
} }
@ -1036,7 +1050,7 @@ mod tests {
create_pdfium_library_in(&libraries); create_pdfium_library_in(&libraries);
assert_eq!( assert_eq!(
select_pdfium_library_directory(temp_dir.path()), select_pdfium_library_directory(temp_dir.path(), false),
Some(libraries) 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("resources").join("libraries")).unwrap();
fs::create_dir_all(temp_dir.path().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) { fn create_pdfium_library_in(path: &Path) {

2
runtime/src/environment.rs
View File

@ -31,6 +31,8 @@ pub const DOTNET_ENV_CUSTOM_ROOT_CERTIFICATE_ALLOWED_HOSTS: &str = "AI_STUDIO_EX
#[cfg(any(target_os = "linux", test))] #[cfg(any(target_os = "linux", test))]
const FLATPAK_ENTERPRISE_POLICY_DIRECTORY: &str = "/app/etc/MindWorkAI"; const FLATPAK_ENTERPRISE_POLICY_DIRECTORY: &str = "/app/etc/MindWorkAI";
pub(crate) const FLATPAK_LIBRARY_DIRECTORY: &str = "/app/lib";
const ENTERPRISE_ENV_CONFIG_ID_PREFIX: &str = "MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ID"; const ENTERPRISE_ENV_CONFIG_ID_PREFIX: &str = "MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ID";
const ENTERPRISE_ENV_CONFIG_SERVER_URL_PREFIX: &str = "MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_SERVER_URL"; const ENTERPRISE_ENV_CONFIG_SERVER_URL_PREFIX: &str = "MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_SERVER_URL";
const ENTERPRISE_ENV_CONFIGS: &str = "MINDWORK_AI_STUDIO_ENTERPRISE_CONFIGS"; const ENTERPRISE_ENV_CONFIGS: &str = "MINDWORK_AI_STUDIO_ENTERPRISE_CONFIGS";