mdless 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40b4de5e5f68bf91800f9f7448a8b3620c5f194b2966b786fe4621cd3ccc7ccc
-  data.tar.gz: ee00c4e594a1c2b6d3526e6c5e1c6a0143c2ad9800577b31e8f73f558df99500
+  metadata.gz: ef90f38be64fdcd4e3666782b957ac2a27ec4346103fa79a1760626977051a8f
+  data.tar.gz: 856113d17ab7217c28de2f2c2405acd185e99cdc4ca0370fbb73053371babab1
 SHA512:
-  metadata.gz: d4ba05b198c6ad16caeab6e0875fc3ef1b86181099e23a8cabf04063f73f4b6f22c2376d6f394c57165c76f7476c784e527918ea6213b978e413de8be4bb0943
-  data.tar.gz: 76eb9fc848d10f82e557cfe880204252719c5d3aad9d5e6cee70c44c25a6d10ad1fce5493b025a97dc7fd1ddf127a10ff7fc2fd6b04e9bd400dd7f720467b9e4
+  metadata.gz: f291d6eef35c904afc13adecc673db8736b002e556fc55f311cae6721685868f709cc285cf2a2906657933a05f385ce5168190e8672f16a672b8dd41f3bb7d1c
+  data.tar.gz: 75c67e0498a10ff7c26d2b9f9d43808174826807369650b33918ba0b63342cfaf1ae359530f957db2b9c403026918783d3411a291f92b732e6a2921efccd15b0

data/lib/mdless/console.rb

@@ -349,9 +349,9 @@ module Redcarpet
               end
             elsif exec_available('chafa')
               @log.info('Using chafa for image rendering')
-              term = '-f sixels'
-              term = ENV['TERMINAL_PROGRAM'] =~ /iterm/i ? '-f iterm' : term
-              term = ENV['TERMINAL_PROGRAM'] =~ /kitty/i ? '-f kitty' : term
+              term = ''
+              term = ENV['TERM_PROGRAM'] =~ /iterm/i ? '-f iterm' : term
+              term = ENV['TERM_PROGRAM'] =~ /kitty/i ? '-f kitty' : term
               FileUtils.rm_r '.mdless_tmp', force: true if File.directory?('.mdless_tmp')
               Dir.mkdir('.mdless_tmp')
               Dir.chdir('.mdless_tmp')
@@ -377,11 +377,13 @@ module Redcarpet
               pre = !alt_text.nil? ? "    #{c(%i[d blue])}[#{alt_text.strip}]\n" : ''
               post = !title.nil? ? "\n    #{c(%i[b blue])}-- #{title} --" : ''
               if exec_available('imgcat')
-                img = `imgcat "#{img_path}"`
+                img = `imgcat -p "#{img_path}"`
+                @log.info("Rendering image with `imgcat -p #{img_path}`")
               elsif exec_available('chafa')
-                term = '-f sixels'
-                term = ENV['TERMINAL_PROGRAM'] =~ /iterm/i ? '-f iterm' : term
-                term = ENV['TERMINAL_PROGRAM'] =~ /kitty/i ? '-f kitty' : term
+                term = ''
+                term = ENV['TERM_PROGRAM'] =~ /iterm/i ? '-f iterm' : term
+                term = ENV['TERM_PROGRAM'] =~ /kitty/i ? '-f kitty' : term
+                @log.info("Rendering image with `chafa #{term} #{img_path}`")
                 img = `chafa #{term} "#{img_path}"`
               end
               result = pre + img + post
@@ -572,7 +574,8 @@ module Redcarpet
 
       def preprocess(input)
         in_yaml = false
-        if input.split("\n")[0] =~ /(?i-m)^---[ \t]*?(\n|$)/
+        first_line = input.split("\n").first
+        if first_line =~ /(?i-m)^---[ \t]*?$/
           @log.info('Found YAML')
           # YAML
           in_yaml = true
@@ -596,10 +599,12 @@ module Redcarpet
           end
         end
 
-        if !in_yaml && input.gsub(/\n/, ' ') =~ /(?i-m)^[\w ]+:\s+\S+/
+        if !in_yaml && first_line =~ /(?i-m)^[\w ]+:\s+\S+/
           @log.info('Found MMD Headers')
           input.sub!(/(?i-m)^([\S ]+:[\s\S]*?)+(?=\n\n)/) do |mmd|
             lines = mmd.split(/\n/)
+            return mmd if lines.count > 20
+
             longest = lines.inject { |memo, word| memo.length > word.length ? memo : word }.length
             longest = longest < @cols ? longest + 1 : @cols
             lines.map do |line|

data/lib/mdless/converter.rb

@@ -47,11 +47,15 @@ module CLIMarkdown
         opts.on('-i', '--images=TYPE',
                 'Include [local|remote (both)] images in output (requires chafa or imgcat, default NONE).') do |type|
           if exec_available('imgcat') || exec_available('chafa')
-            if type =~ /^(r|b|a)/i
+            case type
+            when /^(r|b|a)/i
               @options[:local_images] = true
               @options[:remote_images] = true
-            elsif type =~ /^l/i
+            when /^l/i
               @options[:local_images] = true
+            when /^n/
+              @options[:local_images] = false
+              @options[:remote_images] = false
             end
           else
             @log.warn('images turned on but imgcat/chafa not found')

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '2.0.7'
+  VERSION = '2.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-23 00:00:00.000000000 Z
+date: 2023-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet