mirror of
https://github.com/UzixLS/migresia.git
synced 2025-07-19 07:11:28 +03:00
Changing all exit calls to throws, and changing bad file names to be excluded rather than cause a problem (so things like additional directories, notes, .svn folders, etc, will not cause issue)
This commit is contained in:
@ -68,7 +68,7 @@ get_migrations(Dir) ->
|
|||||||
end.
|
end.
|
||||||
|
|
||||||
check_dir({error, Reason}) ->
|
check_dir({error, Reason}) ->
|
||||||
exit({file, list_dir, Reason});
|
throw({file, list_dir, Reason});
|
||||||
check_dir({ok, Filenames}) ->
|
check_dir({ok, Filenames}) ->
|
||||||
normalize_names(Filenames, []).
|
normalize_names(Filenames, []).
|
||||||
|
|
||||||
@ -80,8 +80,9 @@ normalize_names([<<Short:14/bytes, $_, R/binary>> = Name|T], Acc)
|
|||||||
normalize_names(T, [{Short, Base}|Acc]);
|
normalize_names(T, [{Short, Base}|Acc]);
|
||||||
normalize_names([Name|T], Acc) when is_list(Name) ->
|
normalize_names([Name|T], Acc) when is_list(Name) ->
|
||||||
normalize_names([list_to_binary(Name)|T], Acc);
|
normalize_names([list_to_binary(Name)|T], Acc);
|
||||||
normalize_names([Name|_], _Acc) ->
|
normalize_names([Name|T], Acc) ->
|
||||||
exit({badmatch, Name});
|
io:format("Ignoring: ~p~n", [Name]),
|
||||||
|
normalize_names(T, Acc);
|
||||||
normalize_names([], Acc) ->
|
normalize_names([], Acc) ->
|
||||||
lists:sort(Acc).
|
lists:sort(Acc).
|
||||||
|
|
||||||
@ -129,10 +130,10 @@ compile_file(Dir, Short, Name) ->
|
|||||||
{Module, Short, Binary};
|
{Module, Short, Binary};
|
||||||
{error, Errors, Warnings} ->
|
{error, Errors, Warnings} ->
|
||||||
io:format("Warnings: ~p~nErrors: ~p~nExiting...~n", [Warnings, Errors]),
|
io:format("Warnings: ~p~nErrors: ~p~nExiting...~n", [Warnings, Errors]),
|
||||||
exit(Errors);
|
throw(Errors);
|
||||||
error ->
|
error ->
|
||||||
io:format("Unknown error encoutered, Exiting...~n", []),
|
io:format("Unknown error encoutered, Exiting...~n", []),
|
||||||
exit({compile, file, error})
|
throw({compile, file, error})
|
||||||
end.
|
end.
|
||||||
|
|
||||||
load_migration(Module, Short, Binary) ->
|
load_migration(Module, Short, Binary) ->
|
||||||
@ -140,6 +141,6 @@ load_migration(Module, Short, Binary) ->
|
|||||||
{module, Module} ->
|
{module, Module} ->
|
||||||
{Module, Short};
|
{Module, Short};
|
||||||
{error, What} ->
|
{error, What} ->
|
||||||
exit({code, load_binary, What})
|
throw({code, load_binary, What})
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user