chore: make elvis checking happy
This commit is contained in:
parent
e65cfb836c
commit
fed512689a
|
@ -78,6 +78,8 @@
|
||||||
{<<"is_superuser">>, atom}
|
{<<"is_superuser">>, atom}
|
||||||
]).
|
]).
|
||||||
|
|
||||||
|
-elvis([{elvis_style, nesting_level, disable}]).
|
||||||
|
|
||||||
%%------------------------------------------------------------------------------
|
%%------------------------------------------------------------------------------
|
||||||
%% Mnesia bootstrap
|
%% Mnesia bootstrap
|
||||||
%%------------------------------------------------------------------------------
|
%%------------------------------------------------------------------------------
|
||||||
|
@ -175,10 +177,12 @@ import_users({PasswordType, Filename, FileData}, State) ->
|
||||||
Convertor = convertor(PasswordType, State),
|
Convertor = convertor(PasswordType, State),
|
||||||
try
|
try
|
||||||
{_NewUsersCnt, Users} = parse_import_users(Filename, FileData, Convertor),
|
{_NewUsersCnt, Users} = parse_import_users(Filename, FileData, Convertor),
|
||||||
try
|
|
||||||
case do_import_users(Users) of
|
case do_import_users(Users) of
|
||||||
ok -> ok;
|
ok ->
|
||||||
{error, Reason} -> error(Reason)
|
ok;
|
||||||
|
{error, Reason} ->
|
||||||
|
_ = do_clean_imported_users(Users),
|
||||||
|
error(Reason)
|
||||||
end
|
end
|
||||||
catch
|
catch
|
||||||
error:Reason1:Stk ->
|
error:Reason1:Stk ->
|
||||||
|
@ -191,21 +195,7 @@ import_users({PasswordType, Filename, FileData}, State) ->
|
||||||
stacktrace => Stk
|
stacktrace => Stk
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
_ = do_clean_imported_users(Users),
|
|
||||||
{error, Reason1}
|
{error, Reason1}
|
||||||
end
|
|
||||||
catch
|
|
||||||
error:Reason2:Stk2 ->
|
|
||||||
?SLOG(
|
|
||||||
warning,
|
|
||||||
#{
|
|
||||||
msg => "import_users_failed",
|
|
||||||
type => PasswordType,
|
|
||||||
filename => Filename,
|
|
||||||
stacktrace => Stk2
|
|
||||||
}
|
|
||||||
),
|
|
||||||
{error, Reason2}
|
|
||||||
end.
|
end.
|
||||||
|
|
||||||
do_import_users(Users) ->
|
do_import_users(Users) ->
|
||||||
|
@ -514,10 +504,7 @@ reader(json, Data, Convertor) when is_binary(Data) ->
|
||||||
%% Example: data/user-credentials.csv
|
%% Example: data/user-credentials.csv
|
||||||
reader(csv, Data, Convertor) when is_binary(Data) ->
|
reader(csv, Data, Convertor) when is_binary(Data) ->
|
||||||
CSVData = csv_data(Data),
|
CSVData = csv_data(Data),
|
||||||
case get_csv_header(CSVData) of
|
Reader = fun _Iter(Headers, Lines) ->
|
||||||
{ok, Headers, CSVLines} ->
|
|
||||||
Reader =
|
|
||||||
fun _Iter(Lines) ->
|
|
||||||
case csv_read_line(Lines) of
|
case csv_read_line(Lines) of
|
||||||
{ok, Line, Rest} ->
|
{ok, Line, Rest} ->
|
||||||
%% XXX: not support ' ' for a field?
|
%% XXX: not support ' ' for a field?
|
||||||
|
@ -527,7 +514,7 @@ reader(csv, Data, Convertor) when is_binary(Data) ->
|
||||||
case length(Fields) == length(Headers) of
|
case length(Fields) == length(Headers) of
|
||||||
true ->
|
true ->
|
||||||
User = maps:from_list(lists:zip(Headers, Fields)),
|
User = maps:from_list(lists:zip(Headers, Fields)),
|
||||||
{Convertor(User), fun() -> _Iter(Rest) end};
|
{Convertor(User), fun() -> _Iter(Headers, Rest) end};
|
||||||
false ->
|
false ->
|
||||||
error(bad_format)
|
error(bad_format)
|
||||||
end;
|
end;
|
||||||
|
@ -535,7 +522,9 @@ reader(csv, Data, Convertor) when is_binary(Data) ->
|
||||||
eof
|
eof
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
fun() -> Reader(CSVLines) end;
|
case get_csv_header(CSVData) of
|
||||||
|
{ok, CSVHeaders, CSVLines} ->
|
||||||
|
fun() -> Reader(CSVHeaders, CSVLines) end;
|
||||||
{error, Reason} ->
|
{error, Reason} ->
|
||||||
error(Reason)
|
error(Reason)
|
||||||
end;
|
end;
|
||||||
|
|
Loading…
Reference in New Issue