Skip to content

Load app extensions from both supported directories #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LosFarmosCTL wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Load app extensions from both supported directories #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions isideload/src/sideload/bundle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,27 @@ impl Bundle {
"Failed to parse Info.plist".to_string(),
))?;

// Load app extensions from PlugIns directory
let plug_ins_dir = bundle_path.join("PlugIns");
let app_extensions = if isideload_vfs::fs::metadata(&plug_ins_dir).is_ok() {
isideload_vfs::fs::read_dir(&plug_ins_dir)
.context(SideloadError::InvalidBundle(
"Failed to read PlugIns directory".to_string(),
))?
// Load app extensions from both supported extension directories.
let mut app_extensions = Vec::new();
for directory in ["PlugIns", "Extensions"] {
let extensions_dir = bundle_path.join(directory);
if isideload_vfs::fs::metadata(&extensions_dir).is_err() {
continue;
}

let extensions = isideload_vfs::fs::read_dir(&extensions_dir)
.context(SideloadError::InvalidBundle(format!(
"Failed to read {directory} directory"
)))?
.filter_map(|entry| entry.ok())
.filter(|entry| {
entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false)
&& isideload_vfs::fs::metadata(&entry.path().join("Info.plist")).is_ok()
})
.filter_map(|entry| Bundle::new(entry.path()).ok())
.collect()
} else {
Vec::new()
};
.filter_map(|entry| Bundle::new(entry.path()).ok());

app_extensions.extend(extensions);
}

// Load frameworks from Frameworks directory
let frameworks_dir = bundle_path.join("Frameworks");
Expand Down