Changeset 828

Timestamp:

02/04/14 16:59:25 (10 years ago)

Author:

ngw8

Message:

Added support for converting websites that scroll sideways. Still need to make the overview index page display the layout a bit better and maybe add up/down/left/right buttons rather than previous/next on each converted page.

File:

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

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

@@ -289 +289 @@
                         
                         final MutableBool bottomReached = new MutableBool(false);
+                        final MutableBool rightReached = new MutableBool(false);
                         
                         final MutableInt pageCount = new MutableInt(0);
@@ -317 +318 @@
                                 @Override
                                 public void handle(long arg0) {
-                                        System.out.println(frameCount);
                                         // Must wait 2 frames before taking a snapshot of the webview, otherwise JavaFX won't have redrawn
                                         if (frameCount++ > 1) {
@@ -340 +340 @@
 
                                                         WebParser.addTextToFrame(visibleWidth, visibleHeight, window, webEngine, frameToAddTo);
-                                                        System.out.println("added text");
+
                                                         FrameIO.SaveFrame(frameToAddTo);
                                                 } catch (Exception ex) {
@@ -438 +438 @@
                                                 webEngine.executeScript(""
                                                                 // Initializing the counter used when scrolling the page
-                                                                + "var scrollCounter = 0;");
+                                                                + "var scrollCounter = 0;"
+                                                                + "var scrollCounterHorizontal = 0;");
 
                                                 // Setting up the element that contains the CSS to hide all text.
@@ -573 +574 @@
                         }
 
-                        while (!bottomReached.getValue()) {
+                        // Loop that scrolls the page horizontally
+                        while (!rightReached.getValue()) {
+                                bottomReached.setValue(false);
+                                
                                 Platform.runLater(new Runnable() {
                                         @Override
@@ -580 +584 @@
                                                         // Scrolling down the page
                                                         webEngine.executeScript(""
-                                                                        + "window.scrollTo(0, scrollCounter * 0.9 * window.innerHeight);"
-                                                                        + "scrollCounter = scrollCounter+1;");
-
-                                                        System.out.println("Scrolling");
-
-                                                        bottomReached.setValue((Boolean) webEngine.executeScript("(window.pageYOffset + window.innerHeight >= document.documentElement.scrollHeight)"));
-
-                                                        synchronized (notifier) {
-                                                                notifier.notify();
-                                                        }
+                                                                        + "scrollCounter = 0;"
+                                                                        + "window.scrollTo(scrollCounterHorizontal * 0.9 * window.innerWidth, 0);"
+                                                                        + "scrollCounterHorizontal = scrollCounterHorizontal+1;");
+
+                                                        rightReached.setValue((boolean) webEngine.executeScript("(window.pageXOffset + window.innerWidth >= document.documentElement.scrollWidth)"));
 
                                                 } catch (Exception e) {
@@ -596 +595 @@
                                         }
                                 });
-
-                                synchronized (notifier) {
-                                        try {
-                                                // Waiting for the page to be scrolled
-                                                notifier.wait();
-                                        } catch (InterruptedException e) {
-                                                // TODO Auto-generated catch block
-                                                e.printStackTrace();
-                                        }
-                                }
-
-                                timer.start();
-
-                                synchronized (notifier) {
-                                        try {
-                                                // Waiting for the timer thread to finish before looping again
-                                                notifier.wait();
-                                        } catch (InterruptedException e) {
-                                                // TODO Auto-generated catch block
-                                                e.printStackTrace();
-                                        }
-                                }
-
+                                
+                                // Loop that scrolls the page vertically (for each horizontal scroll position)
+                                while (!bottomReached.getValue()) {
+                                        Platform.runLater(new Runnable() {
+                                                @Override
+                                                public void run() {
+                                                        try {
+                                                                // Scrolling down the page
+                                                                webEngine.executeScript(""
+                                                                                + "window.scrollTo(window.pageXOffset, scrollCounter * 0.9 * window.innerHeight);"
+                                                                                + "scrollCounter = scrollCounter+1;");
+
+                                                                bottomReached.setValue((Boolean) webEngine.executeScript("(window.pageYOffset + window.innerHeight >= document.documentElement.scrollHeight)"));
+        
+                                                                synchronized (notifier) {
+                                                                        notifier.notify();
+                                                                }
+        
+                                                        } catch (Exception e) {
+                                                                e.printStackTrace();
+                                                        }
+                                                }
+                                        });
+        
+                                        synchronized (notifier) {
+                                                try {
+                                                        // Waiting for the page to be scrolled
+                                                        notifier.wait();
+                                                } catch (InterruptedException e) {
+                                                        // TODO Auto-generated catch block
+                                                        e.printStackTrace();
+                                                }
+                                        }
+        
+                                        timer.start();
+        
+                                        synchronized (notifier) {
+                                                try {
+                                                        // Waiting for the timer thread to finish before looping again
+                                                        notifier.wait();
+                                                } catch (InterruptedException e) {
+                                                        // TODO Auto-generated catch block
+                                                        e.printStackTrace();
+                                                }
+                                        }
+        
+                                }
                         }
 
@@ -882 +905 @@
                                         // If the element has a background color then add it (to Expeditee) as a rectangle with that background color
                                         if (bgColor != null) {
-                                                System.out.println("bg");
                                                 frame.addRectangle(Math.round(x), Math.round(y), Math.round(width), Math.round(height), 0, null, bgColor);
                                         }