Add compile button

Author: jpallen

.gitignore

@@ -1,4 +1,4 @@
 **.swo
 **.swp
 node_modules/
-**/.DS_Store
+**.DS_Store

config/config.json

@@ -6,5 +6,9 @@
   "cookie" : {
     "secret" : "nzalv26mhkp3h5jzc7p30tdh3lj9rpyxliyxic97hjeyf6t691golpgwr8j1siyn"
   },
-  "host" : "localhost:3000"
+  "host" : "http://localhost:3000",
+  "clsi" : {
+    "host"  : "http://localhost:3002",
+    "token" : "1bd993d7d739eca8740f9919d8748352"
+  }
 }

index.js

@@ -1,6 +1,9 @@
 var fs            = require("fs");
 var express       = require("express");
 var connect       = require("connect");
+var http          = require("http");
+var url           = require("url");
+var request       = require("request");
 var MergeServer   = require("./server/merge");
 
 var config = JSON.parse(fs.readFileSync(__dirname + "/config/config.json"));
@@ -11,7 +14,6 @@ var app = express.createServer();
 
 app.use(connect.cookieParser(config.cookie.secret));
 app.use(connect.cookieSession({ key: "scribtex-dropbox" }));
-app.use(connect.static("public"));
 
 app.get("/session/new", function(req, res, next) {
   dbox.request_token(function(status, dboxRes) {
@@ -44,10 +46,21 @@ function redirectToLogin(req, res, next) {
 
 app.get(/^\/files\/(.*)/, function(req, res, next) {
   var filePath = req.params[0];
+
+  var oauth_token, oauth_token_secret;
+  if (req.query.access_token && req.query.access_token_secret) {
+    oauth_token        = req.query.access_token;
+    oauth_token_secret = req.query.access_token_secret;
+  } else {
+    oauth_token        = req.session.dropbox_oauth_token;
+    oauth_token_secret = req.session.dropbox_oauth_token_secret;
+  }
+
   var client = dbox.createClient({
-    oauth_token : req.session.dropbox_oauth_token,
-    oauth_token_secret : req.session.dropbox_oauth_token_secret
+    oauth_token        : oauth_token,
+    oauth_token_secret : oauth_token_secret
   });
+
   client.get(filePath, function(status, reply, metadata) {
     try {
       metadata = JSON.parse(metadata);
@@ -60,11 +73,11 @@ app.get(/^\/files\/(.*)/, function(req, res, next) {
       headers = {
         "Content-Type"  : metadata["mime_type"],
         "X-Revision-Id" : metadata["rev"],
-        "X-Icon"        : metadata["icon"]
+        "X-Icon"        : metadata["icon"],
+        "Last-Modified" : metadata["modified"]
       }
     }
 
-    console.log(filePath, status, reply);
     res.writeHead(status, headers);
     res.write(reply || ""); // Sometimes reply is undefined. Blank file?
     res.end();
@@ -109,7 +122,9 @@ app.put(/^\/files\/(.*)/, function(req, res, next) {
         if (metadata) {
           headers = {
             "Content-Type"  : metadata.mime_type,
-            "X-Revision-Id" : metadata.rev
+            "X-Revision-Id" : metadata.rev,
+            "X-Icon"        : metadata["icon"],
+            "Last-Modified" : metadata["modified"]
           }
         }
 
@@ -156,6 +171,60 @@ app.propfind(/^\/files\/(.*)/, function(req, res, next) {
   });
 });
 
+app.all(/^\/clsi\/(.*)/, function(req, res, next) {
+  var clientUrl = "/" + req.params[0];
+
+  if (clientUrl == "/clsi/compile" && req.method == "POST") {
+    // Insert the token and access params
+    var body = "";
+    req.on("data", function(chunk) { body += chunk });
+    req.on("end", function() {
+      function badRequest() {
+        res.writeHead(400);
+        res.end();
+      }
+
+      try {
+        var json = JSON.parse(body);
+      } catch (e) {
+        badRequest();
+        return;
+      }
+
+      if (!json.compile) {
+        json.compile = {};
+      }
+
+      json.compile.token = config.clsi.token;
+
+      if (!json.compile.resources) {
+        json.compile.resources = [];
+      }
+
+      for (var i = 0; i < json.compile.resources.length; i++) {
+        var resource = json.compile.resources[i];
+        if (resource.url) {
+          var resourceUrl = url.parse(resource.url, true);
+          resourceUrl.query["access_token"] = req.session.dropbox_oauth_token;
+          resourceUrl.query["access_token_secret"] = req.session.dropbox_oauth_token_secret;
+          resource.url = url.format(resourceUrl);
+        }
+      }
+
+      request({
+        url     : config.clsi.host + clientUrl,
+        headers : req.headers,
+        method  : "POST",
+        body    : JSON.stringify(json)
+      }).pipe(res);
+    });
+  } else {
+    req.pipe(request(config.clsi.host + clientUrl)).pipe(res);
+  }
+});
+
+app.use(connect.static("public"));
+
 var merge = new MergeServer({
   mount : "/merge"
 });

package.json

@@ -3,6 +3,7 @@
   "version" : "0.0.1",
   "dependencies" : {
     "express" : "2.5.9",
+    "request" : "2.9.202",
     "dbox"    : "0.4.3"
   }
 }

public/editor/bootstrap

@@ -0,0 +1,21 @@
+define(["components/pdf-window-view/pdf-window-view"], function(PdfWindowView) {
+  var query = {};
+  _.each( location.search.slice(1).split("&"), function(part) {
+    query[part.split("=")[0]] = part.split("=")[1];
+  });
+
+  var pdfUrl, logUrl;
+  if (query.success == "true") {
+    pdfUrl = "http://localhost:3002/output/" + query.compileId + "/output.pdf";
+  }
+  logUrl = "/clsi/output/" + query.compileId + "/output.log";
+
+  var view = new PdfWindowView({
+    pdfUrl : pdfUrl,
+    logUrl : logUrl
+  });
+
+  $(document.body).append(view.el);
+  view.render();
+});
+

public/editor/compile-window.js

@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+  <head>
+
+    <title>
+      Compiled document
+    </title>
+  
+    <link rel="stylesheet" href='/editor/bootstrap/bootstrap/css/bootstrap.css'></link>
+    
+    <script src='/editor/support/jquery-1.7.2.min.js'></script>  
+    <script src='/editor/support/jquery-ui-1.8.20.min.js'></script>  
+    <script src='/editor/bootstrap/js/bootstrap-tab.js'></script>  
+    <script src='/editor/support/underscore-min.js'></script>  
+    <script src='/editor/support/backbone-min.js'></script>  
+    <script src='/editor/support/backbone-customisations.js'></script>  
+    <script src='/editor/support/require.js' data-main="compile-window"></script>  
+  
+  </head>
+
+  <body class="no-bounce">
+    <script type="text/template" id="pdf-tabs-template">
+      <ul class="nav nav-tabs full-page-pdf-tabs" id="pdf-tabs">
+        <a class="btn btn-primary" href="{{ pdfSrc }}">Download</a>
+        <li>
+          <a href="#log" data-toggle="tab">Log</a>
+        </li>
+
+        <li class="active">
+          <a href="#pdf" data-toggle="tab">PDF</a>
+        </li>
+      </ul>
+
+      <div class="tab-content">
+        <div class="pdf-tab-pane tab-pane active" id="pdf">
+          <embed src="{{ pdfSrc }}"></embed>
+        </div>
+        <div class="log-tab-pane tab-pane" id="log">Log</div>
+      </div>
+    </script>
+  </body>
+</html>

public/editor/compiled.html

@@ -2,9 +2,10 @@ define([
   "components/base",
   "components/compile/clsi_client",
   "components/dialog/dialog",
+  "components/text-editor/text-editor",
   "components/compile/views/new-window-view",
   "lib/path_util"
-], function(Base, CLSIClient, Dialog, NewWindowView, PathUtil) {
+], function(Base, CLSIClient, Dialog, TextEditor, NewWindowView, PathUtil) {
   var CompileState = Backbone.Model.extend();
 
   var Compile = Base.extend({
@@ -34,35 +35,48 @@ define([
       var resources = [];
       var options = {};
 
-      editor.get("openFileView").transferContentToModel();
 
-      var rootResourcePath;
-      if (editor.get("openFile").get("content").match(/\\documentclass/)) {
-        rootResourcePath = editor.get("openFile").get("path")
-      } else {
-        rootResourcePath = editor.get("mainFile");
+      if (!editor.get("openFile")) {
+        this.enableCompiling();
+        return;
       }
 
+      var rootResourcePath;
+      editor.get("openFiles").each(function(file) {
+        if (file.get("content") && file.get("content").match(/\\documentclass/)) {
+          rootResourcePath = file.get("path")
+        }
+      });
+
       if (!rootResourcePath) {
         this.showNoRootResourceDialog();
         this.enableCompiling();
         return;
       }
 
+      // Lets gather the resources by their ids so that we can override existing ones
+      // We'll group them into an array later.
+      var resources = {};
       editor.get("rootDirectory").eachFile(function(file) {
-        if (file === editor.get("openFile")) {
-          resources.push({
+        resources[file.id] = {
+          path     : file.get("path"),
+          url      : PathUtil.join(editor.get("host"), editor.get("fileBaseUrl"), file.get("path")),
+          modified : file.get("modified")
+        };
+      });
+      // Override resources with content from open files
+      _.each(editor.components.tabs.getOpenFileViews(), function(fileView) {
+        if (fileView instanceof TextEditor) {
+          var file = fileView.model;
+          fileView.transferContentToModel();
+          resources[file.id] = {
             content : file.get("content"),
             path    : file.get("path")
-          });
-        } else {
-          resources.push({
-            path    : file.get("path"),
-            url     : PathUtil.join(editor.get("origin"), editor.get("fileBaseUrl"), file.get("path")),
-            modifed : file.get("lastModified")
-          });
+          };
         }
       });
+      // Flatten our resource down to an array.
+      resources = _.map(resources, function(value, key) { return value });
 
       var self = this;
       CLSIClient.compile(resources, {
@@ -97,12 +111,12 @@ define([
     enableCompiling : function() {
       $("#compile-button").removeClass("disabled");
       var self = this;
-      $("#compile-button").on("click", function() { self.compile() });
+      $("#compile-button").on("click.compile", function() { self.compile() });
     },
 
     disableCompiling : function() {
       $("#compile-button").addClass("disabled");
-      $("#compile-button").off("click");
+      $("#compile-button").off("click.compile");
     },
 
     showNoRootResourceDialog : function() {

public/editor/components/compile/compile.js

@@ -5,10 +5,10 @@ define(["lib/path_util"], function(PathUtil) {
     },
 
     openWindow : function(compileId, pdfExists) {
-      var url = PathUtil.join(editor.get("projectBaseUrl"), "compiled");
+      var url = editor.get("compileWindowUrl");
       url += "?compileId=" + compileId;
       url += "&success=" + pdfExists;
-      this.compileWindow = window.open(url, "scribtex-compiled");
+      this.compileWindow = window.open(url, "compile-window");
     },
 
     closeWindow : function() {

public/editor/components/compile/views/new-window-view.js

@@ -59,7 +59,7 @@ define(["components/base", "lib/path_util"], function(Base, PathUtil) {
 
       // Remove it from the places the open files and tabs are stored.
       delete this.openTabs[file.id];
-      editor.get("openFiles").remove(file);
+      editor.get("openFiles").remove(tab.file);
 
       // If the tab is currently selected we open either the previous of
       // next tab (unless there are no more tabs!)
@@ -99,6 +99,10 @@ define(["components/base", "lib/path_util"], function(Base, PathUtil) {
       tab.tabEl.find("a").tab("show");
     },
 
+    getOpenFileViews : function(file) {
+      return _.map(this.openTabs, function(tab) { return tab.fileView });
+    },
+
     _removeEventListeners : function(tabEl) {
       tabEl.find("a").off("click.tabs");
       tabEl.find("a").off("shown.tabs");