jellyfin/Swiftfin
1
0
Fork 0
mirror of https://github.com/jellyfin/Swiftfin.git synced 2025-02-25 01:31:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #309 from andrein/fix-baseurl

Browse Source 
Fix Base URL handling
This commit is contained in:
Ethan Pippin 2022-01-17 09:31:36 -07:00 committed by GitHub
commit 68f0eb8cf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
.first(where: { $0.index! == currentMediaSource.defaultSubtitleStreamIndex ?? -1 })
var directStreamURL: URLComponents
var directStreamURL: URL
let transcodedStreamURL: URLComponents?
let mediaSourceID: String
let streamType: ServerStreamType
if let transcodeURL = currentMediaSource.transcodingUrl {
@ -61,17 +62,19 @@ extension BaseItemDto {
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 {
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
var subtitle: String?
@ -106,7 +109,7 @@ extension BaseItemDto {
let videoPlayerViewModel = VideoPlayerViewModel(item: modifiedSelfItem,
title: modifiedSelfItem.name ?? "",
subtitle: subtitle,
directStreamURL: directStreamURL.url!,
directStreamURL: directStreamURL,
transcodedStreamURL: transcodedStreamURL?.url,
streamType: streamType,
response: response,