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
68dfac29
Commit
68dfac29
authored
Jul 02, 2018
by
Hugo Beauzée-Luyssen
Browse files
FsDiscoverer: Check for specific exceptions when they can be thrown
parent
e559d030
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/discoverer/FsDiscoverer.cpp
View file @
68dfac29
...
...
@@ -113,23 +113,29 @@ void FsDiscoverer::reloadFolder( std::shared_ptr<Folder> f )
assert
(
f
->
isPresent
()
);
auto
mrl
=
f
->
mrl
();
std
::
shared_ptr
<
fs
::
IDirectory
>
folder
;
try
{
auto
folder
=
m_fsFactory
->
createDirectory
(
mrl
);
folder
=
m_fsFactory
->
createDirectory
(
mrl
);
assert
(
folder
->
device
()
!=
nullptr
);
if
(
folder
->
device
()
==
nullptr
)
return
;
checkFolder
(
std
::
move
(
folder
),
std
::
move
(
f
),
false
);
}
catch
(
DeviceRemovedException
&
)
{
LOG_INFO
(
"Reloading of "
,
mrl
,
" was stopped after the device was removed"
);
}
catch
(
const
std
::
system_error
&
ex
)
{
LOG_INFO
(
"Failed to instanciate a directory for "
,
mrl
,
": "
,
ex
.
what
(),
". Can't reload the folder."
);
return
;
}
try
{
checkFolder
(
std
::
move
(
folder
),
std
::
move
(
f
),
false
);
}
catch
(
DeviceRemovedException
&
)
{
LOG_INFO
(
"Reloading of "
,
mrl
,
" was stopped after the device was removed"
);
}
}
bool
FsDiscoverer
::
reload
()
...
...
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