move responsibility for creation and deletion into monic_file (and cl…

…ose the file descriptors when we delete)

src/monic_container_resource.erl

@@ -40,7 +40,7 @@ content_types_provided(ReqData, Context) ->
     {[{?CONTAINER_MIME_TYPE, get_container}], ReqData, Context}.
 
 delete_resource(ReqData, Context) ->
-    {file:delete(monic_utils:path(ReqData, Context)) == ok, ReqData, Context}.
+    {monic_file:delete(monic_utils:path(ReqData, Context)) == ok, ReqData, Context}.
 
 is_conflict(ReqData, Context) ->
     {monic_utils:exists(ReqData, Context), ReqData, Context}.
@@ -54,4 +54,4 @@ get_container(ReqData, Context) ->
     {"{\"ok\": true}", ReqData, Context}.
 
 put_container(ReqData, Context) ->
-    {file:write_file(monic_utils:path(ReqData, Context), <<>>, [exclusive]) == ok, ReqData, Context}.
+    {monic_file:create(monic_utils:path(ReqData, Context)), ReqData, Context}.

src/monic_file.erl

@@ -17,7 +17,7 @@
 -include("monic.hrl").
 
 %% public API
--export([open/1, open_new/1, close/1, add/5, delete/3, info/3, read/3]).
+-export([create/1, delete/1, open/1, open_new/1, close/1, add/5, delete/3, info/3, read/3]).
 
 %% gen_server API
 -export([init/1, terminate/2, code_change/3,handle_call/3, handle_cast/2, handle_info/2]).
@@ -55,6 +55,22 @@ open_new(Path) ->
 close(Pid) ->
     gen_server:call(Pid, close, infinity).
 
+create(Path) ->
+    file:write_file(Path, <<>>, [exclusive]) == ok.
+
+delete(Path) ->
+    case file:delete(Path ++ ".idx") == ok andalso file:delete(Path) == ok of
+        true ->
+            case open(Path) of
+                {ok, Pid} ->
+                    close(Pid); %% ensure fds are released.
+                Else ->
+                    Else
+            end;
+        Else ->
+            Else
+    end.
+
 -spec add(pid(), binary(), integer(), integer(), streambody()) -> ok | {error, term()}.
 add(Pid, Key, Cookie, Size, StreamBody) ->
     case gen_server:call(Pid, {start_writing, Key, Cookie, Size}) of