rt/wrolpi
1
0
Fork 0
mirror of https://github.com/lrnselfreliance/wrolpi.git synced 2026-10-26 19:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hiding .DS_Store files in the File Browser.

Browse source
This commit is contained in:
Roland 2026-07-01 19:00:56 -06:00
parent 05bb65fc03
commit 7005cd0681
No known key found for this signature in database
GPG key ID: 1BA620CE6C9A4680
2 changed files with 38 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
wrolpi/files/lib.py
View file

@ -175,6 +175,9 @@ def _get_recursive_directory_dict(session: Session, directory: pathlib.Path, dir
if directory in directories:
children = dict()
for path in directory.iterdir():
if not path.is_dir() and path.name in HIDDEN_FILES:
# Never show ignored files.
continue
if path.is_dir() and path in directories:
children[f'{path.name}/'] = _get_recursive_directory_dict(session, path, directories)
elif path.is_dir():
@ -186,6 +189,8 @@ def _get_recursive_directory_dict(session: Session, directory: pathlib.Path, dir
HIDDEN_DIRECTORIES = ('lost+found',)
# macOS metadata files which should never be shown in the FileBrowser.
HIDDEN_FILES = ('.DS_Store', '._.DS_Store')
def list_directories_contents(session: Session, directories_: List[str]) -> Dict:
@ -208,6 +213,9 @@ def list_directories_contents(session: Session, directories_: List[str]) -> Dict
if path.is_dir() and path.name in HIDDEN_DIRECTORIES:
# Never show ignored directories.
continue
if not path.is_dir() and path.name in HIDDEN_FILES:
# Never show ignored files.
continue
if path.is_dir():
paths[f'{path.name}/'] = _get_recursive_directory_dict(session, path, directories)
else:

30
wrolpi/files/test/test_api.py
View file

@ -117,6 +117,36 @@ async def test_list_files_api(test_session, async_client, make_files_structure,
await check_get_files(['videos', 'archives'], expected)
@pytest.mark.asyncio
async def test_list_files_api_hides_ds_store(test_session, async_client, make_files_structure, test_directory):
"""macOS metadata files (.DS_Store / ._.DS_Store) are never shown in the FileBrowser."""
make_files_structure([
'.DS_Store', # Top-level metadata file should be hidden.
'._.DS_Store', # Top-level AppleDouble metadata file should be hidden.
'archives/foo.txt',
'archives/.DS_Store', # Nested metadata file should be hidden.
'archives/._.DS_Store', # Nested AppleDouble metadata file should be hidden.
])
async def get_files(directories):
request, response = await async_client.post('/api/files', content=json.dumps({'directories': directories}))
assert response.status_code == HTTPStatus.OK
return response.json['files']
# Top-level listing hides the metadata files.
top_level = await get_files([])
assert '.DS_Store' not in top_level
assert '._.DS_Store' not in top_level
assert 'archives/' in top_level
# Nested listing hides the metadata files, but still shows real files.
nested = await get_files(['archives'])
children = nested['archives/']['children']
assert '.DS_Store' not in children
assert '._.DS_Store' not in children
assert 'foo.txt' in children
@pytest.mark.asyncio
async def test_delete_file(test_session, async_client, make_files_structure, test_directory):
files = ['bar.txt', 'baz/', 'foo']