From 521dbdea67be02ba29bfa07f8f9526932fcd9fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Menu?= Date: Wed, 24 Jan 2024 15:44:10 +0100 Subject: [PATCH] Fix audiobook regression --- .../Navigator/Audiobook/PublicationMediaLoader.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Sources/Navigator/Audiobook/PublicationMediaLoader.swift b/Sources/Navigator/Audiobook/PublicationMediaLoader.swift index f385f331a..714b5df4e 100644 --- a/Sources/Navigator/Audiobook/PublicationMediaLoader.swift +++ b/Sources/Navigator/Audiobook/PublicationMediaLoader.swift @@ -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 }