Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions packages/app-lib/src/state/instance_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,19 @@ impl ProjectType {
}
}

pub fn get_from_version_file(
loaders: Vec<String>,
file_name: &str,
) -> Option<Self> {
let is_zip = Path::new(file_name)
.extension()
.is_some_and(|ext| ext.eq_ignore_ascii_case("zip"));
if is_zip && loaders.iter().any(|x| x == "datapack") {
return Some(ProjectType::DataPack);
}
Self::get_from_loaders(loaders)
}

pub fn get_from_parent_folder(path: impl AsRef<Path>) -> Option<Self> {
match path
.as_ref()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,19 @@ pub(crate) async fn switch_project_version_with_dependencies(
.ok_or(ErrorKind::InputError(format!(
"unable to install version id {version_id}, not found"
)))?;
let content_type = ProjectType::get_from_loaders(version.loaders.clone())
.map(ContentType::from)
.unwrap_or(ContentType::Mod);
let primary_file_name = version
.files
.iter()
.find(|file| file.primary)
.or_else(|| version.files.first())
.map(|file| file.filename.as_str())
.unwrap_or_default();
let content_type = ProjectType::get_from_version_file(
version.loaders.clone(),
primary_file_name,
)
.map(ContentType::from)
.unwrap_or(ContentType::Mod);
let plan = resolve_install_plan(
instance_id,
InstanceInstallProjectRequest {
Expand Down Expand Up @@ -433,8 +443,11 @@ pub(crate) async fn download_project_version_with_progress(
progress,
)
.await?;
let project_type = ProjectType::get_from_loaders(version.loaders.clone())
.ok_or(ErrorKind::InputError(format!(
let project_type = ProjectType::get_from_version_file(
version.loaders.clone(),
&file.filename,
)
.ok_or(ErrorKind::InputError(format!(
"unable to infer project type for version {version_id}"
)))?;
let project_id = version.project_id.clone();
Expand Down
Loading