Added support for image cache downloading without image Feature #460
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…es enable_cover_image_cache app.toml option instead
aome510
reviewed
Jun 2, 2024
spotify_player/src/client/mod.rs
Outdated
Comment on lines
1384
to
1400
| if configs.app_config.enable_cover_image_cache{ | ||
| if !state.data.read().caches.images.contains_key(url) { | ||
| let bytes = self | ||
| .retrieve_image(url, &path, configs.app_config.enable_cover_image_cache) | ||
| .await?; | ||
| let image = | ||
| image::load_from_memory(&bytes).context("Failed to load image from memory")?; | ||
| state | ||
| .data | ||
| .write() | ||
| .caches | ||
| .images | ||
| .insert(url.to_owned(), image, *TTL_CACHE_DURATION); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| #[cfg(any(feature = "image", feature = "notify"))] |
There was a problem hiding this comment.
you can keep MemoryCaches and image feature optional by updating the logic to retrieve and save image separately if the image cache is enabled
Suggested change
| if configs.app_config.enable_cover_image_cache{ | |
| if !state.data.read().caches.images.contains_key(url) { | |
| let bytes = self | |
| .retrieve_image(url, &path, configs.app_config.enable_cover_image_cache) | |
| .await?; | |
| let image = | |
| image::load_from_memory(&bytes).context("Failed to load image from memory")?; | |
| state | |
| .data | |
| .write() | |
| .caches | |
| .images | |
| .insert(url.to_owned(), image, *TTL_CACHE_DURATION); | |
| } | |
| } | |
| #[cfg(any(feature = "image", feature = "notify"))] | |
| if configs.app_config.enable_cover_image_cache{ | |
| self | |
| .retrieve_image(url, &path, true) | |
| .await?; | |
| } | |
| #[cfg(feature = "image")] | |
| if !state.data.read().caches.images.contains_key(url) { | |
| let bytes = self | |
| .retrieve_image(url, &path, false) | |
| .await?; | |
| let image = | |
| image::load_from_memory(&bytes).context("Failed to load image from memory")?; | |
| state | |
| .data | |
| .write() | |
| .caches | |
| .images | |
| .insert(url.to_owned(), image, *TTL_CACHE_DURATION); | |
| } |
There was a problem hiding this comment.
Ahh yeah, that makes sense; I don't know why I was trying to avoid adding that extra code block. I'll add those checks back in and recommit. Thanks!
There was a problem hiding this comment.
Made the suggested changes and removed the loose Feature check since it was no longer needed.
There was a problem hiding this comment.
can you undo the change in Cargo.toml as well?
There was a problem hiding this comment.
Oh whoops, absolutely. Re-pushed.
aome510
approved these changes
Jun 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #458
Image cache download is now solely based upon the
enable_cover_image_cacheoption regardless if theimagefeature is used or not.