Fixed podcast episode not containing podcast image.

SamTV12345 · Jan 7, 2024 · b8fe852 · b8fe852
1 parent 1fd0dd3
commit b8fe852
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 30 deletions.
diff --git a/src/constants/inner_constants.rs b/src/constants/inner_constants.rs
@@ -134,3 +134,5 @@ pub const DEFAULT_DEVICE: &str = "webview";
 // static constants
 
 pub static ENVIRONMENT_SERVICE: OnceLock<EnvironmentService> = OnceLock::new();
+
+pub static DEFAULT_IMAGE_URL: &str = "ui/default.jpg";
diff --git a/src/controllers/controller_utils.rs b/src/controllers/controller_utils.rs
@@ -1,4 +1,4 @@
-use crate::constants::inner_constants::ENVIRONMENT_SERVICE;
+use crate::constants::inner_constants::{DEFAULT_IMAGE_URL, ENVIRONMENT_SERVICE};
 use serde_json::Value;
 
 pub fn unwrap_string(value: &Value) -> String {
@@ -10,7 +10,7 @@ pub fn unwrap_string_audio(value: &Value) -> String {
         true => {
             let env = ENVIRONMENT_SERVICE.get().unwrap();
 
-            env.server_url.clone().to_owned() + "ui/default.jpg"
+            env.server_url.clone().to_owned() + DEFAULT_IMAGE_URL
         }
         false => value.to_string().replace('\"', ""),
     }
@@ -19,5 +19,5 @@ pub fn unwrap_string_audio(value: &Value) -> String {
 pub fn get_default_image() -> String {
     let env = ENVIRONMENT_SERVICE.get().unwrap();
 
-    env.server_url.clone().to_owned() + "ui/default.jpg"
+    env.server_url.clone().to_owned() + DEFAULT_IMAGE_URL
 }
diff --git a/src/controllers/podcast_controller.rs b/src/controllers/podcast_controller.rs
@@ -1,6 +1,4 @@
-use crate::constants::inner_constants::{
-    PodcastType, BASIC_AUTH, COMMON_USER_AGENT, ENVIRONMENT_SERVICE, OIDC_AUTH,
-};
+use crate::constants::inner_constants::{PodcastType, BASIC_AUTH, COMMON_USER_AGENT, ENVIRONMENT_SERVICE, OIDC_AUTH, DEFAULT_IMAGE_URL};
 use crate::models::dto_models::PodcastFavorUpdateModel;
 use crate::models::misc_models::{PodcastAddModel, PodcastInsertModel};
 use crate::models::opml_model::OpmlModel;
@@ -652,7 +650,7 @@ async fn insert_outline(
                 None => {
                     log::info!(
                         "No image found for podcast. Downloading from {}",
-                        environment.server_url.clone().to_owned() + "ui/default.jpg"
+                        environment.server_url.clone().to_owned() + DEFAULT_IMAGE_URL
                     );
                     environment.server_url.clone().to_owned() + "ui/default.jpg"
                 }

diff --git a/src/controllers/podcast_episode_controller.rs b/src/controllers/podcast_episode_controller.rs
@@ -61,8 +61,8 @@ pub async fn find_all_podcast_episodes_of_podcast(
     )?;
     let mapped_podcasts = res
         .into_iter()
-        .map(|podcast| {
-            let mapped_podcast_episode = MappingService::map_podcastepisode_to_dto(&podcast.0);
+        .map(|mut podcast| {
+            let mapped_podcast_episode = MappingService::map_podcastepisode_to_dto(&mut podcast.0);
             PodcastEpisodeWithHistory {
                 podcast_episode: mapped_podcast_episode,
                 podcast_history_item: podcast.1,
@@ -117,9 +117,9 @@ pub async fn get_timeline(
         .data
         .iter()
         .map(|podcast_episode| {
-            let (podcast_episode, podcast, history, favorite) = podcast_episode.clone();
+            let (mut podcast_episode, podcast, history, favorite) = podcast_episode.clone();
             let mapped_podcast_episode =
-                MappingService::map_podcastepisode_to_dto(&podcast_episode);
+                MappingService::map_podcastepisode_to_dto(&mut podcast_episode);
 
             TimeLinePodcastEpisode {
                 podcast_episode: mapped_podcast_episode,

diff --git a/src/models/podcast_episode.rs b/src/models/podcast_episode.rs
@@ -21,6 +21,7 @@ use diesel::{
 };
 use rss::{Guid, Item};
 use utoipa::ToSchema;
+use crate::constants::inner_constants::DEFAULT_IMAGE_URL;
 
 #[derive(
     Queryable,
@@ -169,9 +170,18 @@ impl PodcastEpisode {
             None => {}
         }
 
-        let inserted_image_url = match optional_image {
-            Some(image_url_podcast_episode) => image_url_podcast_episode,
-            None => podcast.original_image_url,
+        let inserted_image_url: String = match optional_image {
+            Some(c)=>{
+                c
+            }
+            None=>match podcast.image_url.is_empty() {
+                    true=>{
+                        DEFAULT_IMAGE_URL.to_string()
+                    }
+                    false=>{
+                        podcast.image_url
+                    }
+                }
         };
 
         let guid_to_insert = Guid {

diff --git a/src/service/download_service.rs b/src/service/download_service.rs
@@ -10,8 +10,9 @@ use std::io;
 use std::io::Read;
 
 use crate::config::dbconfig::establish_connection;
-use crate::constants::inner_constants::{PODCAST_FILENAME, PODCAST_IMAGENAME};
+use crate::constants::inner_constants::{DEFAULT_IMAGE_URL, PODCAST_FILENAME, PODCAST_IMAGENAME};
 use crate::dbconfig::DBType;
+use crate::get_default_image;
 use crate::models::file_path::{FilenameBuilder, FilenameBuilderReturn};
 use crate::models::settings::Setting;
 use crate::service::podcast_episode_service::PodcastEpisodeService;
@@ -53,11 +54,23 @@ impl DownloadService {
             .send()
             .unwrap();
 
-        let mut image_response = client
-            .get(podcast_episode.image_url.clone())
-            .headers(header_map)
-            .send()
-            .unwrap();
+        let mut image_response;
+        match podcast_episode.image_url == DEFAULT_IMAGE_URL {
+            true=>{
+                image_response = client
+                    .get(get_default_image())
+                    .headers(header_map)
+                    .send()
+                    .unwrap();
+            }
+            false=>{
+                image_response = client
+                    .get(podcast_episode.image_url.clone())
+                    .headers(header_map)
+                    .send()
+                    .unwrap();
+            }
+        }
 
         let paths = match settings_in_db.use_existing_filename {
             true => FilenameBuilder::default()

diff --git a/src/service/mapping_service.rs b/src/service/mapping_service.rs
@@ -1,4 +1,4 @@
-use crate::constants::inner_constants::ENVIRONMENT_SERVICE;
+use crate::constants::inner_constants::{DEFAULT_IMAGE_URL, ENVIRONMENT_SERVICE};
 use crate::models::favorites::Favorite;
 use crate::models::podcast_dto::PodcastDto;
 use crate::models::podcast_episode::PodcastEpisode;
@@ -65,6 +65,7 @@ impl MappingService {
     }
 
     pub fn map_podcastepisode_to_dto(podcast_episode: &PodcastEpisode) -> PodcastEpisode {
+
         PodcastEpisode {
             id: podcast_episode.id,
             podcast_id: podcast_episode.podcast_id,
@@ -73,10 +74,10 @@ impl MappingService {
             description: podcast_episode.description.clone(),
             url: podcast_episode.url.clone(),
             date_of_recording: podcast_episode.date_of_recording.clone(),
-            image_url: podcast_episode.image_url.clone(),
+            image_url: Self::map_image_url(&podcast_episode.image_url.clone()),
             total_time: podcast_episode.total_time,
             local_url: podcast_episode.local_url.clone(),
-            local_image_url: podcast_episode.local_image_url.clone(),
+            local_image_url: Self::map_image_url(&podcast_episode.local_image_url),
             status: podcast_episode.status.clone(),
             download_time: podcast_episode.download_time,
             guid: podcast_episode.guid.clone(),
@@ -85,4 +86,15 @@ impl MappingService {
             file_image_path: None,
         }
     }
+
+    fn map_image_url(image_url: &str) -> String{
+        match image_url == DEFAULT_IMAGE_URL {
+            true => {
+                let env = ENVIRONMENT_SERVICE.get().unwrap();
+
+                env.server_url.clone().to_owned() + DEFAULT_IMAGE_URL
+            }
+            false => image_url.to_string(),
+        }
+    }
 }
diff --git a/src/service/podcast_episode_service.rs b/src/service/podcast_episode_service.rs
@@ -1,6 +1,4 @@
-use crate::constants::inner_constants::{
-    PodcastType, COMMON_USER_AGENT, ENVIRONMENT_SERVICE, TELEGRAM_API_ENABLED,
-};
+use crate::constants::inner_constants::{PodcastType, COMMON_USER_AGENT, ENVIRONMENT_SERVICE, TELEGRAM_API_ENABLED, DEFAULT_IMAGE_URL};
 use crate::models::messages::BroadcastMessage;
 use crate::models::podcast_episode::PodcastEpisode;
 use crate::models::podcasts::Podcast;
@@ -49,9 +47,9 @@ impl PodcastEpisodeService {
         match PodcastEpisode::check_if_downloaded(&podcast_episode.url, conn) {
             Ok(true) => {}
             Ok(false) => {
-                let podcast_inserted =
+                let mut podcast_inserted =
                     Self::perform_download(&podcast_episode_cloned, podcast_cloned, conn)?;
-                let mapped_dto = MappingService::map_podcastepisode_to_dto(&podcast_inserted);
+                let mapped_dto = MappingService::map_podcastepisode_to_dto(&mut podcast_inserted);
                 if let Some(lobby) = lobby {
                     lobby.do_send(BroadcastMessage {
                         message: format!(
@@ -230,7 +228,7 @@ impl PodcastEpisodeService {
                             conn,
                             podcast.clone(),
                             item.clone(),
-                            Some("ui/default.jpg".parse().unwrap()),
+                            Some(DEFAULT_IMAGE_URL.to_string()),
                             duration_episode,
                         );
                         podcast_inserted.push(inserted_episode);
@@ -252,7 +250,7 @@ impl PodcastEpisodeService {
             }
             None => {
                 let env = ENVIRONMENT_SERVICE.get().unwrap();
-                let url = env.server_url.clone().to_owned() + "ui/default.jpg";
+                let url = env.server_url.clone().to_owned() + DEFAULT_IMAGE_URL;
                 Podcast::update_original_image_url(&url, podcast.id, conn)?;
             }
         }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -134,3 +134,5 @@ pub const DEFAULT_DEVICE: &str = "webview";
		// static constants

		pub static ENVIRONMENT_SERVICE: OnceLock<EnvironmentService> = OnceLock::new();

		pub static DEFAULT_IMAGE_URL: &str = "ui/default.jpg";