Fix parsing of HTML returned from raw API (#144)

* Fix parsing of HTML returned from raw API Github must have changed something on their end, the HTML seems to have changed a little. * Update gh-md-toc Co-authored-by: Vladyslav Diachenko <[email protected]> --------- Co-authored-by: Eugene Kalinin <[email protected]> Co-authored-by: Vladyslav Diachenko <[email protected]>
ekalinin · Sep 25, 2023 · c836e5e · c836e5e
1 parent 661b5c5
commit c836e5e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/gh-md-toc b/gh-md-toc
@@ -241,17 +241,17 @@ gh_toc_grab() {
         grepcmd="pcregrep -o"
         echoargs=""
         awkscript='{
-                     level = substr($0, length($0), 1)
-                     text = substr($0, match($0, /a>.*<\/h/)+2, RLENGTH-5)
+                     level = substr($0, 3, 1)
+                     text = substr($0, match($0, />[^<]*<span aria-hidden/)+1, RLENGTH-18)
                      href = substr($0, match($0, "href=\"([^\"]+)?\"")+6, RLENGTH-7)
                      '"$common_awk_script"'
                 }'
     else
         grepcmd="grep -Eo"
         echoargs="-e"
         awkscript='{
-                     level = substr($0, length($0), 1)
-                     text = substr($0, match($0, /a>.*<\/h/)+2, RLENGTH-5)
+                     level = substr($0, 3, 1)
+                     text = substr($0, match($0, />[^<]*<span aria-hidden/)+1, RLENGTH-18)
                      href = substr($0, match($0, "href=\"[^\"]+?\"")+6, RLENGTH-7)
                      '"$common_awk_script"'
                 }'
@@ -266,7 +266,7 @@ gh_toc_grab() {
     sed -e ':a' -e 'N' -e '$!ba' -e 's/\n<\/h/<\/h/g' |
 
     # find strings that corresponds to template
-    $grepcmd '<a.*id="user-content-[^"]*".*</h[1-6]' |
+    $grepcmd '<h.*id="user-content-[^"]*".*</h[1-6]' |
 
     # remove code tags
     sed 's/<code>//g' | sed 's/<\/code>//g' |
@@ -275,7 +275,7 @@ gh_toc_grab() {
     sed 's/<g-emoji[^>]*[^<]*<\/g-emoji> //g' |
 
     # now all rows are like:
-    #   <a id="user-content-..." href="..."><span ...></span></a> ... </h1
+    #   <h1 id="user-content-..."><a href="..."> ... <span ...></span></a></h1
     # format result line
     #   * $0 - whole string
     #   * last element of each row: "</hN" where N in (1,2,3,...)