rget 2.2.4 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e99c7e9a1b29aac8c9be1b14d24e8fea384ce857
-  data.tar.gz: 4bb7b4d20b29d4f2af4e453a7bfebeff4f2f87da
+  metadata.gz: 813d569b8900605477e89efad7ec9c9b40f8a6aa
+  data.tar.gz: ad5ec609930b4d4e682d004422a45e3d2c381f94
 SHA512:
-  metadata.gz: af2a08ecfa619c99b0896b77504cf79b11f587262f778d2af210b08f28932b4af6aa63f20784a07cb093b83f3f4fc04b7a7ddd468bf00af91913c59097719b0b
-  data.tar.gz: e5c2ac0f0fe3662aec0fbbd61f49d41968fc13f8c659eeee20162ba211904c1ab4b932cd1dc0ccaa5b753e1117c614e49aba333524846f14445983778a8c8607
+  metadata.gz: 6e3ed3332af62479a99377879f46875998113b5a638d33bb3e03f9940c07f0bc7c2de34736951f79eb95b6b1c54c702e712bcefa09f2dba83fcff20207555e76
+  data.tar.gz: 045a14ba979a6f425082da7c6dbd234fbe0de85ee61800f8941be096398a58b702904b5691885fe7e639ed7de9d706c1fcbe6f50b2299a92b52fa20b119ab2a4

data/bin/rget

@@ -3,6 +3,7 @@
 require 'thor'
 require 'pathname'
 require 'yaml'
+require 'ostruct'
 require 'webradio'
 require 'podcast'
 
@@ -10,7 +11,7 @@ class GetWebRadio < Thor
 	class_option :mp3, type: :boolean, default:true, desc:'convert to mp3 with ffmpeg'
 	class_option :path, type: :string, desc:'store path (accept "dropbox://~")'
 
-	config = nil
+	config_file = nil
 	[
 		'./rget.yaml',
 		'~/.rget',
@@ -18,38 +19,28 @@ class GetWebRadio < Thor
 	].each do |file|
 		path = Pathname(file).expand_path
 		if path.exist?
-			config = path.to_s
+			config_file = path.to_s
 			break
 		end
 	end
-	unless config
+	unless config_file
 		$stderr.puts 'config file not found'
 		exit 1
 	end
 
-	YAML::load_file(config)['programs'].each do |command, params|
+	config = YAML::load_file(config_file)
+	config['programs'].each do |command, params|
 		desc command, params['desc']
 		define_method(command) do
+			url = params['url']
+			opts = OpenStruct.new(config['options'].merge(options))
 			if params['podcast']
-				podcast(params['url'], params['label'])
+				Podcast.new(url, opts){|media|media.download(params['label'])}
 			else
-				process(params['url'], params['label'])
+				WebRadio(url, opts){|media|media.download(params['label'])}
 			end
 		end
 	end
-
-private
-	def process(uri, label)
-		WebRadio(uri, options) do |radio|
-			radio.download(label)
-		end
-	end
-
-	def podcast(uri, label = nil)
-		Podcast.new(uri, options) do |pod|
-			pod.download(label)
-		end
-	end
 end
 
 GetWebRadio.start(ARGV)

data/lib/webradio.rb

@@ -80,7 +80,15 @@ private
 
 		# convert to mp3
 		print "converting to mp3..."
-     	result = Open3.capture3("ffmpeg -i #{src} -ab 64k #{dst}")
+		ffmpeg = (@options['mp3nize'] || "ffmpeg -i '$1' -ab 64k '$2'").gsub(/\$(.)/){|s|
+			case $1
+				when '1'; src
+				when '2'; dst
+				when '$'; '$'
+				else; s
+			end
+		}
+		result = Open3.capture3(ffmpeg)
 		if result[2].to_i == 0
 			File.delete(src) if delete_src
 			puts "done."

data/rget.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rget"
-  spec.version       = "2.2.4"
+  spec.version       = "2.3.0"
   spec.authors       = ["TADA Tadashi"]
   spec.email         = ["t@tdtds.jp"]
   spec.description   = %q{Downloading newest radio programs on the web. Supported radio stations are hibiki, animate, onsen, seaside communications, niconico and youtube.}

data/rget.yaml

@@ -1,3 +1,5 @@
+options:
+  mp3nize: ffmpeg -i '$1' -ab 64k '$2'
 programs:
   imas_cg:
     desc: デレラジA (THE IDOLM@STERシンデレラガールズラジオ)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.3.0
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor