Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Public Share video streaming in previews #1392

Merged
merged 1 commit into from
Jan 22, 2025
Merged

feat: Public Share video streaming in previews #1392

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 25 additions & 16 deletions kDriveCore/VideoPlayer/VideoPlayer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,35 +91,44 @@ public final class VideoPlayer: Pausable {
}

private func setupPlayer(with file: File, driveFileManager: DriveFileManager) {
guard !driveFileManager.isPublicShare else {
return
}

if !file.isLocalVersionOlderThanRemote {
let localAsset = AVAsset(url: file.localUrl)
asset = localAsset
let playerItem = AVPlayerItem(asset: localAsset)
player = AVPlayer(playerItem: playerItem)
updateMetadata(asset: localAsset, defaultName: file.name)
observePlayer(currentItem: playerItem)
} else if let publicShareProxy = driveFileManager.publicShareProxy {
let url = Endpoint.downloadShareLinkFile(
driveId: publicShareProxy.driveId,
linkUuid: publicShareProxy.shareLinkUid,
fileId: file.id
).url

let asset = AVURLAsset(url: url, options: nil)
setupStreamingAsset(asset, fileName: file.name)

} else if let token = driveFileManager.apiFetcher.currentToken {
driveFileManager.apiFetcher.performAuthenticatedRequest(token: token) { token, _ in
if let token = token {
let url = Endpoint.download(file: file).url
let headers = ["Authorization": "Bearer \(token.accessToken)"]
let urlAsset = AVURLAsset(url: url, options: ["AVURLAssetHTTPHeaderFieldsKey": headers])
self.asset = urlAsset
Task { @MainActor in
let playerItem = AVPlayerItem(asset: urlAsset)
self.player = AVPlayer(playerItem: playerItem)
self.updateMetadata(asset: urlAsset, defaultName: file.name)
self.observePlayer(currentItem: playerItem)
}
}
guard let token else { return }
let url = Endpoint.download(file: file).url
let headers = ["Authorization": "Bearer \(token.accessToken)"]
let asset = AVURLAsset(url: url, options: ["AVURLAssetHTTPHeaderFieldsKey": headers])
self.setupStreamingAsset(asset, fileName: file.name)
}
}
}

private func setupStreamingAsset(_ urlAsset: AVURLAsset, fileName: String) {
asset = urlAsset
Task { @MainActor in
let playerItem = AVPlayerItem(asset: urlAsset)
self.player = AVPlayer(playerItem: playerItem)
self.updateMetadata(asset: urlAsset, defaultName: fileName)
self.observePlayer(currentItem: playerItem)
}
}

private func observePlayer(currentItem: AVPlayerItem) {
NotificationCenter.default.addObserver(
self,
Expand Down
Loading