Merge pull request #11 from MatthewTurk/master

Update to v2 for PNaCl, add in directory picker

chrome/kernel.js

@@ -42,6 +42,7 @@ Kernel.prototype.start = function() {
   addParam('PS_EXIT_MESSAGE', 'exited');
   addParam('TERM', 'xterm-256color');
   addParam('NACL_DATA_URL', '/');
+  addParam('ZEROPY_PACKAGE', 'zeropy_20140520.tar.gz')
 
   var eventTypes = {'message': ['data'],
                     'progress': ['loaded', 'total'],

chrome/launch.js

@@ -22,4 +22,37 @@ var launchNotebookWindow = function(params) {
       'height': 600
     }
   });
+  window.requestFileSystem  = window.requestFileSystem ||
+                              window.webkitRequestFileSystem;
+  window.terms = [];
+  window.fileSystems = {};
+  function newHTML5Volume(persistent, sizeInMegabytes) {
+      if (persistent == true) {
+        fsType = PERSISTENT;
+        name = 'persistent';
+      } else {
+        fsType = TEMPORARY;
+        name = 'temporary';
+      }
+      function errorFn(e) {
+        console.log("Binding " + name + " failed: " + e);
+      }
+      function registerFileSystem(fs) {
+        console.log("Bound " + name);
+        window.fileSystems[name] = fs;
+      }
+      function grantedFileSystem(grantedBytes) {
+        window.requestFileSystem(fsType,
+                                 grantedBytes,
+                                 registerFileSystem,
+                                 errorFn);
+      }
+      navigator.webkitPersistentStorage.requestQuota(
+        sizeInMegabytes*1024*1024,
+        grantedFileSystem,
+        errorFn
+      )
+  }
+  newHTML5Volume(true, 8192);
+
 };

chrome/manifest.json

@@ -29,6 +29,8 @@
         "udp-send-to:*:*"]
     },
     "webview",
+    {"fileSystem" : ["write", "directory", "retainEntries"]},
+    "unlimitedStorage",
     "storage",
     "clipboardRead",
     "clipboardWrite",

chrome/pnacl/kernel.py

@@ -4,9 +4,16 @@
 
 """A simple shell that uses the IPython messaging system."""
 
+import time
 import json
 import logging
 import sys
+sys_stdout = sys.stdout
+sys_stderr = sys.stderr
+
+def emit(s):
+    print >> sys_stderr, "EMITTING: %s" % (s)
+    time.sleep(1)
 
 import IPython
 from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC
@@ -17,7 +24,7 @@
 from IPython.config.configurable import Configurable
 
 # module defined in shell.cc for communicating via pepper API
-import ppmessage
+from pyppapi import nacl_instance
 
 def sendMessage(socket_name, msg_type, parent_header=None, content=None):
   if parent_header is None:
@@ -27,9 +34,11 @@ def sendMessage(socket_name, msg_type, parent_header=None, content=None):
   msg = {
       'header': {'msg_type': msg_type},
       'parent_header': parent_header,
-      'content': content
+      'content': content,
+      'msg_type': msg_type,
       }
-  ppmessage._PostJSONMessage(socket_name, json.dumps(msg))
+  nacl_instance.send_raw_object({'stream': socket_name,
+                              'json': json.dumps(msg)})
 
 class MsgOutStream(object):
   """Class to overrides stderr and stdout."""
@@ -58,13 +67,10 @@ def writelines(self, sequence):
 # override sys.stdout and sys.stderr to broadcast on iopub
 stdout_stream = MsgOutStream('stdout')
 stderr_stream = MsgOutStream('stderr')
-sys_stdout = sys.stdout
-sys_stderr = sys.stderr
 sys.stdout = stdout_stream
 sys.stderr = stderr_stream
 
 
-
 class PepperShellDisplayHook(DisplayHook):
   parent_header = Dict({})
 
@@ -161,7 +167,10 @@ def __init__(self):
 
 while 1:
   sendMessage('iopub', 'status', content={'execution_state': 'idle'})
-  msg = json.loads(ppmessage._AcquireJSONMessageWait())
+  msg = None
+  while msg is None:
+    msg = nacl_instance.wait_for_message()
+  msg = json.loads(msg['json'])
   sendMessage('iopub', 'status', content={'execution_state': 'busy'})
 
   if not 'header' in msg:

chrome/welcome.js

@@ -92,7 +92,7 @@ window.onload = function() {
     chrome.identity.getAuthToken({'interactive': true }, function(token) {
       if (token) {
         // Remove this cached token and re-authenticate
-        chrome.identity.removeCachedAuthToken(token, authenticate);
+        chrome.identity.removeCachedAuthToken({'token': token}, authenticate);
       } else {
         // There is no cached token, so prompt for authentication
         authenticate();

chrome/window.js

@@ -3,7 +3,6 @@ var notebookPath = '/static/v2/notebook.html';
 var notebookUrl = chrome.runtime.getURL(notebookPath);
 var serverOrigin = notebookUrl.substr(0, notebookUrl.length -
     notebookPath.length);
-
 var tokenRefreshInterval = 10 * 60 * 1000;  // 10 minutes
 
 var webview = document.getElementById('webview');
@@ -25,6 +24,14 @@ window.addEventListener('message', function(message) {
     kernel.start();
   } else if (message.data === 'restart_kernel') {
     kernel.restart();
+  } else if (message.data == 'pick_file') {
+    chrome.fileSystem.chooseEntry({type: 'openDirectory'}, function(theEntry) {
+      if (!theEntry) {
+        return;
+      }
+      kernel.handleMessage({'filesystem_name': theEntry.fullPath,
+                            'filesystem_resource': theEntry.filesystem});
+    });
   } else if (message.data && message.data.json) {
     kernel.handleMessage(message.data);
   }

ipython_patch/services/kernels/js/kernel.js

@@ -554,6 +554,10 @@ var IPython = (function (IPython) {
         } else if (execution_state === 'dead') {
             this.stop_channels();
             $([IPython.events]).trigger('status_dead.Kernel', {kernel: this});
+        } else if (execution_state == 'nacl_ready') {
+            $([IPython.events]).trigger(IPythonInterface.KERNEL_STARTED_EVENT,
+                              {kernel: this});
+            this.running = true;
         }
     };
 

static/frontend/js/filepicker.js

@@ -117,3 +117,12 @@ colab.filepicker.selectFileAndReload = function() {
   };
   colab.filepicker.selectFile(cb);
 };
+
+
+/**
+ * Selects a file from the local filesystem and posts a message directly.
+ */
+colab.filepicker.selectLocalFile = function() {
+    // use local storage to retain access to this file
+    colab.globalKernel.kernel_window.postMessage('pick_file', colab.globalKernel.kernel_origin);
+}

static/frontend/js/header.js

@@ -130,6 +130,10 @@ colab.createMenubar = function(document, permissions) {
         colab.drive.openDriveViewer();
         break;
 
+      case 'openlocalfs-menuitem':
+        colab.filepicker.selectLocalFile();
+        break;
+
       case 'clear-outputs-menuitem':
         colab.globalNotebook.clearOutputs();
         break;

static/frontend/js/pnacl_kernel.js

@@ -90,7 +90,7 @@ colab.PNaClKernel.prototype.handleMessage_ = function (message) {
     if (typeof data == 'string' || data instanceof String) {
       console.log('nacl>' + data.substring(tty_prefix.length));
     } else if (data.stream == 'iopub') {
-      that._handle_iopub_reply({data: data.json});
+      that._handle_iopub_message({data: data.json});
     } else if (data.stream == 'shell') {
       that._handle_shell_reply({data: data.json});
     }
@@ -109,4 +109,4 @@ colab.PNaClKernel.prototype.handleMessage_ = function (message) {
     that.running = false;
     $([IPython.events]).trigger('status_dead.Kernel', {kernel: that});
   }
-};
+};

static/frontend/notebook.html

@@ -111,6 +111,8 @@
                   <div class="goog-menuitem goog-menuitem" id="open-menuitem">Open...</div>
                   <div class="goog-menuitem goog-menuitem" id="new-menuitem">New Notebook</div>
                   <div class="goog-menuseparator goog-menuitem-disabled"></div>
+                  <div class="goog-menuitem" id="openlocalfs-menuitem">Open Local Directory</div>
+                  <div class="goog-menuseparator goog-menuitem-disabled"></div>
                   <div class="goog-menuitem" id="share-menuitem">Share...</div>
                   <div class="goog-menuitem" id="save-menuitem">Save and Checkpoint</div>
                   <div class="goog-menuitem" id="viewindrive-menuitem">View in Drive...</div>