mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

fix missing URL encoding for font name + fix typo

Browse source 
Missing URL encoding of this was causing an error if font name included "#" or other problematic characters probably...
This commit is contained in:
p0358 2024-05-05 19:52:17 +02:00
parent 3100f21612
commit f09d5fb462
No known key found for this signature in database
GPG key ID: F2FFD05F552EFC00
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/plugins/htmlVideoPlayer/plugin.js
View file

@ -1250,14 +1250,14 @@ export class HtmlVideoPlayer {
*/ */
renderSsaAss(videoElement, track, item) { renderSsaAss(videoElement, track, item) {
const supportedFonts = ['application/vnd.ms-opentype', 'application/x-truetype-font', 'font/otf', 'font/ttf', 'font/woff', 'font/woff2']; const supportedFonts = ['application/vnd.ms-opentype', 'application/x-truetype-font', 'font/otf', 'font/ttf', 'font/woff', 'font/woff2'];
const avaliableFonts = []; const availableFonts = [];
const attachments = this._currentPlayOptions.mediaSource.MediaAttachments || []; const attachments = this._currentPlayOptions.mediaSource.MediaAttachments || [];
const apiClient = ServerConnections.getApiClient(item); const apiClient = ServerConnections.getApiClient(item);
attachments.forEach(i => { attachments.forEach(i => {
// we only require font files and ignore embedded media attachments like covers as there are cases where ffmpeg fails to extract those // we only require font files and ignore embedded media attachments like covers as there are cases where ffmpeg fails to extract those
if (supportedFonts.includes(i.MimeType)) { if (supportedFonts.includes(i.MimeType)) {
// embedded font url // embedded font url
avaliableFonts.push(apiClient.getUrl(i.DeliveryUrl)); availableFonts.push(apiClient.getUrl(i.DeliveryUrl));
} }
}); });
const fallbackFontList = apiClient.getUrl('/FallbackFont/Fonts', { const fallbackFontList = apiClient.getUrl('/FallbackFont/Fonts', {
@ -1268,7 +1268,7 @@ export class HtmlVideoPlayer {
const options = { const options = {
video: videoElement, video: videoElement,
subUrl: getTextTrackUrl(track, item), subUrl: getTextTrackUrl(track, item),
fonts: avaliableFonts, fonts: availableFonts,
workerUrl: `${appRouter.baseUrl()}/libraries/subtitles-octopus-worker.js`, workerUrl: `${appRouter.baseUrl()}/libraries/subtitles-octopus-worker.js`,
legacyWorkerUrl: `${appRouter.baseUrl()}/libraries/subtitles-octopus-worker-legacy.js`, legacyWorkerUrl: `${appRouter.baseUrl()}/libraries/subtitles-octopus-worker-legacy.js`,
onError() { onError() {
@ -1307,10 +1307,10 @@ export class HtmlVideoPlayer {
if (config.EnableFallbackFont) { if (config.EnableFallbackFont) {
apiClient.getJSON(fallbackFontList).then((fontFiles = []) => { apiClient.getJSON(fallbackFontList).then((fontFiles = []) => {
fontFiles.forEach(font => { fontFiles.forEach(font => {
const fontUrl = apiClient.getUrl(`/FallbackFont/Fonts/${font.Name}`, { const fontUrl = apiClient.getUrl(`/FallbackFont/Fonts/${encodeURIComponent(font.Name)}`, {
api_key: apiClient.accessToken() api_key: apiClient.accessToken()
}); });
avaliableFonts.push(fontUrl); availableFonts.push(fontUrl);
}); });
this.#currentAssRenderer = new SubtitlesOctopus(options); this.#currentAssRenderer = new SubtitlesOctopus(options);
}); });