quran-audio 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9d4aa2977f958be7f3d1544b0cefa0141a464886fbcc6681390735b1af33083
-  data.tar.gz: 467c4a4f34baf890df84fce649122fb3fca2bb483c399ee831fdb7e699b43b9b
+  metadata.gz: 709a79351be5539a80a26a13ac39b41336b6a084cc14e56d476e5cd203090ab6
+  data.tar.gz: 7a0e5403541389a206d28f98bf53756a33ef672ad2bbc7162378efd59080642e
 SHA512:
-  metadata.gz: 00c1fef420cf3fb24b2130c04da9b8c8032f8cb101089d4f430fb1a3029e869d0359aa20e7e650f9c2b0ce3f52c09e28399710bb62cb33a246a5c99efec1dab5
-  data.tar.gz: 0c7ab62d560a4b775edfdbb596cffffa8163de8137133b84e826fd647f7654316d659490cc11c339715a8ac11e0f1f11703c1a1d5010606d23fdc873e1dca5de
+  metadata.gz: 655fda01723b31bd0d125f886a1b4695d6f16f8ae6bc5b3fac69c12019954c059f1a0fad0987e4d417e689d818400696a11dfa4431002cbcf4d9151f3c41640e
+  data.tar.gz: ede8a0dee97e2c33ddb78314bf4004ab8e785cf6b761cb7b9aea2c1ce03e30d7bbc88b7c0dfc0eeca96c5ac23b013f767b062f415eb3d2ed6608da600fd76554

data/bin/quran-audio

@@ -1,17 +1,28 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-libexec = File.realpath File.join(__dir__, "..", "libexec", "quran-audio")
-case ARGV[0]
-when "pull"
-  Process.spawn File.join(libexec, "pull"), *ARGV[1..]
+def wait
   Process.wait
-when "ls"
-  Process.spawn File.join(libexec, "ls"), *ARGV[1..]
-  Process.wait
-else
-  warn "Usage: quran-audio [COMMAND] [OPTIONS]\n\n" \
-       "Commands:\n" \
-       "  pull              Pull MP3 files from everyayah.com\n" \
-       "  ls                List reciters\n" \
+rescue Interrupt
+  retry
+end
+
+def main(argv)
+  libexec = File.realpath File.join(__dir__, "..", "libexec", "quran-audio")
+  case argv[0]
+  when "pull"
+    Process.spawn File.join(libexec, "pull"), *ARGV[1..]
+    Process.wait
+  when "ls"
+    Process.spawn File.join(libexec, "ls"), *ARGV[1..]
+    Process.wait
+  else
+    warn "Usage: quran-audio [COMMAND] [OPTIONS]\n\n" \
+         "Commands:\n" \
+         "  pull              Pull MP3 files from everyayah.com\n" \
+         "  ls                List reciters\n" \
+  end
+rescue Interrupt
+  wait
 end
+main(ARGV)

data/lib/quran/audio/command/pull.rb

@@ -16,6 +16,14 @@ module Quran::Audio
 
     def run
       summary(recitations[recitation])
+      start(surahs)
+    end
+
+    private
+
+    attr_reader :http
+
+    def start(surahs)
       surahs.each do |surah|
         1.upto(sizeof[surah]) do |ayah|
           mp3 = MP3.new(recitation:, surah:, ayah:, bitrate:)
@@ -27,20 +35,16 @@ module Quran::Audio
       end
     end
 
-    private
-
-    attr_reader :http
-
     def pull(mp3, delay, interrupt: false)
       res = http.get(mp3.remote_path)
       write(mp3, res, interrupt:)
       sleep(delay)
     rescue Interrupt
-      line.end.rewind.print("Wait for a graceful exit").end
+      line.end.rewind.print("SIGINT: exiting cleanly, please wait").end
       pull(mp3, delay, interrupt: true)
     rescue SocketError, SystemCallError, Net::OpenTimeout => e
       line.end.rewind.print("#{e.class}: retry")
-      interrupt ? throw(:interrupt, true) : pull(mp3, delay)
+      interrupt ? abort! : pull(mp3, delay)
     end
 
     def write(mp3, res, interrupt:)
@@ -48,9 +52,10 @@ module Quran::Audio
       when Net::HTTPOK
         mkdir_p File.dirname(mp3.local_path)
         File.binwrite(mp3.local_path, res.body)
-        throw(:interrupt, true) if interrupt
+        abort! if interrupt
       else
-        puts "error #{res.body}"
+        line.end.print("error: unexpected response (#{res.class})")
+        abort!
       end
     end
 
@@ -58,7 +63,7 @@ module Quran::Audio
       line
         .rewind
         .print("Recitation".ljust(12), r.name).end
-        .print("Directory".ljust(12), format(r.dest_dir, sharedir: dir.sharedir))
+        .print("Directory".ljust(12), format(r.destdir, sharedir: dir.sharedir))
         .end.end
     end
 
@@ -69,5 +74,9 @@ module Quran::Audio
     def recitations
       @recitations ||= Ryo.from_json(path: File.join(dir.datadir, "recitations.json"))
     end
+
+    def abort!
+      throw(:abort, 1)
+    end
   end
 end

data/lib/quran/audio/mp3.rb

@@ -22,7 +22,7 @@ module Quran::Audio
     #  Returns the path to an MP3 file on a remote HTTP server
     def remote_path
       filename = [surah.to_s.rjust(3, "0"), ayah.to_s.rjust(3, "0"), ".mp3"].join
-      File.join format(recitation.remote_path, bitrate:), filename
+      File.join format(recitation.path, bitrate:), filename
     end
 
     ##
@@ -30,7 +30,7 @@ module Quran::Audio
     #  Returns the path to an MP3 file on disk
     def local_path
       File.join(
-        format(recitation.dest_dir, sharedir:),
+        format(recitation.destdir, sharedir:),
         surah.to_s,
         "#{ayah}.mp3"
       )

data/libexec/quran-audio/pull

@@ -7,5 +7,8 @@ def main(argv)
     .new(argv)
     .run
 end
-interrupt = catch(:interrupt) { main(ARGV) }
-exit(1) if interrupt
+excode = catch(:abort) {
+  main(ARGV)
+  0
+}
+exit excode

data/share/quran-audio/VERSION

@@ -1 +1 @@
-v0.3.2
+v0.3.3

data/share/quran-audio/data/recitations.json

@@ -4,23 +4,23 @@
     "origin": "Kuwait",
     "available_bitrates": [128, 64],
     "default_bitrate": 128,
-    "remote_path": "/data/Alafasy_%{bitrate}kbps/",
-    "dest_dir": "%{sharedir}/mp3/alafasy/"
+    "path": "/data/Alafasy_%{bitrate}kbps/",
+    "destdir": "%{sharedir}/mp3/alafasy/"
   },
   "alajmi": {
     "name": "Ahmad bin Ali Al-Ajmi",
     "origin": "Saudi Arabia",
     "available_bitrates": [128],
     "default_bitrate": 128,
-    "remote_path": "/data/ahmed_ibn_ali_al_ajamy_%{bitrate}kbps/",
-    "dest_dir": "%{sharedir}/mp3/alajmi/"
+    "path": "/data/ahmed_ibn_ali_al_ajamy_%{bitrate}kbps/",
+    "destdir": "%{sharedir}/mp3/alajmi/"
   },
   "yassin": {
     "name": "Sahl Yassin",
     "origin": "Saudi Arabia",
     "available_bitrates": [128],
     "default_bitrate": 128,
-    "remote_path": "/data/Sahl_Yassin_%{bitrate}kbps/",
-    "dest_dir": "%{sharedir}/mp3/yassin/"
+    "path": "/data/Sahl_Yassin_%{bitrate}kbps/",
+    "destdir": "%{sharedir}/mp3/yassin/"
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quran-audio
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - '0x1eef'