ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Base URL handling

This commit is contained in:
Andrei Nistor 2022-01-17 17:31:11 +02:00
parent a799ad4d8c
commit 1515fcb158
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift
View File

@ -48,8 +48,9 @@ extension BaseItemDto {
let defaultSubtitleStream = subtitleStreams let defaultSubtitleStream = subtitleStreams
.first(where: { $0.index! == currentMediaSource.defaultSubtitleStreamIndex ?? -1 }) .first(where: { $0.index! == currentMediaSource.defaultSubtitleStreamIndex ?? -1 })
var directStreamURL: URLComponents var directStreamURL: URL
let transcodedStreamURL: URLComponents? let transcodedStreamURL: URLComponents?
let mediaSourceID: String
let streamType: ServerStreamType let streamType: ServerStreamType
if let transcodeURL = currentMediaSource.transcodingUrl { if let transcodeURL = currentMediaSource.transcodingUrl {
@ -61,17 +62,19 @@ extension BaseItemDto {
transcodedStreamURL = nil transcodedStreamURL = nil
} }
directStreamURL = URLComponents(string: SessionManager.main.currentLogin.server.currentURI)!
directStreamURL.path = "/Videos/\(self.id!)/stream"
directStreamURL.addQueryItem(name: "Static", value: "true")
directStreamURL.addQueryItem(name: "MediaSourceId", value: self.id!)
directStreamURL.addQueryItem(name: "Tag", value: self.etag)
directStreamURL.addQueryItem(name: "MinSegments", value: "6")
if mediaSources.count > 1 { if mediaSources.count > 1 {
directStreamURL.addQueryItem(name: "MediaSourceId", value: currentMediaSource.id) mediaSourceID = currentMediaSource.id!
} else {
mediaSourceID = self.id!
} }
let requestBuilder = VideosAPI.getVideoStreamWithRequestBuilder(itemId: self.id!,
_static: true,
tag: self.etag,
minSegments: 6,
mediaSourceId: mediaSourceID)
directStreamURL = URL(string: requestBuilder.URLString)!
// MARK: VidoPlayerViewModel Creation // MARK: VidoPlayerViewModel Creation
var subtitle: String? var subtitle: String?
@ -106,7 +109,7 @@ extension BaseItemDto {
let videoPlayerViewModel = VideoPlayerViewModel(item: modifiedSelfItem, let videoPlayerViewModel = VideoPlayerViewModel(item: modifiedSelfItem,
title: modifiedSelfItem.name ?? "", title: modifiedSelfItem.name ?? "",
subtitle: subtitle, subtitle: subtitle,
directStreamURL: directStreamURL.url!, directStreamURL: directStreamURL,
transcodedStreamURL: transcodedStreamURL?.url, transcodedStreamURL: transcodedStreamURL?.url,
streamType: streamType, streamType: streamType,
response: response, response: response,