Compare commits
No commits in common. "344dc0c7e7f074b3dc5176210c3703532fdc4130" and "34976a66d2bba8a4f4c30703a7fc71ceb30a36c1" have entirely different histories.
344dc0c7e7
...
34976a66d2
4 changed files with 20 additions and 20 deletions
|
|
@ -13,18 +13,15 @@ fn get_loaders(lockfile: &LockFile) -> Vec<String> {
|
||||||
|
|
||||||
pub fn create_all_platforms()
|
pub fn create_all_platforms()
|
||||||
-> Result<HashMap<String, Box<dyn crate::platform::PlatformClient>>> {
|
-> Result<HashMap<String, Box<dyn crate::platform::PlatformClient>>> {
|
||||||
const MODRINTH: &str = "modrinth";
|
|
||||||
const CURSEFORGE: &str = "curseforge";
|
|
||||||
|
|
||||||
let mut platforms = HashMap::new();
|
let mut platforms = HashMap::new();
|
||||||
|
|
||||||
if let Ok(platform) = create_platform(MODRINTH, None) {
|
if let Ok(platform) = create_platform("modrinth", None) {
|
||||||
platforms.insert(MODRINTH.to_owned(), platform);
|
platforms.insert("modrinth".to_string(), platform);
|
||||||
}
|
}
|
||||||
if let Ok(platform) =
|
if let Ok(platform) =
|
||||||
create_platform(CURSEFORGE, std::env::var("CURSEFORGE_API_KEY").ok())
|
create_platform("curseforge", std::env::var("CURSEFORGE_API_KEY").ok())
|
||||||
{
|
{
|
||||||
platforms.insert(CURSEFORGE.to_owned(), platform);
|
platforms.insert("curseforge".to_string(), platform);
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(platforms)
|
Ok(platforms)
|
||||||
|
|
|
||||||
|
|
@ -103,13 +103,9 @@ impl std::fmt::Display for UpdateStrategy {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize,
|
|
||||||
)]
|
|
||||||
#[serde(rename_all = "lowercase")]
|
#[serde(rename_all = "lowercase")]
|
||||||
pub enum ReleaseType {
|
pub enum ReleaseType {
|
||||||
// Order matters: Release < Beta < Alpha for sorting (we want Release first)
|
|
||||||
// But we want reverse order, so we'll use reverse() or handle in comparison
|
|
||||||
Release,
|
Release,
|
||||||
Beta,
|
Beta,
|
||||||
Alpha,
|
Alpha,
|
||||||
|
|
|
||||||
|
|
@ -20,15 +20,13 @@ mod tests {
|
||||||
let mut id_map = HashMap::new();
|
let mut id_map = HashMap::new();
|
||||||
id_map.insert("modrinth".to_string(), pakku_id.to_string());
|
id_map.insert("modrinth".to_string(), pakku_id.to_string());
|
||||||
|
|
||||||
let slug_map = name_map.clone();
|
|
||||||
|
|
||||||
Project {
|
Project {
|
||||||
pakku_id: Some(pakku_id.to_string()),
|
pakku_id: Some(pakku_id.to_string()),
|
||||||
pakku_links: HashSet::new(),
|
pakku_links: HashSet::new(),
|
||||||
r#type: ProjectType::Mod,
|
r#type: ProjectType::Mod,
|
||||||
side: ProjectSide::Both,
|
side: ProjectSide::Both,
|
||||||
slug: slug_map,
|
slug: name_map.clone(),
|
||||||
name: name_map,
|
name: name_map.clone(),
|
||||||
id: id_map,
|
id: id_map,
|
||||||
update_strategy: UpdateStrategy::Latest,
|
update_strategy: UpdateStrategy::Latest,
|
||||||
redistributable: true,
|
redistributable: true,
|
||||||
|
|
|
||||||
|
|
@ -261,11 +261,20 @@ impl Project {
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sort by release type (Release < Beta < Alpha) and date (newest first)
|
// Sort by release type (release > beta > alpha) and date
|
||||||
let mut sorted_files = compatible_files.to_vec();
|
let mut sorted_files = compatible_files.clone();
|
||||||
sorted_files.sort_by(|a, b| {
|
sorted_files.sort_by(|a, b| {
|
||||||
a.release_type
|
use super::enums::ReleaseType;
|
||||||
.cmp(&b.release_type)
|
let type_order = |rt: &ReleaseType| {
|
||||||
|
match rt {
|
||||||
|
ReleaseType::Release => 0,
|
||||||
|
ReleaseType::Beta => 1,
|
||||||
|
ReleaseType::Alpha => 2,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
type_order(&a.release_type)
|
||||||
|
.cmp(&type_order(&b.release_type))
|
||||||
.then_with(|| b.date_published.cmp(&a.date_published))
|
.then_with(|| b.date_published.cmp(&a.date_published))
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue