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

Fix panic on requesting projects (#223)

Browse Source
This commit is contained in:
Geometrically
2021-07-19 14:47:14 -07:00
committed by GitHub
parent 9ee92fb9e9
commit b2f8bb9990
5 changed files with 348 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/database/models/categories.rs
View File

@@ -19,6 +19,7 @@ pub struct GameVersion {
pub version: String,
pub version_type: String,
pub date: chrono::DateTime<chrono::Utc>,
pub major: bool,
}
pub struct Category {
@@ -496,7 +497,7 @@ impl GameVersion {
{
let result = sqlx::query!(
"
SELECT gv.id id, gv.version version_, gv.type type_, gv.created created FROM game_versions gv
SELECT gv.id id, gv.version version_, gv.type type_, gv.created created, gv.major FROM game_versions gv
ORDER BY created DESC
"
)
@@ -505,7 +506,8 @@ impl GameVersion {
id: GameVersionId(c.id),
version: c.version_,
version_type: c.type_,
date: c.created
date: c.created,
major: c.major
})) })
.try_collect::<Vec<GameVersion>>()
.await?;
@@ -527,7 +529,7 @@ impl GameVersion {
if let Some(major) = major_option {
result = sqlx::query!(
"
SELECT gv.id id, gv.version version_, gv.type type_, gv.created created FROM game_versions gv
SELECT gv.id id, gv.version version_, gv.type type_, gv.created created, gv.major major FROM game_versions gv
WHERE major = $1 AND type = $2
ORDER BY created DESC
",
@@ -539,14 +541,15 @@ impl GameVersion {
id: GameVersionId(c.id),
version: c.version_,
version_type: c.type_,
date: c.created
date: c.created,
major: c.major,
})) })
.try_collect::<Vec<GameVersion>>()
.await?;
} else {
result = sqlx::query!(
"
SELECT gv.id id, gv.version version_, gv.type type_, gv.created created FROM game_versions gv
SELECT gv.id id, gv.version version_, gv.type type_, gv.created created, gv.major major FROM game_versions gv
WHERE type = $1
ORDER BY created DESC
",
@@ -557,7 +560,8 @@ impl GameVersion {
id: GameVersionId(c.id),
version: c.version_,
version_type: c.type_,
date: c.created
date: c.created,
major: c.major,
})) })
.try_collect::<Vec<GameVersion>>()
.await?;
@@ -565,7 +569,7 @@ impl GameVersion {
} else if let Some(major) = major_option {
result = sqlx::query!(
"
SELECT gv.id id, gv.version version_, gv.type type_, gv.created created FROM game_versions gv
SELECT gv.id id, gv.version version_, gv.type type_, gv.created created, gv.major major FROM game_versions gv
WHERE major = $1
ORDER BY created DESC
",
@@ -576,7 +580,8 @@ impl GameVersion {
id: GameVersionId(c.id),
version: c.version_,
version_type: c.type_,
date: c.created
date: c.created,
major: c.major,
})) })
.try_collect::<Vec<GameVersion>>()
.await?;

36
src/database/models/project_item.rs
View File

@@ -650,14 +650,20 @@ impl Project {
.split(" ,")
.map(|d| {
let strings: Vec<&str> = d.split(", ").collect();
DonationUrl {
project_id: id,
platform_id: DonationPlatformId(strings[0].parse().unwrap_or(0)),
platform_short: strings[2].to_string(),
platform_name: strings[3].to_string(),
url: strings[1].to_string(),
if strings.len() >= 3 {
Some(DonationUrl {
project_id: id,
platform_id: DonationPlatformId(strings[0].parse().unwrap_or(0)),
platform_short: strings[2].to_string(),
platform_name: strings[3].to_string(),
url: strings[1].to_string(),
})
} else {
None
}
})
.flatten()
.collect(),
gallery_items: m
.gallery
@@ -755,14 +761,20 @@ impl Project {
.split(" ,")
.map(|d| {
let strings: Vec<&str> = d.split(", ").collect();
DonationUrl {
project_id: ProjectId(id),
platform_id: DonationPlatformId(strings[0].parse().unwrap_or(0)),
platform_short: strings[2].to_string(),
platform_name: strings[3].to_string(),
url: strings[1].to_string(),
if strings.len() >= 3 {
Some(DonationUrl {
project_id: ProjectId(id),
platform_id: DonationPlatformId(strings[0].parse().unwrap_or(0)),
platform_short: strings[2].to_string(),
platform_name: strings[3].to_string(),
url: strings[1].to_string(),
})
} else {
None
}
})
.flatten()
.collect(),
gallery_items: m.gallery.iter().map(|x| GalleryItem {
project_id: ProjectId(id),

262
src/database/models/version_item.rs
View File

@@ -626,73 +626,25 @@ impl Version {
.await?;
if let Some(v) = result {
let mut hashes: Vec<(FileId, String, Vec<u8>)> = Vec::new();
v.hashes.unwrap_or_default().split(" ,").for_each(|f| {
let hash: Vec<&str> = f.split(", ").collect();
if hash.len() >= 3 {
hashes.push((
FileId(hash[2].parse().unwrap_or(0)),
hash[0].to_string(),
hash[1].to_string().into_bytes(),
));
}
});
let mut files = Vec::new();
v.files.unwrap_or_default().split(" ,").for_each(|f| {
let file: Vec<&str> = f.split(", ").collect();
if file.len() >= 4 {
let file_id = FileId(file[0].parse().unwrap_or(0));
let mut file_hashes = HashMap::new();
for hash in &hashes {
if (hash.0).0 == file_id.0 {
file_hashes.insert(hash.1.clone(), hash.2.clone());
}
}
files.push(QueryFile {
id: file_id,
url: file[3].to_string(),
filename: file[1].to_string(),
hashes: file_hashes,
primary: file[2].parse().unwrap_or(false),
})
}
});
let mut dependencies = Vec::new();
v.dependencies
let hashes: Vec<(FileId, String, Vec<u8>)> = v
.hashes
.unwrap_or_default()
.split(" ,")
.for_each(|f| {
let dependency: Vec<&str> = f.split(", ").collect();
.map(|f| {
let hash: Vec<&str> = f.split(", ").collect();
if dependency.len() >= 3 {
dependencies.push(QueryDependency {
project_id: match &*dependency[2] {
"0" => None,
_ => match dependency[2].parse() {
Ok(x) => Some(ProjectId(x)),
Err(_) => None,
},
},
version_id: match &*dependency[0] {
"0" => None,
_ => match dependency[0].parse() {
Ok(x) => Some(VersionId(x)),
Err(_) => None,
},
},
dependency_type: dependency[1].to_string(),
});
if hash.len() >= 3 {
Some((
FileId(hash[2].parse().unwrap_or(0)),
hash[0].to_string(),
hash[1].to_string().into_bytes(),
))
} else {
None
}
});
})
.flatten()
.collect();
Ok(Some(QueryVersion {
id: VersionId(v.id),
@@ -705,7 +657,36 @@ impl Version {
date_published: v.date_published,
downloads: v.downloads,
release_channel: v.release_channel,
files,
files: v
.files
.unwrap_or_default()
.split(" ,")
.map(|f| {
let file: Vec<&str> = f.split(", ").collect();
if file.len() >= 4 {
let file_id = FileId(file[0].parse().unwrap_or(0));
let mut file_hashes = HashMap::new();
for hash in &hashes {
if (hash.0).0 == file_id.0 {
file_hashes.insert(hash.1.clone(), hash.2.clone());
}
}
Some(QueryFile {
id: file_id,
url: file[3].to_string(),
filename: file[1].to_string(),
hashes: file_hashes,
primary: file[2].parse().unwrap_or(false),
})
} else {
None
}
})
.flatten()
.collect(),
game_versions: v
.game_versions
.unwrap_or_default()
@@ -719,7 +700,37 @@ impl Version {
.map(|x| x.to_string())
.collect(),
featured: v.featured,
dependencies,
dependencies: v
.dependencies
.unwrap_or_default()
.split(" ,")
.map(|f| {
let dependency: Vec<&str> = f.split(", ").collect();
if dependency.len() >= 3 {
Some(QueryDependency {
project_id: match &*dependency[2] {
"0" => None,
_ => match dependency[2].parse() {
Ok(x) => Some(ProjectId(x)),
Err(_) => None,
},
},
version_id: match &*dependency[0] {
"0" => None,
_ => match dependency[0].parse() {
Ok(x) => Some(VersionId(x)),
Err(_) => None,
},
},
dependency_type: dependency[1].to_string(),
})
} else {
None
}
})
.flatten()
.collect(),
}))
} else {
Ok(None)
@@ -763,74 +774,19 @@ impl Version {
.fetch_many(exec)
.try_filter_map(|e| async {
Ok(e.right().map(|v| {
let mut hashes : Vec<(FileId, String, Vec<u8>)> = Vec::new();
v.hashes.unwrap_or_default().split(" ,").for_each(|f| {
let hashes: Vec<(FileId, String, Vec<u8>)> = v.hashes.unwrap_or_default().split(" ,").map(|f| {
let hash: Vec<&str> = f.split(", ").collect();
if hash.len() >= 3 {
hashes.push((
Some((
FileId(hash[2].parse().unwrap_or(0)),
hash[0].to_string(),
hash[1].to_string().into_bytes(),
));
))
} else {
None
}
});
let mut files = Vec::new();
v.files.unwrap_or_default().split(" ,").for_each(|f| {
let file : Vec<&str> = f.split(", ").collect();
if file.len() >= 4 {
let file_id = FileId(file[0].parse().unwrap_or(0));
let mut file_hashes = HashMap::new();
for hash in &hashes {
if (hash.0).0 == file_id.0 {
file_hashes.insert(hash.1.clone(), hash.2.clone());
}
}
files.push(QueryFile {
id: file_id,
url: file[3].to_string(),
filename: file[1].to_string(),
hashes: file_hashes,
primary: file[2].parse().unwrap_or(false)
})
}
});
let mut dependencies = Vec::new();
v.dependencies.unwrap_or_default().split(" ,").for_each(|f| {
let dependency: Vec<&str> = f.split(", ").collect();
if dependency.len() >= 3 {
dependencies.push(QueryDependency {
project_id: match &*dependency[2] {
"0" => None,
_ => {
match dependency[2].parse() {
Ok(x) => Some(ProjectId(x)),
Err(_) => None,
}
},
},
version_id: match &*dependency[0] {
"0" => None,
_ => {
match dependency[0].parse() {
Ok(x) => Some(VersionId(x)),
Err(_) => None,
}
},
},
dependency_type: dependency[1].to_string()
});
}
});
}).flatten().collect();
QueryVersion {
id: VersionId(v.id),
@@ -843,11 +799,61 @@ impl Version {
date_published: v.date_published,
downloads: v.downloads,
release_channel: v.release_channel,
files,
files: v.files.unwrap_or_default().split(" ,").map(|f| {
let file: Vec<&str> = f.split(", ").collect();
if file.len() >= 4 {
let file_id = FileId(file[0].parse().unwrap_or(0));
let mut file_hashes = HashMap::new();
for hash in &hashes {
if (hash.0).0 == file_id.0 {
file_hashes.insert(hash.1.clone(), hash.2.clone());
}
}
Some(QueryFile {
id: file_id,
url: file[3].to_string(),
filename: file[1].to_string(),
hashes: file_hashes,
primary: file[2].parse().unwrap_or(false),
})
} else {
None
}
}).flatten().collect(),
game_versions: v.game_versions.unwrap_or_default().split(',').map(|x| x.to_string()).collect(),
loaders: v.loaders.unwrap_or_default().split(',').map(|x| x.to_string()).collect(),
featured: v.featured,
dependencies,
dependencies: v.dependencies
.unwrap_or_default()
.split(" ,")
.map(|f| {
let dependency: Vec<&str> = f.split(", ").collect();
if dependency.len() >= 3 {
Some(QueryDependency {
project_id: match &*dependency[2] {
"0" => None,
_ => match dependency[2].parse() {
Ok(x) => Some(ProjectId(x)),
Err(_) => None,
},
},
version_id: match &*dependency[0] {
"0" => None,
_ => match dependency[0].parse() {
Ok(x) => Some(VersionId(x)),
Err(_) => None,
},
},
dependency_type: dependency[1].to_string(),
})
} else {
None
}
}).flatten().collect(),
}
}))
})