yt_mp3 0.0.1 → 1.0

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+notifications:
+  email: false
+bundler_args: --without development

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in yt_mp3.gemspec
 gemspec
 gem 'rspec'
+gem 'rake'

data/README.md

@@ -1,29 +1,37 @@
-# YtMp3
+# YTMp3 [![Build Status](https://secure.travis-ci.org/Kofel/yt_mp3.png)](http://travis-ci.org/Kofel/yt_mp3)
 
-Easily download YouTube videos as Mp3 with commandline tool!
+Quickly download video from YouTube to mp3. Sync the folder with playlists or favorites!
 
 ## Installation
     $ gem install yt_mp3
 
 ## Usage
 
+###Just download
+
     $ yt_mp3 http://www.youtube.com/watch?v=DYyWVlh8NLM
+    
+###Syncing
+**syncing user favorites**
+
+    $ yt_mp3 init favorites kofels
+    $ yt_mp3 sync
+    
+**syncing playlist**
 
-## YouTube MP3 API:
-This gem was build on top of [YouTube-Mp3.org](http://youtube-mp3.org). Every MP3 file convertion are made by them. There I've described an API:
+    $ yt_mp3 init playlist 39D3FA44E3F75572
+    $ yt_mp3 sync
+    
+**and when something has been pushed to playlist type**
 
-### Request a video to mp3 convert:
-GET: http://www.youtube-mp3.org/api/pushItem/?item=#{video_url}&xy=yx&bf=false&r=#{Time.now.to_i}
-RESPONSE: video_id
+    $ yt_mp3 sync
 
-  HTTParty.get("http://www.youtube-mp3.org/api/pushItem/?item=http%3A//www.youtube.com/watch%3Fv%3D41L3a0QUzwY%26feature%3Dg-all-u&xy=yx&bf=false&r=#{Time.now.to_i}").body
-  => "41L3a0QUzwY"
+## YouTube MP3 API
+This gem was build on top of [YouTube-Mp3.org](http://youtube-mp3.org).
 
-### Get video info (we need it to get a hash). Repeat until status is "serving".
-GET: http://www.youtube-mp3.org/api/itemInfo/?video_id=#{video_id}&ac=www&r=#{Time.now.to_i}
-RESPONSE: info JSON fetched by response.body.match(/\Ainfo = (.*?);\z/)[1]
+[There I've described an API](https://github.com/Kofel/yt_mp3/wiki/YouTube-MP3-API)
 
-  HTTParty.get()
+Please note that *yt_mp3* is not responsible for failed conversions. There are limitations ex. 15 convertions for 30 minutes.
 
 ## Contributing
 

data/bin/yt_mp3

@@ -1,28 +1,83 @@
 #!/usr/bin/env ruby
 
-require 'trollop'
-
 $:.unshift(File.join(File.dirname(__FILE__), "/../lib"))
 require "yt_mp3"
+require "json"
 
-opts = Trollop::options do
-  version "yt_mp3 #{YTMp3::VERSION} (c) 2012 #{YTMp3::AUTHORS.join(', ')}"
-  banner <<-EOS
-  USAGE: #{$0} [url]
+banner  = <<-EOS
+yt_mp3 #{YTMp3::VERSION} (c) 2012 #{YTMp3::AUTHORS.join(', ')}
+  USAGE:
+    #{$0} [url]
+  OR:
+    initalize playlist sync:
+    #{$0} init playlist PLAYLIST_ID
+    initalize user favourite sync:
+    #{$0} init favorites USERNAME
+    and then:
+    #{$0} sync
 EOS
-end
 
 if ARGV.empty?
-  STDERR.puts "You need to provide a URL"
-  STDERR.puts "USAGE: #{$0} [url]"
+  STDERR.puts banner
 else
-  mp3 = YTMp3::YouTubeMP3.new ARGV.first
-  puts "Converting #{mp3.url}..."
-  begin
-    mp3.convert
-  rescue Exception => e
-    STDERR.puts e
-  end
+  opts = ARGV.first
+
+  if opts == "--help" || opts == "-h"
+    puts banner
+  elsif opts == "init"
+    if ARGV[1] and ARGV[2]
+      options = {:synced => Array.new}
+
+      if ARGV[1] == "playlist"
+        options["playlist"] = ARGV[2]
+        puts "Playlist #{ARGV[2]} syncing initalized..."
+      elsif ARGV[1] == "favorites"
+        options["favorites"] = ARGV[2]
+        puts "User favorites \"#{ARGV[2]}\" syncing initalized..."
+      else
+        STDERR.puts banner
+        Kernel.exit
+      end
+
+      File.open(".yt_mp3.json","w") {|f| f.puts options.to_json}
+    else
+      STDERR.puts banner
+    end
+  elsif opts == "sync"
+    #begin
+      if File.exists?(".yt_mp3.json") && (options = JSON.parse(File.read(".yt_mp3.json")))
+        sync = nil
 
-  system "curl --progress-bar -L \"#{mp3.downloadable}\" > \"#{mp3.title}\".mp3"
+        if options["playlist"]
+          sync = YTMp3::Sync.new :playlist => options["playlist"]
+        else
+          sync = YTMp3::Sync.new :favorites => options["favorites"] 
+        end
+
+        sync.synced = options["synced"] || Array.new
+
+        if (n_count = sync.new_videos.count ) > 0
+          puts "Found #{n_count} new videos. Syncing..."
+        else
+          puts "Nothing to sync. Exiting."
+          Kernel.exit
+        end
+
+        options["synced"] = sync.sync do |mp3|
+          YTMp3::download_progress mp3
+        end
+
+        File.open(".yt_mp3.json","w") {|f| f.puts options.to_json}
+
+        puts "Syncing done."
+      else
+        STDERR.puts "Syncing not initialized yet. Please type:\n#{$1} init (...)"
+      end
+    #rescue Exception => e
+    #  e.inspect
+    #  STDERR.puts "Error found: #{e}\nPlease initalize syncing by:\n#{$1} init (...)"
+    #end
+  else
+    YTMp3::download_progress YTMp3::YouTubeMP3.new(opts)
+  end
 end

data/lib/yt_mp3.rb

@@ -1,5 +1,8 @@
 require "yt_mp3/version"
 require "yt_mp3/youtube_mp3"
+require "yt_mp3/sync"
+
+require "yt_mp3/badge_progress_bar"
 
 module YTMp3
   def self.uri?(string)
@@ -11,7 +14,30 @@ module YTMp3
     false
   end
 
-  class RequestFailed < StandardError; end
+  def self.download_progress(mp3)
+    puts ":: #{mp3.url}\n"
+    
+    bar = BadgeProgressBar.new
+    bar.badge = "Converting"
 
-  YOUTUBE_MP3_TIMEOUT = 90
+    begin
+      mp3.convert do |info|
+        bar.count = (info["progress"].to_f * 100).abs
+        bar.write
+      end
+
+      begin
+        mp3.download
+      rescue DownloadError => e
+        STDERR.puts "Failed to download. Video cannot be converted. Could not exists. (#{e})"
+      end
+    rescue RequestFailed => e
+      STDERR.puts e
+    end
+  end
+
+  class RequestFailed < StandardError; end
+  class DownloadError < StandardError; end
+  class SyncError < StandardError; end
 end
+

data/lib/yt_mp3/badge_progress_bar.rb

@@ -0,0 +1,21 @@
+require "progress_bar"
+
+module YTMp3
+  class BadgeProgressBar < ProgressBar 
+    attr_accessor :badge
+
+    def initialize(*args)
+      super 100, :badge, :bar, :percentage, :elapsed
+    end
+
+    protected
+
+    def render_badge
+      @badge
+    end
+
+    def badge_width
+      @badge.length
+    end
+  end
+end

data/lib/yt_mp3/sync.rb

@@ -0,0 +1,37 @@
+require 'youtube_it'
+
+module YTMp3
+  class Sync
+    attr_reader :videos_playlist
+    attr_accessor :synced
+
+    def initialize(options)
+      client = YouTubeIt::Client.new
+      videos = {}
+
+      if options[:favorites]
+        videos = client.videos_by(:favorites, :user => options[:favorites]).videos
+      elsif options[:playlist]
+        videos = client.playlist(options[:playlist].gsub(/\APL/, "")).videos
+      else
+        raise SyncError, "Sync by what?"
+      end
+
+      @videos_playlist = videos.collect { |v| v.unique_id }
+      @synced = Array.new
+
+      raise SyncError, "Empty playlist to synchronize" if @videos_playlist.empty?
+    end
+
+    def new_videos
+      (@videos_playlist - @synced)
+    end
+
+    def sync
+      new_videos.each do |video|
+        @synced << video
+        yield YTMp3::YouTubeMP3.new(video)
+      end
+    end
+  end
+end

data/lib/yt_mp3/version.rb

@@ -1,4 +1,4 @@
 module YTMp3
-  VERSION = "0.0.1"
+  VERSION = "1.0"
   AUTHORS = ["Jakub Kaflik"]
 end

data/lib/yt_mp3/youtube_mp3.rb

@@ -1,4 +1,3 @@
-require 'timeout'
 require 'httparty'
 require 'uri'
 require 'json'
@@ -13,27 +12,42 @@ module YTMp3
     end
 
     def convert
-      r = HTTParty.get "http://www.youtube-mp3.org/api/pushItem/?item=#{URI.escape(@url)}&xy=yx&bf=false&r#{Time.now.to_i}"
+      r = HTTParty.get "http://www.youtube-mp3.org/api/pushItem/?item=#{CGI.escape(@url)}&xy=yx&bf=false&r=#{Time.now.to_i}", :headers => {"Accept-Location" => "*"}
 
-      raise RequestFailed, "YouTubeMP3 service responsed: #{r.body}" unless r.response.class == Net::HTTPOK
+      raise RequestFailed, "Something went wrong (not HTTP OK)" unless r.response.class == Net::HTTPOK
+      handle_error(r.body)
 
       video_id = r.body
 
-      Timeout::timeout(YOUTUBE_MP3_TIMEOUT) do
-        while true
-          r = HTTParty.get "http://www.youtube-mp3.org/api/itemInfo/?video_id=#{video_id}&ac=www&r=#{Time.now.to_i}"
+      while true
+        r = HTTParty.get "http://www.youtube-mp3.org/api/itemInfo/?video_id=#{video_id}&ac=www&r=#{Time.now.to_i}", :headers => {"Accept-Location" => "*"}
 
-          raise RequestFailed, "YouTubeMP3 service responsed: #{r.body}" unless r.response.class == Net::HTTPOK
+        raise RequestFailed, "Something went wrong (not HTTP OK)" unless r.response.class == Net::HTTPOK
 
-          info = JSON.parse(r.body.match(/\Ainfo = (.*?);\z/)[1])
+        info = JSON.parse(r.body.match(/\Ainfo = (.*?);\z/)[1])
 
-          if info["status"] == "serving"
-            @downloadable = "http://www.youtube-mp3.org/get?video_id=#{video_id}&h=#{info['h']}&r=#{Time.now.to_i}"
-            @title = info["title"]
-            break
-          end
+        if info["status"] == "serving"
+          @downloadable = "http://www.youtube-mp3.org/get?video_id=#{video_id}&h=#{info['h']}&r=#{Time.now.to_i}"
+          @title = info["title"]
+          break
         end
-      end      
+
+        yield info if block_given?
+      end
+    end
+
+    def download
+      raise DownloadError, "File not converted yet" unless @downloadable
+      system "curl --progress-bar -L \"#{@downloadable}\" > \"#{@title.gsub(/\//,"-")}.mp3\""
+    end
+
+    protected
+
+    def handle_error( body )
+      case body
+        when "$$$LIMIT$$$" then raise RequestFailed, "YouTubeMP3 limit reached! Only 15 convertions per 30 minutes."
+        when "$$$ERROR$$$" then raise RequestFailed, "There was an Error caused by YouTube, we cannot deliver this Video! This error is mostly caused by copyright issues or the length of the video. YouTubeMP3 only support videos with maximum of 20 minutes."
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,13 @@ require 'bundler/setup'
 
 require 'yt_mp3' # and any other gems you need
 
-RSpec.configure do |config|
+module Helpers
+  def temp
+    system("mkdir -p tmp")
+    Dir.chdir "tmp/"
+  end
+end
 
+RSpec.configure do |config|
+  config.include Helpers
 end

data/spec/sync_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe YTMp3::Sync do
+  before do
+    temp
+  end
+
+  it "loads playlist" do
+    sync = YTMp3::Sync.new :playlist => "39D3FA44E3F75572"
+    sync.new_videos.count.should be > 0
+  end
+
+  it "loads playlist with prefix" do
+    sync = YTMp3::Sync.new :playlist => "PL39D3FA44E3F75572"
+    sync.new_videos.count.should be > 0
+  end
+  
+  it "loads user favorites" do
+    sync = YTMp3::Sync.new :favorites => "SuchyKanal"
+    sync.new_videos.count.should be > 0
+  end
+
+  it "does sync" do 
+    sync = YTMp3::Sync.new :playlist => "PL912D4D7B38309EAA"
+    sync.synced.count.should eq 0
+
+    new_videos = sync.new_videos
+
+    sync.sync do |mp3|
+      mp3.should be_an_instance_of YTMp3::YouTubeMP3
+    end
+
+    sync.synced.should eq new_videos
+  end
+end

data/spec/youtube_mp3_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe YTMp3::YouTubeMP3 do
+  before do
+    temp
+  end
+
   it "initialize by URL" do
     YTMp3::YouTubeMP3.new("http://www.youtube.com/watch?v=KlJy_Cb21Lw").url.should eq "http://www.youtube.com/watch?v=KlJy_Cb21Lw"
   end
@@ -20,4 +24,15 @@ describe YTMp3::YouTubeMP3 do
     mp3.convert
     mp3.title.should eq "Lady Antebellum - Need You Now (HQ) [Lyrics]"
   end
+
+  it "downloads" do
+    mp3 = YTMp3::YouTubeMP3.new("KlJy_Cb21Lw")
+    mp3.convert
+    mp3.download
+  end
+
+  it "cannot download while not converted" do
+    mp3 = YTMp3::YouTubeMP3.new("KlJy_Cb21Lw")
+    expect { mp3.download }.to raise_error(YTMp3::DownloadError)
+  end
 end

data/yt_mp3.gemspec

@@ -4,13 +4,14 @@ require File.expand_path('../lib/yt_mp3/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = YTMp3::AUTHORS
   gem.email         = ["kofels@gmail.com"]
-  gem.description   = %q{Simply download YT videos as mp3!}
-  gem.summary       = gem.description
+  gem.description   = %q{Quickly download video from YouTube to mp3. Sync the folder with playlists or favorites!}
+  gem.summary       = %q{Downloading YouTube videos as mp3}
   gem.homepage      = "http://kofel.github.com/yt_mp3/"
 
   gem.rubyforge_project = "yt_mp3"
   gem.add_dependency "httparty"
-  gem.add_dependency "trollop"
+  gem.add_dependency "youtube_it"
+  gem.add_dependency "progress_bar"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yt_mp3
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: '1.0'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: youtube_it
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -43,7 +43,24 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Simply download YT videos as mp3!
+- !ruby/object:Gem::Dependency
+  name: progress_bar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Quickly download video from YouTube to mp3. Sync the folder with playlists
+  or favorites!
 email:
 - kofels@gmail.com
 executables:
@@ -53,15 +70,19 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/yt_mp3
 - lib/yt_mp3.rb
+- lib/yt_mp3/badge_progress_bar.rb
+- lib/yt_mp3/sync.rb
 - lib/yt_mp3/version.rb
 - lib/yt_mp3/youtube_mp3.rb
 - spec/spec_helper.rb
+- spec/sync_spec.rb
 - spec/youtube_mp3_spec.rb
 - yt_mp3.gemspec
 homepage: http://kofel.github.com/yt_mp3/
@@ -87,7 +108,8 @@ rubyforge_project: yt_mp3
 rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
-summary: Simply download YT videos as mp3!
+summary: Downloading YouTube videos as mp3
 test_files:
 - spec/spec_helper.rb
+- spec/sync_spec.rb
 - spec/youtube_mp3_spec.rb