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

Merge pull request #2975 from jellyfin/fix-auto-server

Browse source 
Fix server candidates on apps
This commit is contained in:
Bill Thornton 2021-09-23 10:18:56 -04:00 • committed by GitHub
commit 555fe63f9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/scripts/clientUtils.js
View file

@ -27,19 +27,22 @@ export async function serverAddress() {
const urls = await webSettings.getServers(); const urls = await webSettings.getServers();
if (urls.length === 0) { if (urls.length === 0) {
// Don't use app URL as server URL // Otherwise use computed base URL
if (window.NativeShell) { let url;
const index = window.location.href.toLowerCase().lastIndexOf('/web');
if (index != -1) {
url = window.location.href.substring(0, index);
} else {
// fallback to location without path
url = window.location.origin;
}
// Don't use bundled app URL (file:) as server URL
if (url.startsWith('file:')) {
return Promise.resolve(); return Promise.resolve();
} }
// Otherwise use computed base URL urls.push(url);
const index = window.location.href.toLowerCase().lastIndexOf('/web');
if (index != -1) {
urls.push(window.location.href.substring(0, index));
} else {
// fallback to location without path
urls.push(window.location.origin);
}
} }
console.debug('URL candidates:', urls); console.debug('URL candidates:', urls);