Fix /stream endpoint serving directory for fileless scenes (#3541)

* Fix stream endpoint serving folder
* Hide stream link for fileless scenes
This commit is contained in:
WithoutPants
2023-03-16 15:45:25 +11:00
committed by GitHub
parent 943a6d3be7
commit 9bae98cf57
2 changed files with 15 additions and 6 deletions

View File

@@ -88,7 +88,14 @@ func (rs sceneRoutes) Routes() chi.Router {
// region Handlers // region Handlers
func (rs sceneRoutes) StreamDirect(w http.ResponseWriter, r *http.Request) { func (rs sceneRoutes) StreamDirect(w http.ResponseWriter, r *http.Request) {
scene := r.Context().Value(sceneKey).(*models.Scene) scene := r.Context().Value(sceneKey).(*models.Scene)
// #3526 - return 404 if the scene does not have any files
if scene.Path == "" {
w.WriteHeader(http.StatusNotFound)
return
}
sceneHash := scene.GetHash(config.GetInstance().GetVideoFileNamingAlgorithm()) sceneHash := scene.GetHash(config.GetInstance().GetVideoFileNamingAlgorithm())
filepath := manager.GetInstance().Paths.Scene.GetStreamPath(scene.Path, sceneHash) filepath := manager.GetInstance().Paths.Scene.GetStreamPath(scene.Path, sceneHash)

View File

@@ -306,12 +306,14 @@ export const SceneFileInfoPanel: React.FC<ISceneFileInfoPanelProps> = (
return ( return (
<> <>
<dl className="container scene-file-info details-list"> <dl className="container scene-file-info details-list">
<URLField {props.scene.files.length > 0 && (
id="media_info.stream" <URLField
url={props.scene.paths.stream} id="media_info.stream"
value={props.scene.paths.stream} url={props.scene.paths.stream}
truncate value={props.scene.paths.stream}
/> truncate
/>
)}
{renderFunscript()} {renderFunscript()}
{renderInteractiveSpeed()} {renderInteractiveSpeed()}
<URLField <URLField