add wildcards in blocked_filenames

This commit is contained in:
lelo 2025-06-03 19:16:37 +00:00
parent 20e65f4c69
commit 1b374b667e

7
app.py
View File

@ -24,6 +24,7 @@ import auth
import analytics as a import analytics as a
import folder_secret_config_editor as fsce import folder_secret_config_editor as fsce
import helperfunctions as hf import helperfunctions as hf
import fnmatch
app_config = auth.return_app_config() app_config = auth.return_app_config()
BASE_DIR = os.path.realpath(app_config['BASE_DIR']) BASE_DIR = os.path.realpath(app_config['BASE_DIR'])
@ -136,7 +137,7 @@ def list_directory_contents(directory, subpath):
music_exts = ('.mp3',) music_exts = ('.mp3',)
image_exts = ('.jpg', '.jpeg', '.png', '.gif', '.bmp') image_exts = ('.jpg', '.jpeg', '.png', '.gif', '.bmp')
blocked_filenames = ['Thumbs.db'] blocked_filenames = ['Thumbs.db', '*.mrk']
try: try:
with os.scandir(directory) as it: with os.scandir(directory) as it:
@ -146,8 +147,8 @@ def list_directory_contents(directory, subpath):
if entry.name.startswith('.'): if entry.name.startswith('.'):
continue continue
# Skip blocked_filenames # Skip blocked_filenames using fnmatch for wildcards
if entry.name in blocked_filenames: if any(fnmatch.fnmatch(entry.name, pattern) for pattern in blocked_filenames):
continue continue
if entry.is_dir(follow_symlinks=False): if entry.is_dir(follow_symlinks=False):