eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Renamed default project type to unknown. (#774)

Browse Source 
* small change

* plugins and datapacks now correctly return to project

* Adds to search
This commit is contained in:
Wyatt Verchere
2023-11-30 17:17:21 -08:00
committed by GitHub
parent 58093a9438
commit b3b55210f7
5 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/models/v2/projects.rs
View File

@@ -79,12 +79,26 @@ impl LegacyProject {
let mut game_versions = Vec::new();
// V2 versions only have one project type- v3 versions can rarely have multiple.
// We'll just use the first one.
let mut project_type = data
.project_types
// We'll prioritize 'modpack' first, then 'mod', and if neither are found, use the first one.
// If there are no project types, default to 'project'
let mut project_types = data.project_types;
if project_types.contains(&"modpack".to_string()) {
project_types = vec!["modpack".to_string()];
} else if project_types.contains(&"mod".to_string()) {
project_types = vec!["mod".to_string()];
}
let project_type = project_types
.first()
.cloned()
.unwrap_or("unknown".to_string());
.unwrap_or("project".to_string()); // Default to 'project' if none are found
let mut project_type = if project_type == "datapack" || project_type == "plugin" {
// These are not supported in V2, so we'll just use 'mod' instead
"mod".to_string()
} else {
project_type
};
let mut loaders = data.loaders;
if let Some(versions_item) = versions_item {

27
src/models/v2/search.rs
View File

@@ -63,12 +63,29 @@ impl LegacyResultSearchProject {
display_categories.sort();
display_categories.dedup();
// V2 versions only have one project type- v3 versions can rarely have multiple.
// We'll prioritize 'modpack' first, then 'mod', and if neither are found, use the first one.
// If there are no project types, default to 'project'
let mut project_types = result_search_project.project_types;
if project_types.contains(&"modpack".to_string()) {
project_types = vec!["modpack".to_string()];
} else if project_types.contains(&"mod".to_string()) {
project_types = vec!["mod".to_string()];
}
let project_type = project_types
.first()
.cloned()
.unwrap_or("project".to_string()); // Default to 'project' if none are found
let project_type = if project_type == "datapack" || project_type == "plugin" {
// These are not supported in V2, so we'll just use 'mod' instead
"mod".to_string()
} else {
project_type
};
Self {
project_type: result_search_project
.project_types
.first()
.cloned()
.unwrap_or_default(),
project_type,
client_side: result_search_project
.loader_fields
.get("client_side")