From 1dc94c737a12e0b216a351be133c338362ec99d3 Mon Sep 17 00:00:00 2001
From: Alex Miller <apmiller108@yahoo.com>
Date: Mon, 9 Apr 2018 20:59:57 -0400
Subject: [PATCH] Update codeblock regex - fix multiple codeblocks

- Remove local `code_block` variable and rely on matched pattern to
convert multiple code blocks.
- Sometimes exported enex files do not contain the `-en-codeblock` tag.  This
uses the border style attribute to match the code block.
---
 lib/ever2boost/md_converter.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/ever2boost/md_converter.rb b/lib/ever2boost/md_converter.rb
index 52926cc..433bb03 100644
--- a/lib/ever2boost/md_converter.rb
+++ b/lib/ever2boost/md_converter.rb
@@ -2,6 +2,7 @@
 
 module Ever2boost
   class MdConverter
+    CODE_BLOCK_REGEX = %r{<div\s(.*?)border:\s1px\ssolid\srgba\((0,\s){3}0\.14902\)(.*?)(-en-codeblock)?(.*?)><div(.*?)>(<span(.*?)>)?(.*?)(<\/span>)?<\/div><\/div>}
     class << self
       # params: String
       #   "<note>(/.*/)</note>" (import)
@@ -20,16 +21,13 @@ def convert(note_content)
           en_note.sub(/<tr(.*?)>(.*?)<\/tr>/m, '')
           number_of_row = $2.nil? ? 0 : $2.scan(/<\/td>/).size
 
-          en_note.gsub(/<div(.*?)-en-codeblock(.*?)><div(.*?)>(.*?)<\/div><\/div>/, '\n```\n\4\n```')
-          code_block = $4
-
           en_note.gsub(/<en-note(.*?)>(.*?)<\/en-note>/m, '\2')
                  .gsub(/<en-note\/>/, '')
                  .gsub(/<\/en-note>/, '')
                  .gsub(/\\n(\ *)/, '\n')
                  .gsub(/(\ *?)/m, '')
                  .gsub(/^\s*/, '')
-                 .gsub(/<div(.*?)-en-codeblock(.*?)><div(.*?)>(.*?)<\/div><\/div>/, "\n```\n#{code_block}\n```")
+                 .gsub(CODE_BLOCK_REGEX) { "\n```\n#{Regexp.last_match[9]}\n```\n" }
                  .gsub(/<div(.*?)>(.*?)<\/div>/m, '\2')
                  .gsub(/<div(.*?)>/, '')
                  .gsub(/<\/div>/, '')