joplin 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74c549d0f51425533265897cf2432dc52bfa866ef89f91bfaeb8565939b6c0ff
-  data.tar.gz: 46b1ee7c947603256778c0df08ba027d964d5451594374323a9a5dd2059f4afa
+  metadata.gz: 709555c1917e195e956c526a75979ea74deb8f3da829afe0f6d34ab7d074fad5
+  data.tar.gz: a09ac659f62def224a04adf7766d90231d8034335190dc99402d7b3715a763f3
 SHA512:
-  metadata.gz: b1c2eefbb3fa1405d54395ab787c9bd69fda22d8f6f84cba0f7efe792f93b70c6a557d09b7059a525e301ef26233cd5dc2d0c0fa4835f400d5b809e06101da95
-  data.tar.gz: 5367467b053246881bc9a4d539641765141984b77de421c7efa31d01509ffe6d7b30c94e2d9d5eabd8962cb5a4ef794dd7433674e20dd9fca4e5c142bf70804b
+  metadata.gz: a53a2aae8f8a7c073cbef92668097171a5038357ad8c16c045e01b4336b16b4369abef498ecb0961dfa14b8592be1b34c0998a4da37e3470e602e314d7f01f91
+  data.tar.gz: 50f3207ad27c7eaa968fa031b4bd3b052c8d58014701f2d64166b8594a753fa9422e03e7ecedb758bdce9f9e11a188e19e8a2046ee493ec0f57e08ee79618bc3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    joplin (0.5.2)
+    joplin (1.0.1)
       http (~> 5.1.1)
       sqlite3 (~> 1.6.3)
       thor (~> 1.2.2)

data/bin/joplin

@@ -4,6 +4,7 @@ $:.unshift File.expand_path('../lib', __dir__)
 
 require 'joplin'
 require 'thor'
+require 'yaml'
 
 DIVIDER = %(
 
@@ -70,14 +71,34 @@ class MyCLI < Thor
   desc :epub,
        'build a note from a note (help build), write the note, and create an epub from the result. needs pandoc installed'
 
+  long_desc <<-DESC
+    If the building note has a yaml descriptor https://pandoc.org/MANUAL.html#epubs
+    then the epub will end up having the meta data.
+
+    Below is an example note. The for the referenced note are a result from using Joplin's webclipper on https://fiachetti.gitlab.io/mastering-roda/
+
+    ---\n
+    title: Mastering Roda\n
+    author: Federico Iachetti\n
+    rights:   Creative Commons Attribution 4.0 International License\n
+    language: en-US\n
+    ...
+
+    [Mastering Roda](:/ca267a317fa544f99f559040696f1cae)
+  DESC
+
   def epub(id)
+    abort 'You need to install pandoc and have it in your path' unless has_exec? 'pandoc'
+    build_note = Joplin::Note.new(id:)
     note = build(id)
-    write(note.id)
+    note.write
+    build_note.write note.title
     FileUtils.cd note.title
     `pandoc '#{note.title}.md' -o '../#{note.title}.epub' -t epub3 -f markdown+smart --title '#{note.title}' --toc --toc-depth=3 --metadata title='#{note.title}'`
     note.delete!
     FileUtils.cd '..'
     FileUtils.rm_rf note.title
+    abort 'Omg. pandoc failed!' if $?.exitstatus != 0
     puts "OK. Done. Your book is #{note.title}.epub"
   end
 
@@ -92,25 +113,39 @@ class MyCLI < Thor
     token
     note = Joplin::Note.new(id:)
     notes = []
-    title = nil
     note.body.each_line do |line|
-      title = ::Regexp.last_match(1) if line =~ /title: (.*)$/
-      line =~ %r{\(:/(\w+)\)}
+      match = line.match %r{!?\[(.*)?\]\(:/(\w+)\)}
+      next unless match
+      next if match[0][0] == '!'
+
       begin
-        notes.push Joplin::Note.new id: ::Regexp.last_match(1) if ::Regexp.last_match(1) && ::Regexp.last_match(1)
+        notes.push Joplin::Note.new id: match[2]
       rescue Joplin::Note::NotFound
-        puts "Couldn't find note with id #{id} so we skip it"
+        puts "Couldn't find note with id #{id} so we skip it. Maybe an image"
       end
     end
+    yml = extract_yaml_header_for_epub(note)
     new_note = Joplin::Note.new parent_id: note.parent_id
-    new_note.title = title || "built: #{note.title}"
-    new_note.body = notes.map { |n| "\# #{n.title}\n\n#{n.body}" }.join
+    new_note.title = yml ? yml['title'] : "built: #{note.title}"
+    new_note.body = "#{Psych.dump yml}...\n" if yml
+    new_note.body += notes.map { |n| "\# #{n.title}\n\n#{n.body}" }.join
     new_note.save!
     new_note
   end
 
   private
 
+  def extract_yaml_header_for_epub(note)
+    yml = Psych.load note.body
+    return nil unless yml.is_a? Hash
+
+    yml
+  end
+
+  def has_exec?(command)
+    !`which #{command}`.empty?
+  end
+
   def token
     Joplin.token = Joplin.get_token || options[:token]
     return if Joplin.token

data/lib/joplin/version.rb

@@ -1,3 +1,3 @@
 module Joplin
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/joplin.rb

@@ -129,15 +129,15 @@ module Joplin
       end
     end
 
-    def write
-      Dir.mkdir title
-      Dir.mkdir "#{title}/resources"
+    def write(path = nil)
+      dir = path || title
+      FileUtils.mkdir_p "#{dir}/resources"
       body_to_write = String(body) # make a copy
       resources.each do |resource|
-        resource.write "#{title}/resources/#{resource.id}"
+        resource.write "#{dir}/resources/#{resource.id}"
         body_to_write.gsub!(%r{:/#{resource.id}}, "./resources/#{resource.id}")
       end
-      IO.write "#{title}/#{title}.md", body_to_write
+      IO.write "#{dir}/#{title}.md", body_to_write
     end
 
     def to_json(*_args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joplin
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Daniel Bretoi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-01 00:00:00.000000000 Z
+date: 2023-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http