Merge branch 'master' of github.com:magnolia-fan/BeatHaven
This commit is contained in:
@@ -8,6 +8,7 @@ class ArtistController < ApplicationController
|
||||
name = params[:name].gsub('+', ' ').gsub('%20', ' ')
|
||||
end
|
||||
@artist = Artist.getByName(name)
|
||||
pp @artist
|
||||
end
|
||||
|
||||
def autocomplete
|
||||
|
||||
@@ -2,6 +2,16 @@ class TrackController < ApplicationController
|
||||
require 'net/http'
|
||||
require 'uri'
|
||||
def listen
|
||||
pp track = Track.where(:id => params[:id].to_i).first
|
||||
pp release = Release.where(:id => track.release_id).first
|
||||
pp album = Album.where(:id => release.album_id).first
|
||||
pp artist = Artist.where(:id => album.artist_id).first
|
||||
|
||||
data = Vkontakte.get(artist.name, track.name, (track.length / 1000).round)
|
||||
#data = open('/Users/chez/Sites/beathaven/tmp/media.mp3').read
|
||||
#send_data data, :type=>"audio/mp3"
|
||||
|
||||
#render :text => data
|
||||
redirect_to data
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,19 +1,111 @@
|
||||
module Vkontakte
|
||||
@@accounts = YAML.load_file("#{RAILS_ROOT}/config/vk_accounts.yml")
|
||||
require 'uri'
|
||||
require 'net/http'
|
||||
require 'erb'
|
||||
#require 'nokogiri'
|
||||
|
||||
def get artist, track, length
|
||||
|
||||
@@accounts = YAML.load_file("#{Rails.root.to_s}/config/vk_accounts.yml")
|
||||
@@bot = nil
|
||||
|
||||
def self.get artist, track, length
|
||||
self.randomBot
|
||||
html = self.getHtml(artist << ' - ' << track).force_encoding("WINDOWS-1251").encode("UTF-8")
|
||||
#pp html.encoding
|
||||
#File.open('/Users/chez/Sites/beathaven/tmp/vkres1.html', 'w') {|f| f.write(html) }
|
||||
#html = open('/Users/chez/Sites/beathaven/tmp/vkres1.html').read
|
||||
files = self.parseHtml(html)
|
||||
files = self.calcWeight(files, artist, track, length)
|
||||
#self.stream files.first['url']
|
||||
files.first['url']
|
||||
end
|
||||
|
||||
def getHtml q
|
||||
|
||||
|
||||
private
|
||||
|
||||
def self.randomBot
|
||||
botname = @@accounts.keys[rand(@@accounts.keys.length - 1)]
|
||||
@@bot = @@accounts[botname]
|
||||
pp 'Using bot ' << botname
|
||||
end
|
||||
|
||||
def parseHtml html
|
||||
def self.getHtml q
|
||||
headers = {
|
||||
'Cookie' => 'remixsid='+ @@bot['remixsid'] + ';remixchk='+ @@bot['remixchk'].to_s,
|
||||
'Referer' => 'http://vkontakte.ru/audio?album_id=0',
|
||||
'X-Requested-With' => 'XMLHttpRequest',
|
||||
'Origin' => 'http://vkontakte.ru',
|
||||
'Content-Type' => 'application/x-www-form-urlencoded',
|
||||
'User-Agent' => @@bot['user_agent'],
|
||||
'Connection' => 'close'
|
||||
}
|
||||
data = {
|
||||
'act' => 'search',
|
||||
'al' => 1,
|
||||
'gid' => 0,
|
||||
'id' => @@bot['user_id'],
|
||||
'offset' => 0,
|
||||
'q' => q,
|
||||
'sort' => 2
|
||||
}
|
||||
data_str = []
|
||||
data.each {|k, v| data_str << k +'='+ ERB::Util.url_encode(v.to_s)}
|
||||
|
||||
http = Net::HTTP.new('vkontakte.ru', 80)
|
||||
resp, data = http.post('/audio', data_str.join('&'), headers)
|
||||
data
|
||||
end
|
||||
|
||||
def calcWeight files
|
||||
def self.parseHtml html
|
||||
files = []
|
||||
html
|
||||
.scan(/<table.*?<input.*?value=\"(.*?)\,\d{1,4}\".*?>.*?<div\sclass=\"duration.*?>(.*?)<\/div>.*?<div\sclass=\"title_wrap\".*?>.*?selectPerformer\(event\,\s\'(.*?)\'\).*?<span\sclass=\"title\">(.*?)<\/span><\/div>.*?<\/table>/mi)
|
||||
.each do |item|
|
||||
t = item[1].split(':')
|
||||
files << {
|
||||
'url' => item[0],
|
||||
'length' => (t[0].to_i * 60) + t[1].to_i,
|
||||
'artist' => item[2],
|
||||
'track' => item[3].gsub(/<.*?>/, '')
|
||||
}
|
||||
end
|
||||
files
|
||||
end
|
||||
|
||||
def self.calcWeight files, artist, track, length
|
||||
files.each do |file|
|
||||
weight = 0
|
||||
|
||||
if file['artist'] == artist then weight += 10 else
|
||||
if file['artist'].include? artist then weight += 5 else
|
||||
if file['track'].include? artist then weight += 4
|
||||
end end end
|
||||
|
||||
if file['track'] == track then weight += 10 else
|
||||
if file['track'].include? track then weight += 5
|
||||
end end
|
||||
|
||||
if file['length'] == length then weight +=10 else
|
||||
delta = (length - file['length']).abs
|
||||
if delta < 5 then weight += (5 - delta) end
|
||||
end
|
||||
|
||||
file['weight'] = weight
|
||||
end
|
||||
|
||||
files.sort_by{|file| file['weight']}.reverse
|
||||
end
|
||||
|
||||
def self.stream url
|
||||
headers = {
|
||||
'Cookie' => 'remixsid='+ @@bot['remixsid'] + ';remixchk='+ @@bot['remixchk'].to_s,
|
||||
'Referer' => 'http://vkontakte.ru/audio?album_id=0',
|
||||
'User-Agent' => @@bot['user_agent'],
|
||||
}
|
||||
|
||||
uri = URI.parse(url)
|
||||
http = Net::HTTP.new(uri.host, 80)
|
||||
resp, data = http.get2(uri.path, headers)
|
||||
|
||||
data
|
||||
end
|
||||
end
|
||||
@@ -13,7 +13,7 @@
|
||||
<span id="artist"></span>
|
||||
<span id="dash"> - </span>
|
||||
<span id="title"></span>
|
||||
<audio controls preload style="width:1000px;"></audio>
|
||||
<audio controls preload autoplay style="width:1000px;"></audio>
|
||||
</div>
|
||||
<%= yield %>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user