fix: browser import and chrome search-engine choice

ennioVisco · Aug 29, 2024 · 67d7c6b · 67d7c6b
1 parent 3f7c42e
commit 67d7c6b
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 24 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -156,18 +156,18 @@ fun runtimeArgs(exec: Any) {
     val arguments =
         listOf(
             GARBAGE_COLLECTOR,
-//            "--add-exports",
-//            "javafx.graphics/com.sun.glass.ui=ALL-UNNAMED",
-//            "--add-exports",
-//            "javafx.graphics/com.sun.glass.utils=ALL-UNNAMED",
-//            "--add-exports",
-//            "javafx.graphics/com.sun.javafx.util=ALL-UNNAMED",
-//            "--add-exports",
-//            "javafx.base/com.sun.javafx.logging=ALL-UNNAMED",
-//            "--add-opens",
-//            "javafx.graphics/com.sun.glass.ui=ALL-UNNAMED",
-//            "--add-opens",
-//            "javafx.graphics/com.sun.glass.utils=ALL-UNNAMED"
+            "--add-exports",
+            "javafx.graphics/com.sun.glass.ui=ALL-UNNAMED",
+            "--add-exports",
+            "javafx.graphics/com.sun.glass.utils=ALL-UNNAMED",
+            "--add-exports",
+            "javafx.graphics/com.sun.javafx.util=ALL-UNNAMED",
+            "--add-exports",
+            "javafx.base/com.sun.javafx.logging=ALL-UNNAMED",
+            "--add-opens",
+            "javafx.graphics/com.sun.glass.ui=ALL-UNNAMED",
+            "--add-opens",
+            "javafx.graphics/com.sun.glass.utils=ALL-UNNAMED"
         )
     when (exec) {
         is JavaExec -> exec.jvmArgs(arguments)

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ kotlin.code.style=official
 # Gradle config
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.configuration-cache=true
+#org.gradle.configuration-cache=true
 org.gradle.warning-mode=all
 # Project info
 project.name=webmonitor

diff --git a/src/main/kotlin/com/enniovisco/Main.kt b/src/main/kotlin/com/enniovisco/Main.kt
@@ -21,6 +21,9 @@ fun main(args: Array<String>, preloaded: Boolean = false, toFile : Boolean = tru
         it.title("Tracking")
         val snapshots = tracking(it)
 
+        if(snapshots.isEmpty()) {
+            throw IllegalStateException("Unable to start the browser session.")
+        }
         val grid = generateSpatialModel(snapshots[0])
 
         it.title("Checking")

diff --git a/src/main/kotlin/com/enniovisco/Shared.kt b/src/main/kotlin/com/enniovisco/Shared.kt
@@ -1,7 +1,7 @@
 package com.enniovisco
 
 import com.enniovisco.dsl.*
-import com.enniovisco.tracking.Browser
+import com.enniovisco.dsl.Browser
 import io.github.moonlightsuite.moonlight.core.formula.*
 import io.github.moonlightsuite.moonlight.formula.*
 import io.github.moonlightsuite.moonlight.formula.classic.*

diff --git a/...kotlin/com/enniovisco/tracking/Browser.kt → ...main/kotlin/com/enniovisco/dsl/Browser.kt b/...kotlin/com/enniovisco/tracking/Browser.kt → ...main/kotlin/com/enniovisco/dsl/Browser.kt
@@ -1,4 +1,4 @@
-package com.enniovisco.tracking
+package com.enniovisco.dsl
 
 /**
  * Allowed browsers for webpages tracking

diff --git a/src/main/kotlin/com/enniovisco/dsl/Dsl.kt b/src/main/kotlin/com/enniovisco/dsl/Dsl.kt
@@ -4,12 +4,6 @@ import com.enniovisco.Spec
 import com.enniovisco.WebSource
 import com.enniovisco.main
 
-
-/**
- * Enum of the supported browsers.
- */
-typealias Browser = com.enniovisco.tracking.Browser
-
 class WebMonitor {
     var toFile = true
     var toConsole = false

diff --git a/src/main/kotlin/com/enniovisco/tracking/PageTracker.kt b/src/main/kotlin/com/enniovisco/tracking/PageTracker.kt
@@ -1,5 +1,6 @@
 package com.enniovisco.tracking
 
+import com.enniovisco.dsl.Browser
 import io.github.oshai.kotlinlogging.*
 import org.openqa.selenium.*
 import org.openqa.selenium.devtools.events.*

diff --git a/src/main/kotlin/com/enniovisco/tracking/SessionBuilder.kt b/src/main/kotlin/com/enniovisco/tracking/SessionBuilder.kt
@@ -1,5 +1,6 @@
 package com.enniovisco.tracking
 
+import com.enniovisco.dsl.Browser
 import org.openqa.selenium.*
 import org.openqa.selenium.chrome.*
 import org.openqa.selenium.devtools.*
@@ -49,6 +50,7 @@ class SessionBuilder(
         reduceDriverVerbosity()
         val options = ChromeOptions()
         options.addArguments("--force-device-scale-factor=2.75")
+        options.addArguments("--disable-search-engine-choice-screen")
 
         if (dims?.width!! < 500 || dims.height < 400) {
             initMobileChrome(options, "iPhone 5/SE")

diff --git a/src/main/resources/examples/source.ase.kts b/src/main/resources/examples/source.ase.kts
@@ -1,5 +1,5 @@
 import com.enniovisco.*
-import com.enniovisco.tracking.Browser
+import com.enniovisco.dsl.Browser
 
 // Unfortunately, the frame-size is browser-specific.
 // Typically, all browsers have only a vertical frame,

diff --git a/src/main/resources/examples/source.nyt.kts b/src/main/resources/examples/source.nyt.kts
@@ -1,5 +1,5 @@
 import com.enniovisco.*
-import com.enniovisco.tracking.Browser
+import com.enniovisco.dsl.Browser
 
 WebSource.screenWidth = 800 // px
 WebSource.screenHeight = 400 // px

diff --git a/src/main/resources/examples/source.sample.kts b/src/main/resources/examples/source.sample.kts
@@ -1,5 +1,6 @@
 import com.enniovisco.*
 
+
 // Unfortunately, the frame-size is browser-specific.
 // Typically, all browsers have only a vertical frame,
 // but it would be nice to set a window size based on the inner dimensions,

diff --git a/webmonitor.main.kts b/webmonitor.main.kts
@@ -6,7 +6,7 @@ command -v kscript >/dev/null 2>&1 || source /dev/stdin <<< "$(curl -L https://g
 exec kscript $0 "$@"
 \*** IMPORTANT: Any code including imports and annotations must come after this line ***/
 
-@file:DependsOn("com.enniovisco:webmonitor:1.2.0")
+@file:DependsOn("com.enniovisco:webmonitor:1.3.0")
 
 import com.enniovisco.dsl.*