Move thumbnail back to synced data

elan-ev · Dec 3, 2024 · 80d42af · 80d42af
1 parent 8e50478
commit 80d42af
Show file tree

Hide file tree

Showing 15 changed files with 69 additions and 95 deletions.
diff --git a/backend/src/api/common.rs b/backend/src/api/common.rs
@@ -7,9 +7,9 @@ use crate::{
         Context,
         err::{self, ApiResult},
         model::{
-            event::AuthorizedEvent, 
-            series::Series, 
-            realm::Realm, 
+            event::AuthorizedEvent,
+            series::Series,
+            realm::Realm,
             playlist::AuthorizedPlaylist,
             search::{SearchEvent, SearchRealm, SearchSeries},
         },

diff --git a/backend/src/api/model/event.rs b/backend/src/api/model/event.rs
@@ -51,15 +51,15 @@ pub(crate) struct SyncedEventData {
     updated: DateTime<Utc>,
     start_time: Option<DateTime<Utc>>,
     end_time: Option<DateTime<Utc>>,
-
+    thumbnail: Option<String>,
     /// Duration in milliseconds
     duration: i64,
+    audio_only: bool,
 }
 
 #[derive(Debug)]
 pub(crate) struct AuthorizedEventData {
     tracks: Vec<Track>,
-    thumbnail: Option<String>,
     captions: Vec<Caption>,
     segments: Vec<Segment>,
 }
@@ -98,12 +98,13 @@ impl_from_db!(
                     start_time: row.start_time(),
                     end_time: row.end_time(),
                     duration: row.duration(),
+                    thumbnail: row.thumbnail(),
+                    audio_only: row.tracks::<Vec<EventTrack>>().into_iter().all(|t| t.resolution.is_none()),
                 }),
                 EventState::Waiting => None,
             },
             authorized_data: match row.state::<EventState>() {
                 EventState::Ready => Some(AuthorizedEventData {
-                    thumbnail: row.thumbnail(),
                     tracks: row.tracks::<Vec<EventTrack>>().into_iter().map(Track::from).collect(),
                     captions: row.captions::<Vec<EventCaption>>()
                         .into_iter()
@@ -165,6 +166,12 @@ impl SyncedEventData {
     fn duration(&self) -> f64 {
         self.duration as f64
     }
+    fn thumbnail(&self) -> Option<&str> {
+        self.thumbnail.as_deref()
+    }
+    fn audio_only(&self) -> bool {
+        self.audio_only
+    }
 }
 
 /// Represents event data that is only accessible for users with read access
@@ -174,9 +181,6 @@ impl AuthorizedEventData {
     fn tracks(&self) -> &[Track] {
         &self.tracks
     }
-    fn thumbnail(&self) -> Option<&str> {
-        self.thumbnail.as_deref()
-    }
     fn captions(&self) -> &[Caption] {
         &self.captions
     }
@@ -231,8 +235,8 @@ impl AuthorizedEvent {
     /// Returns the authorized event data if the user has read access or is authenticated for the event.
     async fn authorized_data(
         &self,
-        context: &Context, 
-        user: Option<String>, 
+        context: &Context,
+        user: Option<String>,
         password: Option<String>,
     ) -> Option<&AuthorizedEventData> {
         let sha1_matches = |input: &str, encoded: &str| {

diff --git a/backend/src/api/model/search/event.rs b/backend/src/api/model/search/event.rs
@@ -116,7 +116,7 @@ impl SearchEvent {
             title: src.title,
             description: src.description,
             creators: src.creators,
-            thumbnail: if user_can_read { src.thumbnail } else { None },
+            thumbnail: src.thumbnail,
             duration: src.duration as f64,
             created: src.created,
             start_time: src.start_time,

diff --git a/frontend/src/routes/Embed.tsx b/frontend/src/routes/Embed.tsx
@@ -123,6 +123,7 @@ const embedEventFragment = graphql`
                 startTime
                 endTime
                 duration
+                thumbnail
             }
             ... VideoPageAuthorizedData
                 @arguments(eventUser: $eventUser, eventPassword: $eventPassword)

diff --git a/frontend/src/routes/Search.tsx b/frontend/src/routes/Search.tsx
@@ -161,7 +161,6 @@ const query = graphql`
                         startTime
                         endTime
                         created
-                        userIsAuthorized
                         hostRealms { path ancestorNames }
                         textMatches {
                             start
@@ -521,7 +520,6 @@ const SearchEvent: React.FC<EventItem> = ({
     hostRealms,
     textMatches,
     matches,
-    userIsAuthorized,
 }) => {
     // TODO: decide what to do in the case of more than two host realms. Direct
     // link should be avoided.
@@ -534,19 +532,13 @@ const SearchEvent: React.FC<EventItem> = ({
             image: <Link to={link} tabIndex={-1}>
                 <Thumbnail
                     event={{
-                        id,
                         title,
                         isLive,
                         created,
-                        series: seriesId ? {
-                            id: seriesId,
-                        } : null,
                         syncedData: {
                             duration,
                             startTime,
                             endTime,
-                        },
-                        authorizedData: !userIsAuthorized ? null : {
                             thumbnail,
                             audioOnly,
                         },

diff --git a/frontend/src/routes/Video.tsx b/frontend/src/routes/Video.tsx
@@ -461,6 +461,7 @@ const eventFragment = graphql`
                 duration
                 startTime
                 endTime
+                thumbnail
             }
             ... VideoPageAuthorizedData
                 @arguments(eventUser: $eventUser, eventPassword: $eventPassword)
@@ -486,13 +487,12 @@ const authorizedDataFragment = graphql`
             tracks { uri flavor mimetype resolution isMaster }
             captions { uri lang }
             segments { uri startTime }
-            thumbnail
         }
     }
 `;
 
 // Custom query to refetch authorized event data manually. Unfortunately, using
-// the fragment here is not enough, we need to also selected `authorizedData`
+// the fragment here is not enough, we need to also select `authorizedData`
 // manually. Without that, we could not access that field below to check if the
 // credentials were correct. Normally, adding `@relay(mask: false)` to the
 // fragment should also fix that, but that does not work for some reason.
@@ -509,7 +509,7 @@ export const authorizedDataQuery = graphql`
                 @arguments(eventUser: $eventUser, eventPassword: $eventPassword)
             ...on AuthorizedEvent {
                 authorizedData(user: $eventUser, password: $eventPassword) {
-                    thumbnail
+                    __id
                 }
             }
         }
@@ -558,7 +558,7 @@ const VideoPage: React.FC<Props> = ({ eventRef, realmRef, playlistRef, basePath
         "@type": "VideoObject",
         name: event.title,
         description: event.description ?? undefined,
-        thumbnailUrl: event.authorizedData?.thumbnail ?? undefined,
+        thumbnailUrl: event.syncedData?.thumbnail ?? undefined,
         uploadDate: event.created,
         duration: toIsoDuration(event.syncedData.duration),
         ...event.isLive && event.syncedData.startTime && event.syncedData.endTime && {

diff --git a/frontend/src/routes/manage/Realm/Content/Edit/EditMode/Video.tsx b/frontend/src/routes/manage/Realm/Content/Edit/EditMode/Video.tsx
@@ -47,8 +47,7 @@ export const EditVideoBlock: React.FC<EditVideoBlockProps> = ({ block: blockRef
                     created
                     isLive
                     creators
-                    syncedData { duration startTime endTime }
-                    authorizedData { thumbnail }
+                    syncedData { duration startTime endTime audioOnly }
                 }
             }
             showTitle
@@ -152,6 +151,7 @@ const EventSelector: React.FC<EventSelectorProps> = ({ onChange, onBlur, default
                         duration
                         startTime
                         endTime
+                        audioOnly
                     }
                 }
             }
@@ -204,16 +204,7 @@ const formatOption = (event: Option, t: TFunction) => (
             ? <MovingTruck />
             : <Thumbnail
                 css={{ width: 120, minWidth: 120 }}
-                event={{
-                    ...event,
-                    syncedData: event.syncedData && {
-                        ...event.syncedData,
-                    },
-                    authorizedData: event.authorizedData && {
-                        ...event.authorizedData,
-                        audioOnly: false, // TODO
-                    },
-                }}
+                event={event}
             />}
         <div>
             <div>{event.title}</div>

diff --git a/frontend/src/routes/manage/Video/Shared.tsx b/frontend/src/routes/manage/Video/Shared.tsx
@@ -92,9 +92,10 @@ const query = graphql`
                     updated
                     startTime
                     endTime
+                    thumbnail
+                    audioOnly
                 }
                 authorizedData {
-                    thumbnail
                     tracks { flavor resolution mimetype uri }
                 }
                 series {

diff --git a/frontend/src/routes/manage/Video/index.tsx b/frontend/src/routes/manage/Video/index.tsx
@@ -76,13 +76,22 @@ const query = graphql`
                     startIndex endIndex
                 }
                 items {
-                    id title created description isLive tobiraDeletionTimestamp
+                    id
+                    title
+                    created
+                    description
+                    isLive
+                    tobiraDeletionTimestamp
                     series { id }
                     syncedData {
-                        duration updated startTime endTime
+                        duration
+                        thumbnail
+                        updated
+                        startTime
+                        endTime
+                        audioOnly
                     }
                     authorizedData {
-                        thumbnail
                         tracks { resolution }
                     }
                 }

diff --git a/frontend/src/schema.graphql b/frontend/src/schema.graphql
@@ -215,6 +215,8 @@ type SyncedEventData implements Node {
   endTime: DateTimeUtc
   "Duration in ms."
   duration: Float!
+  thumbnail: String
+  audioOnly: Boolean!
 }
 
 input NewPlaylistBlock {
@@ -766,7 +768,6 @@ union RemoveMountedSeriesOutcome = RemovedRealm | RemovedBlock
 """
 type AuthorizedEventData implements Node {
   tracks: [Track!]!
-  thumbnail: String
   captions: [Caption!]!
   segments: [Segment!]!
 }

diff --git a/frontend/src/ui/Blocks/Video.tsx b/frontend/src/ui/Blocks/Video.tsx
@@ -44,6 +44,7 @@ export const VideoBlock: React.FC<Props> = ({ fragRef, basePath }) => {
                         updated
                         startTime
                         endTime
+                        thumbnail
                     }
                     ... VideoPageAuthorizedData
                 }
@@ -65,7 +66,6 @@ export const VideoBlock: React.FC<Props> = ({ fragRef, basePath }) => {
         return unreachable();
     }
 
-
     return <div css={{ maxWidth: 800 }}>
         {showTitle && <Title title={event.title} />}
         <PlayerContextProvider>

diff --git a/frontend/src/ui/Blocks/VideoList.tsx b/frontend/src/ui/Blocks/VideoList.tsx
@@ -56,9 +56,14 @@ export const videoListEventFragment = graphql`
         isLive
         description
         series { title id }
-        syncedData { duration startTime endTime }
-        authorizedData {
+        syncedData {
             thumbnail
+            duration
+            startTime
+            endTime
+            audioOnly
+        }
+        authorizedData {
             tracks { resolution }
         }
     }