kja 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a494c0ef1730b6813f9f86b400f24cd93882a2dc
-  data.tar.gz: 58270c1e3e31f06251481c8fccc74e192af24cfe
+SHA256:
+  metadata.gz: 1228c3a17d36ddc53f837e4e8d5b4000dd9554d38f621dc2495e3b03f6da64ac
+  data.tar.gz: da86bc75e88decc6d04a799dfc25dc645a7c515b0a2bbbf9fcf0cae1a68e7c8c
 SHA512:
-  metadata.gz: daf2bd34d8f5e627b55b69d033949f1f549f7c1aae99c3a5579df21d87c27e43abe0d72c274b039dfbd162e5e43b34759b3bfd210ca2d86e8fb2e0832ffbfe8f
-  data.tar.gz: 9dd62dd936930c8dde16ea6a80dbb988b406e2c6d09f2c5a4f3a3c8c31e06a531907e0bc09ccb4c8b47b9f05b0c49f16b03c409313cb3208865d14c23ae6b9a1
+  metadata.gz: f252c1900dc380411faed4fe482d1279c1599279e7d01133abd07be300b33cfc6e0036b403db8707431b4dbeef5e2b324fd82f5cfc0dbcda175a8bae92f83f85
+  data.tar.gz: 8f9395c86fc703766d69df3c1c1d378c925d59344885f07d4d1a46380ce0264f03859b7618dc3ccdb160899c0ed4d24f2cb5606eb9ed531e68b074bcabc734b7

data/lib/kja.rb

@@ -4,6 +4,9 @@
 
 require 'dynarex'
 require 'tempfile'
+require 'rxfreader'
+require 'kj_reading'
+require 'easyaudio_utils'
 
 
 # description: Intended for use with the kj gem
@@ -25,57 +28,122 @@ require 'tempfile'
 
 class Kja
 
-  def initialize(audio_player: '/usr/bin/ogg123 -q', 
-                 ogg_baseurl: 'http://rorbuilder.info/r/ruby/kja/ogg')
+  def initialize(audio_player: '/usr/bin/ogg123 -q',
+                 ogg_baseurl: 'http://a0.jamesrobertson.me.uk/'  \
+                + 'rorb/r/ruby/kja/ogg', debug: false)
 
     @ogg_baseurl, @audio_player = ogg_baseurl, audio_player
+    @debug = debug
 
   end
-  
+
   def duration(s)
 
-    book_no, book_title, chapter_no, verse_no = \
-      s.downcase.match(/^(?:(\d) )?([\w ]+) (\d+):(\d+)/).captures
+    book_title, chapter_title, verse_no = fracture(s)
 
-    book_title = book_no + '_' + book_title if book_no
-    chapter_title = book_title + '_' + chapter_no
     url = @ogg_baseurl + '/' + File.join(book_title, chapter_title, 'dir.xml')
 
     dx = Dynarex.new url
-    ogg = dx.find_by_name chapter_title + '_' + verse_no + '.ogg'    
+    ogg = dx.find_by_name chapter_title + '_' + verse_no + '.ogg'
     ogg.description[/\d+\.\d+$/].to_f
 
-  end  
+  end
+
+  # e.g. speak 'Eze 18, 30..32'
+  # plays the audio of the title requested
+  #
+  def speak(title)
+
+    a = KjReading.verses title
+
+    a.each do |x|
+
+      filename = download_ogg(x.title)
+      command = @audio_player + ' ' + filename
+      system command
+
+    end
+
+  end
+
+  # e.g. download 'Eze 18, 30..32'
+  # downloads the audio as an ogg file
+  #
+  def download(s, outfile=nil)
+
+    puts 'downloading ...' if @debug
+
+    a = KjReading.verses s
+
+    downloads = a.map do |x|
+      download_ogg(x.title)
+    end
+
+    puts 'converting to wav: ' + downloads.inspect if @debug
+
+    dir = File.dirname(Tempfile.new.path)
+
+    wavfiles = downloads.map do |oggfile|
+
+      wavfile = oggfile.sub(/\.ogg$/,'.wav')
+      EasyAudioUtils.new(oggfile, wavfile, working_dir: dir).convert
+      sleep 1.4
+      File.basename(wavfile)
 
-  def speak(s)
+    end
+
+    puts 'concatenating wav files ...' if @debug
+
+    # concat wav files
+    #
+    fullwavfile = Tempfile.new('kva').path + '.wav'
+    puts 'creating fullwavfile:' + fullwavfile.inspect if @debug
+    EasyAudioUtils.new(out: fullwavfile, working_dir: dir).concat(wavfiles,
+                                                                  sample_rate: 22050)
+
+    # convert wav to ogg
+    #
+    fulloggfile = outfile || fullwavfile.sub(/\.wav$/, '.ogg')
+    puts 'creating fulloggfile: ' + fulloggfile.inspect if @debug
+    EasyAudioUtils.new(fullwavfile, fulloggfile).convert
+
+    'downloaded ' + fulloggfile
+
+  end
+
+  private
+
+  def download_ogg(s)
 
     ogg_filepath = fetch_ogg_filepath(s)
     url = @ogg_baseurl + '/' + ogg_filepath
-    audio, _ = RXFHelper.read(url)
-    
+    audio, _ = RXFReader.read(url)
+
     tmpfile = Tempfile.new('kva')
-    file = File.new(tmpfile.path,'w')        
-    file.puts audio
-    file.close
+    File.write tmpfile.path + '.ogg', audio
 
-    command = @audio_player + ' ' + tmpfile.path
-    system command
+    return tmpfile.path + '.ogg'
 
   end
-  
-  private
-  
-  
-  def fetch_ogg_filepath(s)
-    
+
+  def fracture(s)
+
     book_no, book_title, chapter_no, verse_no = \
-      s.downcase.match(/^(?:(\d) )?([\w ]+) (\d+):(\d+)/).captures
+      s.downcase.match(/(?:(\d) )?([\w ]+) (\d+):(\d+)$/).captures
 
+    book_title.gsub!(/\s/,'_')
     book_title = book_no + '_' + book_title if book_no
     chapter_title = book_title + '_' + chapter_no
+
+    return [book_title, chapter_title, verse_no]
+  end
+
+  def fetch_ogg_filepath(s)
+
+    book_title, chapter_title, verse_no = fracture(s)
     verse_title = chapter_title + '_' + verse_no
 
-    File.join(book_title, chapter_title, verse_title + '.ogg')    
+    File.join(book_title, chapter_title, verse_title + '.ogg')
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kja
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,33 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
+  MIIEljCCAv6gAwIBAgIBATANBgkqhkiG9w0BAQsFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MDYxMTEzMTUzMVoXDTE4MDYxMTEzMTUzMVowSDESMBAG
+  8ixkARkWAmV1MB4XDTIyMDcxNTA3NTY0OVoXDTIzMDcxNTA3NTY0OVowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAK7GZ3j4h3A8ZZRfP2QrDoCpKcSrlz8TP6/swOSGfdRlEvgKSJW7bh0ux8U3
-  /pGQiqPNPGoXSZ1cOCzTDhxOxH4X7EFCWhcJmPoi8v7ikbjKajsIMId/X8QT+/dU
-  GG1pI8luFMk60aQTccEIFJhnZeFEPL7RC21svJSTkIb6/7ZbA3jt1KZDwXwJCRAr
-  Ila1P7iB+ZRvl6r+zHjhgLoAPaJSEP1FyV1+h/F2A73T9wpHqvDaCt+wFcBryYba
-  EQGfKs68qZEYVVhAXipMrP7noyFblbBnBIs/emrpHfLcM372UcuDz9e2518ysrXd
-  7JwAxJHVYa5vlw94+I79hECEiY8CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUMffNiOr7xRYcI8Yzu833wn86Cp4wJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEATslcasaf
-  HgGvG+gGAajwxkpAOVyF8+y5a3LiFKrPgnauJu452zh0DYpCodU/iFRPuGTeHTNN
-  MZiXhzYv3LEJSAYAVb2x67Lq89aVu6V9GHHdZp/2OqwRdFJkty3NbAk+92suwV6i
-  Vp4HlPr6GhtITi53+q0SlUJsOk1pA9ZwJNPbNvC+4HeM1KOiiaBJSMzQZ2LDziGG
-  /QorbSiyvR1dtrkaIfUuerB2HYzpccrFQforkB0Sz0FX/hB2Mk7NlolFYrQt4qSH
-  6po/R2bxzT2Ocy3UuAO73694J87w11m8wbDcPnntL7WYMh/hhGiyfKmTU2eThu0G
-  FeRxNrmBTWCnjg==
+  EjAQBgoJkiaJk/IsZAEZFgJldTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoC
+  ggGBAMeyhOVzwEK9bBD3Ug/gtrUsKVoazVWF6iaRxE1Uljt3T9BqwJZUMtRaOEJE
+  /+wUYc2msnR8p4IC0rihgd98ZpWDV6rN4/WcGNwISuORz2w46jmyeQRcvpCX3v35
+  8k8bocGs8VdAI2ZE3BsLmu8Aeqhc+nKJHG+KqqRgQMjIx5POLXSn3yFdkepaaj1Q
+  Sl4MSPq5oQqThp/HUS024ACfL3Um9NCQBbemwn5sgXQeaSLJCRi61sV0EplZZ4Jn
+  vdVySO6MdV4i5II8qBl7hq4dCrBwhoCOfFzCISHbTYi/BUjiMNVM2QtvB7hSpZQw
+  HMwunuGYB4Oji/PLEFNaODlkzxFWnvZA9pd8FeUiK1yrNhP9RehARdS4rX3Z8GAd
+  WpZEFKUwa9Zip06nu6WkCnyHSs7h8E4Qai9kM3PI17tR04t+3uuCFyAMIrjOnpTB
+  OWGLB+U5GmgKGGmvzRJb2jajF4koBFdewxfxW1sbehgwvBxWMVRUOrPsIVwfBPox
+  pPtSPwIDAQABo4GKMIGHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBSe8lWA6J1ZcIQAKZPSoBL93+XQqjAmBgNVHREEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwJgYDVR0SBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MA0GCSqGSIb3DQEBCwUAA4IBgQAn2FL/3bLh1VhxGF0EU+oeAhKsOPFH
+  Ks2DhTw4S51ya4lAyJ0XKHft+TXWhFwG8q3by3icQsQC+dkhvhGhQ1X6UNLfdxPg
+  umwUfmcDKv9SUrJRUhh8FE3JzrIZ6hQaSwVg4onK/8aHinlN1fdlF/NTI7xJWBF3
+  lx7gtn3xeHlRRQ0LFyHafa6pqbOmGc9OXd0lx3YSia+CO8neZoor9q6eYcSiipsd
+  kgYOH5UsMHGt0Ir4kx45mvRQsCc+uTtO8PTXVJ4HwDygPlrj4eUrQHDJZp+c1T3k
+  Cx+uD+KmsS0PAxLgztrNvv4GRMxIr0eXpRea2HvX3kAkzC68v6M9R0tczWzpYuf/
+  hyP4rr90xWTMpBbCWCljzCCE068eKCOoYFhGLEQfuZ+w3bjFLx+u4pTOQdfhK9dq
+  n6o7BhDy9zrdH807AvfNd7InQgMgGUGq75tHatBTStNKF7ng7zTIPYHWc7YUDamV
+  c/p/VO0efUKyKAHzOQQe8VZzcgh6e7jVIws=
   -----END CERTIFICATE-----
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -39,22 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.22
+        version: 1.9.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.22
+        version: 1.9.11
+- !ruby/object:Gem::Dependency
+  name: kj_reading
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -79,9 +104,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
-summary: Downloads and plays King James Bible OGG files from rorbuilder.info
+summary: Downloads and plays King James Bible OGG files from jamesrobertson.me.uk
 test_files: []