ted_talk 0.0.4 → 0.0.11

data/README.md

@@ -6,7 +6,7 @@ TedTalk helps download TED talk video and covert it to a slowed down MP3 with pa
 
 ## Installation
 
-TedTalk requires [FFmpeg](http://ffmpeg.org/) and [SoX](http://sox.sourceforge.net/) **with LAME support** [important], as well as [TagLib](http://taglib.github.com/) audio meta-data library installed to the system
+TedTalk requires [FFmpeg](http://ffmpeg.org/) and [SoX](http://sox.sourceforge.net/) with LAME support, as well as [TagLib](http://taglib.github.com/) audio meta-data library installed to the system
 
     $ gem install ted_talk 
 
@@ -54,5 +54,4 @@ TedTalk requires [FFmpeg](http://ffmpeg.org/) and [SoX](http://sox.sourceforge.n
 	    --speed, -s <f>:   Speed of output file [0.1 - 100] (default: 1.0)
 	  --silence, -i <f>:   Length (secondes) of a pause added to each utterance
 	                       [0.1 - 120] (default: 0.0)
-            --video, -v:   Save not only audio but also the original video	
 	         --help, -h:   Show this message

data/bin/ted_talk

@@ -26,13 +26,13 @@ global_opts = Trollop::options do
   banner <<-EOS
 TedTalk helps download TED talk video and covert it to a slowed down MP3 with pauses that is helpful for English learning
 
-Basic usage: ted_talk desc <option>  - show TED Talk description(s)
-             ted_talk exec <option>  - download and convert a TED Talk video
-             ted_talk delete         - delete cache folder
+Basic usage: tedtalk desc <option>  - show TED Talk description(s)
+             tedtalk exec <option>  - download and convert a TED Talk video
+             tedtalk delete         - delete cache folder
 
 For details about <option>, type:
-             ted_talk desc -h
-      or     ted_talk exec -h
+             tedtalk desc -h
+      or     tedtalk exec -h
 
 [global options]:
 EOS
@@ -89,7 +89,6 @@ EOS
     opt :outdir, "Directory for file output", :default=> "./"
     opt :speed, "Speed of output file [0.1 - 100]", :default => 1.0
     opt :silence, "Length (secondes) of a pause added to each utterance [0.1 - 120]", :default => 0.0
-    opt :video, "Save not only audio but also the original video", :default => false
   end
 
   Trollop::die :outdir, "must be an existing directory" unless File::ftype(exec_opts[:outdir]) == "directory"
@@ -101,10 +100,9 @@ EOS
   outdir     = exec_opts[:outdir]
   speed      = exec_opts[:speed]
   silence    = exec_opts[:silence]
-  video      = exec_opts[:video]
 
   tedtalk = TedTalk::Converter.new(source_url)
-  tedtalk.execute(outdir, lang, speed, silence, video)
+  tedtalk.execute(outdir, lang, speed, silence)
 when "delete"
   TedTalk.delete_cache
 else

data/lib/ted_talk.rb

@@ -114,8 +114,8 @@ module TedTalk
       end
       @lang = lang 
       if lang != "en"
-        @titles[lang] = get_title(lang) rescue ""
-        @descriptions[lang] = get_description(lang) rescue ""
+        @titles[lang] = get_title(lang)
+        @descriptions[lang] = get_description(lang)
         @lang_name = @language_hash[@lang]
       end    
     end
@@ -125,7 +125,7 @@ module TedTalk
       unless @descriptions[lang]
         lang = "en"
       end
-      puts "\nTitle:\n" + @titles["en"]
+      puts "\nTitle:\n" + @titles["en"]    
       puts @titles[lang] if lang != "en"
       puts ""
       puts "Description:\n" + @descriptions[lang]
@@ -137,7 +137,7 @@ module TedTalk
       end
     end
   
-    def execute(outdir = "./", lang = "en", speed = 1, silence = 0, video = false)
+    def execute(outdir = "./", lang = "en", speed = 1, silence = 0)
       puts "TedTalk is prepararing for the process"
       @outdir = File.join(outdir, @ted_id + "-" + @basename)    
       Dir.mkdir(@outdir) unless File.exists?(@outdir)    
@@ -148,15 +148,12 @@ module TedTalk
       get_captions("en")      
       setup_lang(lang)
       get_captions(lang)      
-      video_filepath = get_binary(@video_url)      
+      video_filepath = get_binary(@video_url)
       wav_filepath = get_wav(video_filepath)
       outfile = @outdir + "/" + @basename + "-result.mp3"
       speakslow = SpeakSlow::Converter.new(wav_filepath, outfile)
       speakslow.execute(speed, silence)
-      write_info(outfile)
-      if video
-        `cp #{video_filepath} #{@outdir + "/"}`
-      end
+      write_info(outfile)    
     end
     
     def get_title(lang)
@@ -170,8 +167,9 @@ module TedTalk
       lang_url = "http://www.ted.com/talks/lang/#{lang}/" + @url_basename
       html = get_html(lang_url)
       lang_doc = Nokogiri::HTML(html)  
-      result = lang_doc.xpath("//meta[@name='description']").first.attribute("content").value.strip
-      return result || ""
+      temp = lang_doc.xpath("//meta[@name='description']").first.attribute("content").value.strip
+      /\ATED Talks\s*(.+)\z/ =~ temp
+      $1 rescue temp ""
     end
         
     def get_captions(lang = "en")
@@ -237,10 +235,10 @@ module TedTalk
         tag.title  += " [x#{@speed}]" if @speed and  @speed != 1
         tag.genre  = "Talk"
           
-        caption_text = @titles["en"] || ""
+        caption_text = @titles["en"] + "\n"
         caption_text << @titles[@lang] + "\n" if @titles[@lang]
         caption_text << "--------------------\n"
-        caption_text << @descriptions["en"] + "\n"  if @descriptions["en"]
+        caption_text << @descriptions["en"] + "\n"
         caption_text << @descriptions[@lang] + "\n" if @descriptions[@lang]
         caption_text << "\n"
         @captions["en"].each_with_index do |c, index|

data/lib/ted_talk/version.rb

@@ -1,3 +1,3 @@
 module TedTalk
-  VERSION = "0.0.4"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ted_talk
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70364332347800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364332347800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70364332347380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364332347380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70364332346960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364332346960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
-  requirement: &70364328200660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364328200660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70364328199120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364328199120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: speak_slow
-  requirement: &70364328198040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364328198040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70364328196340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +117,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364328196340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: TedTalk helps download TED talk video and covert it to a slowed down
   MP3 with pauses that is useful for English learning
 email:
@@ -129,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: TED talk downloader and converter for English learners