Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
VideoLAN
medialibrary
Commits
24904fb4
Commit
24904fb4
authored
Jul 02, 2018
by
Hugo Beauzée-Luyssen
Browse files
FsDiscoverer: Handle an entrypoint not being found upon reload
parent
3f5d3144
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/discoverer/FsDiscoverer.cpp
View file @
24904fb4
...
...
@@ -125,7 +125,17 @@ void FsDiscoverer::reloadFolder( std::shared_ptr<Folder> f )
{
LOG_INFO
(
"Failed to instanciate a directory for "
,
mrl
,
": "
,
ex
.
what
(),
". Can't reload the folder."
);
return
;
}
if
(
directory
==
nullptr
)
{
auto
device
=
m_fsFactory
->
createDeviceFromMrl
(
mrl
);
if
(
device
==
nullptr
||
device
->
isRemovable
()
==
false
)
{
LOG_INFO
(
"Failed to find folder matching entrypoint "
,
mrl
,
". "
"Removing that folder"
);
m_ml
->
deleteFolder
(
*
f
);
return
;
}
}
try
{
...
...
test/unittest/FolderTests.cpp
View file @
24904fb4
...
...
@@ -462,3 +462,15 @@ TEST_F( Folders, RemoveNonExistantEntryPoint )
auto
res
=
cbMock
->
waitEntryPointRemoved
();
ASSERT_TRUE
(
res
);
}
TEST_F
(
Folders
,
RemoveRootFolder
)
{
ASSERT_EQ
(
3u
,
ml
->
files
().
size
()
);
// Do not watch for live changes
ml
.
reset
();
fsMock
->
removeFolder
(
mock
::
FileSystemFactory
::
Root
);
Reload
();
ASSERT_EQ
(
0u
,
ml
->
files
().
size
()
);
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment