vikarti.anatra/polaris-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rely on Axum to do percent decoding

Browse source
This commit is contained in:
Antoine Gersant 2024-08-03 15:01:42 -07:00
parent 16434e6c51
commit 7a17cdc195
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/server/axum/api.rs
View file

@ -494,12 +494,11 @@ async fn delete_playlist(
async fn get_audio( async fn get_audio(
_auth: Auth, _auth: Auth,
State(vfs_manager): State<vfs::Manager>, State(vfs_manager): State<vfs::Manager>,
Path(path): Path<String>, Path(path): Path<PathBuf>,
range: Option<TypedHeader<Range>>, range: Option<TypedHeader<Range>>,
) -> Result<impl IntoResponse, APIError> { ) -> Result<impl IntoResponse, APIError> {
let vfs = vfs_manager.get_vfs().await?; let vfs = vfs_manager.get_vfs().await?;
let path = percent_decode_str(&path).decode_utf8_lossy(); let audio_path = vfs.virtual_to_real(&path)?;
let audio_path = vfs.virtual_to_real(std::path::Path::new(path.as_ref()))?;
let Ok(file) = tokio::fs::File::open(audio_path).await else { let Ok(file) = tokio::fs::File::open(audio_path).await else {
return Err(APIError::AudioFileIOError); return Err(APIError::AudioFileIOError);
@ -517,14 +516,13 @@ async fn get_thumbnail(
_auth: Auth, _auth: Auth,
State(vfs_manager): State<vfs::Manager>, State(vfs_manager): State<vfs::Manager>,
State(thumbnails_manager): State<thumbnail::Manager>, State(thumbnails_manager): State<thumbnail::Manager>,
Path(path): Path<String>, Path(path): Path<PathBuf>,
Query(options_input): Query<dto::ThumbnailOptions>, Query(options_input): Query<dto::ThumbnailOptions>,
range: Option<TypedHeader<Range>>, range: Option<TypedHeader<Range>>,
) -> Result<impl IntoResponse, APIError> { ) -> Result<impl IntoResponse, APIError> {
let options = thumbnail::Options::from(options_input); let options = thumbnail::Options::from(options_input);
let vfs = vfs_manager.get_vfs().await?; let vfs = vfs_manager.get_vfs().await?;
let path = percent_decode_str(&path).decode_utf8_lossy(); let image_path = vfs.virtual_to_real(&path)?;
let image_path = vfs.virtual_to_real(std::path::Path::new(path.as_ref()))?;
let thumbnail_path = thumbnails_manager.get_thumbnail(&image_path, &options)?; let thumbnail_path = thumbnails_manager.get_thumbnail(&image_path, &options)?;
let Ok(file) = tokio::fs::File::open(thumbnail_path).await else { let Ok(file) = tokio::fs::File::open(thumbnail_path).await else {
@ -543,14 +541,13 @@ async fn put_lastfm_now_playing(
auth: Auth, auth: Auth,
State(lastfm_manager): State<lastfm::Manager>, State(lastfm_manager): State<lastfm::Manager>,
State(user_manager): State<user::Manager>, State(user_manager): State<user::Manager>,
Path(path): Path<String>, Path(path): Path<PathBuf>,
) -> Result<(), APIError> { ) -> Result<(), APIError> {
if !user_manager.is_lastfm_linked(auth.get_username()).await { if !user_manager.is_lastfm_linked(auth.get_username()).await {
return Err(APIError::LastFMAccountNotLinked); return Err(APIError::LastFMAccountNotLinked);
} }
let path = percent_decode_str(&path).decode_utf8_lossy();
lastfm_manager lastfm_manager
.now_playing(auth.get_username(), std::path::Path::new(path.as_ref())) .now_playing(auth.get_username(), &path)
.await?; .await?;
Ok(()) Ok(())
} }
@ -559,15 +556,12 @@ async fn post_lastfm_scrobble(
auth: Auth, auth: Auth,
State(lastfm_manager): State<lastfm::Manager>, State(lastfm_manager): State<lastfm::Manager>,
State(user_manager): State<user::Manager>, State(user_manager): State<user::Manager>,
Path(path): Path<String>, Path(path): Path<PathBuf>,
) -> Result<(), APIError> { ) -> Result<(), APIError> {
if !user_manager.is_lastfm_linked(auth.get_username()).await { if !user_manager.is_lastfm_linked(auth.get_username()).await {
return Err(APIError::LastFMAccountNotLinked); return Err(APIError::LastFMAccountNotLinked);
} }
let path = percent_decode_str(&path).decode_utf8_lossy(); lastfm_manager.scrobble(auth.get_username(), &path).await?;
lastfm_manager
.scrobble(auth.get_username(), std::path::Path::new(path.as_ref()))
.await?;
Ok(()) Ok(())
} }