- ${script.name} |
- ${script.label || script.name} |
+ ${escapeHtml(script.name)} |
+ ${escapeHtml(script.label || script.name)} |
${escapeHtml(script.command || 'N/A')} |
${script.timeout}s |
@@ -1151,10 +1404,10 @@
}
}
- function closeScriptDialog() {
+ async function closeScriptDialog() {
// Check if form has unsaved changes
if (scriptFormDirty) {
- if (!confirm(t('scripts.confirm.unsaved'))) {
+ if (!await showConfirm(t('scripts.confirm.unsaved'))) {
return; // User cancelled, don't close
}
}
@@ -1220,7 +1473,7 @@
}
async function deleteScriptConfirm(scriptName) {
- if (!confirm(`Are you sure you want to delete the script "${scriptName}"?`)) {
+ if (!await showConfirm(t('scripts.confirm.delete').replace('{name}', scriptName))) {
return;
}
@@ -1280,19 +1533,19 @@
tbody.innerHTML = callbacksList.map(callback => `
|
- ${callback.name} |
+ ${escapeHtml(callback.name)} |
${escapeHtml(callback.command)} |
${callback.timeout}s |
@@ -1367,10 +1620,10 @@
}
}
- function closeCallbackDialog() {
+ async function closeCallbackDialog() {
// Check if form has unsaved changes
if (callbackFormDirty) {
- if (!confirm(t('callbacks.confirm.unsaved'))) {
+ if (!await showConfirm(t('callbacks.confirm.unsaved'))) {
return; // User cancelled, don't close
}
}
@@ -1433,7 +1686,7 @@
}
async function deleteCallbackConfirm(callbackName) {
- if (!confirm(`Are you sure you want to delete the callback "${callbackName}"?`)) {
+ if (!await showConfirm(t('callbacks.confirm.delete').replace('{name}', callbackName))) {
return;
}
@@ -1650,6 +1903,8 @@ let viewMode = localStorage.getItem('mediaBrowser.viewMode') || 'grid';
let cachedItems = null;
let browserSearchTerm = '';
let browserSearchTimer = null;
+const thumbnailCache = new Map();
+const THUMBNAIL_CACHE_MAX = 200;
// Load media folders on page load
async function loadMediaFolders() {
@@ -1852,8 +2107,12 @@ function renderBreadcrumbs(currentPath, parentPath) {
}
function revokeBlobUrls(container) {
+ const cachedUrls = new Set(thumbnailCache.values());
container.querySelectorAll('img[src^="blob:"]').forEach(img => {
- URL.revokeObjectURL(img.src);
+ // Don't revoke URLs managed by the thumbnail cache
+ if (!cachedUrls.has(img.src)) {
+ URL.revokeObjectURL(img.src);
+ }
});
}
@@ -2117,12 +2376,20 @@ async function loadThumbnail(imgElement, fileName) {
return;
}
- const fullPath = currentPath === '/'
- ? '/' + fileName
- : currentPath + '/' + fileName;
- const encodedPath = encodeURIComponent(
- mediaFolders[currentFolderId].path + fullPath.replace(/\//g, '\\')
- );
+ const absolutePath = buildAbsolutePath(currentFolderId, currentPath, fileName);
+
+ // Check cache first
+ if (thumbnailCache.has(absolutePath)) {
+ const cachedUrl = thumbnailCache.get(absolutePath);
+ imgElement.onload = () => {
+ imgElement.classList.remove('loading');
+ imgElement.classList.add('loaded');
+ };
+ imgElement.src = cachedUrl;
+ return;
+ }
+
+ const encodedPath = encodeURIComponent(absolutePath);
const response = await fetch(
`/api/browser/thumbnail?path=${encodedPath}&size=medium`,
@@ -2132,6 +2399,14 @@ async function loadThumbnail(imgElement, fileName) {
if (response.status === 200) {
const blob = await response.blob();
const url = URL.createObjectURL(blob);
+ thumbnailCache.set(absolutePath, url);
+
+ // Evict oldest entries when cache exceeds limit
+ if (thumbnailCache.size > THUMBNAIL_CACHE_MAX) {
+ const oldest = thumbnailCache.keys().next().value;
+ URL.revokeObjectURL(thumbnailCache.get(oldest));
+ thumbnailCache.delete(oldest);
+ }
// Wait for image to actually load before showing it
imgElement.onload = () => {
@@ -2139,9 +2414,14 @@ async function loadThumbnail(imgElement, fileName) {
imgElement.classList.add('loaded');
};
- // Revoke previous blob URL if any
+ // Revoke previous blob URL if not managed by cache
+ // (Cache is keyed by path, so check values)
if (imgElement.src && imgElement.src.startsWith('blob:')) {
- URL.revokeObjectURL(imgElement.src);
+ let isCached = false;
+ for (const url of thumbnailCache.values()) {
+ if (url === imgElement.src) { isCached = true; break; }
+ }
+ if (!isCached) URL.revokeObjectURL(imgElement.src);
}
imgElement.src = url;
} else {
@@ -2164,6 +2444,16 @@ async function loadThumbnail(imgElement, fileName) {
}
}
+function buildAbsolutePath(folderId, relativePath, fileName) {
+ const folderPath = mediaFolders[folderId].path;
+ // Detect separator from folder path
+ const sep = folderPath.includes('/') ? '/' : '\\';
+ const fullRelative = relativePath === '/'
+ ? sep + fileName
+ : relativePath.replace(/[/\\]/g, sep) + sep + fileName;
+ return folderPath + fullRelative;
+}
+
let playInProgress = false;
async function playMediaFile(fileName) {
@@ -2176,10 +2466,7 @@ async function playMediaFile(fileName) {
return;
}
- const fullPath = currentPath === '/'
- ? '/' + fileName
- : currentPath + '/' + fileName;
- const absolutePath = mediaFolders[currentFolderId].path + fullPath.replace(/\//g, '\\');
+ const absolutePath = buildAbsolutePath(currentFolderId, currentPath, fileName);
const response = await fetch('/api/browser/play', {
method: 'POST',
@@ -2235,7 +2522,7 @@ async function playAllFolder() {
}
}
-function downloadFile(fileName, event) {
+async function downloadFile(fileName, event) {
if (event) event.stopPropagation();
const token = localStorage.getItem('media_server_token');
if (!token) return;
@@ -2244,14 +2531,27 @@ function downloadFile(fileName, event) {
? '/' + fileName
: currentPath + '/' + fileName;
const encodedPath = encodeURIComponent(fullPath);
- const url = `/api/browser/download?folder_id=${currentFolderId}&path=${encodedPath}&token=${token}`;
- const a = document.createElement('a');
- a.href = url;
- a.download = fileName;
- document.body.appendChild(a);
- a.click();
- document.body.removeChild(a);
+ try {
+ const response = await fetch(
+ `/api/browser/download?folder_id=${currentFolderId}&path=${encodedPath}`,
+ { headers: { 'Authorization': `Bearer ${token}` } }
+ );
+ if (!response.ok) throw new Error('Download failed');
+
+ const blob = await response.blob();
+ const url = URL.createObjectURL(blob);
+ const a = document.createElement('a');
+ a.href = url;
+ a.download = fileName;
+ document.body.appendChild(a);
+ a.click();
+ document.body.removeChild(a);
+ URL.revokeObjectURL(url);
+ } catch (error) {
+ console.error('Download error:', error);
+ showToast(t('browser.download_error'), 'error');
+ }
}
function createDownloadBtn(fileName, cssClass) {
@@ -2341,7 +2641,8 @@ function applyBrowserSearch() {
}
const filtered = cachedItems.filter(item =>
- item.name.toLowerCase().includes(browserSearchTerm)
+ item.name.toLowerCase().includes(browserSearchTerm) ||
+ (item.title && item.title.toLowerCase().includes(browserSearchTerm))
);
renderBrowserItems(filtered);
}
@@ -2468,13 +2769,3 @@ async function saveFolder(event) {
closeFolderDialog();
}
-// Initialize browser on page load
-window.addEventListener('DOMContentLoaded', () => {
- initBrowserToolbar();
-
- // Load media folders after authentication
- const token = localStorage.getItem('media_server_token');
- if (token) {
- loadMediaFolders();
- }
-});
diff --git a/media_server/static/locales/en.json b/media_server/static/locales/en.json
index e341697..e72b373 100644
--- a/media_server/static/locales/en.json
+++ b/media_server/static/locales/en.json
@@ -154,6 +154,12 @@
"browser.folder_dialog.enabled": "Enabled",
"browser.folder_dialog.cancel": "Cancel",
"browser.folder_dialog.save": "Save",
+ "browser.download_error": "Failed to download file",
+ "connection.reconnecting": "Connection lost. Reconnecting (attempt {attempt})...",
+ "connection.lost": "Connection lost. Server may be unavailable.",
+ "connection.reconnect": "Reconnect",
+ "dialog.cancel": "Cancel",
+ "dialog.confirm": "Confirm",
"footer.created_by": "Created by",
"footer.source_code": "Source Code"
}
diff --git a/media_server/static/locales/ru.json b/media_server/static/locales/ru.json
index 0b545e2..bed6387 100644
--- a/media_server/static/locales/ru.json
+++ b/media_server/static/locales/ru.json
@@ -154,6 +154,12 @@
"browser.folder_dialog.enabled": "Включено",
"browser.folder_dialog.cancel": "Отмена",
"browser.folder_dialog.save": "Сохранить",
+ "browser.download_error": "Не удалось скачать файл",
+ "connection.reconnecting": "Соединение потеряно. Переподключение (попытка {attempt})...",
+ "connection.lost": "Соединение потеряно. Сервер может быть недоступен.",
+ "connection.reconnect": "Переподключиться",
+ "dialog.cancel": "Отмена",
+ "dialog.confirm": "Подтвердить",
"footer.created_by": "Создано",
"footer.source_code": "Исходный код"
}
|
@@ -138,7 +144,7 @@