changes: correct resolve mime type

Author: 0nSystem

document_manager/src/operations/fs.rs

@@ -9,6 +9,7 @@ use base64::engine::{GeneralPurpose, GeneralPurposeConfig};
 use color_eyre::{Report, Result};
 use color_eyre::eyre::ContextCompat;
 use log::debug;
+use mime_guess::{from_ext, Mime};
 use tokio::fs::{File, remove_file};
 use tokio::io::AsyncWriteExt;
 use uuid::Uuid;
@@ -138,6 +139,13 @@ pub fn get_extension_and_file_name(file_name: &str) -> (&str, Option<&str>) {
     }
 }
 
+pub fn get_content_type_by_extension(ex: &str) -> String {
+    let extension_format_mime_type = match ex.rfind(".") {
+        None => ex,
+        Some(index) => &ex[index + 1..]
+    };
+    from_ext(extension_format_mime_type).first_or_octet_stream().to_string()
+}
 
 pub fn get_file_name_in_url(url: &str) -> Option<&str> {
     if let Some(index) = url.rfind('/') {

document_manager/src/operations/mod.rs

@@ -12,7 +12,7 @@ use diesel_async::{AsyncConnection, RunQueryDsl};
 use diesel_async::scoped_futures::ScopedFutureExt;
 use itertools::Itertools;
 use log::{debug, error, info};
-use mime_guess::from_ext;
+use mime_guess::{from_ext, Mime};
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
@@ -23,7 +23,7 @@ use crate::endpoints::filter::DocumentFilterRequest;
 use crate::endpoints::save::{SaveDocumentByUrlRequest, SaveDocumentRequest};
 use crate::EnvironmentState;
 use crate::models::{Content, DeleteContent, DeleteDocument, Document, NewContent, NewDocument};
-use crate::operations::fs::{delete_file, generate_path_by_uuid, generate_url_by_uuid, get_extension_and_file_name, get_file_name_in_url, move_file, read_content_bytes_to_base64, read_content_file_to_base64, save_file};
+use crate::operations::fs::{delete_file, generate_path_by_uuid, generate_url_by_uuid, get_content_type_by_extension, get_extension_and_file_name, get_file_name_in_url, move_file, read_content_bytes_to_base64, read_content_file_to_base64, save_file};
 use crate::schema::{content, document};
 
 mod fs;
@@ -100,12 +100,12 @@ pub async fn save_document_by_url(params: SaveDocumentByUrlRequest,
     let r = conn.transaction::<Uuid, Report, _>(|conn| {
         async move {
             let url_file = params.url_file.clone();
+
             let file_name_in_url = get_file_name_in_url(&url_file)
                 .ok_or_eyre(format!("Error not match filename in url: {:?} ", url_file))?;
             let (filename, extension) = get_extension_and_file_name(file_name_in_url);
 
-            let mime_type = extension
-                .map(|x| from_ext(x).first_or_octet_stream().to_string());
+            let mime_type = extension.map(get_content_type_by_extension);
             let info_download = download_file(&params.url_file).await?;
             let new_document = NewDocument {
                 id_document: &uuid_document,