rework import system pt. 8: federated streams & change jhls

2 files changed, 13 insertions, 10 deletions

diff --git a/common/src/jhls.rs b/common/src/jhls.rs
index eadf9a2..33c67d2 100644
--- a/common/src/jhls.rs
+++ b/common/src/jhls.rs
@@ -3,20 +3,12 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2023 metamuffin <metamuffin.org>
 */
-use crate::SourceTrack;
 use serde::{Deserialize, Serialize};
 use std::ops::Range;
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
-pub struct JhlsMetadata {
-    pub duration: f64,
+pub struct JhlsTrackIndex {
     pub extra_profiles: Vec<EncodingProfile>,
-    pub tracks: Vec<JhlsTrack>,
-}
-
-#[derive(Debug, Clone, Deserialize, Serialize)]
-pub struct JhlsTrack {
-    pub info: SourceTrack,
     pub segments: Vec<Range<f64>>,
 }
 
diff --git a/common/src/user.rs b/common/src/user.rs
index 466423c..7e654a9 100644
--- a/common/src/user.rs
+++ b/common/src/user.rs
@@ -7,7 +7,10 @@ use crate::{stream::StreamFormat, user};
 #[cfg(feature = "rocket")]
 use rocket::{FromFormField, UriDisplayQuery};
 use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, fmt::Display};
+use std::{
+    collections::{HashMap, HashSet},
+    fmt::Display,
+};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct User {
@@ -32,6 +35,14 @@ pub enum WatchedState {
     Watched,
 }
 
+#[derive(Debug, Serialize, Deserialize)]
+pub struct CreateSessionParams {
+    pub username: String,
+    pub password: String,
+    pub expire: Option<i64>,
+    pub drop_permissions: Option<HashSet<UserPermission>>,
+}
+
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq)]
 #[cfg_attr(feature = "rocket", derive(FromFormField, UriDisplayQuery))]
 #[serde(rename_all = "snake_case")]