Compare commits
No commits in common. "ece99f8e48bccc04ff7d6c97ffdd07f0da819823" and "d2952c3ac07f307a5fcb7c07649e2feb7b779451" have entirely different histories.
ece99f8e48
...
d2952c3ac0
7
app.py
7
app.py
@ -542,12 +542,7 @@ def list_directory_contents(directory, subpath):
|
||||
music_exts = ('.mp3',)
|
||||
image_exts = ('.jpg', '.jpeg', '.png', '.gif', '.bmp')
|
||||
|
||||
blocked_filenames = [
|
||||
'Thumbs.db',
|
||||
'*.mrk',
|
||||
'*.arw', '*.cr2', '*.lrf'
|
||||
]
|
||||
|
||||
blocked_filenames = ['Thumbs.db', '*.mrk']
|
||||
|
||||
try:
|
||||
with os.scandir(directory) as it:
|
||||
|
||||
27
auth.py
27
auth.py
@ -171,23 +171,16 @@ def require_secret(f):
|
||||
if 'device_id' not in session:
|
||||
session['device_id'] = os.urandom(32).hex()
|
||||
|
||||
# For token links, immediately open the single folder they grant access to.
|
||||
if (
|
||||
args_token
|
||||
and request.method == 'GET'
|
||||
and request.endpoint == 'index'
|
||||
and is_valid_token(args_token)
|
||||
):
|
||||
try:
|
||||
token_item = decode_token(args_token)
|
||||
folders = token_item.get('folders', [])
|
||||
if len(folders) == 1:
|
||||
target_foldername = folders[0].get('foldername')
|
||||
if target_foldername:
|
||||
session.modified = True # ensure session persists before redirect
|
||||
return redirect(f"/path/{target_foldername}")
|
||||
except Exception as e:
|
||||
print(f"Error during token auto-open: {e}")
|
||||
# AUTO-JUMP FOR TOKENS - Disabled for now to debug
|
||||
# try:
|
||||
# if args_token and is_valid_token(args_token):
|
||||
# token_item = decode_token(args_token)
|
||||
# target_foldername = token_item['folders'][0]['foldername']
|
||||
# # Mark session as modified to ensure it's saved before redirect
|
||||
# session.modified = True
|
||||
# return redirect(f"/path/{target_foldername}")
|
||||
# except Exception as e:
|
||||
# print(f"Error during auto-jump: {e}")
|
||||
|
||||
return f(*args, **kwargs)
|
||||
else:
|
||||
|
||||
@ -3,44 +3,6 @@ let currentMusicFiles = []; // Array of objects with at least { path, index }
|
||||
let currentMusicIndex = -1; // Index of the current music file
|
||||
let currentTrackPath = "";
|
||||
|
||||
// Check thumb availability in parallel; sequentially generate missing ones to avoid concurrent creation.
|
||||
function ensureFirstFivePreviews() {
|
||||
const images = Array.from(document.querySelectorAll('.images-grid img')).slice(0, 5);
|
||||
if (!images.length) return;
|
||||
|
||||
const checks = images.map(img => {
|
||||
const thumbUrl = img.dataset.thumbUrl || img.src;
|
||||
const fullUrl = img.dataset.fullUrl;
|
||||
return fetch(thumbUrl, { method: 'GET', cache: 'no-store' })
|
||||
.then(res => ({
|
||||
img,
|
||||
thumbUrl,
|
||||
fullUrl,
|
||||
hasThumb: res.ok && res.status !== 204
|
||||
}))
|
||||
.catch(() => ({ img, thumbUrl, fullUrl, hasThumb: false }));
|
||||
});
|
||||
|
||||
Promise.all(checks).then(results => {
|
||||
const missing = results.filter(r => !r.hasThumb && r.fullUrl);
|
||||
if (!missing.length) return;
|
||||
generateThumbsSequentially(missing);
|
||||
});
|
||||
}
|
||||
|
||||
async function generateThumbsSequentially(entries) {
|
||||
for (const { img, thumbUrl, fullUrl } of entries) {
|
||||
try {
|
||||
await fetch(fullUrl, { method: 'GET', cache: 'no-store' });
|
||||
const cacheBust = `_=${Date.now()}`;
|
||||
const separator = thumbUrl.includes('?') ? '&' : '?';
|
||||
img.src = `${thumbUrl}${separator}${cacheBust}`;
|
||||
} catch (e) {
|
||||
// ignore; best effort
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Cache common DOM elements
|
||||
const mainContainer = document.querySelector('main');
|
||||
const searchContainer = document.querySelector('search');
|
||||
@ -99,20 +61,17 @@ function renderContent(data) {
|
||||
});
|
||||
document.getElementById('breadcrumbs').innerHTML = breadcrumbHTML;
|
||||
|
||||
const imageFiles = data.files.filter(file => file.file_type === 'image');
|
||||
const nonImageFiles = data.files.filter(file => file.file_type !== 'image');
|
||||
|
||||
// Check for image-only directory (no subdirectories, at least one file, all images)
|
||||
const isImageOnly = data.directories.length === 0
|
||||
&& imageFiles.length > 0
|
||||
&& nonImageFiles.length === 0;
|
||||
&& data.files.length > 0
|
||||
&& data.files.every(file => file.file_type === 'image');
|
||||
|
||||
let contentHTML = '';
|
||||
|
||||
if (isImageOnly) {
|
||||
// Display thumbnails grid
|
||||
contentHTML += '<div class="images-grid">';
|
||||
imageFiles.forEach(file => {
|
||||
data.files.forEach(file => {
|
||||
const thumbUrl = `${file.path}?thumbnail=true`;
|
||||
contentHTML += `
|
||||
<div class="image-item">
|
||||
@ -122,8 +81,6 @@ function renderContent(data) {
|
||||
data-file-type="${file.file_type}">
|
||||
<img
|
||||
src="/media/${thumbUrl}"
|
||||
data-thumb-url="/media/${thumbUrl}"
|
||||
data-full-url="/media/${file.path}"
|
||||
class="thumbnail"
|
||||
onload="this.closest('.image-item').classList.add('loaded')"
|
||||
/>
|
||||
@ -181,9 +138,9 @@ function renderContent(data) {
|
||||
|
||||
// Render files (including music and non-image files)
|
||||
currentMusicFiles = [];
|
||||
if (nonImageFiles.length > 0) {
|
||||
if (data.files.length > 0) {
|
||||
contentHTML += '<ul>';
|
||||
nonImageFiles.forEach((file, idx) => {
|
||||
data.files.forEach((file, idx) => {
|
||||
let symbol = '📄';
|
||||
if (file.file_type === 'music') {
|
||||
symbol = '🔊';
|
||||
@ -201,32 +158,6 @@ function renderContent(data) {
|
||||
});
|
||||
contentHTML += '</ul>';
|
||||
}
|
||||
|
||||
// Show images in preview grid after the file list
|
||||
if (imageFiles.length > 0) {
|
||||
contentHTML += '<div class="images-grid">';
|
||||
imageFiles.forEach(file => {
|
||||
const thumbUrl = `${file.path}?thumbnail=true`;
|
||||
contentHTML += `
|
||||
<div class="image-item">
|
||||
|
||||
<a href="#" class="play-file image-link"
|
||||
data-url="${file.path}"
|
||||
data-file-type="${file.file_type}">
|
||||
<img
|
||||
src="/media/${thumbUrl}"
|
||||
data-thumb-url="/media/${thumbUrl}"
|
||||
data-full-url="/media/${file.path}"
|
||||
class="thumbnail"
|
||||
onload="this.closest('.image-item').classList.add('loaded')"
|
||||
/>
|
||||
</a>
|
||||
<span class="file-name">${file.name}</span>
|
||||
</div>
|
||||
`;
|
||||
});
|
||||
contentHTML += '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
// Insert generated content
|
||||
@ -243,7 +174,7 @@ function renderContent(data) {
|
||||
});
|
||||
|
||||
// Attach event listeners for file items (including images)
|
||||
if (isImageOnly || imageFiles.length > 0) {
|
||||
if (isImageOnly) {
|
||||
document.querySelectorAll('.image-item').forEach(item => {
|
||||
item.addEventListener('click', function(e) {
|
||||
if (!e.target.closest('a')) {
|
||||
@ -264,8 +195,9 @@ function renderContent(data) {
|
||||
}
|
||||
|
||||
// Update gallery images for lightbox or similar
|
||||
currentGalleryImages = imageFiles.map(f => f.path);
|
||||
ensureFirstFivePreviews();
|
||||
currentGalleryImages = data.files
|
||||
.filter(f => f.file_type === 'image')
|
||||
.map(f => f.path);
|
||||
|
||||
attachEventListeners();
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user