Skip to content

Commit

Permalink
embyfin/plex: Read user ID and name from session
Browse files Browse the repository at this point in the history
  • Loading branch information
@aksiksi
aksiksi committed Oct 13, 2024
1 parent 9cfc5a1 commit b1d827c
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 18 deletions.
2 changes: 2 additions & 0 deletions src/media_server.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ pub struct NowPlaying {
pub series: Series,
pub episode: i32,
pub season: i32,
pub user_id: String,
pub user_name: String,
}

pub trait MediaServer: Sized {
Expand Down
44 changes: 29 additions & 15 deletions src/media_server/embyfin.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ struct Series {
#[serde(rename_all = "PascalCase")]
pub struct SessionInfo {
user_id: String,
user_name: String,
now_playing_item: Episode,
#[serde(flatten)]
other: serde_json::Value,
Expand Down Expand Up @@ -159,6 +160,8 @@ impl MediaServer for Client {
session: Self::Session,
) -> std::prelude::v1::Result<NowPlaying, Self::Error> {
let episode_num = session.now_playing_item.index_number;
let user_id = session.user_id.clone();
let user_name = session.user_name.clone();
let ids = Ids::from(session);

let series: Series = self.item(&ids.user, &ids.series).await?;
Expand All @@ -177,6 +180,8 @@ impl MediaServer for Client {
series,
episode: episode_num,
season: season_num,
user_id,
user_name,
};

Ok(now_playing)
Expand All @@ -197,7 +202,8 @@ mod test {
fn episode() -> serde_json::Value {
serde_json::json!(
[{
"UserId": "user",
"UserId": "08ba1929-681e-4b24-929b-9245852f65c0",
"UserName": "user",
"NowPlayingItem": {
"SeriesId": "a",
"SeasonId": "b",
Expand Down Expand Up @@ -226,14 +232,14 @@ mod test {

let season_mock = server
.mock_async(|when, then| {
when.path("/pathprefix/Users/user/Items/b");
when.path("/pathprefix/Users/08ba1929-681e-4b24-929b-9245852f65c0/Items/b");
then.json_body(serde_json::json!({"IndexNumber": 3}));
})
.await;

let series_mock = server
.mock_async(|when, then| {
when.path("/pathprefix/Users/user/Items/a");
when.path("/pathprefix/Users/08ba1929-681e-4b24-929b-9245852f65c0/Items/a");
then.json_body(series());
})
.await;
Expand All @@ -251,6 +257,8 @@ mod test {
series: Series::Tvdb(1234),
episode: 5,
season: 3,
user_id: "08ba1929-681e-4b24-929b-9245852f65c0".to_string(),
user_name: "user".to_string(),
});

assert_eq!(message, Some(message_expect));
Expand All @@ -273,15 +281,17 @@ mod test {
then.json_body(serde_json::json!(
[{ "invalid": "session" },
{
"UserId": "user",
"UserId": "08ba1929-681e-4b24-929b-9245852f65c0",
"UserName": "user",
"NowPlayingItem": {
"SeriesId": "invalid",
"SeasonId": "invalid",
"IndexNumber": 5
}
},
{
"UserId": "user",
"UserId": "08ba1929-681e-4b24-929b-9245852f65c0",
"UserName": "user",
"NowPlayingItem": {
"SeriesId": "a",
"SeasonId": "b",
Expand All @@ -294,14 +304,14 @@ mod test {

let season_mock = server
.mock_async(|when, then| {
when.path("/pathprefix/Users/user/Items/b");
when.path("/pathprefix/Users/08ba1929-681e-4b24-929b-9245852f65c0/Items/b");
then.json_body(serde_json::json!({"IndexNumber": 3}));
})
.await;

let series_mock = server
.mock_async(|when, then| {
when.path("/pathprefix/Users/user/Items/a");
when.path("/pathprefix/Users/08ba1929-681e-4b24-929b-9245852f65c0/Items/a");
then.json_body(series());
})
.await;
Expand All @@ -319,6 +329,8 @@ mod test {
series: Series::Tvdb(1234),
episode: 5,
season: 3,
user_id: "08ba1929-681e-4b24-929b-9245852f65c0".to_string(),
user_name: "user".to_string(),
});

assert_eq!(message, Some(message_expect));
Expand All @@ -344,14 +356,14 @@ mod test {

let season_mock = server
.mock_async(|when, then| {
when.path("/pathprefix/Users/user/Items/b");
when.path("/pathprefix/Users/08ba1929-681e-4b24-929b-9245852f65c0/Items/b");
then.json_body(serde_json::json!({"IndexNumber": 3}));
})
.await;

let series_mock = server
.mock_async(|when, then| {
when.path("/pathprefix/Users/user/Items/a");
when.path("/pathprefix/Users/08ba1929-681e-4b24-929b-9245852f65c0/Items/a");
then.json_body(serde_json::json!({
"Name": "Test Show",
"ProviderIds": { }
Expand All @@ -369,6 +381,8 @@ mod test {
series: Series::Title("Test Show".to_string()),
episode: 5,
season: 3,
user_id: "08ba1929-681e-4b24-929b-9245852f65c0".to_string(),
user_name: "user".to_string(),
});

assert_eq!(message, Some(message_expect));
Expand Down Expand Up @@ -399,14 +413,14 @@ mod test {

let _season_mock = server
.mock_async(|when, then| {
when.path("/pathprefix/Users/user/Items/b");
when.path("/pathprefix/Users/08ba1929-681e-4b24-929b-9245852f65c0/Items/b");
then.json_body(serde_json::json!({"IndexNumber": 3}));
})
.await;

let _series_mock = server
.mock_async(|when, then| {
when.path("/pathprefix/Users/user/Items/a");
when.path("/pathprefix/Users/08ba1929-681e-4b24-929b-9245852f65c0/Items/a");
then.json_body(series());
})
.await;
Expand Down Expand Up @@ -443,14 +457,14 @@ mod test {

let _season_mock = server
.mock_async(|when, then| {
when.path("/pathprefix/Users/user/Items/b");
when.path("/pathprefix/Users/08ba1929-681e-4b24-929b-9245852f65c0/Items/b");
then.json_body(serde_json::json!({"IndexNumber": 3}));
})
.await;

let _series_mock = server
.mock_async(|when, then| {
when.path("/pathprefix/Users/user/Items/a");
when.path("/pathprefix/Users/08ba1929-681e-4b24-929b-9245852f65c0/Items/a");
then.json_body(series());
})
.await;
Expand Down Expand Up @@ -485,14 +499,14 @@ mod test {

let _season_mock = server
.mock_async(|when, then| {
when.path("/pathprefix/Users/user/Items/b");
when.path("/pathprefix/Users/08ba1929-681e-4b24-929b-9245852f65c0/Items/b");
then.json_body(serde_json::json!({"IndexNumber": 3}));
})
.await;

let _series_mock = server
.mock_async(|when, then| {
when.path("/pathprefix/Users/user/Items/a");
when.path("/pathprefix/Users/08ba1929-681e-4b24-929b-9245852f65c0/Items/a");
then.json_body(series());
})
.await;
Expand Down
39 changes: 36 additions & 3 deletions src/media_server/plex.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ use serde_json::Value;

use super::{MediaServer, NowPlaying};

#[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct User {
id: String,
title: String,
#[serde(flatten)]
_other: serde_json::Value,
}

#[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Episode {
Expand All @@ -13,6 +22,7 @@ pub struct Episode {
index: i32,
parent_index: i32,
r#type: String,
user: User,
#[serde(flatten)]
_other: serde_json::Value,
}
Expand Down Expand Up @@ -113,6 +123,8 @@ impl MediaServer for Client {
series,
episode,
season,
user_id: session.user.id,
user_name: session.user.title,
})
}
}
Expand All @@ -137,7 +149,12 @@ mod test {
"grandparentKey": "path/to/series",
"index": 5,
"parentIndex": 3,
"type": "episode"
"type": "episode",
"user": {
"id": "1",
"title": "user",
"thumb": "ignore"
}
}]
}
}
Expand Down Expand Up @@ -187,6 +204,8 @@ mod test {
series: Series::Tvdb(1234),
episode: 5,
season: 3,
user_id: "1".to_string(),
user_name: "user".to_string(),
});

assert_eq!(message, Some(message_expect));
Expand Down Expand Up @@ -228,7 +247,12 @@ mod test {
"grandparentKey": "path/to/series",
"index": 5,
"parentIndex": 3,
"type": "episode"
"type": "episode",
"user": {
"id": "1",
"title": "user",
"thumb": "ignore"
}
}
]
}
Expand All @@ -253,6 +277,8 @@ mod test {
series: Series::Tvdb(1234),
episode: 5,
season: 3,
user_id: "1".to_string(),
user_name: "user".to_string(),
});

assert_eq!(message, Some(message_expect));
Expand Down Expand Up @@ -280,7 +306,12 @@ mod test {
"grandparentKey": "invalid",
"index": 5,
"parentIndex": 3,
"type": "episode"
"type": "episode",
"user": {
"id": "1",
"title": "user",
"thumb": "ignore"
}
}
]
}
Expand All @@ -305,6 +336,8 @@ mod test {
series: Series::Title("Test Show".to_string()),
episode: 5,
season: 3,
user_id: "1".to_string(),
user_name: "user".to_string(),
});

assert_eq!(message, Some(message_expect));
Expand Down
6 changes: 6 additions & 0 deletions src/process.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ mod test {
series: Series::Title("TestShow".to_string()),
episode: 7,
season: 1,
user_id: "12345".to_string(),
user_name: "test".to_string(),
}))
.await?;

Expand Down Expand Up @@ -301,6 +303,8 @@ mod test {
series: Series::Tvdb(5678),
episode: 7,
season: 1,
user_id: "12345".to_string(),
user_name: "test".to_string(),
}))
.await?;

Expand Down Expand Up @@ -392,6 +396,8 @@ mod test {
series: Series::Title("TestShow".to_string()),
episode: 1,
season: 1,
user_id: "12345".to_string(),
user_name: "test".to_string(),
}))
.await?;

Expand Down

0 comments on commit b1d827c

Please sign in to comment.