From b858eac3c4cc011e2d438691f3417ae857bbd388 Mon Sep 17 00:00:00 2001 From: Pierre HUBERT Date: Fri, 3 Jul 2020 10:27:09 +0200 Subject: [PATCH] Add post with PDF support --- src/api_data/post_api.rs | 3 +-- src/data/post.rs | 4 ++-- src/helpers/posts_helper.rs | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/api_data/post_api.rs b/src/api_data/post_api.rs index e490d70..71bafad 100644 --- a/src/api_data/post_api.rs +++ b/src/api_data/post_api.rs @@ -61,7 +61,7 @@ impl PostAPI { match &p.kind { PostKind::POST_KIND_TEXT => { /* do nothing */ } - PostKind::POST_KIND_IMAGE(file) => { + PostKind::POST_KIND_IMAGE(file) | PostKind::POST_KIND_PDF(file) => { post.file_size = Option::from(file.size); post.file_type = file.file_type.clone(); post.file_path = Some(file.path.clone()); @@ -75,7 +75,6 @@ impl PostAPI { post.link_image = link.image.clone(); } - PostKind::POST_KIND_PDF => {} PostKind::POST_KIND_MOVIE => {} PostKind::POST_KIND_COUNTDOWN => {} PostKind::POST_KIND_SURVEY => {} diff --git a/src/data/post.rs b/src/data/post.rs index b3b9f81..9f04699 100644 --- a/src/data/post.rs +++ b/src/data/post.rs @@ -55,7 +55,7 @@ pub enum PostKind { POST_KIND_TEXT, POST_KIND_IMAGE(PostFile), POST_KIND_WEBLINK(PostWebLink), - POST_KIND_PDF, + POST_KIND_PDF(PostFile), POST_KIND_MOVIE, POST_KIND_COUNTDOWN, POST_KIND_SURVEY, @@ -68,7 +68,7 @@ impl PostKind { PostKind::POST_KIND_TEXT => "text", PostKind::POST_KIND_IMAGE(_) => "image", PostKind::POST_KIND_WEBLINK(_) => "weblink", - PostKind::POST_KIND_PDF => "pdf", + PostKind::POST_KIND_PDF(_) => "pdf", PostKind::POST_KIND_MOVIE => "movie", PostKind::POST_KIND_COUNTDOWN => "countdown", PostKind::POST_KIND_SURVEY => "survey", diff --git a/src/helpers/posts_helper.rs b/src/helpers/posts_helper.rs index faf32cf..c611a34 100644 --- a/src/helpers/posts_helper.rs +++ b/src/helpers/posts_helper.rs @@ -5,7 +5,7 @@ use crate::constants::database_tables_names::POSTS_TABLE; use crate::data::error::{ExecError, ResultBoxError}; use crate::data::post::{Post, PostFile, PostKind, PostPageKind, PostVisibilityLevel, PostWebLink}; -use crate::data::post::PostKind::{POST_KIND_IMAGE, POST_KIND_WEBLINK}; +use crate::data::post::PostKind::{POST_KIND_IMAGE, POST_KIND_PDF, POST_KIND_WEBLINK}; use crate::data::user::UserID; use crate::helpers::{database, friends_helper}; use crate::utils::date_utils::time; @@ -168,6 +168,8 @@ fn db_to_post(res: &database::RowResult) -> ResultBoxError { image: res.get_optional_str("image_page")?, }), + "pdf" => post.kind = POST_KIND_PDF(file?), + _ => {} }