Expanded API/arities for additional flexibility.

Author: oubiwann

.gitignore

@@ -1,5 +1,37 @@
 deps
 priv/mac_listener
 *.d
+.DS_Store
+*.beam
+*.beam
+*.elc
+*.iml
 *.o
+*.plt
+*.sublime-project
+*.sublime-workspace
+*.swo
+*.swp
+*~
+.\#*
+.erlang.cookie
+.eunit
+.idea
+.rebar/*
+.rebar3
+/.emacs.desktop
+/.emacs.desktop.lock
+\#*\#
+_*
+_build/*
+auto-save-list
+bin
+deps
 ebin
+erl_crash.dump
+log
+logs
+rebar/*
+rebar3.crashdump
+tramp
+rebar.lock

README.md

@@ -38,7 +38,7 @@ Shell got {<0.47.0>,
 ### Sample Subscriber
 
 ```erlang
-> fs:start_looper(). % starts a sample process that logs events
+> fs_demo:start_looper(). % starts a sample process that logs events
 =INFO REPORT==== 28-Aug-2013::19:36:26 ===
 file_event: "/tank/proger/erlfsmon/src/4913" [closed,modified]
 ```

include/const.hrl

@@ -0,0 +1 @@
+-define(DEFAULT_NAME, default_fs).

src/fs.erl

@@ -1,17 +1,13 @@
 -module(fs).
 
 -include_lib("kernel/include/file.hrl").
+-include_lib("fs/include/const.hrl").
 
--export([start_link/1,
-         start_link/2,
-         subscribe/0,
-         subscribe/1,
-         known_events/0,
-         known_events/1,
-         start_looper/0,
-         start_looper/1,
+-export([start_link/1, start_link/2,
+         subscribe/0, subscribe/1, subscribe/2,
+         known_events/0, known_events/1,
          find_executable/2,
-         path/0]).
+         path/0, path/1]).
 
 % sample subscriber
 
@@ -22,41 +18,30 @@ start_link(Name, Path) ->
     FileHandler = name(Name, "file"),
     fs_sup:start_link(SupName, Name, FileHandler, Path).
 
-subscribe() -> subscribe(default_fs).
+subscribe() -> subscribe(?DEFAULT_NAME).
 
-subscribe(Name) ->
+subscribe(Name) -> subscribe(Name, self()).
+
+subscribe(Name, Pid) ->
     gen_event:add_sup_handler(Name,
-                              {fs_event_bridge, self()},
-                              [self()]).
+                              {fs_event_bridge, Pid},
+                              [Pid]).
 
 path() ->
-    case application:get_env(fs, path) of
+    path(application:get_env(fs, path)).
+
+path(Path) ->
+    case Path of
+        undefined -> filename:absname("");
         {ok, P} -> filename:absname(P);
-        undefined -> filename:absname("")
+        P -> filename:absname(P)
     end.
 
-known_events() -> known_events(default_fs).
+known_events() -> known_events(?DEFAULT_NAME).
 
 known_events(Name) ->
     gen_server:call(name(Name, "file"), known_events).
 
-start_looper() -> start_looper(default_fs).
-
-start_looper(Name) ->
-    spawn(fun () ->
-                  subscribe(Name),
-                  loop()
-          end).
-
-loop() ->
-    receive
-        {_Pid, {fs, file_event}, {Path, Flags}} ->
-            error_logger:info_msg("file_event: ~p ~p",
-                                  [Path, Flags]);
-        _ -> ignore
-    end,
-    loop().
-
 find_executable(Cmd, DepsPath) ->
     Executable = 
         case priv_file(Cmd) of

src/fs_app.erl

@@ -4,10 +4,12 @@
 
 -export([start/2, stop/1]).
 
+-include_lib("fs/include/const.hrl").
+
 start(_StartType, _StartArgs) ->
     case application:get_env(fs, backwards_compatible) of
         {ok, false} -> {ok, self()};
-        {ok, true} -> fs:start_link(default_fs)
+        {ok, true} -> fs:start_link(?DEFAULT_NAME)
     end.
 
 stop(_State) -> ok.

src/fs_demo.erl

@@ -11,7 +11,7 @@ start_looper() -> start_looper(?DEFAULT_NAME).
 
 start_looper(Name) ->
     spawn(fun () ->
-                  subscribe(Name),
+                  fs:subscribe(Name),
                   loop()
           end).
 

src/fs_server.erl

@@ -28,8 +28,13 @@ start_link(Name, EventHandler, Backend, Path, Cwd) ->
 init([EventHandler, Backend, Path, Cwd]) ->
     {ok,
      #state{event_handler = EventHandler,
-            port = Backend:start_port(Path, Cwd), path = Path,
-            backend = Backend,cwd=Cwd,crashes=0}}.
+            port = Backend:start_port(Path, Cwd),
+            path = Path,
+            backend = Backend,
+            cwd=Cwd,
+            crashes=0
+     }
+    }.
 
 handle_call(known_events, _From,
             #state{backend = Backend} = State) ->