Skip to content

Commit 6e36de6

Browse files
author
Evan Miller
committed
Fix compile_dir
1 parent 3330835 commit 6e36de6

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

src/erlydtl_compiler.erl

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,17 +118,22 @@ compile_dir(Dir, Module, Options) ->
118118
Context = init_dtl_context_dir(Dir, Module, Options),
119119
Files = filelib:fold_files(Dir, ".*", true, fun(F1,Acc1) -> [F1 | Acc1] end, []),
120120
{ParserResults, ParserErrors} = lists:foldl(fun
121-
("."++_, Acc) -> Acc;
122121
(File, {ResultAcc, ErrorAcc}) ->
123-
FilePath = filename:join([Dir, File]),
124-
case filelib:is_dir(FilePath) of
125-
true ->
122+
case filename:basename(File) of
123+
"."++_ ->
126124
{ResultAcc, ErrorAcc};
127-
false ->
128-
case parse(FilePath, Context) of
129-
ok -> {ResultAcc, ErrorAcc};
130-
{ok, DjangoParseTree, CheckSum} -> {[{File, DjangoParseTree, CheckSum}|ResultAcc], ErrorAcc};
131-
Err -> {ResultAcc, [Err|ErrorAcc]}
125+
_ ->
126+
FilePath = filename:absname(File),
127+
case filelib:is_dir(FilePath) of
128+
true ->
129+
{ResultAcc, ErrorAcc};
130+
false ->
131+
case parse(FilePath, Context) of
132+
ok -> {ResultAcc, ErrorAcc};
133+
{ok, DjangoParseTree, CheckSum} ->
134+
{[{File, DjangoParseTree, CheckSum}|ResultAcc], ErrorAcc};
135+
Err -> {ResultAcc, [Err|ErrorAcc]}
136+
end
132137
end
133138
end
134139
end, {[], []}, Files),

src/erlydtl_runtime.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ stringify_final([El | Rest], Out, BinaryStrings) ->
174174
init_counter_stats(List) ->
175175
init_counter_stats(List, undefined).
176176

177-
init_counter_stats(List, Parent) ->
177+
init_counter_stats(List, Parent) when is_list(List) ->
178178
[{counter, 1},
179179
{counter0, 0},
180180
{revcounter, length(List)},

0 commit comments

Comments
 (0)