From 5e15238cf28ec448d67b114152230d1f0f4dbe17 Mon Sep 17 00:00:00 2001
From: Urgau <urgau@numericable.fr>
Date: Mon, 13 Oct 2025 08:47:48 +0200
Subject: [PATCH 1/2] Revert "Merge pull request #2199 from
 Urgau/gha-logs-better-uncopy"

This reverts commit b6ec1198290358530e09689ffafe95abe3e95729, reversing
changes made to a983074f3240121ad98c8beb37e0ea952dbd15d4.
---
 src/gha_logs.rs | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/gha_logs.rs b/src/gha_logs.rs
index e6a8ae933..8f421090c 100644
--- a/src/gha_logs.rs
+++ b/src/gha_logs.rs
@@ -211,30 +211,19 @@ pub async fn gha_logs(
     <title>{job_name} - {owner}/{repo}@{short_sha}</title>
     {icon_status}
     <style>
-:root {{
-    --timestamp-length: 28ch;
-}}
 body {{
   font: 14px SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
   background: #0C0C0C;
   color: #CCC;
   white-space: pre;
-  padding-left: calc(var(--timestamp-length) + 1ch);
-  margin: 0;
 }}
 .timestamp {{
   color: #848484;
   text-decoration: none;
-  position: absolute;
-  left: 0;
-  width: var(--timestamp-length);
 }}
 .timestamp:hover {{
   text-decoration: underline;
 }}
-.timestamp::before {{
-  content: attr(data-timestamp);
-}}
 .error-marker {{
   scroll-margin-bottom: 15vh;
   color: #e5534b;
@@ -286,9 +275,9 @@ body {{
         }}
 
         // 3. Add a self-referencial anchor to all timestamps at the start of the lines
-        const dateRegex = /^(\d{{4}}-\d{{2}}-\d{{2}}T\d{{2}}:\d{{2}}:\d{{2}}\.\d+Z) /gm;
-        html = html.replace(dateRegex, (match, ts) => 
-            `<a id="${{ts}}" href="#${{ts}}" class="timestamp" data-timestamp="${{ts}}"></a>`
+        const dateRegex = /^(\d{{4}}-\d{{2}}-\d{{2}}T\d{{2}}:\d{{2}}:\d{{2}}\.\d+Z)/gm;
+        html = html.replace(dateRegex, (ts) => 
+            `<a id="${{ts}}" href="#${{ts}}" class="timestamp">${{ts}}</a>`
         );
 
         // 4. Add a anchor around every "##[error]" string
@@ -348,9 +337,11 @@ body {{
             }});
         }}
 
-        // 8. Add a copy handler that force plain/text copy
+        // 8. Add a copy handler that force plain/text copy and removes the timestamps
+        //  from the copied selection.
+        const dateRegexWithSpace = /^(\d{{4}}-\d{{2}}-\d{{2}}T\d{{2}}:\d{{2}}:\d{{2}}\.\d+Z )/gm;
         document.addEventListener("copy", function(e) {{
-            var text = window.getSelection().toString();
+            var text = window.getSelection().toString().replace(dateRegexWithSpace, '');
             e.clipboardData.setData('text/plain', text);
             e.preventDefault();
         }});

From c5b3e75f55b0ebc9dd25f2e85f67206e9a3357d5 Mon Sep 17 00:00:00 2001
From: Urgau <urgau@numericable.fr>
Date: Mon, 13 Oct 2025 11:56:43 +0200
Subject: [PATCH 2/2] Prefer using an HTML table with `user-select: none` in
 GHA logs

---
 src/gha_logs.rs | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/gha_logs.rs b/src/gha_logs.rs
index 8f421090c..8dacfe4f0 100644
--- a/src/gha_logs.rs
+++ b/src/gha_logs.rs
@@ -219,6 +219,7 @@ body {{
 }}
 .timestamp {{
   color: #848484;
+  user-select: none;
   text-decoration: none;
 }}
 .timestamp:hover {{
@@ -270,14 +271,19 @@ body {{
         var html = ansi_up.ansi_to_html(logs);
 
         // 2. Remove UTF-8 useless BOM
-        if (html.charCodeAt(0) === 0xFEFF) {{
-            html = html.substr(1);
-        }}
-
-        // 3. Add a self-referencial anchor to all timestamps at the start of the lines
-        const dateRegex = /^(\d{{4}}-\d{{2}}-\d{{2}}T\d{{2}}:\d{{2}}:\d{{2}}\.\d+Z)/gm;
-        html = html.replace(dateRegex, (ts) => 
-            `<a id="${{ts}}" href="#${{ts}}" class="timestamp">${{ts}}</a>`
+        html = html.replace(/^\uFEFF/gm, "");
+        
+        // 3. Transform each log lines that doesn't start with a timestamp into a row where everything is in the second column
+        const untsRegex = /^(?!\d{{4}}-\d{{2}}-\d{{2}}T\d{{2}}:\d{{2}}:\d{{2}}\.\d+Z)(.*)$/gm;
+        html = html.replace(untsRegex, (match, log) => 
+            `<tr><td></td><td>${{log}}</td></tr>`
+        );
+        
+        // 3.b Transform each log lines that start with a timestamp in a row with two columns and make the timestamp be a
+        //  self-referencial anchor.
+        const tsRegex = /^(\d{{4}}-\d{{2}}-\d{{2}}T\d{{2}}:\d{{2}}:\d{{2}}\.\d+Z) (.*)$/gm;
+        html = html.replace(tsRegex, (match, ts, log) => 
+            `<tr><td><a id="${{ts}}" href="#${{ts}}" class="timestamp">${{ts}}</a></td><td>${{log}}</td></tr>`
         );
 
         // 4. Add a anchor around every "##[error]" string
@@ -324,8 +330,8 @@ body {{
             return `${{boundary_start}}<a href="https://github.com/{owner}/{repo}/blob/{sha}/${{path}}${{pos}}" class="path-marker">${{inner}}</a>${{boundary_end}}`;
         }});
 
-        // 6. Add the html to the DOM
-        document.body.innerHTML = html;
+        // 6. Add the html to the table
+        document.getElementById("logs").innerHTML = html;
 
         // 7. If no anchor is given, scroll to the last error
         if (location.hash === "" && errorCounter >= 0) {{
@@ -337,11 +343,9 @@ body {{
             }});
         }}
 
-        // 8. Add a copy handler that force plain/text copy and removes the timestamps
-        //  from the copied selection.
-        const dateRegexWithSpace = /^(\d{{4}}-\d{{2}}-\d{{2}}T\d{{2}}:\d{{2}}:\d{{2}}\.\d+Z )/gm;
+        // 8. Add a copy handler that force plain/text copy
         document.addEventListener("copy", function(e) {{
-            var text = window.getSelection().toString().replace(dateRegexWithSpace, '');
+            var text = window.getSelection().toString();
             e.clipboardData.setData('text/plain', text);
             e.preventDefault();
         }});
@@ -353,6 +357,14 @@ body {{
     </script>
 </head>
 <body>
+<table style="table-layout: fixed; width: 100%">
+    <colgroup>
+        <col style="width: 29ch">
+        <col style="width: 100%">
+    </colgroup>
+    <tbody id="logs">
+    </tbody>
+</table>
 </body>
 </html>"###,
     );