Skip to content

Fix audiobook regression #380

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

Merged
merged 1 commit into from
Jan 24, 2024
Merged

Fix audiobook regression #380

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
10 changes: 5 additions & 5 deletions Sources/Navigator/Audiobook/PublicationMediaLoader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,18 +165,18 @@ private let schemePrefix = "r2"

private extension AVAssetResourceLoadingRequest {
var href: String? {
guard let url = request.url, url.scheme?.hasPrefix(schemePrefix) == true else {
guard let url = request.url?.absoluteURL, url.scheme.rawValue.hasPrefix(schemePrefix) == true else {
return nil
}

// The URL can be either:
// * r2file://directory/local-file.mp3
// * r2http(s)://domain.com/external-file.mp3
switch url.scheme?.lowercased().removingPrefix(schemePrefix) {
case "file":
switch url.scheme.rawValue {
case "r2file", "r2":
return url.path
case "http", "https":
return url.absoluteString.removingPrefix(schemePrefix)
case "r2http", "r2https":
return url.string.removingPrefix(schemePrefix)
default:
return nil
}
Expand Down