request start/end events to ui

bg/background.go

@@ -9,9 +9,12 @@ import (
 
 func Run(out chan events.BackgroundEvent, in chan events.UserEvent) {
 	bg := &background{
-		in:     in,
+		in:  in,
-		out:    out,
+		out: out,
-		server: newServer(),
+		server: &server{
+			port: 8000,
+			out:  out,
+		},
 	}
 	go bg.handleSignals()
 	go bg.listen()

bg/server.go

@@ -4,15 +4,14 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+
+	"github.com/jordanorelli/dws/events"
 )
 
 type server struct {
 	port int
 	root string
-}
+	out  chan events.BackgroundEvent
-
-func newServer() *server {
-	return &server{port: 8000}
 }
 
 func (s *server) listen() {
@@ -29,11 +28,13 @@ func (s *server) setRoot(path string) {
 }
 
 func (s *server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	s.out <- events.BeginRequestEvent{}
 	if s.root == "" {
 		writeNotInitializedResponse(w)
 		return
 	}
 	fmt.Fprintf(w, "root: %s", s.root)
+	s.out <- events.EndRequestEvent{}
 }
 
 func writeNotInitializedResponse(w http.ResponseWriter) {

events/background_event.go

@@ -15,3 +15,11 @@ type SetRootEvent struct {
 	Path string
 	backgroundEvent
 }
+
+type BeginRequestEvent struct {
+	backgroundEvent
+}
+
+type EndRequestEvent struct {
+	backgroundEvent
+}

ui/EventListener.h

@@ -2,5 +2,7 @@
 
 @protocol EventListener
 - (void) serverDidSetRoot:(NSString *)path;
+- (void) serverDidBeginHandlingRequest;
+- (void) serverDidFinishHandlingRequest;
 @end
 

ui/MainViewController.m

@@ -75,38 +75,16 @@
     }];
 }
 
-- (void) viewWillAppear {
+- (void) serverDidSetRoot:(NSString *)path {
-    NSLog(@"[MainViewController] viewWillAppear");
+	[self.selectedDirectoryText setStringValue:path];
-    return [super viewWillAppear];
-}
-
-- (void) viewDidAppear {
-    NSLog(@"[MainViewController] viewDidAppear");
-    return [super viewDidAppear];
-}
-
-- (void) viewWillDisappear {
-    NSLog(@"[MainViewController] viewWillDisappear");
-    return [super viewWillDisappear];
-}
-
-- (void) viewDidDisappear {
-    NSLog(@"[MainViewController] viewDidDisappear");
-    return [super viewDidDisappear];
-}
-
-- (void) viewWillLayout {
-    NSLog(@"[MainViewController] viewWillLayout");
-    return [super viewWillLayout];
 }
 
-- (void) viewDidLayout {
+- (void) serverDidBeginHandlingRequest {
-    NSLog(@"[MainViewController] viewDidLayout");
+	NSLog(@"[MainViewController] request start");
-    return [super viewDidLayout];
 }
 
-- (void) serverDidSetRoot:(NSString *)path {
+- (void) serverDidFinishHandlingRequest {
-	[self.selectedDirectoryText setStringValue:path];
+	NSLog(@"[MainViewController] request finish");
 }
 
 @end

ui/ui_darwin.go

@@ -52,6 +52,10 @@ func (ui *cocoaUI) forwardEvents() {
 			cs := C.CString(v.Path)
 			C.set_root(cs)
 			C.free(unsafe.Pointer(cs))
+		case events.BeginRequestEvent:
+			C.begin_request()
+		case events.EndRequestEvent:
+			C.end_request()
 		}
 	}
 }

ui/ui_darwin.h

@@ -2,3 +2,5 @@ void initialize();
 int run();
 void shutdown();
 void set_root(char *);
+void begin_request();
+void end_request();

ui/ui_darwin.m

@@ -26,3 +26,13 @@ void set_root(char *path) {
 	id listener = [[EventBridge shared] listener];
 	[listener serverDidSetRoot:[NSString stringWithUTF8String:path]];
 }
+
+void begin_request() {
+	id listener = [[EventBridge shared] listener];
+	[listener serverDidBeginHandlingRequest];
+}
+
+void end_request() {
+	id listener = [[EventBridge shared] listener];
+	[listener serverDidFinishHandlingRequest];
+}