Merge pull request #1050 from Zibbp/misc-02-07

Playback fix when changing layout

Author: Zibbp

frontend/app/components/videos/Player.tsx

@@ -42,6 +42,7 @@ const VideoPlayer = ({ video, ref }: Params) => {
   const axiosPrivate = useAxiosPrivate();
   // get playback data
   const { data: playbackData } = useFetchPlaybackForVideo(axiosPrivate, video.id, {
+    refetchOnMount: "always",
     refetchOnWindowFocus: false,
     refetchOnReconnect: false,
     retry: false,
@@ -97,7 +98,7 @@ const VideoPlayer = ({ video, ref }: Params) => {
       }
     });
 
-    // set playback progress
+    // Resume from server-side playback progress.
     if (playbackData && playbackData.time) {
       player.current!.currentTime = playbackData.time
     }
@@ -209,4 +210,4 @@ const VideoPlayer = ({ video, ref }: Params) => {
   );
 }
 
-export default VideoPlayer;
+export default VideoPlayer;

frontend/app/hooks/usePlayback.ts

@@ -59,12 +59,12 @@ const useFetchPlaybackForVideo = (
   return useQuery<Playback, Error, Playback, [string, string]>({
     queryKey: ["playback-data", videoId],
     queryFn: () => fetchPlaybackForVideo(axiosPrivate, videoId),
-    ...options,
     refetchInterval: false,
     refetchOnMount: false,
     refetchOnWindowFocus: false,
     refetchOnReconnect: false,
     refetchIntervalInBackground: false,
+    ...options,
   });
 };
 

internal/transport/http/handler.go

@@ -157,9 +157,16 @@ func (h *Handler) mapRoutes() {
 	})
 
 	// Static files if not using nginx
-	envConfig := config.GetEnvConfig()
-	h.Server.Static(envConfig.VideosDir, envConfig.VideosDir)
-	h.Server.Static(envConfig.TempDir, envConfig.TempDir)
+	env := config.GetEnvConfig()
+	// Use one handler for both GET + HEAD
+	videosH := echo.WrapHandler(http.StripPrefix(env.VideosDir, http.FileServer(http.Dir(env.VideosDir))))
+	tempH := echo.WrapHandler(http.StripPrefix(env.TempDir, http.FileServer(http.Dir(env.TempDir))))
+
+	h.Server.GET(env.VideosDir+"/*", videosH)
+	h.Server.HEAD(env.VideosDir+"/*", videosH)
+
+	h.Server.GET(env.TempDir+"/*", tempH)
+	h.Server.HEAD(env.TempDir+"/*", tempH)
 
 	// RiverUI
 	h.Server.Any("/riverui/", echo.WrapHandler(h.RiverUIServer), AuthGuardMiddleware, AuthGetUserMiddleware, AuthUserRoleMiddleware(utils.EditorRole))