mkwebook 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f05f13d7aa2f3eb2d0ce89b1adc5a49996a046b417a4600212b7e2b8f4f50e9
-  data.tar.gz: 999962eb75333d346ebac90507823254a29a50a74e6e8b84c276d62e5e51434d
+  metadata.gz: 0f8fc12f211be95d5f471f231318136663987e920e2dfd1345118d68eb0bc420
+  data.tar.gz: ec4a088bd415a554c232a85692eba1e1983d4bf75941be8f5a8a76b6578f99b3
 SHA512:
-  metadata.gz: ef91c55e562cda474850d02750b5b460a599b5d83db40980d55e634780e160a61066a7485683e557b8ea745fc0f21cb24de90d811f48353e0e7a8cec89404279
-  data.tar.gz: cb59bd6495a13d81d5657eb14aaaef8d3b2d1c8bfb80f50d64daa61f0ca3bac4980bc2fef0475ac623b462ef99eac0c44af07fe3173088e4edf830bd943aa1b7
+  metadata.gz: 1ed276076ec77a9ed76386232f77282c350ae206fa2b7d477274dc3cfe460817fcf33c9f5e05c7ed4493333df001cfaa9f81dcfcc8bab524caeecadeb04c1037
+  data.tar.gz: 55830b7666568be18a1cdcce720d701c9e33a2121c4e568b1656fca303c71b82911dc3ecf4bd8d4233af64f85bb27b6e7b6c540f2963eec8ef627c300ea38d6e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mkwebook (0.1.5)
+    mkwebook (0.1.7)
       activesupport (>= 6.1.5)
       concurrent-ruby
       ferrum (>= 0.13)

data/lib/mkwebook/app.rb

@@ -152,7 +152,7 @@ module Mkwebook
 
             if page_link_selector = page_config[:page_link_selector]
               page_links = page_elements.flat_map do |element|
-                element.css(page_link_selector).map { |a| a.evaluate('this.href') }
+                element.css(page_link_selector).map { |a| a.evaluate('this.href') rescue nil }.compact
               end.uniq
               @page_links[url] = page_links
             end
@@ -170,6 +170,7 @@ module Mkwebook
               element.css('a').each do |a|
                 u = a.evaluate('this.href') rescue nil
                 next unless u.present?
+                next unless u =~ /^https?:\/\//
                 href = u.normalize_uri('.html').relative_path_from(url.normalize_uri('.html'))
                 file = u.normalize_file_path('.html')
                 a.evaluate <<~JS
@@ -293,12 +294,14 @@ module Mkwebook
       end
 
       elements.uniq.compact.each do |element|
+        puts element if @cli_options[:print_entries]
         name = element['name']
         type = element['type']
         path = element['path'].sub(%r{.*\.docset/Contents/Resources/Documents}, '')
         db.execute('INSERT OR IGNORE INTO searchIndex(name, type, path) VALUES (?, ?, ?);', [name, type, path])
       end
 
+
       plist_content = <<-PLIST
         <?xml version="1.0" encoding="UTF-8"?>
         <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">

data/lib/mkwebook/cli.rb

@@ -33,6 +33,7 @@ module Mkwebook
 
     option :limit, :type => :numeric, :aliases => '-l', :desc => 'Limit number of pages, specially for debugging'
     option :list, :type => :boolean, :aliases => '-L', :desc => 'List all available Dash.app entry types'
+    option :print_entries, :type => :boolean, :aliases => '-p', :desc => 'Print extracted entries'
     desc 'docset', 'Create docset'
     def docset
       if options[:list]

data/lib/mkwebook/ext/string.rb

@@ -16,6 +16,8 @@ class String
   def normalize_file_path(force_extname = nil)
     return self unless present?
     uri = URI.parse(self)
+    return unless uri.scheme.in? %w(http https)
+    return unless uri.path.present?
     file_path = uri.path[1..]
     extname = force_extname || File.extname(file_path)
     basename = File.basename(file_path, extname)
@@ -27,6 +29,8 @@ class String
   def normalize_uri(force_extname = nil)
     return self unless present?
     uri = URI.parse(self)
+    return unless uri.scheme.in? %w(http https)
+    return unless uri.path.present?
     file_path = uri.path[1..]
     extname = force_extname || File.extname(file_path)
     basename = File.basename(file_path, extname)

data/lib/mkwebook/version.rb

@@ -1,3 +1,3 @@
 module Mkwebook
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkwebook
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-13 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport