mirror of
https://github.com/MindWorkAI/AI-Studio.git
synced 2026-05-22 09:52:14 +00:00
Fixed PDFium initialization logic (#771)
Some checks are pending
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
Some checks are pending
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:
parent
cef1c99765
commit
d28184af1a
@ -1,19 +1,36 @@
|
|||||||
|
use std::error::Error;
|
||||||
use std::sync::Mutex;
|
use std::sync::Mutex;
|
||||||
use once_cell::sync::Lazy;
|
use once_cell::sync::Lazy;
|
||||||
use pdfium_render::prelude::Pdfium;
|
use pdfium_render::prelude::Pdfium;
|
||||||
use log::{error, warn};
|
use log::{error, warn};
|
||||||
|
|
||||||
pub static PDFIUM_LIB_PATH: Lazy<Mutex<Option<String>>> = Lazy::new(|| Mutex::new(None));
|
pub static PDFIUM_LIB_PATH: Lazy<Mutex<Option<String>>> = Lazy::new(|| Mutex::new(None));
|
||||||
|
static PDFIUM: Lazy<Mutex<Option<Pdfium>>> = Lazy::new(|| Mutex::new(None));
|
||||||
|
|
||||||
pub trait PdfiumInit {
|
pub trait PdfiumInit {
|
||||||
fn ai_studio_init() -> Result<Pdfium, Box<dyn std::error::Error + Send + Sync>>;
|
fn ai_studio_init() -> Result<Pdfium, Box<dyn Error + Send + Sync>>;
|
||||||
}
|
}
|
||||||
|
|
||||||
impl PdfiumInit for Pdfium {
|
impl PdfiumInit for Pdfium {
|
||||||
|
|
||||||
/// Initializes the PDFium library for AI Studio.
|
/// Initializes the PDFium library for AI Studio.
|
||||||
fn ai_studio_init() -> Result<Pdfium, Box<dyn std::error::Error + Send + Sync>> {
|
fn ai_studio_init() -> Result<Pdfium, Box<dyn Error + Send + Sync>> {
|
||||||
let lib_path = PDFIUM_LIB_PATH.lock().unwrap();
|
let mut pdfium = PDFIUM.lock().unwrap();
|
||||||
|
if let Some(pdfium) = pdfium.as_ref() {
|
||||||
|
return Ok(pdfium.clone());
|
||||||
|
}
|
||||||
|
|
||||||
|
let loaded_pdfium = load_pdfium().map_err(|error| {
|
||||||
|
Box::new(std::io::Error::other(error)) as Box<dyn Error + Send + Sync>
|
||||||
|
})?;
|
||||||
|
*pdfium = Some(loaded_pdfium.clone());
|
||||||
|
|
||||||
|
Ok(loaded_pdfium)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn load_pdfium() -> Result<Pdfium, String> {
|
||||||
|
let lib_path = PDFIUM_LIB_PATH.lock().unwrap().clone();
|
||||||
if let Some(path) = lib_path.as_ref() {
|
if let Some(path) = lib_path.as_ref() {
|
||||||
return match Pdfium::bind_to_library(Pdfium::pdfium_platform_library_name_at_path(path)) {
|
return match Pdfium::bind_to_library(Pdfium::pdfium_platform_library_name_at_path(path)) {
|
||||||
Ok(binding) => Ok(Pdfium::new(binding)),
|
Ok(binding) => Ok(Pdfium::new(binding)),
|
||||||
@ -21,11 +38,12 @@ impl PdfiumInit for Pdfium {
|
|||||||
match Pdfium::bind_to_system_library() {
|
match Pdfium::bind_to_system_library() {
|
||||||
Ok(binding) => Ok(Pdfium::new(binding)),
|
Ok(binding) => Ok(Pdfium::new(binding)),
|
||||||
Err(system_error) => {
|
Err(system_error) => {
|
||||||
error!(
|
let error_message = format!(
|
||||||
"Failed to load PDFium from '{path}' and the system library. Developer action (from repo root): run the build script once to download the required PDFium version: `cd app/Build` and `dotnet run build`. Details: library error: '{library_error}'; system error: '{system_error}'."
|
"Failed to load PDFium from '{path}' and the system library. Developer action (from repo root): run the build script once to download the required PDFium version: `cd app/Build` and `dotnet run build`. Details: library error: '{library_error}'; system error: '{system_error}'."
|
||||||
);
|
);
|
||||||
|
|
||||||
Err(Box::new(system_error))
|
error!("{error_message}");
|
||||||
|
Err(error_message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -36,12 +54,12 @@ impl PdfiumInit for Pdfium {
|
|||||||
match Pdfium::bind_to_system_library() {
|
match Pdfium::bind_to_system_library() {
|
||||||
Ok(binding) => Ok(Pdfium::new(binding)),
|
Ok(binding) => Ok(Pdfium::new(binding)),
|
||||||
Err(system_error) => {
|
Err(system_error) => {
|
||||||
error!(
|
let error_message = format!(
|
||||||
"Failed to load PDFium from the system library. Developer action (from repo root): run the build script once to download the required PDFium version: `cd app/Build` and `dotnet run build`. Details: '{system_error}'."
|
"Failed to load PDFium from the system library. Developer action (from repo root): run the build script once to download the required PDFium version: `cd app/Build` and `dotnet run build`. Details: '{system_error}'."
|
||||||
);
|
);
|
||||||
|
|
||||||
Err(Box::new(system_error))
|
error!("{error_message}");
|
||||||
}
|
Err(error_message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user