Making it so that the status shows up right away

Author: Julie Pitt

app/assets/javascripts/status-controller.js

@@ -1,16 +1,29 @@
 var statusController = angular.module('StatusController', []);
 
 function mainController($scope, $http) {
-	$scope.status = "unknown";
 
-    var wsUrl = jsRoutes.controllers.Application.crawlerStatusWs().webSocketURL()
+	$scope.status = "retrieving";
 
-    $scope.socket = new WebSocket(wsUrl)
+	function doWebSocket() {
+        var wsUrl = jsRoutes.controllers.Application.crawlerStatusWs().webSocketURL()
+
+        $scope.socket = new WebSocket(wsUrl)
+
+        $scope.socket.onmessage =  function (msg) {
+          $scope.$apply( function() {
+                console.log("received : #{msg}");
+                $scope.status = msg.data;
+            })
+          }
+	}
+
+	$http.get(jsRoutes.controllers.Application.crawlerStatus().url)
+		.success(function(data) {
+			$scope.status = data;
+			doWebSocket();
+		})
+		.error(function(data) {
+		    doWebSocket();
+		});
+}
 
-    $scope.socket.onmessage =  function (msg) {
-      $scope.$apply( function() {
-            console.log("received : #{msg}");
-            $scope.status = msg.data;
-        })
-      }
-}

app/controllers/Application.scala

@@ -27,7 +27,10 @@ object Application extends Controller {
     val stateResponse = crawlControlActor ? CrawlState
     stateResponse.map {
       case status: ControllerState =>
-        Ok(status.toString)
+        val json = Map("state" -> status.toString)
+        val out: JsValue = Json.toJson(json)
+
+        Ok(out.toString)
       case _ =>
         InternalServerError("Unknown Error")
     } recover {
@@ -66,7 +69,8 @@ object Application extends Controller {
     implicit request =>
       Ok(
         Routes.javascriptRouter("jsRoutes")(
-          routes.javascript.Application.crawlerStatusWs
+          routes.javascript.Application.crawlerStatusWs,
+          routes.javascript.Application.crawlerStatus
         )
       ).as("text/javascript")
   }