joplin 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a548230abdb46652ed58a42e17cf54ae2d6588469c048195885d103da825529
-  data.tar.gz: b91fa6b4827d935cc1bd0733f77612f00912b9b447b2a920df9a38bb511ba90a
+  metadata.gz: 7fada7c3ac2927ba5715b67437eac2fa1df0a33a24596e7a8619beadcabe27d2
+  data.tar.gz: 694472244aad50df5c84395b647b40840e8aff6eafe76903ccd667806aeed50e
 SHA512:
-  metadata.gz: 798618899c8e96cab2d8baaba45bad5c6e67bb72ca502564e5f1b385740fda0df2921a6627c19e4d2ceffa6e6c5c205c41bee8053379472f1929bbe36bca763e
-  data.tar.gz: ea96a14efefb18c14d468722eee148f1ae75dc62af31a8eabb548e6d8f0fe1ac7e67927f9dff85336cb6650873621120b8cf36169d884200b16b7a7d493d1ed2
+  metadata.gz: 5d006b40cf72590d3c193cd71bf918044f06d4c379447d492c869b3c6533aaa0835196e7219d5ca9e483707206e7c739849d39a925d06542b2ced1dfdb742d77
+  data.tar.gz: ffd27223a512c4538bb5e9156ad1ef1825a5f0123afc45907c2eeba4be719cd7ae0a596b2c638147cec3e76fe1a7cba0390321bcaeb93e5da3b07bade3bdf2a3

data/Gemfile

@@ -8,3 +8,5 @@ gemspec
 gem "faraday", "~> 1.0"
 
 gem "thor", "~> 1.0"
+
+gem "sqlite3", "~> 1.4"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    joplin (0.1.3)
+    joplin (0.2.2)
       faraday (~> 1.0)
 
 GEM
@@ -25,6 +25,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
+    sqlite3 (1.4.2)
     thor (1.0.1)
 
 PLATFORMS
@@ -36,6 +37,7 @@ DEPENDENCIES
   joplin!
   rake (~> 13.0)
   rspec (~> 3.0)
+  sqlite3 (~> 1.4)
   thor (~> 1.0)
 
 BUNDLED WITH

data/Makefile

@@ -5,4 +5,7 @@ push: clean all
 	gem push *gem
 
 clean:
-	rm *gem
+	rm -f *gem
+
+install: clean all
+	gem install --local *gem

data/README.md

@@ -22,9 +22,19 @@ updating a note
   note = Joplin::Notes.new "6e3811c7a73148a" # note id can be found in the information of any note
   note.title = "a new note title"
   note.save!
-end
 ```
 
+### A note on the token
+
+If you've got joplin installed, you can do:
+
+``` ruby
+require "joplin/token"
+token = Joplin::Token.get
+```
+
+to get the token programatically. It reads from the sqlite database located in `~/.config/joplin-desktop`
+
 
 ## CLI
 
@@ -32,4 +42,4 @@ end
 
 Will take a notebook and concatenate all notes into one for easy export to PDF
 
-
+The token argument is optional and if you have it installed locally it will find the token

data/bin/joplin

@@ -4,6 +4,18 @@ $:.unshift File.expand_path("../../lib", __FILE__)
 
 require "joplin"
 require 'thor'
+require "joplin/token"
+
+DIVIDER = %Q(
+
+<svg height="50" width="460">
+  <style> .line { stroke-width: 1px; fill: black; stroke: black; } </style>
+  <g id="triangle"><path d="M0 30 L200 30  Q 220 25 200 35 Z" class="line" /></g>
+  <use xlink:href="#triangle" transform="scale(-1 1) translate(-450 0)"/>
+  <circle cx="225" cy="32" r="7" class="line"/>
+</svg>
+
+)
 
 
 class MyCLI < Thor
@@ -12,14 +24,16 @@ class MyCLI < Thor
   class_option :version, :type => :boolean
   map ["-v", "--version"] => :version
   map ["-h", "--help"] => :help
-  option :token, :required => true
+  option :token
   option :'dry-run', desc: "dry-run", aliases: '-n'
   desc :clean, "clean unused resources"
   def clean
-    Joplin::token = options[:token]
+    Joplin::token = options[:token] || Joplin::Token.get
+    puts "Please wait, this can take while."
     Joplin::Resource.orphaned.map { |r|
       r.delete if not options['dry-run']
-      puts "Deleted #{r.id}"
+      would = "would have " if options['dry-run']
+      puts "#{would}deleted #{r.id}"
     }
   end
 
@@ -30,10 +44,11 @@ class MyCLI < Thor
   end
 
   desc :nb2n, "concate all notes in a notebook to one note. Possible PDF export"
-  option :token, :required => true
+  long_desc "The idea is to make a big note from all the notes in a notebook. PDF export or whatever export can happen from that. The notes are concatenated with a separator."
+  option :token
   option :type, :type => :string
   def nb2n(query)
-    Joplin::token = options[:token]
+    Joplin::token = options[:token] || Joplin::Token.get
     results = Joplin.search(query, { type: 'folder' })
     nb = results[0];
     if not (nb and nb['title'] == query)
@@ -44,21 +59,40 @@ class MyCLI < Thor
     notes = notebook.notes
     new_note = Joplin::Note.new
     new_note.title = query
-    divider = %Q(
+    new_note.body = notes.map { |n| "\# #{n.title}\n\n#{n.body}" }.join(DIVIDER)
+    new_note.save!
+    puts "Saved: #{new_note.title} with id: #{new_note.id}"
+  end
 
-<svg height="50" width="460">
-  <style> .line { stroke-width: 1px; fill: black; stroke: black; } </style>
-  <g id="triangle"><path d="M0 30 L200 30  Q 220 25 200 35 Z" class="line" /></g>
-  <use xlink:href="#triangle" transform="scale(-1 1) translate(-450 0)"/>
-  <circle cx="225" cy="32" r="7" class="line"/>
-</svg>
+  desc :build, "build a note from a note containing references"
 
-)
+  long_desc %Q(Takes a note and looks up all the referenced notes and makes a new
+  note from those. The notes are concatenated with a separator.\n\nIf you have a
+  line with 'title: a title' then it will be used for the title of the built
+  email.)
 
-    new_note.body = notes.map { |n| "\# #{n.title}\n\n#{n.body}" }.join(divider)
+  def build(id)
+    token
+    note = Joplin::Note.new id
+    notes = []
+    title = nil
+    note.body.each_line { |line|
+      title = $1 if line =~ /title: (.*)$/
+      line =~ /\(:\/([^)]+)\)/
+      notes.push Joplin::Note.new $1 if $1
+    }
+    new_note = Joplin::Note.new
+    new_note.title = title || "built: #{note.title}"
+    new_note.body = notes.map { |n| "\# #{n.title}\n\n#{n.body}" }.join(DIVIDER)
     new_note.save!
     puts "Saved: #{new_note.title} with id: #{new_note.id}"
   end
+
+  private
+  def token()
+    Joplin::token = options[:token] || Joplin::Token.get
+    raise "Couldn't find token in local database and it wasn't passed as an option. You better check yourself!" if not Joplin::token
+  end
 end
 
 MyCLI.start(ARGV)

data/lib/joplin.rb

@@ -133,7 +133,9 @@ body: #{self.body}"""
 
     private
     def parse response
-      return if not response.body
+      if response.body.empty?
+        raise "No note found with id #{@id}"
+      end
       note = JSON.parse response.body
       if response.status != 200
         raise Error.new note["error"]

data/lib/joplin/token.rb

@@ -0,0 +1,14 @@
+require "sqlite3"
+module Joplin
+  module Token
+    def self.get
+      begin
+        db = SQLite3::Database.new "#{ENV['HOME']}/.config/joplin-desktop/database.sqlite"
+        rows = db.execute("select value from settings where key='api.token';")
+        return rows.flatten.first
+      rescue
+        return nil
+      end
+    end
+  end
+end

data/lib/joplin/version.rb

@@ -1,3 +1,3 @@
 module Joplin
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joplin
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Bretoi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -102,6 +102,7 @@ files:
 - bin/setup
 - joplin.gemspec
 - lib/joplin.rb
+- lib/joplin/token.rb
 - lib/joplin/version.rb
 homepage: http://github.com/danielb2/joplin
 licenses: