From dcc96d0b349583e5d6a0f25ae1f7a3ffa3769788 Mon Sep 17 00:00:00 2001 From: "Adam T. Carpenter" Date: Mon, 2 Nov 2020 20:36:18 -0500 Subject: swapped json payload url encoded images for multipart form data --- dichroism/src/image_service.rs | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'dichroism/src/image_service.rs') diff --git a/dichroism/src/image_service.rs b/dichroism/src/image_service.rs index 3a31e04..a69cca2 100644 --- a/dichroism/src/image_service.rs +++ b/dichroism/src/image_service.rs @@ -2,28 +2,14 @@ use crate::config::CONFIG_INSTANCE; use crate::constants::{PHOTO_BASE_XY, PHOTO_FULLSIZE_XY, PHOTO_THUMBNAIL_XY}; use crate::error::DichroismError; use crate::models::{Photo, PhotoSet}; -use base64::decode; use image::imageops::FilterType; use image::DynamicImage; use image::GenericImageView; -use once_cell::sync::Lazy; -use regex::Regex; use std::path::PathBuf; use uuid::Uuid; -static DATA_URI_RE: Lazy = Lazy::new(|| { - Regex::new("^data:image/(png|jpeg);base64,(?P.+)") - .expect("Couldn't parse data URI Regex.") -}); - -pub fn generate_photo_set(uri: &str) -> Result { - let data = DATA_URI_RE - .captures(uri) - .ok_or_else(|| DichroismError::UriDataExtract("Failed to parse URI".to_string()))? - .name("data") - .ok_or_else(|| DichroismError::UriDataExtract("Failed to extract data".to_string()))? - .as_str(); - let original = image::load_from_memory(&decode(data)?)?; +pub fn generate_photo_set(data: &[u8]) -> Result { + let original = image::load_from_memory(&data)?; let fullsize = original.resize(PHOTO_FULLSIZE_XY, PHOTO_FULLSIZE_XY, FilterType::Lanczos3); let base = original.resize(PHOTO_BASE_XY, PHOTO_BASE_XY, FilterType::Lanczos3); -- cgit v1.2.3