2023-10-22 17:39:34 +00:00
|
|
|
import Alamofire
|
2021-10-16 22:48:58 +00:00
|
|
|
import AVFoundation
|
|
|
|
import Foundation
|
|
|
|
import Siesta
|
|
|
|
import SwiftyJSON
|
|
|
|
|
2021-10-20 22:21:50 +00:00
|
|
|
final class PipedAPI: Service, ObservableObject, VideosAPI {
|
2022-06-17 10:52:10 +00:00
|
|
|
static var disallowedVideoCodecs = ["av01"]
|
2022-04-10 15:07:10 +00:00
|
|
|
static var authorizedEndpoints = ["subscriptions", "subscribe", "unsubscribe", "user/playlists"]
|
2023-02-28 20:03:02 +00:00
|
|
|
static var contentItemsKeys = ["items", "content", "relatedStreams"]
|
2021-11-14 23:06:01 +00:00
|
|
|
|
2021-10-20 22:21:50 +00:00
|
|
|
@Published var account: Account!
|
2021-10-16 22:48:58 +00:00
|
|
|
|
2022-12-09 00:15:19 +00:00
|
|
|
static func withAnonymousAccountForInstanceURL(_ url: URL) -> PipedAPI {
|
|
|
|
.init(account: Instance(app: .piped, apiURLString: url.absoluteString).anonymousAccount)
|
|
|
|
}
|
|
|
|
|
2021-10-20 22:21:50 +00:00
|
|
|
init(account: Account? = nil) {
|
2021-10-16 22:48:58 +00:00
|
|
|
super.init()
|
|
|
|
|
|
|
|
guard account != nil else {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
setAccount(account!)
|
|
|
|
}
|
|
|
|
|
2021-10-20 22:21:50 +00:00
|
|
|
func setAccount(_ account: Account) {
|
2021-10-16 22:48:58 +00:00
|
|
|
self.account = account
|
|
|
|
|
|
|
|
configure()
|
|
|
|
}
|
|
|
|
|
|
|
|
func configure() {
|
2021-11-14 23:06:01 +00:00
|
|
|
invalidateConfiguration()
|
|
|
|
|
2021-10-16 22:48:58 +00:00
|
|
|
configure {
|
|
|
|
$0.pipeline[.parsing].add(SwiftyJSONTransformer, contentTypes: ["*/json"])
|
|
|
|
}
|
|
|
|
|
2021-11-14 23:06:01 +00:00
|
|
|
configure(whenURLMatches: { url in self.needsAuthorization(url) }) {
|
|
|
|
$0.headers["Authorization"] = self.account.token
|
|
|
|
}
|
|
|
|
|
2023-02-28 20:03:02 +00:00
|
|
|
configureTransformer(pathPattern("channel/*")) { (content: Entity<JSON>) -> ChannelPage in
|
|
|
|
let nextPage = content.json.dictionaryValue["nextpage"]?.string
|
|
|
|
let channel = self.extractChannel(from: content.json)
|
|
|
|
return ChannelPage(
|
|
|
|
results: self.extractContentItems(from: self.contentItemsDictionary(from: content.json)),
|
|
|
|
channel: channel,
|
|
|
|
nextPage: nextPage,
|
|
|
|
last: nextPage.isNil
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
configureTransformer(pathPattern("/nextpage/channel/*")) { (content: Entity<JSON>) -> ChannelPage in
|
|
|
|
let nextPage = content.json.dictionaryValue["nextpage"]?.string
|
|
|
|
return ChannelPage(
|
|
|
|
results: self.extractContentItems(from: self.contentItemsDictionary(from: content.json)),
|
|
|
|
channel: self.extractChannel(from: content.json),
|
|
|
|
nextPage: nextPage,
|
|
|
|
last: nextPage.isNil
|
|
|
|
)
|
2021-10-16 22:48:58 +00:00
|
|
|
}
|
2021-10-20 22:21:50 +00:00
|
|
|
|
2022-11-27 10:42:16 +00:00
|
|
|
configureTransformer(pathPattern("channels/tabs*")) { (content: Entity<JSON>) -> [ContentItem] in
|
|
|
|
(content.json.dictionaryValue["content"]?.arrayValue ?? []).compactMap { self.extractContentItem(from: $0) }
|
|
|
|
}
|
|
|
|
|
2022-06-24 22:48:57 +00:00
|
|
|
configureTransformer(pathPattern("c/*")) { (content: Entity<JSON>) -> Channel? in
|
|
|
|
self.extractChannel(from: content.json)
|
|
|
|
}
|
|
|
|
|
2022-06-29 23:31:51 +00:00
|
|
|
configureTransformer(pathPattern("user/*")) { (content: Entity<JSON>) -> Channel? in
|
|
|
|
self.extractChannel(from: content.json)
|
|
|
|
}
|
|
|
|
|
2021-10-22 23:04:03 +00:00
|
|
|
configureTransformer(pathPattern("playlists/*")) { (content: Entity<JSON>) -> ChannelPlaylist? in
|
2021-12-17 16:39:26 +00:00
|
|
|
self.extractChannelPlaylist(from: content.json)
|
2021-10-22 23:04:03 +00:00
|
|
|
}
|
|
|
|
|
2022-05-21 22:29:51 +00:00
|
|
|
configureTransformer(pathPattern("user/playlists/create")) { (_: Entity<JSON>) in }
|
|
|
|
configureTransformer(pathPattern("user/playlists/delete")) { (_: Entity<JSON>) in }
|
|
|
|
configureTransformer(pathPattern("user/playlists/add")) { (_: Entity<JSON>) in }
|
|
|
|
configureTransformer(pathPattern("user/playlists/remove")) { (_: Entity<JSON>) in }
|
|
|
|
|
2021-10-20 22:21:50 +00:00
|
|
|
configureTransformer(pathPattern("streams/*")) { (content: Entity<JSON>) -> Video? in
|
2021-12-17 16:39:26 +00:00
|
|
|
self.extractVideo(from: content.json)
|
2021-10-20 22:21:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
configureTransformer(pathPattern("trending")) { (content: Entity<JSON>) -> [Video] in
|
2021-12-17 16:39:26 +00:00
|
|
|
self.extractVideos(from: content.json)
|
2021-10-20 22:21:50 +00:00
|
|
|
}
|
|
|
|
|
2022-01-04 23:18:01 +00:00
|
|
|
configureTransformer(pathPattern("search")) { (content: Entity<JSON>) -> SearchPage in
|
2022-06-18 11:24:23 +00:00
|
|
|
let nextPage = content.json.dictionaryValue["nextpage"]?.string
|
2022-01-04 23:18:01 +00:00
|
|
|
return SearchPage(
|
|
|
|
results: self.extractContentItems(from: content.json.dictionaryValue["items"]!),
|
|
|
|
nextPage: nextPage,
|
|
|
|
last: nextPage == "null"
|
|
|
|
)
|
2021-10-20 22:21:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
configureTransformer(pathPattern("suggestions")) { (content: Entity<JSON>) -> [String] in
|
|
|
|
content.json.arrayValue.map(String.init)
|
|
|
|
}
|
2021-11-14 23:06:01 +00:00
|
|
|
|
|
|
|
configureTransformer(pathPattern("subscriptions")) { (content: Entity<JSON>) -> [Channel] in
|
2022-06-18 11:24:23 +00:00
|
|
|
content.json.arrayValue.compactMap { self.extractChannel(from: $0) }
|
2021-11-14 23:06:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
configureTransformer(pathPattern("feed")) { (content: Entity<JSON>) -> [Video] in
|
2022-06-18 11:24:23 +00:00
|
|
|
content.json.arrayValue.compactMap { self.extractVideo(from: $0) }
|
2021-11-14 23:06:01 +00:00
|
|
|
}
|
|
|
|
|
2024-04-01 11:49:09 +00:00
|
|
|
configureTransformer(pathPattern("comments/*")) { (content: Entity<JSON>?) -> CommentsPage in
|
|
|
|
guard let details = content?.json.dictionaryValue else {
|
|
|
|
return CommentsPage(comments: [], nextPage: nil, disabled: true)
|
|
|
|
}
|
|
|
|
|
2022-06-18 11:24:23 +00:00
|
|
|
let comments = details["comments"]?.arrayValue.compactMap { self.extractComment(from: $0) } ?? []
|
|
|
|
let nextPage = details["nextpage"]?.string
|
|
|
|
let disabled = details["disabled"]?.bool ?? false
|
2021-12-04 19:35:41 +00:00
|
|
|
|
2021-12-05 17:14:49 +00:00
|
|
|
return CommentsPage(comments: comments, nextPage: nextPage, disabled: disabled)
|
2021-12-04 19:35:41 +00:00
|
|
|
}
|
|
|
|
|
2022-04-10 15:07:10 +00:00
|
|
|
configureTransformer(pathPattern("user/playlists")) { (content: Entity<JSON>) -> [Playlist] in
|
2022-06-18 11:24:23 +00:00
|
|
|
content.json.arrayValue.compactMap { self.extractUserPlaylist(from: $0) }
|
2022-04-10 15:07:10 +00:00
|
|
|
}
|
|
|
|
|
2022-12-14 16:23:04 +00:00
|
|
|
if account.token.isNil || account.token!.isEmpty {
|
2021-11-14 23:06:01 +00:00
|
|
|
updateToken()
|
2022-12-14 16:23:04 +00:00
|
|
|
} else {
|
2022-12-20 22:51:04 +00:00
|
|
|
FeedModel.shared.onAccountChange()
|
|
|
|
SubscribedChannelsModel.shared.onAccountChange()
|
|
|
|
PlaylistsModel.shared.onAccountChange()
|
2021-11-14 23:06:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func needsAuthorization(_ url: URL) -> Bool {
|
2021-12-17 16:39:26 +00:00
|
|
|
Self.authorizedEndpoints.contains { url.absoluteString.contains($0) }
|
2021-11-14 23:06:01 +00:00
|
|
|
}
|
|
|
|
|
2021-12-04 19:35:41 +00:00
|
|
|
func updateToken() {
|
2022-08-25 23:36:46 +00:00
|
|
|
let (username, password) = AccountsModel.getCredentials(account)
|
|
|
|
|
|
|
|
guard !account.anonymous,
|
2022-09-28 14:27:01 +00:00
|
|
|
let username,
|
|
|
|
let password
|
2022-08-25 23:36:46 +00:00
|
|
|
else {
|
2021-12-04 19:35:41 +00:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2023-10-22 17:39:34 +00:00
|
|
|
AF.request(
|
|
|
|
login.url,
|
|
|
|
method: .post,
|
|
|
|
parameters: ["username": username, "password": password],
|
|
|
|
encoding: JSONEncoding.default
|
2024-02-02 09:42:24 +00:00
|
|
|
)
|
|
|
|
.responseDecodable(of: JSON.self) { [weak self] response in
|
2023-10-22 17:39:34 +00:00
|
|
|
guard let self else {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
switch response.result {
|
|
|
|
case let .success(value):
|
|
|
|
let json = JSON(value)
|
|
|
|
let token = json.dictionaryValue["token"]?.string ?? ""
|
|
|
|
if let error = json.dictionaryValue["error"]?.string {
|
|
|
|
NavigationModel.shared.presentAlert(
|
|
|
|
title: "Account Error",
|
|
|
|
message: error
|
|
|
|
)
|
|
|
|
} else if !token.isEmpty {
|
|
|
|
AccountsModel.setToken(self.account, token)
|
|
|
|
self.objectWillChange.send()
|
|
|
|
} else {
|
|
|
|
NavigationModel.shared.presentAlert(
|
|
|
|
title: "Account Error",
|
|
|
|
message: "Could not update your token."
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
self.configure()
|
|
|
|
|
|
|
|
case let .failure(error):
|
2022-08-25 23:36:46 +00:00
|
|
|
NavigationModel.shared.presentAlert(
|
|
|
|
title: "Account Error",
|
2023-10-22 17:39:34 +00:00
|
|
|
message: error.localizedDescription
|
2022-08-25 23:36:46 +00:00
|
|
|
)
|
2022-08-15 12:49:12 +00:00
|
|
|
}
|
2021-11-14 23:06:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
var login: Resource {
|
|
|
|
resource(baseURL: account.url, path: "login")
|
2021-10-20 22:21:50 +00:00
|
|
|
}
|
|
|
|
|
2023-02-28 20:03:02 +00:00
|
|
|
func channel(_ id: String, contentType: Channel.ContentType, data: String?, page: String?) -> Resource {
|
|
|
|
let path = page.isNil ? "channel" : "nextpage/channel"
|
|
|
|
|
|
|
|
var channel: Siesta.Resource
|
|
|
|
|
|
|
|
if contentType == .videos || data.isNil {
|
|
|
|
channel = resource(baseURL: account.url, path: "\(path)/\(id)")
|
|
|
|
} else {
|
|
|
|
channel = resource(baseURL: account.url, path: "channels/tabs")
|
|
|
|
.withParam("data", data)
|
|
|
|
}
|
|
|
|
|
|
|
|
if let page, !page.isEmpty {
|
|
|
|
channel = channel.withParam("nextpage", page)
|
2022-11-27 10:42:16 +00:00
|
|
|
}
|
|
|
|
|
2023-02-28 20:03:02 +00:00
|
|
|
return channel
|
2021-10-21 23:29:10 +00:00
|
|
|
}
|
|
|
|
|
2022-06-24 22:48:57 +00:00
|
|
|
func channelByName(_ name: String) -> Resource? {
|
|
|
|
resource(baseURL: account.url, path: "c/\(name)")
|
|
|
|
}
|
|
|
|
|
2022-06-29 23:31:51 +00:00
|
|
|
func channelByUsername(_ username: String) -> Resource? {
|
|
|
|
resource(baseURL: account.url, path: "user/\(username)")
|
|
|
|
}
|
|
|
|
|
2021-11-01 21:56:18 +00:00
|
|
|
func channelVideos(_ id: String) -> Resource {
|
2022-11-27 10:42:16 +00:00
|
|
|
channel(id, contentType: .videos)
|
2021-11-01 21:56:18 +00:00
|
|
|
}
|
|
|
|
|
2021-10-22 23:04:03 +00:00
|
|
|
func channelPlaylist(_ id: String) -> Resource? {
|
|
|
|
resource(baseURL: account.url, path: "playlists/\(id)")
|
|
|
|
}
|
|
|
|
|
2021-10-21 23:29:10 +00:00
|
|
|
func trending(country: Country, category _: TrendingCategory? = nil) -> Resource {
|
2021-10-27 21:11:38 +00:00
|
|
|
resource(baseURL: account.instance.apiURL, path: "trending")
|
2021-10-21 23:29:10 +00:00
|
|
|
.withParam("region", country.rawValue)
|
|
|
|
}
|
|
|
|
|
2022-01-04 23:18:01 +00:00
|
|
|
func search(_ query: SearchQuery, page: String?) -> Resource {
|
|
|
|
let path = page.isNil ? "search" : "nextpage/search"
|
|
|
|
|
|
|
|
let resource = resource(baseURL: account.instance.apiURL, path: path)
|
2021-10-21 23:29:10 +00:00
|
|
|
.withParam("q", query.query)
|
2022-01-04 23:18:01 +00:00
|
|
|
.withParam("filter", "all")
|
|
|
|
|
|
|
|
if page.isNil {
|
|
|
|
return resource
|
|
|
|
}
|
|
|
|
|
|
|
|
return resource.withParam("nextpage", page)
|
2021-10-21 23:29:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func searchSuggestions(query: String) -> Resource {
|
2021-10-27 21:11:38 +00:00
|
|
|
resource(baseURL: account.instance.apiURL, path: "suggestions")
|
2021-10-21 23:29:10 +00:00
|
|
|
.withParam("query", query.lowercased())
|
|
|
|
}
|
|
|
|
|
|
|
|
func video(_ id: Video.ID) -> Resource {
|
2021-10-27 21:11:38 +00:00
|
|
|
resource(baseURL: account.instance.apiURL, path: "streams/\(id)")
|
2021-10-21 23:29:10 +00:00
|
|
|
}
|
|
|
|
|
2021-11-14 23:06:01 +00:00
|
|
|
var signedIn: Bool {
|
2022-09-28 14:27:01 +00:00
|
|
|
guard let account else {
|
2022-04-03 22:18:49 +00:00
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
return !account.anonymous && !(account.token?.isEmpty ?? true)
|
2021-11-14 23:06:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
var subscriptions: Resource? {
|
|
|
|
resource(baseURL: account.instance.apiURL, path: "subscriptions")
|
|
|
|
}
|
|
|
|
|
2022-12-10 02:01:59 +00:00
|
|
|
func feed(_: Int?) -> Resource? {
|
2021-11-14 23:06:01 +00:00
|
|
|
resource(baseURL: account.instance.apiURL, path: "feed")
|
|
|
|
.withParam("authToken", account.token)
|
|
|
|
}
|
2021-10-21 23:29:10 +00:00
|
|
|
|
|
|
|
var home: Resource? { nil }
|
|
|
|
var popular: Resource? { nil }
|
2022-04-10 15:07:10 +00:00
|
|
|
var playlists: Resource? {
|
|
|
|
resource(baseURL: account.instance.apiURL, path: "user/playlists")
|
|
|
|
}
|
2021-10-21 23:29:10 +00:00
|
|
|
|
2021-11-14 23:06:01 +00:00
|
|
|
func subscribe(_ channelID: String, onCompletion: @escaping () -> Void = {}) {
|
|
|
|
resource(baseURL: account.instance.apiURL, path: "subscribe")
|
|
|
|
.request(.post, json: ["channelId": channelID])
|
|
|
|
.onCompletion { _ in onCompletion() }
|
|
|
|
}
|
|
|
|
|
|
|
|
func unsubscribe(_ channelID: String, onCompletion: @escaping () -> Void = {}) {
|
|
|
|
resource(baseURL: account.instance.apiURL, path: "unsubscribe")
|
|
|
|
.request(.post, json: ["channelId": channelID])
|
|
|
|
.onCompletion { _ in onCompletion() }
|
|
|
|
}
|
2021-10-21 23:29:10 +00:00
|
|
|
|
2022-04-10 15:07:10 +00:00
|
|
|
func playlist(_ id: String) -> Resource? {
|
|
|
|
channelPlaylist(id)
|
|
|
|
}
|
|
|
|
|
2021-10-21 23:29:10 +00:00
|
|
|
func playlistVideo(_: String, _: String) -> Resource? { nil }
|
|
|
|
func playlistVideos(_: String) -> Resource? { nil }
|
|
|
|
|
2022-05-21 22:29:51 +00:00
|
|
|
func addVideoToPlaylist(
|
|
|
|
_ videoID: String,
|
|
|
|
_ playlistID: String,
|
|
|
|
onFailure: @escaping (RequestError) -> Void = { _ in },
|
|
|
|
onSuccess: @escaping () -> Void = {}
|
|
|
|
) {
|
|
|
|
let resource = resource(baseURL: account.instance.apiURL, path: "user/playlists/add")
|
|
|
|
let body = ["videoId": videoID, "playlistId": playlistID]
|
|
|
|
|
|
|
|
resource
|
|
|
|
.request(.post, json: body)
|
|
|
|
.onSuccess { _ in onSuccess() }
|
|
|
|
.onFailure(onFailure)
|
|
|
|
}
|
|
|
|
|
|
|
|
func removeVideoFromPlaylist(
|
|
|
|
_ index: String,
|
|
|
|
_ playlistID: String,
|
|
|
|
onFailure: @escaping (RequestError) -> Void,
|
|
|
|
onSuccess: @escaping () -> Void
|
|
|
|
) {
|
|
|
|
let resource = resource(baseURL: account.instance.apiURL, path: "user/playlists/remove")
|
|
|
|
let body: [String: Any] = ["index": Int(index)!, "playlistId": playlistID]
|
|
|
|
|
|
|
|
resource
|
|
|
|
.request(.post, json: body)
|
|
|
|
.onSuccess { _ in onSuccess() }
|
|
|
|
.onFailure(onFailure)
|
|
|
|
}
|
|
|
|
|
|
|
|
func playlistForm(
|
|
|
|
_ name: String,
|
|
|
|
_: String,
|
|
|
|
playlist: Playlist?,
|
|
|
|
onFailure: @escaping (RequestError) -> Void,
|
|
|
|
onSuccess: @escaping (Playlist?) -> Void
|
|
|
|
) {
|
|
|
|
let body = ["name": name]
|
|
|
|
let resource = playlist.isNil ? resource(baseURL: account.instance.apiURL, path: "user/playlists/create") : nil
|
|
|
|
|
|
|
|
resource?
|
|
|
|
.request(.post, json: body)
|
|
|
|
.onSuccess { response in
|
|
|
|
if let modifiedPlaylist: Playlist = response.typedContent() {
|
|
|
|
onSuccess(modifiedPlaylist)
|
|
|
|
} else {
|
|
|
|
onSuccess(nil)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
.onFailure(onFailure)
|
|
|
|
}
|
|
|
|
|
|
|
|
func deletePlaylist(
|
|
|
|
_ playlist: Playlist,
|
|
|
|
onFailure: @escaping (RequestError) -> Void,
|
|
|
|
onSuccess: @escaping () -> Void
|
|
|
|
) {
|
|
|
|
let resource = resource(baseURL: account.instance.apiURL, path: "user/playlists/delete")
|
|
|
|
let body = ["playlistId": playlist.id]
|
|
|
|
|
|
|
|
resource
|
|
|
|
.request(.post, json: body)
|
|
|
|
.onSuccess { _ in onSuccess() }
|
|
|
|
.onFailure(onFailure)
|
|
|
|
}
|
|
|
|
|
2021-12-04 19:35:41 +00:00
|
|
|
func comments(_ id: Video.ID, page: String?) -> Resource? {
|
|
|
|
let path = page.isNil ? "comments/\(id)" : "nextpage/comments/\(id)"
|
|
|
|
let resource = resource(baseURL: account.url, path: path)
|
|
|
|
|
|
|
|
if page.isNil {
|
|
|
|
return resource
|
|
|
|
}
|
|
|
|
|
|
|
|
return resource.withParam("nextpage", page)
|
|
|
|
}
|
|
|
|
|
2021-10-21 23:29:10 +00:00
|
|
|
private func pathPattern(_ path: String) -> String {
|
|
|
|
"**\(path)"
|
|
|
|
}
|
|
|
|
|
2021-12-17 16:39:26 +00:00
|
|
|
private func extractContentItem(from content: JSON) -> ContentItem? {
|
2021-10-21 23:29:10 +00:00
|
|
|
let details = content.dictionaryValue
|
|
|
|
|
|
|
|
let contentType: ContentItem.ContentType
|
|
|
|
|
2022-06-18 11:24:23 +00:00
|
|
|
if let url = details["url"]?.string {
|
2021-10-21 23:29:10 +00:00
|
|
|
if url.contains("/playlist") {
|
|
|
|
contentType = .playlist
|
|
|
|
} else if url.contains("/channel") {
|
|
|
|
contentType = .channel
|
|
|
|
} else {
|
|
|
|
contentType = .video
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
contentType = .video
|
|
|
|
}
|
|
|
|
|
|
|
|
switch contentType {
|
|
|
|
case .video:
|
2021-12-17 16:39:26 +00:00
|
|
|
if let video = extractVideo(from: content) {
|
2021-10-21 23:29:10 +00:00
|
|
|
return ContentItem(video: video)
|
|
|
|
}
|
|
|
|
|
|
|
|
case .playlist:
|
2021-12-17 16:39:26 +00:00
|
|
|
if let playlist = extractChannelPlaylist(from: content) {
|
2021-10-22 23:04:03 +00:00
|
|
|
return ContentItem(playlist: playlist)
|
|
|
|
}
|
2021-10-21 23:29:10 +00:00
|
|
|
|
|
|
|
case .channel:
|
2021-12-17 16:39:26 +00:00
|
|
|
if let channel = extractChannel(from: content) {
|
2021-10-21 23:29:10 +00:00
|
|
|
return ContentItem(channel: channel)
|
|
|
|
}
|
2022-03-27 10:49:57 +00:00
|
|
|
default:
|
|
|
|
return nil
|
2021-10-21 23:29:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-12-17 16:39:26 +00:00
|
|
|
private func extractContentItems(from content: JSON) -> [ContentItem] {
|
|
|
|
content.arrayValue.compactMap { extractContentItem(from: $0) }
|
2021-10-21 23:29:10 +00:00
|
|
|
}
|
|
|
|
|
2021-12-17 16:39:26 +00:00
|
|
|
private func extractChannel(from content: JSON) -> Channel? {
|
2021-10-21 23:29:10 +00:00
|
|
|
let attributes = content.dictionaryValue
|
2022-06-18 11:24:23 +00:00
|
|
|
guard let id = attributes["id"]?.string ??
|
|
|
|
(attributes["url"] ?? attributes["uploaderUrl"])?.string?.components(separatedBy: "/").last
|
2021-10-21 23:29:10 +00:00
|
|
|
else {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-06-18 11:24:23 +00:00
|
|
|
let subscriptionsCount = attributes["subscriberCount"]?.int ?? attributes["subscribers"]?.int
|
2021-10-21 23:29:10 +00:00
|
|
|
|
|
|
|
var videos = [Video]()
|
|
|
|
if let relatedStreams = attributes["relatedStreams"] {
|
2021-12-17 16:39:26 +00:00
|
|
|
videos = extractVideos(from: relatedStreams)
|
2021-10-21 23:29:10 +00:00
|
|
|
}
|
|
|
|
|
2022-06-18 11:24:23 +00:00
|
|
|
let name = attributes["name"]?.string ??
|
|
|
|
attributes["uploaderName"]?.string ??
|
|
|
|
attributes["uploader"]?.string ?? ""
|
|
|
|
|
|
|
|
let thumbnailURL = attributes["avatarUrl"]?.url ??
|
|
|
|
attributes["uploaderAvatar"]?.url ??
|
|
|
|
attributes["avatar"]?.url ??
|
|
|
|
attributes["thumbnail"]?.url
|
2021-12-17 16:39:26 +00:00
|
|
|
|
2022-11-27 10:42:16 +00:00
|
|
|
let tabs = attributes["tabs"]?.arrayValue.compactMap { tab in
|
|
|
|
let name = tab["name"].string
|
|
|
|
let data = tab["data"].string
|
|
|
|
if let name, let data, let type = Channel.ContentType(rawValue: name) {
|
|
|
|
return Channel.Tab(contentType: type, data: data)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
} ?? [Channel.Tab]()
|
|
|
|
|
2021-10-21 23:29:10 +00:00
|
|
|
return Channel(
|
2022-12-13 23:07:32 +00:00
|
|
|
app: .piped,
|
2021-10-21 23:29:10 +00:00
|
|
|
id: id,
|
2021-12-17 16:39:26 +00:00
|
|
|
name: name,
|
2022-11-27 10:42:16 +00:00
|
|
|
bannerURL: attributes["bannerUrl"]?.url,
|
2021-12-17 16:39:26 +00:00
|
|
|
thumbnailURL: thumbnailURL,
|
2021-10-21 23:29:10 +00:00
|
|
|
subscriptionsCount: subscriptionsCount,
|
2022-11-27 10:42:16 +00:00
|
|
|
verified: attributes["verified"]?.bool,
|
|
|
|
videos: videos,
|
|
|
|
tabs: tabs
|
2021-10-20 22:21:50 +00:00
|
|
|
)
|
|
|
|
}
|
|
|
|
|
2021-12-17 16:39:26 +00:00
|
|
|
func extractChannelPlaylist(from json: JSON) -> ChannelPlaylist? {
|
2021-10-22 23:04:03 +00:00
|
|
|
let details = json.dictionaryValue
|
2022-06-29 21:50:53 +00:00
|
|
|
let id = details["url"]?.stringValue.components(separatedBy: "?list=").last
|
2021-10-22 23:04:03 +00:00
|
|
|
let thumbnailURL = details["thumbnail"]?.url ?? details["thumbnailUrl"]?.url
|
|
|
|
var videos = [Video]()
|
|
|
|
if let relatedStreams = details["relatedStreams"] {
|
2021-12-17 16:39:26 +00:00
|
|
|
videos = extractVideos(from: relatedStreams)
|
2021-10-22 23:04:03 +00:00
|
|
|
}
|
|
|
|
return ChannelPlaylist(
|
2022-06-29 21:50:53 +00:00
|
|
|
id: id ?? UUID().uuidString,
|
2022-06-18 11:24:23 +00:00
|
|
|
title: details["name"]?.string ?? "",
|
2021-10-22 23:04:03 +00:00
|
|
|
thumbnailURL: thumbnailURL,
|
2022-06-19 15:31:02 +00:00
|
|
|
channel: extractChannel(from: json),
|
2021-10-22 23:04:03 +00:00
|
|
|
videos: videos,
|
|
|
|
videosCount: details["videos"]?.int
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
Conditional proxying
I added a new feature. When instances are not proxied, Yattee first checks the URL to make sure it is not a restricted video. Usually, music videos and sports content can only be played back by the same IP address that requested the URL in the first place. That is why some videos do not play when the proxy is disabled.
This approach has multiple advantages. First and foremost, It reduced the load on Invidious/Piped instances, since users can now directly access the videos without going through the instance, which might be severely bandwidth limited. Secondly, users don't need to manually turn on the proxy when they want to watch IP address bound content, since Yattee automatically proxies such content.
Furthermore, adding the proxy option allows mitigating some severe playback issues with invidious instances. Invidious by default returns proxied URLs for videos, and due to some bug in the Invidious proxy, scrubbing or continuing playback at a random timestamp can lead to severe wait times for the users.
This should fix numerous playback issues: #666, #626, #590, #585, #498, #457, #400
2024-05-09 18:07:55 +00:00
|
|
|
static func nonProxiedAsset(asset: AVURLAsset, completion: @escaping (AVURLAsset?) -> Void) {
|
|
|
|
guard var urlComponents = URLComponents(url: asset.url, resolvingAgainstBaseURL: false) else {
|
|
|
|
completion(asset)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
guard let hostItem = urlComponents.queryItems?.first(where: { $0.name == "host" }),
|
|
|
|
let hostValue = hostItem.value
|
|
|
|
else {
|
|
|
|
completion(asset)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
urlComponents.host = hostValue
|
|
|
|
|
|
|
|
guard let newUrl = urlComponents.url else {
|
|
|
|
completion(asset)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
completion(AVURLAsset(url: newUrl))
|
|
|
|
}
|
|
|
|
|
|
|
|
// Overload used for hlsURLS
|
|
|
|
static func nonProxiedAsset(url: URL, completion: @escaping (AVURLAsset?) -> Void) {
|
|
|
|
let asset = AVURLAsset(url: url)
|
|
|
|
nonProxiedAsset(asset: asset, completion: completion)
|
|
|
|
}
|
|
|
|
|
2021-12-17 16:39:26 +00:00
|
|
|
private func extractVideo(from content: JSON) -> Video? {
|
2021-10-20 22:21:50 +00:00
|
|
|
let details = content.dictionaryValue
|
|
|
|
|
2022-06-18 11:24:23 +00:00
|
|
|
if let url = details["url"]?.string {
|
|
|
|
guard url.contains("/watch") else {
|
2021-10-20 22:21:50 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-06-18 11:24:23 +00:00
|
|
|
let channelId = details["uploaderUrl"]?.string?.components(separatedBy: "/").last ?? "unknown"
|
2021-10-20 22:21:50 +00:00
|
|
|
|
|
|
|
let thumbnails: [Thumbnail] = Thumbnail.Quality.allCases.compactMap {
|
2021-12-17 16:39:26 +00:00
|
|
|
if let url = buildThumbnailURL(from: content, quality: $0) {
|
2021-10-20 22:21:50 +00:00
|
|
|
return Thumbnail(url: url, quality: $0)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-06-18 11:24:23 +00:00
|
|
|
let author = details["uploaderName"]?.string ?? details["uploader"]?.string ?? ""
|
2021-12-17 16:39:26 +00:00
|
|
|
let authorThumbnailURL = details["avatarUrl"]?.url ?? details["uploaderAvatar"]?.url ?? details["avatar"]?.url
|
2022-04-16 17:50:02 +00:00
|
|
|
let subscriptionsCount = details["uploaderSubscriberCount"]?.int
|
2021-12-17 16:39:26 +00:00
|
|
|
|
2022-06-18 11:24:23 +00:00
|
|
|
let uploaded = details["uploaded"]?.double
|
2022-06-14 16:23:15 +00:00
|
|
|
var published = (uploaded.isNil || uploaded == -1) ? nil : (uploaded! / 1000).formattedAsRelativeTime()
|
2023-10-15 12:08:38 +00:00
|
|
|
var publishedAt: Date?
|
|
|
|
|
|
|
|
let dateFormatter = ISO8601DateFormatter()
|
|
|
|
dateFormatter.formatOptions = [.withInternetDateTime]
|
|
|
|
|
|
|
|
if published.isNil,
|
|
|
|
let date = details["uploadDate"]?.string,
|
|
|
|
let formattedDate = dateFormatter.date(from: date)
|
|
|
|
{
|
|
|
|
publishedAt = formattedDate
|
|
|
|
} else {
|
2022-06-18 11:24:23 +00:00
|
|
|
published = (details["uploadedDate"] ?? details["uploadDate"])?.string ?? ""
|
2022-03-20 20:30:45 +00:00
|
|
|
}
|
|
|
|
|
2022-06-18 11:24:23 +00:00
|
|
|
let live = details["livestream"]?.bool ?? (details["duration"]?.int == -1)
|
2021-10-20 22:21:50 +00:00
|
|
|
|
2022-06-18 12:39:49 +00:00
|
|
|
let description = extractDescription(from: content) ?? ""
|
|
|
|
|
|
|
|
var chapters = extractChapters(from: content)
|
|
|
|
if chapters.isEmpty, !description.isEmpty {
|
|
|
|
chapters = extractChapters(from: description)
|
|
|
|
}
|
|
|
|
|
2023-02-25 15:42:18 +00:00
|
|
|
let length = details["duration"]?.double ?? 0
|
|
|
|
|
2021-10-20 22:21:50 +00:00
|
|
|
return Video(
|
2022-12-09 00:15:19 +00:00
|
|
|
instanceID: account.instanceID,
|
|
|
|
app: .piped,
|
|
|
|
instanceURL: account.instance.apiURL,
|
2021-12-17 16:39:26 +00:00
|
|
|
videoID: extractID(from: content),
|
2022-06-18 11:24:23 +00:00
|
|
|
title: details["title"]?.string ?? "",
|
2021-10-20 22:21:50 +00:00
|
|
|
author: author,
|
2023-02-25 15:42:18 +00:00
|
|
|
length: length,
|
2022-06-18 11:24:23 +00:00
|
|
|
published: published ?? "",
|
|
|
|
views: details["views"]?.int ?? 0,
|
2022-06-18 12:39:49 +00:00
|
|
|
description: description,
|
2022-12-13 23:07:32 +00:00
|
|
|
channel: Channel(app: .piped, id: channelId, name: author, thumbnailURL: authorThumbnailURL, subscriptionsCount: subscriptionsCount),
|
2021-10-20 22:21:50 +00:00
|
|
|
thumbnails: thumbnails,
|
2021-12-26 19:14:45 +00:00
|
|
|
live: live,
|
2023-02-25 15:42:18 +00:00
|
|
|
short: details["isShort"]?.bool ?? (length <= Video.shortLength),
|
2023-10-15 12:08:38 +00:00
|
|
|
publishedAt: publishedAt,
|
2021-10-20 22:21:50 +00:00
|
|
|
likes: details["likes"]?.int,
|
|
|
|
dislikes: details["dislikes"]?.int,
|
2021-11-02 23:02:02 +00:00
|
|
|
streams: extractStreams(from: content),
|
2022-06-18 12:39:49 +00:00
|
|
|
related: extractRelated(from: content),
|
|
|
|
chapters: extractChapters(from: content)
|
2021-10-20 22:21:50 +00:00
|
|
|
)
|
|
|
|
}
|
|
|
|
|
2021-12-17 16:39:26 +00:00
|
|
|
private func extractID(from content: JSON) -> Video.ID {
|
2022-06-18 11:24:23 +00:00
|
|
|
content.dictionaryValue["url"]?.string?.components(separatedBy: "?v=").last ??
|
|
|
|
extractThumbnailURL(from: content)?.relativeString.components(separatedBy: "/")[4] ?? ""
|
2021-10-16 22:48:58 +00:00
|
|
|
}
|
|
|
|
|
2021-12-17 16:39:26 +00:00
|
|
|
private func extractThumbnailURL(from content: JSON) -> URL? {
|
2022-06-18 11:24:23 +00:00
|
|
|
content.dictionaryValue["thumbnail"]?.url ?? content.dictionaryValue["thumbnailUrl"]?.url
|
2021-10-20 22:21:50 +00:00
|
|
|
}
|
|
|
|
|
2021-12-17 16:39:26 +00:00
|
|
|
private func buildThumbnailURL(from content: JSON, quality: Thumbnail.Quality) -> URL? {
|
2022-06-18 11:24:23 +00:00
|
|
|
guard let thumbnailURL = extractThumbnailURL(from: content) else {
|
2021-10-20 22:21:50 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
Conditional proxying
I added a new feature. When instances are not proxied, Yattee first checks the URL to make sure it is not a restricted video. Usually, music videos and sports content can only be played back by the same IP address that requested the URL in the first place. That is why some videos do not play when the proxy is disabled.
This approach has multiple advantages. First and foremost, It reduced the load on Invidious/Piped instances, since users can now directly access the videos without going through the instance, which might be severely bandwidth limited. Secondly, users don't need to manually turn on the proxy when they want to watch IP address bound content, since Yattee automatically proxies such content.
Furthermore, adding the proxy option allows mitigating some severe playback issues with invidious instances. Invidious by default returns proxied URLs for videos, and due to some bug in the Invidious proxy, scrubbing or continuing playback at a random timestamp can lead to severe wait times for the users.
This should fix numerous playback issues: #666, #626, #590, #585, #498, #457, #400
2024-05-09 18:07:55 +00:00
|
|
|
return URL(
|
|
|
|
string: thumbnailURL
|
|
|
|
.absoluteString
|
|
|
|
.replacingOccurrences(of: "hqdefault", with: quality.filename)
|
|
|
|
.replacingOccurrences(of: "maxresdefault", with: quality.filename)
|
2022-06-18 11:24:23 +00:00
|
|
|
)
|
2021-10-20 22:21:50 +00:00
|
|
|
}
|
|
|
|
|
2022-04-10 15:07:10 +00:00
|
|
|
private func extractUserPlaylist(from json: JSON) -> Playlist? {
|
2022-06-18 11:24:23 +00:00
|
|
|
let id = json["id"].string ?? ""
|
|
|
|
let title = json["name"].string ?? ""
|
2022-04-10 15:07:10 +00:00
|
|
|
let visibility = Playlist.Visibility.private
|
|
|
|
|
|
|
|
return Playlist(id: id, title: title, visibility: visibility)
|
|
|
|
}
|
|
|
|
|
2021-12-17 16:39:26 +00:00
|
|
|
private func extractDescription(from content: JSON) -> String? {
|
2022-12-12 23:38:45 +00:00
|
|
|
guard let description = content.dictionaryValue["description"]?.string else { return nil }
|
|
|
|
|
|
|
|
return replaceHTML(description)
|
|
|
|
}
|
2021-10-20 22:21:50 +00:00
|
|
|
|
2022-12-12 23:38:45 +00:00
|
|
|
private func replaceHTML(_ string: String) -> String {
|
|
|
|
var string = string.replacingOccurrences(
|
2021-10-20 22:21:50 +00:00
|
|
|
of: "<br/>|<br />|<br>",
|
|
|
|
with: "\n",
|
|
|
|
options: .regularExpression,
|
|
|
|
range: nil
|
|
|
|
)
|
|
|
|
|
2022-08-19 21:55:02 +00:00
|
|
|
let linkRegex = #"(<a\s+(?:[^>]*?\s+)?href=\"[^"]*\">[^<]*<\/a>)"#
|
|
|
|
let hrefRegex = #"href=\"([^"]*)\">"#
|
2022-12-12 23:38:45 +00:00
|
|
|
guard let hrefRegex = try? NSRegularExpression(pattern: hrefRegex) else { return string }
|
|
|
|
string = string.replacingMatches(regex: linkRegex) { matchingGroup in
|
2022-08-19 21:55:02 +00:00
|
|
|
let results = hrefRegex.matches(in: matchingGroup, range: NSRange(matchingGroup.startIndex..., in: matchingGroup))
|
|
|
|
|
|
|
|
if let result = results.first {
|
|
|
|
if let swiftRange = Range(result.range(at: 1), in: matchingGroup) {
|
|
|
|
return String(matchingGroup[swiftRange])
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return matchingGroup
|
|
|
|
}
|
|
|
|
|
2022-12-12 23:38:45 +00:00
|
|
|
string = string
|
|
|
|
.replacingOccurrences(of: "&", with: "&")
|
|
|
|
.replacingOccurrences(of: " ", with: " ")
|
|
|
|
.replacingOccurrences(
|
|
|
|
of: "<[^>]+>",
|
|
|
|
with: "",
|
|
|
|
options: .regularExpression,
|
|
|
|
range: nil
|
|
|
|
)
|
2021-10-20 22:21:50 +00:00
|
|
|
|
2022-12-12 23:38:45 +00:00
|
|
|
return string
|
2021-10-20 22:21:50 +00:00
|
|
|
}
|
|
|
|
|
2021-12-17 16:39:26 +00:00
|
|
|
private func extractVideos(from content: JSON) -> [Video] {
|
2021-10-23 11:51:02 +00:00
|
|
|
content.arrayValue.compactMap(extractVideo(from:))
|
2021-10-20 22:21:50 +00:00
|
|
|
}
|
|
|
|
|
2021-12-17 16:39:26 +00:00
|
|
|
private func extractStreams(from content: JSON) -> [Stream] {
|
2021-10-16 22:48:58 +00:00
|
|
|
var streams = [Stream]()
|
|
|
|
|
2021-10-20 22:21:50 +00:00
|
|
|
if let hlsURL = content.dictionaryValue["hls"]?.url {
|
2022-08-16 21:16:35 +00:00
|
|
|
streams.append(Stream(instance: account.instance, hlsURL: hlsURL))
|
2021-10-16 22:48:58 +00:00
|
|
|
}
|
|
|
|
|
2022-02-16 20:23:11 +00:00
|
|
|
let audioStreams = content
|
|
|
|
.dictionaryValue["audioStreams"]?
|
|
|
|
.arrayValue
|
2022-06-18 11:24:23 +00:00
|
|
|
.filter { $0.dictionaryValue["format"]?.string == "M4A" }
|
2023-07-24 17:09:56 +00:00
|
|
|
.filter { stream in
|
|
|
|
let type = stream.dictionaryValue["audioTrackType"]?.string
|
|
|
|
return type == nil || type == "ORIGINAL"
|
|
|
|
}
|
2022-02-16 20:23:11 +00:00
|
|
|
.sorted {
|
2022-06-18 11:24:23 +00:00
|
|
|
$0.dictionaryValue["bitrate"]?.int ?? 0 >
|
|
|
|
$1.dictionaryValue["bitrate"]?.int ?? 0
|
2022-02-16 20:23:11 +00:00
|
|
|
} ?? []
|
|
|
|
|
|
|
|
guard let audioStream = audioStreams.first else {
|
2021-10-16 22:48:58 +00:00
|
|
|
return streams
|
|
|
|
}
|
|
|
|
|
2022-02-16 20:23:11 +00:00
|
|
|
let videoStreams = content.dictionaryValue["videoStreams"]?.arrayValue ?? []
|
2021-10-16 22:48:58 +00:00
|
|
|
|
2024-04-01 11:49:09 +00:00
|
|
|
for videoStream in videoStreams {
|
2022-06-17 10:52:10 +00:00
|
|
|
let videoCodec = videoStream.dictionaryValue["codec"]?.string ?? ""
|
|
|
|
if Self.disallowedVideoCodecs.contains(where: videoCodec.contains) {
|
2024-04-01 11:49:09 +00:00
|
|
|
continue
|
2022-07-11 13:30:32 +00:00
|
|
|
}
|
|
|
|
|
2022-06-18 11:24:23 +00:00
|
|
|
guard let audioAssetUrl = audioStream.dictionaryValue["url"]?.url,
|
|
|
|
let videoAssetUrl = videoStream.dictionaryValue["url"]?.url
|
|
|
|
else {
|
2024-04-01 11:49:09 +00:00
|
|
|
continue
|
2022-06-18 11:24:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
let audioAsset = AVURLAsset(url: audioAssetUrl)
|
|
|
|
let videoAsset = AVURLAsset(url: videoAssetUrl)
|
2021-10-16 22:48:58 +00:00
|
|
|
|
2022-06-18 11:24:23 +00:00
|
|
|
let videoOnly = videoStream.dictionaryValue["videoOnly"]?.bool ?? true
|
2022-06-17 10:52:10 +00:00
|
|
|
let quality = videoStream.dictionaryValue["quality"]?.string ?? "unknown"
|
|
|
|
let qualityComponents = quality.components(separatedBy: "p")
|
2022-06-17 13:13:56 +00:00
|
|
|
let fps = qualityComponents.count > 1 ? Int(qualityComponents[1]) : 30
|
2022-06-17 10:52:10 +00:00
|
|
|
let resolution = Stream.Resolution.from(resolution: quality, fps: fps)
|
2022-06-18 11:24:23 +00:00
|
|
|
let videoFormat = videoStream.dictionaryValue["format"]?.string
|
2024-05-13 05:54:24 +00:00
|
|
|
let bitrate = videoStream.dictionaryValue["bitrate"]?.int
|
Conditional proxying
I added a new feature. When instances are not proxied, Yattee first checks the URL to make sure it is not a restricted video. Usually, music videos and sports content can only be played back by the same IP address that requested the URL in the first place. That is why some videos do not play when the proxy is disabled.
This approach has multiple advantages. First and foremost, It reduced the load on Invidious/Piped instances, since users can now directly access the videos without going through the instance, which might be severely bandwidth limited. Secondly, users don't need to manually turn on the proxy when they want to watch IP address bound content, since Yattee automatically proxies such content.
Furthermore, adding the proxy option allows mitigating some severe playback issues with invidious instances. Invidious by default returns proxied URLs for videos, and due to some bug in the Invidious proxy, scrubbing or continuing playback at a random timestamp can lead to severe wait times for the users.
This should fix numerous playback issues: #666, #626, #590, #585, #498, #457, #400
2024-05-09 18:07:55 +00:00
|
|
|
var requestRange: String?
|
|
|
|
|
|
|
|
if let initStart = videoStream.dictionaryValue["initStart"]?.int,
|
|
|
|
let initEnd = videoStream.dictionaryValue["initEnd"]?.int
|
|
|
|
{
|
|
|
|
requestRange = "\(initStart)-\(initEnd)"
|
|
|
|
} else if let indexStart = videoStream.dictionaryValue["indexStart"]?.int,
|
|
|
|
let indexEnd = videoStream.dictionaryValue["indexEnd"]?.int
|
|
|
|
{
|
|
|
|
requestRange = "\(indexStart)-\(indexEnd)"
|
|
|
|
} else {
|
|
|
|
requestRange = nil
|
|
|
|
}
|
2021-10-16 22:48:58 +00:00
|
|
|
|
|
|
|
if videoOnly {
|
|
|
|
streams.append(
|
2022-06-18 11:24:23 +00:00
|
|
|
Stream(
|
2022-08-16 21:16:35 +00:00
|
|
|
instance: account.instance,
|
2022-06-18 11:24:23 +00:00
|
|
|
audioAsset: audioAsset,
|
|
|
|
videoAsset: videoAsset,
|
|
|
|
resolution: resolution,
|
|
|
|
kind: .adaptive,
|
2024-05-13 05:54:24 +00:00
|
|
|
videoFormat: videoFormat,
|
Conditional proxying
I added a new feature. When instances are not proxied, Yattee first checks the URL to make sure it is not a restricted video. Usually, music videos and sports content can only be played back by the same IP address that requested the URL in the first place. That is why some videos do not play when the proxy is disabled.
This approach has multiple advantages. First and foremost, It reduced the load on Invidious/Piped instances, since users can now directly access the videos without going through the instance, which might be severely bandwidth limited. Secondly, users don't need to manually turn on the proxy when they want to watch IP address bound content, since Yattee automatically proxies such content.
Furthermore, adding the proxy option allows mitigating some severe playback issues with invidious instances. Invidious by default returns proxied URLs for videos, and due to some bug in the Invidious proxy, scrubbing or continuing playback at a random timestamp can lead to severe wait times for the users.
This should fix numerous playback issues: #666, #626, #590, #585, #498, #457, #400
2024-05-09 18:07:55 +00:00
|
|
|
bitrate: bitrate,
|
|
|
|
requestRange: requestRange
|
2022-06-18 11:24:23 +00:00
|
|
|
)
|
2021-10-16 22:48:58 +00:00
|
|
|
)
|
|
|
|
} else {
|
|
|
|
streams.append(
|
2022-08-16 21:16:35 +00:00
|
|
|
SingleAssetStream(
|
|
|
|
instance: account.instance,
|
|
|
|
avAsset: videoAsset,
|
|
|
|
resolution: resolution,
|
|
|
|
kind: .stream
|
|
|
|
)
|
2021-10-16 22:48:58 +00:00
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return streams
|
|
|
|
}
|
|
|
|
|
2021-12-17 16:39:26 +00:00
|
|
|
private func extractRelated(from content: JSON) -> [Video] {
|
2021-11-02 23:02:02 +00:00
|
|
|
content
|
|
|
|
.dictionaryValue["relatedStreams"]?
|
|
|
|
.arrayValue
|
|
|
|
.compactMap(extractVideo(from:)) ?? []
|
|
|
|
}
|
|
|
|
|
2021-12-17 16:39:26 +00:00
|
|
|
private func extractComment(from content: JSON) -> Comment? {
|
2021-12-04 19:35:41 +00:00
|
|
|
let details = content.dictionaryValue
|
2022-06-18 11:24:23 +00:00
|
|
|
let author = details["author"]?.string ?? ""
|
|
|
|
let commentorUrl = details["commentorUrl"]?.string
|
2021-12-04 19:35:41 +00:00
|
|
|
let channelId = commentorUrl?.components(separatedBy: "/")[2] ?? ""
|
2022-12-12 23:38:45 +00:00
|
|
|
|
2024-04-02 13:08:36 +00:00
|
|
|
let commentText = extractCommentText(from: details["commentText"]?.stringValue)
|
|
|
|
let commentId = details["commentId"]?.string ?? UUID().uuidString
|
|
|
|
|
|
|
|
// Sanity checks: return nil if required data is missing
|
|
|
|
if commentText.isEmpty || commentId.isEmpty || author.isEmpty {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-12-04 19:35:41 +00:00
|
|
|
return Comment(
|
2024-04-02 13:08:36 +00:00
|
|
|
id: commentId,
|
2021-12-04 19:35:41 +00:00
|
|
|
author: author,
|
2022-06-18 11:24:23 +00:00
|
|
|
authorAvatarURL: details["thumbnail"]?.string ?? "",
|
|
|
|
time: details["commentedTime"]?.string ?? "",
|
|
|
|
pinned: details["pinned"]?.bool ?? false,
|
|
|
|
hearted: details["hearted"]?.bool ?? false,
|
|
|
|
likeCount: details["likeCount"]?.int ?? 0,
|
2024-04-02 13:08:36 +00:00
|
|
|
text: commentText,
|
2022-06-18 11:24:23 +00:00
|
|
|
repliesPage: details["repliesPage"]?.string,
|
2022-12-13 23:07:32 +00:00
|
|
|
channel: Channel(app: .piped, id: channelId, name: author)
|
2021-12-04 19:35:41 +00:00
|
|
|
)
|
|
|
|
}
|
2022-06-18 12:39:49 +00:00
|
|
|
|
2022-12-12 23:38:45 +00:00
|
|
|
private func extractCommentText(from string: String?) -> String {
|
|
|
|
guard let string, !string.isEmpty else { return "" }
|
|
|
|
|
|
|
|
return replaceHTML(string)
|
|
|
|
}
|
|
|
|
|
2022-06-18 12:39:49 +00:00
|
|
|
private func extractChapters(from content: JSON) -> [Chapter] {
|
|
|
|
guard let chapters = content.dictionaryValue["chapters"]?.array else {
|
|
|
|
return .init()
|
|
|
|
}
|
|
|
|
|
|
|
|
return chapters.compactMap { chapter in
|
|
|
|
guard let title = chapter["title"].string,
|
|
|
|
let image = chapter["image"].url,
|
|
|
|
let start = chapter["start"].double
|
|
|
|
else {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return Chapter(title: title, image: image, start: start)
|
|
|
|
}
|
|
|
|
}
|
2023-02-28 20:03:02 +00:00
|
|
|
|
|
|
|
private func contentItemsDictionary(from content: JSON) -> JSON {
|
|
|
|
if let key = Self.contentItemsKeys.first(where: { content.dictionaryValue.keys.contains($0) }),
|
|
|
|
let items = content.dictionaryValue[key]
|
|
|
|
{
|
|
|
|
return items
|
|
|
|
}
|
|
|
|
|
|
|
|
return .null
|
|
|
|
}
|
2021-10-16 22:48:58 +00:00
|
|
|
}
|