Changeset 693

Timestamp:

01/15/14 10:41:27 (10 years ago)

Author:

ngw8

Message:

Removed now obsolete loop from web parser, should increase speed for larger pages

File:

• trunk/src/org/expeditee/io/WebParser.java (modified) (2 diffs)

trunk/src/org/expeditee/io/WebParser.java

@@ -99 +99 @@
                                                                 // MessageBay.displayMessage("Finished loading page");
                                                                 System.out.println("Parsing page!");
-                                                                        JavaFX.WebEngineExecuteScript.invoke(webEngine, "window.resizeTo(800, 800);");
+                                                                JavaFX.WebEngineExecuteScript.invoke(webEngine, "window.resizeTo(800, 800);"
+                                                                                + "document.body.style.width = '1000px'");
                                                                 parsePage(webEngine, frame);
                                                                 System.out.println("Parsed page!");
@@ -165 +166 @@
                                                 );
                                         
-                                                // Getting an array of all HTML elements in the page
-                                                Object contentElements = JavaFX.WebEngineExecuteScript.invoke(webEngine, "document.querySelectorAll('body *');");
-                                                int contentElementsLength = (Integer) JavaFX.JSObjectGetMember.invoke(contentElements, "length");
-
-                                                for (int i = 0; i < contentElementsLength; i++) {
-                                                        // Getting the current HTML element, then making it accessible in JavaScript
-                                                        Element currentElement = (Element) JavaFX.JSObjectGetSlot.invoke(contentElements, i);
-                                                        JavaFX.JSObjectSetMember.invoke(window, "para", currentElement);
-                                                                
-                                                        JavaFX.WebEngineExecuteScript.invoke(webEngine, "para.style.wordBreak = 'normal';");
-
-                                                        // Creating a TreeWalker that is used to loop over all the TextNodes within the current element
-                                                        JavaFX.WebEngineExecuteScript.invoke(webEngine, "var walker = document.createTreeWalker(para, NodeFilter.SHOW_TEXT, null, false);");
-
-                                                        // Using Javascript to get an array of all the text nodes in the current element. Have to loop through twice (once
-                                                        // to build the array and once actually going through the array, otherwise when the textnode is removed from the
-                                                        // document items end up being skipped)
-                                                        Object textNodes = JavaFX.WebEngineExecuteScript.invoke(webEngine, ""
-                                                                        + "function getTextNodes(rootNode){" 
-                                                                                + "var node;" 
-                                                                                + "var textNodes=[];"
-                                                                                + "var walk = document.createTreeWalker(rootNode, NodeFilter.SHOW_TEXT);" 
-                                                                                + "while(node=walk.nextNode()) {" 
-                                                                                        + "if((node.textContent.trim().length > 0)) { "
-                                                                                                + "textNodes.push(node);" 
-                                                                                        + "}" 
-                                                                                + "}" 
-                                                                                + "return textNodes;" 
-                                                                        + "}; " 
-                                                                        + "getTextNodes(para)");
-
-                                                        int nodesLength = (Integer) JavaFX.JSObjectGetMember.invoke(textNodes, "length");
-
-                                                        // Looping through all the text nodes in the current paragraph
-                                                        for (int j = 0; j < nodesLength; j++) {
-                                                                Node currentNode = (Node) JavaFX.JSObjectGetSlot.invoke(textNodes, j);
-
-                                                                // Making the current node accessible in JavaScript
-                                                                JavaFX.JSObjectSetMember.invoke(window, "textNode", currentNode);
-                                                                
-                                                                JavaFX.WebEngineExecuteScript.invoke(webEngine, ""
-                                                                                + "var span = null;"
-                                                                                + "var prevSpan = null;"
-                                                                                + "var prevPrevSpan = null;"
-                                                                                );
-
-                                                                // Splitting the text node's content into individual words
-                                                                String textContent = ((String) JavaFX.WebEngineExecuteScript.invoke(webEngine, "textNode.textContent")).replaceAll("\\n|\\r", "").replaceAll("\\s+", " ");
-                                                                String[] words = splitIntoWords(textContent);
-
-                                                                JavaFX.WebEngineExecuteScript.invoke(webEngine, ""
-                                                                                + "var refNode = textNode.nextSibling;"
-                                                                                + "var par = textNode.parentElement;"
-                                                                                + "textNode.parentElement.removeChild(textNode)");
-
-                                                                // Adding each word back to the page
-                                                                for (int k = 0; k < words.length; k++) {
-                                                                        Object currentWord = words[k];
-                                                                        JavaFX.JSObjectCall.invoke(window, "addToSpan", new Object[] { currentWord });
-                                                                }
-                                                                
-                                                                JavaFX.WebEngineExecuteScript.invoke(webEngine, ""
-                                                                                + "                     if (prevPrevSpan !== null && prevPrevSpan.getBoundingClientRect().left == prevSpan.getBoundingClientRect().left) {"
-                                                                                + "                             prevPrevSpan.textContent = prevPrevSpan.textContent + prevSpan.textContent;"
-                                                                                + "                             par.removeChild(prevSpan);"
-                                                                                + "                     }"
-                                                                                );
+                                                // Using Javascript to get an array of all the text nodes in the document so they can be wrapped in spans. Have to
+                                                // loop through twice (once to build the array and once actually going through the array, otherwise when the
+                                                // textnode is removed from the document items end up being skipped)
+                                                Object textNodes = JavaFX.WebEngineExecuteScript.invoke(webEngine, ""
+                                                        + "function getTextNodes(rootNode){" 
+                                                                + "var node;" 
+                                                                + "var textNodes=[];"
+                                                                + "var walk = document.createTreeWalker(rootNode, NodeFilter.SHOW_TEXT);" 
+                                                                + "while(node=walk.nextNode()) {" 
+                                                                        + "if((node.textContent.trim().length > 0)) { "
+                                                                                + "textNodes.push(node);" 
+                                                                        + "}" 
+                                                                + "}" 
+                                                                + "return textNodes;" 
+                                                        + "}; " 
+                                                        + "getTextNodes(document.body)");
+
+                                                int nodesLength = (Integer) JavaFX.JSObjectGetMember.invoke(textNodes, "length");
+
+                                                // Looping through all the text nodes in the current paragraph
+                                                for (int j = 0; j < nodesLength; j++) {
+                                                        Node currentNode = (Node) JavaFX.JSObjectGetSlot.invoke(textNodes, j);
+
+                                                        // Making the current node accessible in JavaScript
+                                                        JavaFX.JSObjectSetMember.invoke(window, "textNode", currentNode);
+                                                        
+                                                        JavaFX.WebEngineExecuteScript.invoke(webEngine, ""
+                                                                        + "var span = null;"
+                                                                        + "var prevSpan = null;"
+                                                                        + "var prevPrevSpan = null;"
+                                                                        );
+
+                                                        // Splitting the text node's content into individual words
+                                                        String textContent = ((String) JavaFX.WebEngineExecuteScript.invoke(webEngine, "textNode.textContent")).replaceAll("\\n|\\r", "").replaceAll("\\s+", " ");
+                                                        String[] words = splitIntoWords(textContent);
+
+                                                        JavaFX.WebEngineExecuteScript.invoke(webEngine, ""
+                                                                        + "var refNode = textNode.nextSibling;"
+                                                                        + "var par = textNode.parentElement;"
+                                                                        + "textNode.parentElement.removeChild(textNode)");
+
+                                                        // Adding each word back to the page
+                                                        for (int k = 0; k < words.length; k++) {
+                                                                Object currentWord = words[k];
+                                                                JavaFX.JSObjectCall.invoke(window, "addToSpan", new Object[] { currentWord });
                                                         }
-
-                                                        progressBar.set((100 * (i + 1)) / contentElementsLength);
+                                                        
+                                                        JavaFX.WebEngineExecuteScript.invoke(webEngine, ""
+                                                                        + "                     if (prevPrevSpan !== null && prevPrevSpan.getBoundingClientRect().left == prevSpan.getBoundingClientRect().left) {"
+                                                                        + "                             prevPrevSpan.textContent = prevPrevSpan.textContent + prevSpan.textContent;"
+                                                                        + "                             par.removeChild(prevSpan);"
+                                                                        + "                     }"
+                                                                        );
+                                                        
+                                                        progressBar.set((100 * (j + 1)) / nodesLength);
                                                 }
-                                                
+
                                                 // Finding all links within the page, then setting the href attribute of all their descendants to be the same
                                                 // link/URL.