Changeset 142613 in webkit

Timestamp:

Feb 12, 2013 6:19:28 AM (11 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: File system should produce more verbose error messages and recover from errors
​https://bugs.webkit.org/show_bug.cgi?id=109571

Reviewed by Alexander Pavlov.

Error handler prints original file system call params now.
Added callbacks to error handler to recover from errors.

• inspector/front-end/FileSystemProjectDelegate.js:

(WebInspector.FileSystemProjectDelegate.prototype.contentCallback):
(WebInspector.FileSystemProjectDelegate.prototype.searchInFileContent):
(WebInspector.FileSystemUtils.errorMessage):
(.fileSystemLoaded):
(.fileEntryLoaded):
(.errorHandler):
(WebInspector.FileSystemUtils.requestFileContent):
(WebInspector.FileSystemUtils.setFileContent):
(WebInspector.FileSystemUtils._readDirectory):
(.innerCallback):
(WebInspector.FileSystemUtils._requestEntries):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/FileSystemProjectDelegate.js (modified) (18 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-12  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: File system should produce more verbose error messages and recover from errors
+        https://bugs.webkit.org/show_bug.cgi?id=109571
+
+        Reviewed by Alexander Pavlov.
+
+        Error handler prints original file system call params now.
+        Added callbacks to error handler to recover from errors.
+
+        * inspector/front-end/FileSystemProjectDelegate.js:
+        (WebInspector.FileSystemProjectDelegate.prototype.contentCallback):
+        (WebInspector.FileSystemProjectDelegate.prototype.searchInFileContent):
+        (WebInspector.FileSystemUtils.errorMessage):
+        (.fileSystemLoaded):
+        (.fileEntryLoaded):
+        (.errorHandler):
+        (WebInspector.FileSystemUtils.requestFileContent):
+        (WebInspector.FileSystemUtils.setFileContent):
+        (WebInspector.FileSystemUtils._readDirectory):
+        (.innerCallback):
+        (WebInspector.FileSystemUtils._requestEntries):
+
 2013-02-12  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/FileSystemProjectDelegate.js

@@ -87 +87 @@
         WebInspector.FileSystemUtils.requestFileContent(this._isolatedFileSystemModel, this._fileSystemPath, filePath, innerCallback.bind(this));
         
+        /**
+         * @param {?string} content
+         */
         function innerCallback(content)
         {
@@ -129 +132 @@
         {
             var result = [];
-            if (content)
+            if (content !== null)
                 result = WebInspector.ContentProvider.performSearchInContent(content, query, caseSensitive, isRegex);
             callback(result);
@@ -215 +218 @@
 }
 
-WebInspector.FileSystemUtils.errorHandler = function(error)
+WebInspector.FileSystemUtils.errorMessage = function(error)
 {
     var msg;
@@ -239 +242 @@
     };
 
-    console.error("File system error: " + msg);
+    return "File system error: " + msg;
 }
 
@@ -297 +300 @@
  * @param {string} fileSystemPath
  * @param {string} path
- * @param {function(string)} callback
+ * @param {function(?string)} callback
  */
 WebInspector.FileSystemUtils.requestFileContent = function(isolatedFileSystemModel, fileSystemPath, path, callback)
@@ -304 +307 @@
 
     var fileSystem;
+    
     /**
      * @param {DOMFileSystem} fs
@@ -309 +313 @@
     function fileSystemLoaded(fs)
     {
-        fs.root.getFile(path, null, fileEntryLoaded, WebInspector.FileSystemUtils.errorHandler);
+        fs.root.getFile(path, null, fileEntryLoaded, errorHandler);
     }
 
@@ -317 +321 @@
     function fileEntryLoaded(entry)
     {
-        entry.file(fileLoaded, WebInspector.FileSystemUtils.errorHandler);
+        entry.file(fileLoaded, errorHandler);
     }
 
@@ -336 +340 @@
     {
         callback(/** @type {string} */ (this.result));
+    }
+
+    function errorHandler(error)
+    {
+        var errorMessage = WebInspector.FileSystemUtils.errorMessage(error);
+        console.error(errorMessage + " when getting content for file '" + (fileSystemPath + "/" + path) + "'");
+        callback(null);
     }
 }
@@ -351 +362 @@
 
     var fileSystem;
+
     /**
      * @param {DOMFileSystem} fs
@@ -356 +368 @@
     function fileSystemLoaded(fs)
     {
-        fs.root.getFile(path, null, fileEntryLoaded, WebInspector.FileSystemUtils.errorHandler);
+        fs.root.getFile(path, null, fileEntryLoaded, errorHandler);
     }
 
@@ -364 +376 @@
     function fileEntryLoaded(entry)
     {
-        entry.createWriter(fileWriterCreated, WebInspector.FileSystemUtils.errorHandler);
+        entry.createWriter(fileWriterCreated, errorHandler);
     }
 
@@ -372 +384 @@
     function fileWriterCreated(fileWriter)
     {
-        fileWriter.onerror = WebInspector.FileSystemUtils.errorHandler;
+        fileWriter.onerror = errorHandler;
         fileWriter.onwriteend = fileTruncated;
         fileWriter.truncate(0);
@@ -388 +400 @@
         callback();
     }
+
+    function errorHandler(error)
+    {
+        var errorMessage = WebInspector.FileSystemUtils.errorMessage(error);
+        console.error(errorMessage + " when setting content for file '" + (fileSystemPath + "/" + path) + "'");
+        callback();
+    }
 }
 
@@ -405 +424 @@
         else {
             entries = entries.concat(toArray(results));
-            dirReader.readEntries(innerCallback, WebInspector.FileSystemUtils.errorHandler);
+            dirReader.readEntries(innerCallback, errorHandler);
         }
     }
@@ -414 +433 @@
     }    
 
-    dirReader.readEntries(innerCallback, WebInspector.FileSystemUtils.errorHandler);
+    dirReader.readEntries(innerCallback, errorHandler);
+
+    function errorHandler(error)
+    {
+        var errorMessage = WebInspector.FileSystemUtils.errorMessage(error);
+        console.error(errorMessage + " when reading directory '" + dirEntry.fullPath + "'");
+        callback([]);
+    }
 }
 
@@ -424 +450 @@
 WebInspector.FileSystemUtils._requestEntries = function(fileSystem, path, callback)
 {
-    fileSystem.root.getDirectory(path, null, innerCallback, WebInspector.FileSystemUtils.errorHandler);
+    fileSystem.root.getDirectory(path, null, innerCallback, errorHandler);
 
     function innerCallback(dirEntry)
@@ -430 +456 @@
         WebInspector.FileSystemUtils._readDirectory(dirEntry, callback)
     }
-}
-
-WebInspector.FileSystemUtils.prototype = {
-}
+
+    function errorHandler(error)
+    {
+        var errorMessage = WebInspector.FileSystemUtils.errorMessage(error);
+        console.error(errorMessage + " when requesting entry '" + path + "'");
+        callback([]);
+    }
+}