wip

Signed-off-by: Andrei Gherghescu <[email protected]>

Author: andrei-ng

plotly_static/build.rs

@@ -325,7 +325,7 @@ fn main() -> Result<()> {
     } else {
         #[cfg(feature = "chromedriver")]
         {
-            let msg = "'webdriver_download' feature disabled. Please install a '{CHROMEDRIVER_NAME}' version manually and make the environment variable 'WEBDRIVER_PATH' point to it.".to_string();
+            let msg = format!("'webdriver_download' feature disabled. Please install a '{CHROMEDRIVER_NAME}' version manually and make the environment variable 'WEBDRIVER_PATH' point to it.");
             println!("cargo::warning={msg}");
         }
         #[cfg(feature = "geckodriver")]

plotly_static/examples/main.rs plotly_static/examples/generate_static.rsplotly_static/examples/main.rs renamed to plotly_static/examples/generate_static.rs

@@ -13,7 +13,7 @@ use serde_json::Value;
 #[command(version)]
 struct Cli {
     /// Input file containing Plotly JSON (use '-' for stdin)
-    #[arg(short, long, default_value = "-")]
+    #[arg(short, long, required = true, default_value = "-")]
     input: String,
 
     /// Output file path

…ly_static/examples/test_chrome_binary.rs …otly_static/examples/test_chrome_path.rsplotly_static/examples/test_chrome_binary.rs renamed to plotly_static/examples/test_chrome_path.rs plotly_static/examples/test_chrome_binary.rs renamed to plotly_static/examples/test_chrome_path.rs

@@ -958,7 +958,7 @@ impl StaticExporter {
     }
 
     fn static_export(&mut self, plot: &PlotData<'_>) -> Result<String> {
-        let data_uri = template::html_body(self.offline_mode);
+        let data_uri = template::get_html_body(self.offline_mode);
         let runtime = self.runtime.clone();
         runtime
             .block_on(self.extract(&data_uri, plot))

plotly_static/src/lib.rs

@@ -53,27 +53,27 @@ pub(crate) const PDF_EXPORT_JS_SCRIPT: &str = r##"
         callback('ERROR:html2pdf library not loaded');
         return;
     }
-    
+
     console.log('html2pdf library is available');
 
     let tempDiv = null;
     let mmWidth, mmHeight;
 
     Plotly.newPlot(graph_div, plot).then(function() {
         console.log('Plotly plot created successfully');
-        
+
         return Plotly.toImage(graph_div, {
         format: format,
         width: width,
         height: height,
         });
     }).then(function(dataUrl) {
         console.log('Plotly image generated successfully');
-        
+
         // Convert px to mm: 1px = 0.264583 mm
         mmWidth = width * 0.264583;
         mmHeight = height * 0.264583;
-        
+
         console.log('PDF dimensions (mm):', mmWidth, 'x', mmHeight);
 
         // Create a temporary div for the image
@@ -112,22 +112,22 @@ pub(crate) const PDF_EXPORT_JS_SCRIPT: &str = r##"
         });
     }).then(function() {
         console.log('Starting PDF generation...');
-        
+
         // Generate PDF with more robust configuration
         return html2pdf().from(tempDiv).set({
             margin: 0,
             filename: 'plotly-plot.pdf',
             image: { type: 'jpeg', quality: 1 },
-            html2canvas: { 
-                scale: 1, 
-                backgroundColor: '#fff', 
+            html2canvas: {
+                scale: 1,
+                backgroundColor: '#fff',
                 useCORS: true,
                 allowTaint: true,
                 logging: true
             },
-            jsPDF: { 
-                unit: 'mm', 
-                format: [mmWidth, mmHeight], 
+            jsPDF: {
+                unit: 'mm',
+                format: [mmWidth, mmHeight],
                 orientation: mmWidth > mmHeight ? 'landscape' : 'portrait',
                 compress: true
             }
@@ -149,16 +149,20 @@ pub(crate) const PDF_EXPORT_JS_SCRIPT: &str = r##"
     });
 "##;
 
-pub(crate) fn html_body(offline: bool) -> String {
+pub(crate) fn get_html_body(offline: bool) -> String {
     let offline_js = offline_js_sources();
     let cdn_js = online_js_cdn();
+    if offline {
+        html_body(&offline_js)
+    } else {
+        html_body(&cdn_js)
+    }
+}
 
+pub(crate) fn html_body(js_source: &str) -> String {
     // HTML with embedded script
-    let html = if offline {
-        format!(
-            r#"
-        <!doctype html>
-
+    let html = format!(
+        r#"
         <html lang="en">
         <style>
             /* Ensures the image has no extra spacing */
@@ -167,41 +171,16 @@ pub(crate) fn html_body(offline: bool) -> String {
                 margin: 0;
                 padding: 0;
                 background: white;
-        }}
+            }}
         </style>
-            <head>
-                {offline_js}
-            </head>
-            <body>
-                <div id="plotly-html-element" hidden></div>
-            </body>
+        <head>
+            {js_source}
+        </head>
+        <body>
+            <div id="plotly-html-element" hidden></div>
+        </body>
         </html>"#
-        )
-    } else {
-        format!(
-            r#"
-        <!doctype html>
-        <html lang="en">
-        <style>
-            /* Ensures the image has no extra spacing */
-            #plotly-img-element {{
-                display: block;
-                margin: 0;
-                padding: 0;
-                background: white;
-        }}
-        </style>
-            <head>
-                {cdn_js}
-            </head>
-            <body>
-                <div>
-                </div>
-                <div id="plotly-html-element" hidden></div>
-            </body>
-        </html>"#
-        )
-    };
+    );
 
     #[cfg(not(test))]
     if log_enabled!(Debug) {
@@ -216,7 +195,6 @@ pub(crate) fn html_body(offline: bool) -> String {
 /// Save the html file to a temporary file
 #[allow(unused)]
 pub(crate) fn to_file(data: &str) -> Result<PathBuf> {
-    debug!("Generate plotly html file");
     use std::env;
     // Set up the temp file with a unique filename.
     let mut tmp_path = env::temp_dir();
@@ -225,6 +203,8 @@ pub(crate) fn to_file(data: &str) -> Result<PathBuf> {
     plot_name = format!("plotly_{plot_name}");
     tmp_path.push(plot_name);
 
+    debug!("Write template plotly html file to {tmp_path:?}");
+
     // Save the rendered plot to the temp file.
     let temp_path = tmp_path
         .to_str()

plotly_static/src/template.rs

@@ -14,11 +14,11 @@ use std::process::{Child, Command, Stdio};
 use std::sync::{Arc, Mutex};
 use std::thread;
 #[cfg(test)]
-use std::{println as info, println as error, println as debug, println as warn};
+use std::{println as info, println as error, println as debug, println as warn, println as trace};
 
 use anyhow::{anyhow, Result};
 #[cfg(not(test))]
-use log::{debug, error, info, warn};
+use log::{debug, error, info, trace, warn};
 
 /// Environment variable for specifying the WebDriver binary path
 const WEBDRIVER_PATH_ENV: &str = "WEBDRIVER_PATH";
@@ -153,7 +153,6 @@ impl WebDriver {
 
         let mut wd = Self::new(port)?;
         wd.spawn_webdriver()?;
-        // Verify that the WebDriver is now running
         if Self::is_webdriver_running(port) {
             info!("Successfully created and started WebDriver on port {port}");
             Ok(wd)
@@ -175,25 +174,19 @@ impl WebDriver {
 
         info!("Spawning {WEBDRIVER_BIN} on port {port} with path: {driver_path:?}");
 
-        // Early return if WebDriver is already running
         if Self::is_webdriver_running(port) {
             warn!("WebDriver already running on port {port}, attempting to connect instead");
             return Ok(());
         }
 
-        // Validate prerequisites
         self.validate_spawn_prerequisites()?;
 
-        // Spawn the process
         let mut child = self.spawn_process(&driver_path, port)?;
 
-        // Set up output monitoring
         self.setup_output_monitoring(&mut child, port);
 
-        // Store the child process
         self.store_child_process(child);
 
-        // Wait for WebDriver to become ready
         self.wait_for_ready(port)
     }
 
@@ -323,7 +316,7 @@ impl WebDriver {
                 info!("Starting stderr monitoring for WebDriver on port {port_for_logging}");
                 let stderr_lines = BufReader::new(stderr).lines();
                 for line in stderr_lines.map_while(Result::ok) {
-                    debug!("WebDriver[{port_for_logging}] stderr: {line}");
+                    trace!("WebDriver[{port_for_logging}] stderr: {line}");
                 }
                 info!("Stderr monitoring ended for WebDriver on port {port_for_logging}");
             });
@@ -336,7 +329,7 @@ impl WebDriver {
                 info!("Starting stdout monitoring for WebDriver on port {port_for_logging}");
                 let stdout_lines = BufReader::new(stdout).lines();
                 for line in stdout_lines.map_while(Result::ok) {
-                    debug!("WebDriver[{port_for_logging}] stdout: {line}");
+                    trace!("WebDriver[{port_for_logging}] stdout: {line}");
                 }
                 info!("Stdout monitoring ended for WebDriver on port {port_for_logging}");
             });