Mirrors/Stirling-PDF
Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2025-08-06 13:48:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Desktop upgrades and mac file handling

Browse Source
This commit is contained in:
Connor Yoh 2025-07-17 12:13:16 +01:00
parent 871cbb8f07
commit 38e0656e98
3 changed files with 23 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
frontend/src-tauri/src/file_handler.rs
View File

@ -84,31 +84,6 @@ mod macos_native {
// Store files opened during launch // Store files opened during launch
static LAUNCH_FILES: Lazy<Mutex<Vec<String>>> = Lazy::new(|| Mutex::new(Vec::new())); static LAUNCH_FILES: Lazy<Mutex<Vec<String>>> = Lazy::new(|| Mutex::new(Vec::new()));
// Track if app has finished launching
static APP_FINISHED_LAUNCHING: Lazy<Mutex<bool>> = Lazy::new(|| Mutex::new(false));
extern "C" fn application_did_finish_launching(_self: &Object, _cmd: Sel, _notification: id) {
add_log("🚀 applicationDidFinishLaunching called".to_string());
*APP_FINISHED_LAUNCHING.lock().unwrap() = true;
// Process any files that were opened during launch
let launch_files = {
let mut files = LAUNCH_FILES.lock().unwrap();
let result = files.clone();
files.clear();
result
};
for file_path in launch_files {
add_log(format!("📂 Processing launch file: {}", file_path));
set_opened_file(file_path.clone());
if let Some(app) = APP_HANDLE.lock().unwrap().as_ref() {
let _ = app.emit("macos://open-file", file_path.clone());
add_log(format!("✅ Emitted launch file event: {}", file_path));
}
}
}
extern "C" fn open_file(_self: &Object, _cmd: Sel, _sender: id, filename: id) -> bool { extern "C" fn open_file(_self: &Object, _cmd: Sel, _sender: id, filename: id) -> bool {
unsafe { unsafe {
@ -119,20 +94,16 @@ mod macos_native {
if let Ok(path) = cstr.to_str() { if let Ok(path) = cstr.to_str() {
add_log(format!("📂 macOS native file open event: {}", path)); add_log(format!("📂 macOS native file open event: {}", path));
if path.ends_with(".pdf") { if path.ends_with(".pdf") {
let app_finished = *APP_FINISHED_LAUNCHING.lock().unwrap(); // Always set the opened file for command-line interface
set_opened_file(path.to_string());
if app_finished { if let Some(app) = APP_HANDLE.lock().unwrap().as_ref() {
// App is running, handle immediately // App is running, emit event immediately
add_log(format!("✅ App running, handling file immediately: {}", path)); add_log(format!("✅ App running, emitting file event: {}", path));
set_opened_file(path.to_string()); let _ = app.emit("macos://open-file", path.to_string());
if let Some(app) = APP_HANDLE.lock().unwrap().as_ref() {
let _ = app.emit("macos://open-file", path.to_string());
add_log(format!("✅ Emitted file open event: {}", path));
}
} else { } else {
// App is launching, store for later // App not ready yet, store for later processing
add_log(format!("🚀 App launching, storing file for later: {}", path)); add_log(format!("🚀 App not ready, storing file for later: {}", path));
LAUNCH_FILES.lock().unwrap().push(path.to_string()); LAUNCH_FILES.lock().unwrap().push(path.to_string());
} }
} }
@ -150,11 +121,7 @@ mod macos_native {
let superclass = class!(NSObject); let superclass = class!(NSObject);
let mut decl = objc::declare::ClassDecl::new("StirlingAppDelegate", superclass).unwrap(); let mut decl = objc::declare::ClassDecl::new("StirlingAppDelegate", superclass).unwrap();
// Add both delegate methods // Add file opening delegate method
decl.add_method(
sel!(applicationDidFinishLaunching:),
application_did_finish_launching as extern "C" fn(&Object, Sel, id)
);
decl.add_method( decl.add_method(
sel!(application:openFile:), sel!(application:openFile:),
open_file as extern "C" fn(&Object, Sel, id, id) -> bool open_file as extern "C" fn(&Object, Sel, id, id) -> bool
@ -177,20 +144,18 @@ mod macos_native {
// Store the app handle // Store the app handle
*APP_HANDLE.lock().unwrap() = Some(app.clone()); *APP_HANDLE.lock().unwrap() = Some(app.clone());
// If app has finished launching and there are launch files, process them now // Process any files that were opened during launch
if *APP_FINISHED_LAUNCHING.lock().unwrap() { let launch_files = {
let launch_files = { let mut files = LAUNCH_FILES.lock().unwrap();
let mut files = LAUNCH_FILES.lock().unwrap(); let result = files.clone();
let result = files.clone(); files.clear();
files.clear(); result
result };
};
for file_path in launch_files { for file_path in launch_files {
add_log(format!("📂 Processing stored launch file: {}", file_path)); add_log(format!("📂 Processing stored launch file: {}", file_path));
set_opened_file(file_path.clone()); set_opened_file(file_path.clone());
let _ = app.emit("macos://open-file", file_path); let _ = app.emit("macos://open-file", file_path);
}
} }
add_log("✅ macOS file handler connected successfully".to_string()); add_log("✅ macOS file handler connected successfully".to_string());

6
frontend/src-tauri/stirling-pdf.desktop
View File

@ -3,16 +3,12 @@ Version=1.0
Type=Application Type=Application
Name=Stirling-PDF Name=Stirling-PDF
Comment=Locally hosted web application that allows you to perform various operations on PDF files Comment=Locally hosted web application that allows you to perform various operations on PDF files
Exec={{bin}}
Icon={{icon}} Icon={{icon}}
Terminal=false Terminal=false
MimeType=application/pdf; MimeType=application/pdf;
Categories=Office;Graphics;Utility; Categories=Office;Graphics;Utility;
StartupNotify=true
StartupWMClass=stirling-pdf
NoDisplay=false
Actions=open-file; Actions=open-file;
[Desktop Action open-file] [Desktop Action open-file]
Name=Open PDF File Name=Open PDF File
Exec={{bin}} %F Exec=/usr/bin/stirling-pdf %F

2
scripts/build-tauri-jlink.sh
View File

@ -98,7 +98,7 @@ if command -v jdeps &> /dev/null; then
if [ -n "$REQUIRED_MODULES" ]; then if [ -n "$REQUIRED_MODULES" ]; then
print_success "jdeps detected modules: $REQUIRED_MODULES" print_success "jdeps detected modules: $REQUIRED_MODULES"
# Add additional modules we know Stirling-PDF needs # Add additional modules we know Stirling-PDF needs
MODULES="$REQUIRED_MODULES,java.compiler,java.instrument,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.transaction.xa,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported" MODULES="$REQUIRED_MODULES,java.compiler,java.instrument,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported"
else else
print_warning "jdeps analysis failed, using predefined module list" print_warning "jdeps analysis failed, using predefined module list"
MODULES="java.base,java.compiler,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported" MODULES="java.base,java.compiler,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported"