yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: only import checks for external backup file

This commit is contained in:
Thales Macedo Garitezi 2022-05-20 09:37:09 -03:00
parent 67e3e2de96
commit 78c5cb4aac
No known key found for this signature in database
GPG Key ID: DD279F8152A9B6DD
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apps/emqx_management/src/emqx_mgmt_data_backup.erl
View File

@ -660,16 +660,19 @@ backup_files(Dir) ->
look_up_file(Filename) when is_binary(Filename) ->
look_up_file(binary_to_list(Filename));
look_up_file(Filename) ->
DefOnNotFound = fun(_Filename) -> {error, not_found} end,
do_look_up_file(Filename, DefOnNotFound).
do_look_up_file(Filename, OnNotFound) when is_binary(Filename) ->
do_look_up_file(binary_to_list(Filename), OnNotFound);
do_look_up_file(Filename, OnNotFound) ->
Filter =
fun(MaybeFile) ->
filename:basename(MaybeFile) == Filename
end,
case lists:filter(Filter, backup_files()) of
[] ->
case filelib:is_file(Filename) of
true -> {ok, Filename};
false -> {error, not_found}
end;
OnNotFound(Filename);
List ->
{ok, hd(List)}
end.
@ -813,19 +816,26 @@ import(Filename, OverridesJson) ->
-spec(check_import_json(binary() | string()) -> {ok, map()} | {error, term()}).
check_import_json(Filename) ->
OnNotFound =
fun(F) ->
case filelib:is_file(F) of
true -> {ok, F};
false -> {error, not_found}
end
end,
FunList = [
fun look_up_file/1,
fun(F) -> do_look_up_file(F, OnNotFound) end,
fun(F) -> file:read_file(F) end,
fun check_json/1
],
check_import_json(Filename, FunList).
do_check_import_json(Filename, FunList).
check_import_json(Res, []) ->
do_check_import_json(Res, []) ->
{ok, Res};
check_import_json(Acc, [Fun | FunList]) ->
do_check_import_json(Acc, [Fun | FunList]) ->
case Fun(Acc) of
{ok, Next} ->
check_import_json(Next, FunList);
do_check_import_json(Next, FunList);
{error, Reason} ->
{error, Reason}
end.