kja 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bbd132952cb33ec1613e40b1b8931844eafc764f
-  data.tar.gz: 32d80038c1c73e32d674a781e76cbe89cb375f38
+SHA256:
+  metadata.gz: cf0f96cfdf4fabf09605e847917fea00ccd6d2e422653d2f5c654c4401a4d929
+  data.tar.gz: 117cae0553d930f9a1fe67fb632aa62ae608d191f708a6d67669c1b9045bdb26
 SHA512:
-  metadata.gz: 10ecbf62143ede9cfb272fc26ec985a6c43ed6255505e850a6dd0c76ff28af93d0b23a25a7e5f6cdd06d06bf59d69fd1df1b33d4d8f3b9b3cc15ddc43a768079
-  data.tar.gz: 6a8b94e96cad8efe9096c09fb956827d30ea5cfd4a11e6a1c733e95d65e5d01c882809b6cc1707f816eba76072550c279ce9cc4fd1cbfa14d038109241b41a17
+  metadata.gz: 45143316db18a8a22201d1bdabcd374c967f42f7d3ffa9a1a9e493e0424575378f253daaaca0e238b36c40baf24875fb2620e0e53c1b22753e58cd115ebabcac
+  data.tar.gz: 0ad0b442e3d3cdedd23e99087057fcbe244f955d133f8d80fdb4d10bd8b74e6bccd42d27d3aecb10ca959a0a28dd9d408f05b8fbdc92174d44f97304046307db

data/lib/kja.rb

@@ -4,6 +4,8 @@
 
 require 'dynarex'
 require 'tempfile'
+require 'rxfreader'
+require 'kj_reading'
 
 
 # description: Intended for use with the kj gem
@@ -25,41 +27,97 @@ 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 download_ogg(s)
+
+    ogg_filepath = fetch_ogg_filepath(s)
+    url = @ogg_baseurl + '/' + ogg_filepath
+    audio, _ = RXFReader.read(url)
+
+    tmpfile = Tempfile.new('kva')
+    File.write tmpfile.path + '.ogg', audio
+
+    return tmpfile.path + '.ogg'
+
+  end
+
   def duration(s)
-    
-    book_title, chapter_title, verse_no = fracture(s)    
-    
+
+    book_title, chapter_title, verse_no = fracture(s)
+
     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
 
-  def speak(s)
+  def speak(title)
 
-    ogg_filepath = fetch_ogg_filepath(s)
-    url = @ogg_baseurl + '/' + ogg_filepath
-    audio, _ = RXFHelper.read(url)
-    
-    tmpfile = Tempfile.new('kva')
-    File.write tmpfile.path, audio
+    a = KjReading.verses title
+
+    a.each do |x|
 
-    command = @audio_player + ' ' + tmpfile.path
-    system command
+      filename = download_ogg(x.title)
+      command = @audio_player + ' ' + filename
+      system command
+
+    end
 
   end
-  
+
+
+  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
+
+    wavfiles = downloads.map do |oggfile|
+
+      wavfile = oggfile.sub(/\.ogg$/,'.wav')
+      EasyAudioUtils.new(oggfile, wavfile).convert
+      sleep 1.4
+      File.basename(wavfile)
+
+    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: \
+                       File.dirname(fullwavfile)).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 fracture(s)
 
     book_no, book_title, chapter_no, verse_no = \
@@ -68,16 +126,16 @@ class Kja
     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
@@ -87,4 +145,4 @@ if __FILE__ == $0 then
   kja = Kja.new(audio_player: '/usr/bin/ogg123 -q')
   kja.speak(ARGV[0])
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kja
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 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-07-11 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: []

metadata.gz.sig

@@ -1,2 +1 @@
-���bQ���~�e�����
�lfe��1l�,�7.+�b�˵7���ؓ
-�_#F����|E;���}���G�FYJ%��f��Գ�c3�lg��ڞH^Ki���	:Q����d�S賮����8�Õf1�>S�ŵӉk�m�D A����t �O.��V;H����0�52�/�*�:߽���̕[�Q��G�?!XWݧ�&��!�5<fF��Щ�^#��mȿQ�B��t^���f��4\��
+�%�