Apps/ImageApi
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Merge pull request 'Update build image to Rust 1.51' (#8) from feature/update-to-1.51 into master
All checks were successful
Core Repos/ImageApi/pipeline/head This commit looks good
Details

Browse Source 
Reviewed-on: #8
This commit was merged in pull request #8.
This commit is contained in:
cameron
2021-03-26 12:40:23 +00:00
parent 1539255ae0 53cdbabae1
commit bc6ce94e5a
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@@ -1,7 +1,7 @@
pipeline { pipeline {
agent { agent {
docker { docker {
image 'rust:1.48' image 'rust:1.51'
args '-v "$PWD":/usr/src/image-api' args '-v "$PWD":/usr/src/image-api'
} }
} }

8
src/database/mod.rs
View File

@@ -144,9 +144,7 @@ pub mod testhelpers {
.user_map .user_map
.borrow() .borrow()
.iter() .iter()
.filter(|u| u.username == user && u.password == pass) .find(|&u| u.username == user && u.password == pass)
.collect::<Vec<&User>>()
.first()
{ {
Some(u) => { Some(u) => {
let copy = (*u).clone(); let copy = (*u).clone();
@@ -160,9 +158,7 @@ pub mod testhelpers {
self.user_map self.user_map
.borrow() .borrow()
.iter() .iter()
.filter(|u| u.username == user) .find(|&u| u.username == user)
.collect::<Vec<&User>>()
.first()
.is_some() .is_some()
} }
} }

16
src/main.rs
View File

@@ -234,10 +234,13 @@ async fn favorites(claims: Claims) -> impl Responder {
async fn post_add_favorite(claims: Claims, body: web::Json<AddFavoriteRequest>) -> impl Responder { async fn post_add_favorite(claims: Claims, body: web::Json<AddFavoriteRequest>) -> impl Responder {
if let Ok(user_id) = claims.sub.parse::<i32>() { if let Ok(user_id) = claims.sub.parse::<i32>() {
let path = body.path.clone(); let path = body.path.clone();
web::block::<_, _, String>(move || Ok(add_favorite(user_id, path))) web::block::<_, _, String>(move || {
.await add_favorite(user_id, path);
.unwrap(); Ok(())
debug!("Adding favorite \"{}\" for userid: {}", user_id, body.path); })
.await
.unwrap();
debug!("Adding favorite \"{}\" for userid: {}", body.path, user_id);
HttpResponse::Ok() HttpResponse::Ok()
} else { } else {
error!("Unable to parse sub as i32: {}", claims.sub); error!("Unable to parse sub as i32: {}", claims.sub);
@@ -330,9 +333,8 @@ fn main() -> std::io::Result<()> {
DebouncedEvent::Rename(orig, _) | DebouncedEvent::Write(orig) => { DebouncedEvent::Rename(orig, _) | DebouncedEvent::Write(orig) => {
let image_base_path = PathBuf::from(env::var("BASE_PATH").unwrap()); let image_base_path = PathBuf::from(env::var("BASE_PATH").unwrap());
let image_relative = orig.strip_prefix(&image_base_path).unwrap(); let image_relative = orig.strip_prefix(&image_base_path).unwrap();
if let Ok(old_thumbnail) = env::var("THUMBNAILS") if let Ok(old_thumbnail) =
.map(|base| PathBuf::from(base)) env::var("THUMBNAILS").map(PathBuf::from).map(|mut base| {
.map(|mut base| {
base.push(image_relative); base.push(image_relative);
base base
}) })