repo
string | commit
string | message
string | diff
string |
|---|---|---|---|
simonhn/pav-api
|
91764f79dbed0d36527bc2d5ab3a7fc2f0e9b6ec
|
updating gemfile
|
diff --git a/Gemfile.lock b/Gemfile.lock
index 7a71b32..f33a9a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,114 +1,117 @@
GEM
remote: http://rubygems.org/
specs:
activesupport (3.0.9)
addressable (2.2.6)
beanstalk-client (1.1.0)
builder (3.0.0)
chronic (0.6.2)
chronic_duration (0.9.6)
numerizer (~> 0.1.1)
crack (0.1.8)
daemons (1.1.4)
data_objects (0.10.6)
addressable (~> 2.1)
delayed_job (2.1.4)
activesupport (~> 3.0)
daemons
delayed_job_data_mapper (1.0.0.rc)
delayed_job (~> 2.1)
dm-aggregates
dm-core
dm-observer
dm-aggregates (1.1.0)
dm-core (~> 1.1.0)
dm-core (1.1.0)
addressable (~> 2.2.4)
dm-do-adapter (1.1.0)
data_objects (~> 0.10.2)
dm-core (~> 1.1.0)
dm-migrations (1.1.0)
dm-core (~> 1.1.0)
dm-mysql-adapter (1.1.0)
dm-do-adapter (~> 1.1.0)
do_mysql (~> 0.10.2)
dm-observer (1.1.0)
dm-core (~> 1.1.0)
dm-serializer (1.1.0)
dm-core (~> 1.1.0)
fastercsv (~> 1.5.4)
json (~> 1.4.6)
dm-timestamps (1.1.0)
dm-core (~> 1.1.0)
do_mysql (0.10.6)
data_objects (= 0.10.6)
fastercsv (1.5.4)
foreman (0.19.0)
term-ansicolor (~> 1.0.5)
thor (>= 0.13.6)
httparty (0.7.8)
crack (= 0.1.8)
i18n (0.6.0)
json (1.4.6)
json_pure (1.5.3)
memcached (1.3)
meta-spotify (0.1.5)
crack (>= 0.1.4)
httparty (>= 0.4.5)
mime-types (1.16)
newrelic_rpm (3.1.1)
numerizer (0.1.1)
rack (1.3.2)
rack-contrib (1.1.0)
rack (>= 0.9.1)
+ rack-cors (0.2.4)
+ rack
rack-throttle (0.3.0)
rack (>= 1.0.0)
rbrainz (0.5.2)
rchardet19 (1.3.5)
rest-client (1.6.3)
mime-types (>= 1.16)
sinatra (1.2.6)
rack (~> 1.1)
- tilt (< 2.0, >= 1.2.2)
+ tilt (>= 1.2.2, < 2.0)
sinatra-respond_to (0.7.0)
sinatra (~> 1.2)
stalker (0.9.0)
beanstalk-client
json_pure
term-ansicolor (1.0.6)
thor (0.14.6)
tilt (1.3.2)
yajl-ruby (0.8.2)
PLATFORMS
ruby
DEPENDENCIES
builder
chronic
chronic_duration
crack
delayed_job
delayed_job_data_mapper
dm-aggregates
dm-core
dm-migrations
dm-mysql-adapter
dm-serializer
dm-timestamps
foreman
i18n
json
memcached
meta-spotify
newrelic_rpm
rack
rack-contrib
+ rack-cors
rack-throttle
rbrainz
rchardet19
rest-client
sinatra
sinatra-respond_to
stalker
yajl-ruby
|
simonhn/pav-api
|
156a6d5fc9d2dd5171fc2e3bc9483eaa004c8e51
|
enabling CORS. a bit too open now, must tweak later
|
diff --git a/Gemfile b/Gemfile
index 962ed9a..665e758 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,36 +1,37 @@
source :rubygems
gem 'sinatra'
gem 'json'
gem 'rack'
gem 'rack-contrib', :require => 'rack/contrib'
gem 'builder'
gem 'rbrainz'
gem 'rchardet19'
gem 'rest-client', :require=>'rest_client'
gem 'crack'
gem 'meta-spotify'
gem 'chronic_duration'
gem 'chronic'
gem 'sinatra-respond_to'
gem 'dm-core'
gem 'dm-mysql-adapter'
gem 'dm-serializer'
gem 'dm-timestamps'
gem 'dm-aggregates'
gem 'dm-migrations'
gem 'rack-throttle', :require => 'rack/throttle'
+gem 'rack-cors', :require => 'rack/cors'
gem 'memcached'
gem 'yajl-ruby', :require=> 'yajl/json_gem'
gem 'newrelic_rpm'
gem 'delayed_job'
gem 'delayed_job_data_mapper'
gem 'stalker'
gem 'i18n'
gem 'foreman'
\ No newline at end of file
diff --git a/pavapi.rb b/pavapi.rb
index 9131321..f5fe781 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -1,279 +1,286 @@
#versioning
@version = "v1"
#core stuff
require 'rubygems'
require 'sinatra'
require './models'
require './store_methods'
#Queueing with delayed job
#require 'delayed_job'
#require 'delayed_job_data_mapper'
#require './storetrackjob'
require 'stalker'
#template systems
require 'yajl/json_gem'
require 'rack/contrib/jsonp'
require 'builder'
use Rack::JSONP
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
# Enable New Relic
#configure :production do
#require 'newrelic_rpm'
#end
#throttling
#require 'rack/throttle'
#require 'memcached'
#require './throttler'
+require 'rack/cors'
#for serving different content types
require 'sinatra/respond_to'
Sinatra::Application.register Sinatra::RespondTo
require 'bigdecimal'
+#require "sinatra/reloader" if development?
configure do
#use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
#use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
-
+ use Rack::Cors do
+ allow do
+ origins '*'
+ resource '/*', :headers => :any, :methods => :get
+ end
+ end
#logging
DataMapper::Logger.new('log/datamapper.log', :warn )
DataMapper::Model.raise_on_save_failure = true
$LOG = Logger.new('log/pavstore.log', 'monthly')
# MySQL connection:
@config = YAML::load( File.open( 'config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#DataMapper.auto_upgrade!
#DataMapper::auto_migrate!
set :default_content, :html
end
#Caching
before '/*' do
cache_control :public, :must_revalidate, :max_age => 60 unless development?
end
before '/demo/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
before '*/chart/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
#one week = 60*60*24*7
from_date = played_to - 604800
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
def get_artist_query(q)
if (!q.nil?)
return "AND artists.artistname LIKE '%#{q}%' "
end
end
def get_track_query(q)
if (!q.nil?)
return "AND tracks.title LIKE '%#{q}%' "
end
end
def get_album_query(q)
if (!q.nil?)
return "AND albums.albumname LIKE '%#{q}%' "
end
end
def get_all_query(q)
if (!q.nil?)
return "AND (albums.albumname LIKE '%#{q}%' OR albums.albumname LIKE '%#{q}%' OR artists.artistname LIKE '%#{q}%') "
end
end
def get_order_by(order)
if (order=='artist')
return "artists.artistname ASC, plays.playedtime DESC"
elsif (order=='track')
return "tracks.title ASC, plays.playedtime DESC"
else
return "plays.playedtime DESC"
end
end
def get_channel(channel)
if(!channel.nil?)
return "AND plays.channel_id=#{channel}"
end
end
def get_program(program)
if(!program.nil?)
return "AND plays.program_id='#{program}'"
end
end
def merge_tracks(old_id, new_id)
old_track = Track.get(old_id)
new_track = Track.get(new_id)
if(old_track&&new_track)
#album
#move tracks from old album to new album
link = AlbumTrack.all(:track_id => old_track.id)
link.each{ |link_item|
@album_load = Album.get(link_item.album_id)
@moved = @album_load.tracks << new_track
@moved.save
}
#delete old album_track relations
link.destroy!
#artist
#move tracks from old artist to new artist
link = ArtistTrack.all(:track_id => old_track.id)
link.each{ |link_item|
@artist_load = Artist.get(link_item.artist_id)
@moved = @artist_load.tracks << new_track
@moved.save
}
#delete old artist_track relations
link.destroy!
#plays
plays = Play.all(:track_id => old_track.id)
plays.each{ |link_item|
link_item.update(:track_id => new_id)
}
#delete old track
old_track.destroy!
end
end
end
#ROUTES
# Front page
get '/' do
erb :front
end
require './routes/admin'
require './routes/artist'
require './routes/track'
require './routes/album'
require './routes/channel'
require './routes/play'
require './routes/chart'
require './routes/demo'
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
\ No newline at end of file
|
simonhn/pav-api
|
7f1bad0eaaf5a3f2f5aa5ef501fc7c3d3731baac
|
removing group by from query, multiple artists for a track will appear twice from now on, but muuuuch better performance
|
diff --git a/routes/play.rb b/routes/play.rb
index 3914a9a..8458890 100644
--- a/routes/play.rb
+++ b/routes/play.rb
@@ -1,34 +1,34 @@
#PLAY
get "/#{@version}/plays" do
#DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
artist_query = get_artist_query(params[:artist_query])
track_query = get_track_query(params[:track_query])
album_query = get_album_query(params[:album_query])
query_all = get_all_query(params[:q])
order_by = get_order_by(params[:order_by])
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
program = get_program(params[:program])
if channel
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
- @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} #{program} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
+ @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} #{program} order by #{order_by} limit #{limit}")
else
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
- @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} #{program} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
+ @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} #{program} order by #{order_by} limit #{limit}")
end
hat = @plays.collect {|o| {:title => o.title, :track_id => o.track_id, :trackmbid => o.trackmbid, :artistname => o.artistname, :artist_id => o.artist_id, :artistmbid => o.artistmbid, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage, :album_id => o.album_id, :albummbid => o.albummbid, :program_id => o.program_id, :channel_id => o.channel_id} }
respond_to do |wants|
wants.html { erb :plays }
wants.xml { builder :plays }
wants.json { hat.to_json }
end
end
get "/#{@version}/play/:id" do
@play = Play.get(params[:id])
respond_to do |wants|
wants.json { @play.to_json }
end
end
\ No newline at end of file
|
simonhn/pav-api
|
ce002a54341f5938d94a4b9a961df8c702507396
|
adding programs to /details
|
diff --git a/routes/artist.rb b/routes/artist.rb
index 60b3a40..4f257a4 100644
--- a/routes/artist.rb
+++ b/routes/artist.rb
@@ -1,211 +1,220 @@
#show all artists, defaults to 10, ordered by created date
get "/#{@version}/artists" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist }
wants.xml { builder :artist }
wants.json { @artist.to_json }
end
end
get "/#{@version}/artist/:id/details" do
result = Hash.new
#if no channel parameter provided, we assume all channels
channel = get_channel(params[:channel])
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
artist_result = Hash.new
artist_result['artist_id'] = @artist.id
artist_result['artistname'] = @artist.artistname
result["artist"] = artist_result
@play_count = repository(:default).adapter.select("SELECT plays.playedtime, tracks.title FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} #{channel} order by playedtime")
if !@play_count.empty?
@tracks = repository(:default).adapter.select("SELECT count(plays.id) as play_count, tracks.title, tracks.id FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} group by tracks.id order by playedtime")
result["tracks"] = @tracks.collect {|o| {:count => o.play_count, :title => o.title, :track_id => o.id} }
@albums = @artist.tracks.albums
- result["albums"] = @albums.collect {|o| {:count => o.id, :album_id => o.id, :albumname => o.albumname, :albumimage => o.albumimage} }
+ result["albums"] = @albums.collect {|o| {:album_id => o.id, :albumname => o.albumname, :albumimage => o.albumimage} }
result["play_count"] = @play_count.size
+ programs = repository(:default).adapter.select("select count(plays.id) as play_count, program_id from plays, tracks, artist_tracks, artists where artists.id=#{@artist.id} AND artists.id = artist_tracks.artist_id AND artist_tracks.track_id=tracks.id and tracks.id=plays.track_id AND plays.program_id !='' group by program_id")
+ result["programs"] = programs.collect {|o| {:play_count => o.play_count, :program_id => o.program_id} }
+
first_play = @play_count.first
#puts 'first played on '+Time.parse(first_play.playedtime.to_s).to_s
result["first_play"] = Time.parse(first_play.playedtime.to_s).to_s
last_play = @play_count.last
#puts 'last played on '+Time.parse(last_play.playedtime.to_s).to_s
result["last_play"] = Time.parse(last_play.playedtime.to_s).to_s
average_duration = @artist.tracks.avg(:duration)
#puts 'average track duration '+average_duration.inspect
result["avg_duration"] = average_duration
australian = @artist.tracks.first.aust
#puts 'australian? '+australian.inspect
result["australian"] = australian
@artist_chart = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{channel} group by artists.id order by cnt desc")
index_number = @artist_chart.index{|x|x[:id][email protected]}
real_index = 1+index_number.to_i
#puts 'Position on all time chart '+real_index.to_s
result["chart_pos"] = real_index
- #@play_count_range
- @time_range = (Time.parse(last_play.playedtime.to_s) - Time.parse(first_play.playedtime.to_s))
- @slice = @time_range / 10
- hat = Time.parse(first_play.playedtime.to_s)
- i = 0
- result_array = []
+ #@play_count_range, divides last - first into 10 time slots
+ if @play_count.size > 1 #only makes sense if more than one play
+ @time_range = (Time.parse(last_play.playedtime.to_s) - Time.parse(first_play.playedtime.to_s))
+ @slice = @time_range / 10
+ hat = Time.parse(first_play.playedtime.to_s)
+ i = 0
+ result_array = []
- while i < 10 do
- from = hat
- hat = hat + @slice
- to = hat
- to_from = "AND playedtime <= '#{to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime >= '#{from.strftime("%Y-%m-%d %H:%M:%S")}'"
- @play_counter = repository(:default).adapter.select("SELECT plays.playedtime, tracks.title FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} #{channel} #{to_from} order by playedtime")
- item = Hash.new
- item["from"] = from.to_s
- item["to"] = to.to_s
- item["count"] = @play_counter.size.to_s
- result_array[i] = item
- i += 1
+ while i < 10 do
+ from = hat
+ hat = hat + @slice
+ to = hat
+ to_from = "AND playedtime <= '#{to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime >= '#{from.strftime("%Y-%m-%d %H:%M:%S")}'"
+ @play_counter = repository(:default).adapter.select("SELECT plays.playedtime, tracks.title FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} #{channel} #{to_from} order by playedtime")
+ item = Hash.new
+ item["from"] = from.to_s
+ item["to"] = to.to_s
+ item["count"] = @play_counter.size.to_s
+ result_array[i] = item
+ i += 1
+ end
+ #puts 'time sliced play count '+result_array.inspect
+ result["time_sliced"] = result_array
+
+ #average play counts per week from first played to now
+ #@play_count.size
+ @new_time_range = (Time.now - Time.parse(first_play.playedtime.to_s))
+ avg = @play_count.size/(@new_time_range/(60*60*24*7))
+ #puts 'avg plays per week '+ avg.to_s
+ result["avg_play_week"] = avg
+ else
+ #when only 1 play:
+ result["time_sliced"] = []
+ result["avg_play_week"] = 0
end
- #puts 'time sliced play count '+result_array.inspect
- result["time_sliced"] = result_array
-
- #average play counts per week from first played to now
- #@play_count.size
- @new_time_range = (Time.now - Time.parse(first_play.playedtime.to_s))
- avg = @play_count.size/(@new_time_range/(60*60*24*7))
- #puts 'avg plays per week '+ avg.to_s
- result["avg_play_week"] = avg
#played on other channels?
channel_result = Hash.new
channels = Channel.all
channels.each do |channel|
q = repository(:default).adapter.select("SELECT count(*) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} AND plays.channel_id=#{channel.id}")
if q.first.to_i>0
channel_result[channel.channelname] = q.first
#puts 'played on ' + channel.channelname+' '+q.first.to_s+' times'
end
end
result["channels"] = channel_result
@res = result
end
respond_to do |wants|
wants.json { result.to_json }
end
end
# edit artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id/edit" do
protected!
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist_edit }
end
end
post "/#{@version}/artist/:id/edit" do
protected!
@artist = Artist.get(params[:id])
raise not_found unless @artist
@artist.attributes = {
:artistname => params["artistname"],
:artistmbid => params["artistmbid"],
:artistlink => params["artistlink"],
:artistnote => params["artistnote"]
}
@artist.save
redirect "/v1/artist/#{@artist.id}"
end
# show tracks from artist
get "/#{@version}/artist/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@tracks = @artist.tracks
@tracks_json = repository(:default).adapter.select("SELECT count(plays.id) as play_count, tracks.title FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} group by tracks.id order by playedtime")
respond_to do |wants|
wants.html { erb :artist_tracks }
wants.xml { builder :artist_tracks }
wants.json { @tracks_json.to_json }
end
end
# show albums from artist
get "/#{@version}/artist/:id/albums" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@albums = @artist.tracks.albums
respond_to do |wants|
wants.html { erb :artist_albums }
wants.xml { builder :artist_albums }
wants.json { @albums.to_json }
end
end
# show plays from artist
get "/#{@version}/artist/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
channel = params[:channel]
limit = get_limit(params[:limit])
if channel
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} AND artists.id=#{@artist.id} group by tracks.id, plays.playedtime order by plays.playedtime limit #{limit}")
else
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id AND artists.id=#{@artist.id} group by tracks.id, plays.playedtime order by plays.playedtime limit #{limit}")
end
hat = @plays.collect {|o| {:title => o.title, :track_id => o.track_id, :trackmbid => o.trackmbid, :artistname => o.artistname, :artist_id => o.artist_id, :artistmbid => o.artistmbid, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage, :album_id => o.album_id, :albummbid => o.albummbid, :program_id => o.program_id, :channel_id => o.channel_id} }
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
wants.json { hat.to_json }
end
end
\ No newline at end of file
|
simonhn/pav-api
|
5cf960a97083b3889265620e7347a1e21f44d562
|
styling the toc
|
diff --git a/public/css/master.css b/public/css/master.css
index 45d66e9..77bf135 100644
--- a/public/css/master.css
+++ b/public/css/master.css
@@ -1,23 +1,24 @@
h1{
font-size: 3em;
font-weight: 300;
}
ul li a{
font-weight: normal;
}
ul li ul li a{
font-weight: normal;
}
.row .span5{
- background-color: #EEE;
- padding:10px;
+ background-color: #F8F8F8;
+ border: 1px #CCC solid;
+ padding:1em;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.1);
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.1);
box-shadow: 0 1px 2px rgba(0,0,0,.1);
float:right;
}
|
simonhn/pav-api
|
b5a2e63a3f290cb882a8613639f20b89da29b0a4
|
styling the documentation
|
diff --git a/public/css/master.css b/public/css/master.css
index 2284b6b..45d66e9 100644
--- a/public/css/master.css
+++ b/public/css/master.css
@@ -1,63 +1,23 @@
-body { font-family: " Georgia, serif"; margin: 0; padding: 0; }
-header, article, section, aside, footer { display: block; }
-h1, h2, h3, h4, h5, h6, p { margin: 0; padding: 0; font-weight: normal; }
-a { color: inherit; text-decoration: none; }
-ul a, code a{text-decoration: underline;}
-a:hover {
- border-bottom: 1px solid #555;
- background-color:#FFF461;
- color:#222222;
+h1{
+ font-size: 3em;
+ font-weight: 300;
}
-div#wrapper { margin: 2em auto 0; width: 600px; padding: 0 0 1em 0; }
-header#main { width: 600px; margin: 0 auto; border-bottom: 3px double rgba(0, 0, 0, 0.5); }
-
-header#main h1{font-family: 'Helvetica Neue', Helvetica, sans-serif;
-text-shadow: 0 1px 0 white;
-color: black;
-font-size: 58px;
-line-height: 1.0em;
-letter-spacing: -1px;
-margin-top: 60px;
-margin-bottom: 10px;
-font-weight: bold;
-}
-
-h2,h3,h4{
- font-family: 'Helvetica Neue', Helvetica, sans-serif;
- text-shadow: 0 1px 0 white;
- color: black;
- letter-spacing: -1px;
- font-weight: bold;
-}
-h4{
- font-family: 'Helvetica Neue', Helvetica, sans-serif;
- color: black;
- letter-spacing: 0px;
+ul li a{
+ font-weight: normal;
}
-h5{
- font-family: 'Helvetica Neue', Helvetica, sans-serif;
- color:#A30000;
+ul li ul li a{
+ font-weight: normal;
}
-
-p, code {
- padding-bottom: 5px;
+.row .span5{
+ background-color: #EEE;
+ padding:10px;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+ -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.1);
+ -moz-box-shadow: 0 1px 2px rgba(0,0,0,.1);
+ box-shadow: 0 1px 2px rgba(0,0,0,.1);
+ float:right;
}
-.missing{text-decoration:line-through;}
-
-code{
- background-color: ghostWhite;
- border: 1px solid #DEDEDE;
- font-family: Monaco, "Courier New", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace;
- font-size:75%;
- width:100%;
- display:block;
-}
-code .inner-code{
- padding: 5px;
-}
-code a{
- font-family: Monaco, "Courier New", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace;
-
-}
\ No newline at end of file
diff --git a/views/front.html.erb b/views/front.html.erb
index 9e77b78..3884ded 100644
--- a/views/front.html.erb
+++ b/views/front.html.erb
@@ -1,465 +1,521 @@
<section id="intro">
-<p>The pav:api exposes playlist data and is currently under development.</p>
-<p>Have a look at the <a href='/demo'>app gallery</a> to see what can be built using pav:api.</p>
-
-<ul class="unstyled">
- <li><a href="#general">general information</a></li>
- <ul>
- <li><a href="#general-query-parameters">query parameters</a></li>
- <li><a href="#general-identifiers">identifiers</a></li>
- <li><a href="#general-authentication">authentication</a></li>
- <li><a href="#general-versioning">versioning</a></li>
- <li><a href="#general-return-types">return types</a></li>
- <li><a href="#general-response-codes">reponse codes</a></li>
- <li><a href="#general-terms">terms</a></li>
- </ul>
- <li> </li>
- <li><a href="#resources">resources</a></li>
- <ul>
- <li><a href="#resources-artists">artists</a></li>
- <li><a href="#resources-tracks">tracks</a></li>
- <li><a href="#resources-albums">albums</a></li>
- <li><a href="#resources-channels">channels</a></li>
- <li><a href="#resources-plays">plays</a></li>
- <li><a href="#resources-chart">charts</a></li>
- <li><a href="#resources-search">search</a></li>
- </ul>
-</ul>
-</section>
-<section id="general">
- <h2 id="general">general information</h2>
- <h3 id="general-query-parameters">query parameters</h3>
- <div>Some paths accepts the following query parameters. See each <a href="#resources">resource</a> type for more specifics.</div>
- <ul>
- <li><code>channel</code>, default is all channels, available on paths that returns a list of results</li>
- <li><code>limit</code>, default is 10, available on paths that returns a list results</li>
- <li><code>callback</code>, for cross-domain access jsonp is delivered to requests with 'callback' query parameter and json as return type</li>
- <li><code>format</code>, return type format (html, json, xml)</li>
- <li><code>type</code>, to specify lookup type, mbid</li>
- <li><code>to</code> (to date) in yyyy-mm-dd hh:mm:ss format. The hh:mm:ss part is optional, assumes 12:00:00 if absent</li>
- <li><code>from</code> (from date) in yyyy-mm-dd hh:mm:ss format. The hh:mm:ss part is optional, assumes 12:00:00 if absent</li>
- <li><code>order_by</code>, for ordering results. Default is playedtime. Allowed values are artist and track</li>
- <li><code>q</code>, a query for searching for track title, album name and artist name</li>
- <li><code>artist_query</code>, searching for an artist name</li>
- <li><code>track_query</code>, searching for a track title</li>
- <li><code>album_query</code>, searching for an album name</li>
- <li><code>program</code>, the program_id to limit result to a certain show</li>
- </ul>
-<p>
- <h3 id="general-identifiers">identifiers</h3>
- To lookup a specific artist/track/album you can use pav IDs or Musicbrainz IDs where available.
-</p>
+<div class="row">
+ <div class="span10 columns">
+ <p>The pav:api exposes playlist data and is currently under development.</p>
+ <p>Have a look at the <a href='/demo'>app gallery</a> to see what can be built using pav:api.</p>
+ <section id="general">
+ <h2 id="general">General Information</h2>
+ <h3 id="general-query-parameters">Query Parameters</h3>
+ <div>Some paths accepts the following query parameters. See each <a href="#resources">resource</a> type for more specifics.</div>
+ <ul>
+ <li><code>channel</code>, default is all channels, available on paths that returns a list of results</li>
+ <li><code>limit</code>, default is 10, available on paths that returns a list results</li>
+ <li><code>callback</code>, for cross-domain access jsonp is delivered to requests with 'callback' query parameter and json as return type</li>
+ <li><code>format</code>, return type format (html, json, xml)</li>
+ <li><code>type</code>, to specify lookup type, mbid</li>
+ <li><code>to</code> (to date) in yyyy-mm-dd hh:mm:ss format. The hh:mm:ss part is optional, assumes 12:00:00 if absent</li>
+ <li><code>from</code> (from date) in yyyy-mm-dd hh:mm:ss format. The hh:mm:ss part is optional, assumes 12:00:00 if absent</li>
+ <li><code>order_by</code>, for ordering results. Default is playedtime. Allowed values are artist and track</li>
+ <li><code>q</code>, a query for searching for track title, album name and artist name</li>
+ <li><code>artist_query</code>, searching for an artist name</li>
+ <li><code>track_query</code>, searching for a track title</li>
+ <li><code>album_query</code>, searching for an album name</li>
+ <li><code>program</code>, the program_id to limit result to a certain show</li>
+ </ul>
+
+ <p>
+ <h3 id="general-identifiers">Identifiers</h3>
+ To lookup a specific artist/track/album you can use pav IDs or Musicbrainz IDs where available.
+ </p>
+
+ <p>
+ <h3 id="general-authentication">Authentication</h3>
+ All put and post requests require authentication
+ </p>
+
+ <p>
+ <h3 id="general-versioning">Versioning</h3>
+ The version of the api you wish to use is specified at the root path of resources. The current version is v1.
+ </p>
+
+ <p>
+ <h3 id="general-return-types">Return Types</h3>
+ Return type can selected by appending the desired content type to the url (.html, .xml, .json) or by adding ?format=(html, xml, json) to the query parameter. Use only one of these methods when doing a request.
+ <br />
+ Default return type is currently html but will change to json when the API is put in production.
+ </p>
+
+ <p>
+ <h3 id="general-response-codes">Response Codes</h3>
+ The API attempts to return appropriate HTTP status codes for every request.
+ <ul>
+ <li>200 OK: Request succeeded</li>
+ <li>400 Bad Request: Your request was invalid and we'll return an error message telling you why</li>
+ <li>401 Not Authorized: You did not provide the right credentials</li>
+ <li>404 Not Found: The URI requested is invalid or the resource requested, such as a user, does not exists</li>
+ <li>500 Internal Server Error: Something is broken.</li>
+ <li>503 Service Unavailable: You cannot make this request at this time. Servers are up, but overloaded with requests</li>
+ </ul>
+ </p>
+
+ <p>
+ <h3 id="general-terms">Terms</h3>
+ Please be nice when using the api. If you plan to make massive amounts of calls please advise us.
+ </p>
+ </section>
+ </div>
+ <div class="span5 columns">
+ <h3>Table of Contents</h3>
+ <ul class="unstyled">
+ <li><a href="#general">General Information</a></li>
+ <ul>
+ <li><a href="#general-query-parameters">Query Parameters</a></li>
+ <li><a href="#general-identifiers">Identifiers</a></li>
+ <li><a href="#general-authentication">Authentication</a></li>
+ <li><a href="#general-versioning">Versioning</a></li>
+ <li><a href="#general-return-types">Return Types</a></li>
+ <li><a href="#general-response-codes">Reponse Codes</a></li>
+ <li><a href="#general-terms">Terms</a></li>
+ </ul>
+ <li> </li>
+ <li><a href="#resources">Resources</a></li>
+ <ul>
+ <li><a href="#resources-artists">Artists</a>
+ <ul>
+ <li><a href="#resources-artists-list">List of new artists</a></li>
+ <li><a href="#resources-artist-single">A single artist</a></li>
+ <li><a href="#resources-artist-albums">Albums from a specific artist</a></li>
+ <li><a href="#resources-artist-tracks">Tracks from a specific artist</a></li>
+ <li><a href="#resources-artist-plays">Plays from a specific artist</a></li>
+ </ul>
+ </li>
+ <li><a href="#resources-tracks">Tracks</a>
+ <ul>
+ <li><a href="#resources-tracks-list">List of new tracks</a></li>
+ <li><a href="#resources-track-single">A single track</a></li>
+ <li><a href="#resources-track-artists">Artists related to a specific track</a></li>
+ <li><a href="#resources-track-albums">Albums related to a specific track</a></li>
+ <li><a href="#resources-track-plays">Plays of a specific track</a></li>
+ <li><a href="#resources-track-new">Create a new play of a track</a></li>
+ </ul>
+ </li>
+ <li><a href="#resources-albums">Albums</a>
+ <ul>
+ <li><a href="#resources-albums-list">List of new albums</a></li>
+ <li><a href="#resources-album-single">A single album</a></li>
+ <li><a href="#resources-album-tracks">Tracks on a specific album</a></li>
+ </ul>
+ </li>
+ <li><a href="#resources-channels">Channels</a>
+ <ul>
+ <li><a href="#resources-channels-list">All channels</a></li>
+ <li><a href="#resources-channel-single">A single channel</a></li>
+ <li><a href="#resources-channel-new">Create a new channel</a></li>
+ <li><a href="#resources-channel-edit">Edit a channel</a></li>
+ </ul>
+ </li>
+ <li><a href="#resources-plays">Plays</a>
+ <ul>
+ <li><a href="#resources-plays-list">A playlist</a></li>
+ <li><a href="#resources-play-single">A single play</a></li>
+ </ul>
+ </li>
+ <li><a href="#resources-chart">Charts</a>
+ <ul>
+ <li><a href="#resources-chart-artist">An artist chart</a></li>
+ <li><a href="#resources-chart-track">A track chart</a></li>
+ <li><a href="#resources-chart-album">An album chart</a></li>
+ </ul>
+ </li>
+ <li><a href="#resources-search">Search</a></li>
+ </ul>
+ </ul>
+ </div>
+ </div>
-<p>
- <h3 id="general-authentication">authentication</h3>
- All put and post requests require authentication
-</p>
-<p>
- <h3 id="general-versioning">versioning</h3>
- The version of the api you wish to use is specified at the root path of resources. The current version is v1.
-</p>
-
-<p>
- <h3 id="general-return-types">return types</h3>
- Return type can selected by appending the desired content type to the url (.html, .xml, .json) or by adding ?format=(html, xml, json) to the query parameter. Use only one of these methods when doing a request.
-<br />
- Default return type is currently html but will change to json when the API is put in production.
-</p>
-
-<p>
- <h3 id="general-response-codes">response codes</h3>
- The API attempts to return appropriate HTTP status codes for every request.
- <ul>
- <li>200 OK: Request succeeded</li>
- <li>400 Bad Request: Your request was invalid and we'll return an error message telling you why</li>
- <li>401 Not Authorized: You did not provide the right credentials</li>
- <li>404 Not Found: The URI requested is invalid or the resource requested, such as a user, does not exists</li>
- <li>500 Internal Server Error: Something is broken.</li>
- <li>503 Service Unavailable: You cannot make this request at this time. Servers are up, but overloaded with requests</li>
- </ul>
-</p>
-
-<p>
- <h3 id="general-terms">terms</h3>
- Please be nice when using the api. If you plan to make massive amounts of calls please advise us.
-</p>
</section>
+
<section id="resources">
-<h2 id="resources">resources</h2>
+<h2 id="resources">Resources</h2>
The resources that can be accessed through the api follows the model below:
<div id="model-img">
<img id="resources-model" width="400px" src="images/models.png"/>
</div>
Some useful observation about the model:
<ul>
<li>An artist can have multiple tracks</li>
<li>A track can have multiple artists</li>
<li>A track can have multiple albums (a track appearing on different albums)</li>
<li>An album can have multiple tracks</li>
<li>A track can have multiple plays</li>
<li>A play belongs to one track</li>
<li>A play belongs to one channel</li>
<li>A channel can have multiple plays</li>
</ul>
+<p>
+
+</p>
-<h3 id="resources-artists">artists</h3>
+<h3 id="resources-artists">Artists</h3>
-<h4>/artists</h4>
+<h4 id="resources-artists-list">/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of artists</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/artists.json?channel=4">/v1/artists.json?channel=4</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967986.js"></script>
</div>
-<h4>/artist/:id</h4>
+<h4 id="resources-artist-single">/artist/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/artist/1234.json">/v1/artist/1234.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967997.js"></script>
</div>
-<h4>/artist/:id/tracks</h4>
+<h4 id="resources-artist-tracks">/artist/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code></p>
<h5>Example query</h5>
<code><a href="/v1/artist/1234/tracks.json">/v1/artist/1234/tracks.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968001.js"></script>
</div>
-<h4>/artist/:id/albums</h4>
+<h4 id="resources-artist-albums">/artist/:id/albums</h4>
<div class='resource'>
<h5>Description</h5>
- <p>Returns the plays related to a single artist</p>
+ <p>Returns the albums related to a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code></p>
<h5>Example query</h5>
<code><a href="/v1/artist/1234/albums.json">/v1/artist/1234/albums.json</a></code>
-
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/1185129.js"></script>
</div>
-<h4>/artist/:id/plays</h4>
+<h4 id="resources-artist-plays">/artist/:id/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the plays related to a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>, <code>channel</code></p>
<h5>Example query</h5>
<code><a href="/v1/artist/1234/plays.json">/v1/artist/1234/plays.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/956363.js"> </script>
</div>
-<h3 id="resources-tracks">tracks</h3>
-<h4>/tracks</h4>
+<h3 id="resources-tracks">Tracks</h3>
+<h4 id="resources-tracks-list">/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of tracks</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/tracks.json?channel=4&limit=3">/v1/tracks.json?channel=4&limit=3</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968008.js"></script>
</div>
-<h4>/track/:id</h4>
+<h4 id="resources-track-single">/track/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single track specified by an id.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324.json">/v1/track/324.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968013.js?file=gistfile1.json"></script>
</div>
-<h4>post /track</h4>
-<div class='resource'>
- <h5>Description</h5>
- <p>Post a track to pav. Requires authentication.</p>
-
- <h5>Parameters</h5>
- <p>A json payload</p>
- <script src="https://gist.github.com/968015.js?file=gistfile1.json"></script>
-
- <h5>Example response</h5>
- <p><code>200</code></p>
-</div>
-
-<h4>/track/:id/artists</h4>
+<h4 id="resources-track-artists">/track/:id/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the artists related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324/artists.json">/v1/track/324/artists.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968022.js?file=gistfile1.json"></script>
</div>
-<h4>/track/:id/albums</h4>
+<h4 id="resources-track-albums">/track/:id/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the albums related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324/albums.json">/v1/track/324/albums.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968023.js?file=gistfile1.json"></script>
</div>
-<h4>/track/:id/plays</h4>
+<h4 id="resources-track-plays">/track/:id/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the plays related to a single track.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324/plays.json">/v1/track/324/plays.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968025.js?file=gistfile1.json"></script>
</div>
+<h4 id="resources-track-new">post /track</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Post a track to pav. Requires authentication.</p>
+
+ <h5>Parameters</h5>
+ <p>A json payload</p>
+ <script src="https://gist.github.com/968015.js?file=gistfile1.json"></script>
+
+ <h5>Example response</h5>
+ <p><code>200</code></p>
+</div>
-<h3 id="resources-albums">albums</h3>
-<h4>/albums</h4>
+<h3 id="resources-albums">Albums</h3>
+<h4 id="resources-albums-list">/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of albums.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/albums.json">/v1/albums.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968027.js?file=gistfile1.json"></script>
</div>
-<h4>/album/:id</h4>
+<h4 id="resources-album-single">/album/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/album/15.json">/v1/album/15.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968029.js?file=gistfile1.json"></script>
</div>
-<h4>/album/:id/tracks</h4>
+<h4 id="resources-album-tracks">/album/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/album/15/tracks.json">/v1/album/15/tracks.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968035.js?file=gistfile1.json"></script>
</div>
-<h3 id="resources-channels">channels</h3>
-<h4>/channels</h4>
+<h3 id="resources-channels">Channels</h3>
+<h4 id="resources-channels-list">/channels</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of channels.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/channels.json">/v1/channels.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968054.js?file=gistfile1.json"></script>
</div>
-<h4>/channel/:id</h4>
+<h4 id="resources-channel-single">/channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single channel.</p>
<h5>Example query</h5>
<code><a href="/v1/channel/1.json">/v1/channel/1.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968058.js?file=gistfile1.json"></script>
</div>
-<h4>post channel</h4>
+<h4 id="resources-channel-new">post channel</h4>
<div class='resource'>
<h5>Description</h5>
<p>Create a new channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
-<h4>put channel/:id</h4>
+<h4 id="resources-channel-edit">put channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Update a channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
-<h3 id="resources-plays">plays</h3>
-<h4>/plays</h4>
+<h3 id="resources-plays">Plays</h3>
+<h4 id="resources-plays-list">/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a playlist.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>to</code>, <code>from</code>, <code>limit</code>, <code>channel</code>, <code>program</code>, <code>artist_query</code>, <code>track_query</code>, <code>album_query</code>, <code>q</code> (query artist, channel and track name), <code>order_by</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/plays.json?channel=1&limit=3">/v1/plays.json?channel=1&limit=3</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/956363.js"> </script>
</div>
-<h4>/play/:id</h4>
+<h4 id="resources-play-single">/play/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single play.</p>
<h5>Example query</h5>
<code><a href="/v1/play/4356.json">/v1/play/4356.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968064.js?file=gistfile1.json"></script>
</div>
-<h3 id="resources-chart">charts</h3>
-<h4>/chart/artist</h4>
+<h3 id="resources-chart">Charts</h3>
+<h4 id="resources-chart-artist">/chart/artist</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played artists for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>, <code>to</code>, <code>from</code>, <code>program</code>. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><a href="/v1/chart/artist.json?channel=1">/v1/chart/artist.json?channel=1</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973721.js?file=gistfile1.json"></script>
</div>
-<h4>/chart/track</h4>
+<h4 id="resources-chart-track">/chart/track</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played tracks for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>, <code>to</code>, <code>from</code>, <code>program</code>. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><a href="/v1/chart/track.json?from=2011-04-20">/v1/chart/track.json?from=2011-04-20</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973726.js?file=gistfile1.json"></script>
</div>
-<h4>/chart/album</h4>
+<h4 id="resources-chart-album">/chart/album</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played albums for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>, <code>to</code>, <code>from</code>, <code>program</code>. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><a href="/v1/chart/album.json?limit=5&channel=4">/v1/chart/album.json?limit=5&channel=4</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973730.js?file=gistfile1.json"></script>
</div>
-<h3 id="resources-search">search</h3>
+<h3 id="resources-search">Search</h3>
<div class='resource'>
<h5>Description</h5>
<p>Search for artists (tracks and albums to come).</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/search/dylan.json?limit=5">/v1/search/dylan.json?limit=5</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973733.js?file=gistfile1.json"></script>
</div>
</section>
<style type="text/css" media="screen">
+
.gist-syntax .s2 {
color: black;
}
.gist .gist-file .gist-data{
font-size:75%;
}
.gist .gist-file .gist-meta{
display:none;
}
</style>
diff --git a/views/layout.html.erb b/views/layout.html.erb
index 68f96de..9734455 100644
--- a/views/layout.html.erb
+++ b/views/layout.html.erb
@@ -1,27 +1,27 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>pav api</title>
-<!--<link rel="stylesheet" href="/css/master.css" type="text/css" />-->
<link rel="stylesheet" href="/css/bootstrap-1.0.0.css" type="text/css" />
+<link rel="stylesheet" href="/css/master.css" type="text/css" />
<!--[if IE]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<link rel="shortcut icon" href="/images/favicon.ico"/>
</head>
<body>
<div class="container">
<a href="http://github.com/simonhn"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>
<header id="main">
<hgroup>
<a href="/"><h1>pav:api</h1></a>
</hgroup>
</header>
<div id="main-content">
<%= yield %>
</div>
</div>
</body>
</html>
\ No newline at end of file
|
simonhn/pav-api
|
d9eef49110f4057e5faddcc931bc1a50229d3eb4
|
adding artist/id/albums and artist/id/plays to the mix
|
diff --git a/routes/artist.rb b/routes/artist.rb
index e3230de..60b3a40 100644
--- a/routes/artist.rb
+++ b/routes/artist.rb
@@ -1,202 +1,211 @@
#show all artists, defaults to 10, ordered by created date
get "/#{@version}/artists" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist }
wants.xml { builder :artist }
wants.json { @artist.to_json }
end
end
get "/#{@version}/artist/:id/details" do
result = Hash.new
#if no channel parameter provided, we assume all channels
channel = get_channel(params[:channel])
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
artist_result = Hash.new
artist_result['artist_id'] = @artist.id
artist_result['artistname'] = @artist.artistname
result["artist"] = artist_result
@play_count = repository(:default).adapter.select("SELECT plays.playedtime, tracks.title FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} #{channel} order by playedtime")
if !@play_count.empty?
@tracks = repository(:default).adapter.select("SELECT count(plays.id) as play_count, tracks.title, tracks.id FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} group by tracks.id order by playedtime")
result["tracks"] = @tracks.collect {|o| {:count => o.play_count, :title => o.title, :track_id => o.id} }
@albums = @artist.tracks.albums
result["albums"] = @albums.collect {|o| {:count => o.id, :album_id => o.id, :albumname => o.albumname, :albumimage => o.albumimage} }
result["play_count"] = @play_count.size
first_play = @play_count.first
#puts 'first played on '+Time.parse(first_play.playedtime.to_s).to_s
result["first_play"] = Time.parse(first_play.playedtime.to_s).to_s
last_play = @play_count.last
#puts 'last played on '+Time.parse(last_play.playedtime.to_s).to_s
result["last_play"] = Time.parse(last_play.playedtime.to_s).to_s
average_duration = @artist.tracks.avg(:duration)
#puts 'average track duration '+average_duration.inspect
result["avg_duration"] = average_duration
australian = @artist.tracks.first.aust
#puts 'australian? '+australian.inspect
result["australian"] = australian
@artist_chart = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{channel} group by artists.id order by cnt desc")
index_number = @artist_chart.index{|x|x[:id][email protected]}
real_index = 1+index_number.to_i
#puts 'Position on all time chart '+real_index.to_s
result["chart_pos"] = real_index
#@play_count_range
@time_range = (Time.parse(last_play.playedtime.to_s) - Time.parse(first_play.playedtime.to_s))
@slice = @time_range / 10
hat = Time.parse(first_play.playedtime.to_s)
i = 0
result_array = []
while i < 10 do
from = hat
hat = hat + @slice
to = hat
to_from = "AND playedtime <= '#{to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime >= '#{from.strftime("%Y-%m-%d %H:%M:%S")}'"
@play_counter = repository(:default).adapter.select("SELECT plays.playedtime, tracks.title FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} #{channel} #{to_from} order by playedtime")
item = Hash.new
item["from"] = from.to_s
item["to"] = to.to_s
item["count"] = @play_counter.size.to_s
result_array[i] = item
i += 1
end
#puts 'time sliced play count '+result_array.inspect
result["time_sliced"] = result_array
#average play counts per week from first played to now
#@play_count.size
@new_time_range = (Time.now - Time.parse(first_play.playedtime.to_s))
avg = @play_count.size/(@new_time_range/(60*60*24*7))
#puts 'avg plays per week '+ avg.to_s
result["avg_play_week"] = avg
#played on other channels?
channel_result = Hash.new
channels = Channel.all
channels.each do |channel|
q = repository(:default).adapter.select("SELECT count(*) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} AND plays.channel_id=#{channel.id}")
if q.first.to_i>0
channel_result[channel.channelname] = q.first
#puts 'played on ' + channel.channelname+' '+q.first.to_s+' times'
end
end
result["channels"] = channel_result
+ @res = result
end
respond_to do |wants|
wants.json { result.to_json }
end
end
# edit artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id/edit" do
protected!
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist_edit }
end
end
post "/#{@version}/artist/:id/edit" do
protected!
@artist = Artist.get(params[:id])
raise not_found unless @artist
@artist.attributes = {
:artistname => params["artistname"],
:artistmbid => params["artistmbid"],
:artistlink => params["artistlink"],
:artistnote => params["artistnote"]
}
@artist.save
redirect "/v1/artist/#{@artist.id}"
end
# show tracks from artist
get "/#{@version}/artist/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@tracks = @artist.tracks
@tracks_json = repository(:default).adapter.select("SELECT count(plays.id) as play_count, tracks.title FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} group by tracks.id order by playedtime")
respond_to do |wants|
wants.html { erb :artist_tracks }
wants.xml { builder :artist_tracks }
wants.json { @tracks_json.to_json }
end
end
# show albums from artist
get "/#{@version}/artist/:id/albums" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@albums = @artist.tracks.albums
respond_to do |wants|
- wants.html { erb :artist_plays }
- wants.xml { builder :artist_plays }
+ wants.html { erb :artist_albums }
+ wants.xml { builder :artist_albums }
wants.json { @albums.to_json }
end
end
# show plays from artist
get "/#{@version}/artist/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
- @plays = @artist.tracks.plays
+ channel = params[:channel]
+ limit = get_limit(params[:limit])
+ if channel
+
+ @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} AND artists.id=#{@artist.id} group by tracks.id, plays.playedtime order by plays.playedtime limit #{limit}")
+ else
+ @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id AND artists.id=#{@artist.id} group by tracks.id, plays.playedtime order by plays.playedtime limit #{limit}")
+ end
+ hat = @plays.collect {|o| {:title => o.title, :track_id => o.track_id, :trackmbid => o.trackmbid, :artistname => o.artistname, :artist_id => o.artist_id, :artistmbid => o.artistmbid, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage, :album_id => o.album_id, :albummbid => o.albummbid, :program_id => o.program_id, :channel_id => o.channel_id} }
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
- wants.json { @plays.to_json }
+ wants.json { hat.to_json }
end
end
\ No newline at end of file
diff --git a/views/albums.xml.builder b/views/albums.xml.builder
index 34cd0f5..d0c310a 100644
--- a/views/albums.xml.builder
+++ b/views/albums.xml.builder
@@ -1,9 +1,10 @@
xml.instruct! :xml, :version => '1.0'
xml.albums do
@albums.each do |album|
xml.album :id => album.id do
xml.artistname album.albumname
xml.created_at album.created_at
+ xml.albummbid album.albummbid
end
end
end
diff --git a/views/artist_albums.html.erb b/views/artist_albums.html.erb
new file mode 100644
index 0000000..8d33983
--- /dev/null
+++ b/views/artist_albums.html.erb
@@ -0,0 +1,7 @@
+<h2>Albums</h2>
+<% for album in @albums %>
+ <p><%= album.albumname %></p>
+ <% if !album.albumimage.nil? %><img src="<%= album.albumimage %>" /><% end %>
+ <% if !album.albummbid.nil? %><li>mbid: <a href="http://musicbrainz.org/release-group/<%= album.albummbid %>"><%= album.albummbid %></a></li><% end %>
+<% end %>
+
diff --git a/views/artist_albums.xml.builder b/views/artist_albums.xml.builder
new file mode 100644
index 0000000..07cad77
--- /dev/null
+++ b/views/artist_albums.xml.builder
@@ -0,0 +1,10 @@
+xml.instruct! :xml, :version => '1.0'
+xml.albums do
[email protected] do |album|
+xml.album :id => album.id do
+ xml.artistname album.albumname
+ xml.created_at album.created_at
+ xml.albummbid album.albummbid
+end
+end
+end
\ No newline at end of file
diff --git a/views/artist_plays.xml.builder b/views/artist_plays.xml.builder
index 82d1369..e9fb8c7 100644
--- a/views/artist_plays.xml.builder
+++ b/views/artist_plays.xml.builder
@@ -1,16 +1,20 @@
xml.instruct! :xml, :version => '1.0'
-xml.artist_plays do
-xml.artist do
- xml.artistname @artist.artistname
- xml.id @artist.id
-end
xml.plays do
[email protected] do |play|
-xml.play do
- xml.id play.id
- xml.channel_id play.channel_id
- xml.playedtime play.date
-end
-end
-end
+ @plays.each do |track|
+ xml.track do
+ xml.trackid track.track_id
+ xml.trackmbid track.trackmbid
+ xml.tracktitle track.title
+ xml.artistname track.artistname
+ xml.artistid track.artist_id
+ xml.artistmbid track.artistmbid
+ xml.albumid track.album_id
+ xml.albummbid track.albummbid
+ xml.albumname track.albumname
+ xml.albumimage track.albumimage
+ xml.channelid track.channel_id
+ xml.programid track.program_id
+ xml.playedtime track.playedtime
+ end
+ end
end
\ No newline at end of file
diff --git a/views/front.html.erb b/views/front.html.erb
index 0ce773c..9e77b78 100644
--- a/views/front.html.erb
+++ b/views/front.html.erb
@@ -1,438 +1,465 @@
<section id="intro">
<p>The pav:api exposes playlist data and is currently under development.</p>
<p>Have a look at the <a href='/demo'>app gallery</a> to see what can be built using pav:api.</p>
<ul class="unstyled">
<li><a href="#general">general information</a></li>
<ul>
<li><a href="#general-query-parameters">query parameters</a></li>
<li><a href="#general-identifiers">identifiers</a></li>
<li><a href="#general-authentication">authentication</a></li>
<li><a href="#general-versioning">versioning</a></li>
<li><a href="#general-return-types">return types</a></li>
<li><a href="#general-response-codes">reponse codes</a></li>
<li><a href="#general-terms">terms</a></li>
</ul>
<li> </li>
<li><a href="#resources">resources</a></li>
<ul>
<li><a href="#resources-artists">artists</a></li>
<li><a href="#resources-tracks">tracks</a></li>
<li><a href="#resources-albums">albums</a></li>
<li><a href="#resources-channels">channels</a></li>
<li><a href="#resources-plays">plays</a></li>
<li><a href="#resources-chart">charts</a></li>
<li><a href="#resources-search">search</a></li>
</ul>
</ul>
</section>
<section id="general">
<h2 id="general">general information</h2>
<h3 id="general-query-parameters">query parameters</h3>
<div>Some paths accepts the following query parameters. See each <a href="#resources">resource</a> type for more specifics.</div>
<ul>
<li><code>channel</code>, default is all channels, available on paths that returns a list of results</li>
<li><code>limit</code>, default is 10, available on paths that returns a list results</li>
<li><code>callback</code>, for cross-domain access jsonp is delivered to requests with 'callback' query parameter and json as return type</li>
<li><code>format</code>, return type format (html, json, xml)</li>
<li><code>type</code>, to specify lookup type, mbid</li>
<li><code>to</code> (to date) in yyyy-mm-dd hh:mm:ss format. The hh:mm:ss part is optional, assumes 12:00:00 if absent</li>
<li><code>from</code> (from date) in yyyy-mm-dd hh:mm:ss format. The hh:mm:ss part is optional, assumes 12:00:00 if absent</li>
<li><code>order_by</code>, for ordering results. Default is playedtime. Allowed values are artist and track</li>
<li><code>q</code>, a query for searching for track title, album name and artist name</li>
<li><code>artist_query</code>, searching for an artist name</li>
<li><code>track_query</code>, searching for a track title</li>
<li><code>album_query</code>, searching for an album name</li>
<li><code>program</code>, the program_id to limit result to a certain show</li>
</ul>
<p>
<h3 id="general-identifiers">identifiers</h3>
To lookup a specific artist/track/album you can use pav IDs or Musicbrainz IDs where available.
</p>
<p>
<h3 id="general-authentication">authentication</h3>
All put and post requests require authentication
</p>
<p>
<h3 id="general-versioning">versioning</h3>
The version of the api you wish to use is specified at the root path of resources. The current version is v1.
</p>
<p>
<h3 id="general-return-types">return types</h3>
Return type can selected by appending the desired content type to the url (.html, .xml, .json) or by adding ?format=(html, xml, json) to the query parameter. Use only one of these methods when doing a request.
<br />
Default return type is currently html but will change to json when the API is put in production.
</p>
<p>
<h3 id="general-response-codes">response codes</h3>
The API attempts to return appropriate HTTP status codes for every request.
<ul>
<li>200 OK: Request succeeded</li>
<li>400 Bad Request: Your request was invalid and we'll return an error message telling you why</li>
<li>401 Not Authorized: You did not provide the right credentials</li>
<li>404 Not Found: The URI requested is invalid or the resource requested, such as a user, does not exists</li>
<li>500 Internal Server Error: Something is broken.</li>
<li>503 Service Unavailable: You cannot make this request at this time. Servers are up, but overloaded with requests</li>
</ul>
</p>
<p>
<h3 id="general-terms">terms</h3>
Please be nice when using the api. If you plan to make massive amounts of calls please advise us.
</p>
</section>
<section id="resources">
<h2 id="resources">resources</h2>
The resources that can be accessed through the api follows the model below:
<div id="model-img">
<img id="resources-model" width="400px" src="images/models.png"/>
</div>
Some useful observation about the model:
<ul>
<li>An artist can have multiple tracks</li>
<li>A track can have multiple artists</li>
<li>A track can have multiple albums (a track appearing on different albums)</li>
<li>An album can have multiple tracks</li>
<li>A track can have multiple plays</li>
<li>A play belongs to one track</li>
<li>A play belongs to one channel</li>
<li>A channel can have multiple plays</li>
</ul>
<h3 id="resources-artists">artists</h3>
<h4>/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of artists</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/artists.json?channel=4">/v1/artists.json?channel=4</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967986.js"></script>
</div>
<h4>/artist/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/artist/1234.json">/v1/artist/1234.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967997.js"></script>
</div>
<h4>/artist/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code></p>
<h5>Example query</h5>
<code><a href="/v1/artist/1234/tracks.json">/v1/artist/1234/tracks.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968001.js"></script>
</div>
+<h4>/artist/:id/albums</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns the plays related to a single artist</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameter: <code>type</code></p>
+
+ <h5>Example query</h5>
+ <code><a href="/v1/artist/1234/albums.json">/v1/artist/1234/albums.json</a></code>
+
+</div>
+
+<h4>/artist/:id/plays</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns the plays related to a single artist</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameter: <code>type</code>, <code>channel</code></p>
+
+ <h5>Example query</h5>
+ <code><a href="/v1/artist/1234/plays.json">/v1/artist/1234/plays.json</a></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/956363.js"> </script>
+</div>
<h3 id="resources-tracks">tracks</h3>
<h4>/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of tracks</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/tracks.json?channel=4&limit=3">/v1/tracks.json?channel=4&limit=3</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968008.js"></script>
</div>
<h4>/track/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single track specified by an id.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324.json">/v1/track/324.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968013.js?file=gistfile1.json"></script>
</div>
<h4>post /track</h4>
<div class='resource'>
<h5>Description</h5>
<p>Post a track to pav. Requires authentication.</p>
<h5>Parameters</h5>
<p>A json payload</p>
<script src="https://gist.github.com/968015.js?file=gistfile1.json"></script>
<h5>Example response</h5>
<p><code>200</code></p>
</div>
<h4>/track/:id/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the artists related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324/artists.json">/v1/track/324/artists.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968022.js?file=gistfile1.json"></script>
</div>
<h4>/track/:id/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the albums related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324/albums.json">/v1/track/324/albums.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968023.js?file=gistfile1.json"></script>
</div>
<h4>/track/:id/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the plays related to a single track.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324/plays.json">/v1/track/324/plays.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968025.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-albums">albums</h3>
<h4>/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of albums.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/albums.json">/v1/albums.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968027.js?file=gistfile1.json"></script>
</div>
<h4>/album/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/album/15.json">/v1/album/15.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968029.js?file=gistfile1.json"></script>
</div>
<h4>/album/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/album/15/tracks.json">/v1/album/15/tracks.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968035.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-channels">channels</h3>
<h4>/channels</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of channels.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/channels.json">/v1/channels.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968054.js?file=gistfile1.json"></script>
</div>
<h4>/channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single channel.</p>
<h5>Example query</h5>
<code><a href="/v1/channel/1.json">/v1/channel/1.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968058.js?file=gistfile1.json"></script>
</div>
<h4>post channel</h4>
<div class='resource'>
<h5>Description</h5>
<p>Create a new channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
<h4>put channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Update a channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-plays">plays</h3>
<h4>/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a playlist.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>to</code>, <code>from</code>, <code>limit</code>, <code>channel</code>, <code>program</code>, <code>artist_query</code>, <code>track_query</code>, <code>album_query</code>, <code>q</code> (query artist, channel and track name), <code>order_by</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/plays.json?channel=1&limit=3">/v1/plays.json?channel=1&limit=3</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/956363.js"> </script>
</div>
<h4>/play/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single play.</p>
<h5>Example query</h5>
<code><a href="/v1/play/4356.json">/v1/play/4356.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968064.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-chart">charts</h3>
<h4>/chart/artist</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played artists for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>, <code>to</code>, <code>from</code>, <code>program</code>. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><a href="/v1/chart/artist.json?channel=1">/v1/chart/artist.json?channel=1</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973721.js?file=gistfile1.json"></script>
</div>
<h4>/chart/track</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played tracks for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>, <code>to</code>, <code>from</code>, <code>program</code>. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><a href="/v1/chart/track.json?from=2011-04-20">/v1/chart/track.json?from=2011-04-20</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973726.js?file=gistfile1.json"></script>
</div>
<h4>/chart/album</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played albums for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>, <code>to</code>, <code>from</code>, <code>program</code>. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><a href="/v1/chart/album.json?limit=5&channel=4">/v1/chart/album.json?limit=5&channel=4</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973730.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-search">search</h3>
<div class='resource'>
<h5>Description</h5>
<p>Search for artists (tracks and albums to come).</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/search/dylan.json?limit=5">/v1/search/dylan.json?limit=5</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973733.js?file=gistfile1.json"></script>
</div>
</section>
<style type="text/css" media="screen">
.gist-syntax .s2 {
color: black;
}
.gist .gist-file .gist-data{
font-size:75%;
}
.gist .gist-file .gist-meta{
display:none;
}
</style>
|
simonhn/pav-api
|
9d59250fc1feb31db074fd3af5a1d6dae3c82fe5
|
making programs null in db if no program available. tweaking details output
|
diff --git a/jobs.rb b/jobs.rb
index a4c81d0..eaba3da 100644
--- a/jobs.rb
+++ b/jobs.rb
@@ -1,252 +1,257 @@
#datamapper stuff
require 'dm-core'
require 'dm-timestamps'
require 'dm-aggregates'
require 'dm-migrations'
#require
#Models - to be moved to individual files
class Artist
include DataMapper::Resource
property :id, Serial
property :artistmbid, String, :length => 36
property :artistname, String, :length => 512
property :artistnote, Text
property :artistlink, Text
property :created_at, DateTime
has n, :tracks, :through => Resource
has n, :channels, :through => Resource
end
class Album
include DataMapper::Resource
property :id, Serial
property :albummbid, String, :length => 36
property :albumname, String, :length => 512
property :albumimage, Text
property :created_at, DateTime
has n, :tracks, :through => Resource
end
class Track
include DataMapper::Resource
property :id, Serial
property :trackmbid, String, :length => 36
property :title, String, :length => 512
property :tracknote, Text
property :tracklink, Text
property :show, Text
property :talent, Text
property :aust, String, :length => 512
property :duration, Integer
property :publisher, Text
property :datecopyrighted, Integer
property :created_at, DateTime
has n, :artists, :through => Resource
has n, :albums, :through => Resource
has n, :plays
def date
created_at.strftime "%R on %B %d, %Y"
end
def playcount
Play.count(:track_id => self.id);
end
end
class Play
include DataMapper::Resource
property :id, Serial
property :playedtime, DateTime
property :program_id, String, :length => 512
belongs_to :track
belongs_to :channel
def date
#converting from utc to aussie time
#playedtime.new_offset(Rational(+20,24)).strftime "%R on %B %d, %Y"
playedtime.strftime "%Y-%m-%d %H:%M:%S"
end
end
class Channel
include DataMapper::Resource
property :id, Serial
property :channelname, String, :length => 512
property :channelxml, String, :length => 512
property :logo, String, :length => 512
property :channellink, String, :length => 512
property :programxml, String, :length => 512
has n, :plays
has n, :artists, :through => Resource
end
#template systems
require 'yajl/json_gem'
require 'builder'
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
pwd = File.dirname(File.expand_path(__FILE__))
$LOG = Logger.new(pwd+'/log/queue.log', 'monthly')
#setup MySQL connection:
@config = YAML::load( File.open(pwd +'/config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
+
DataMapper.setup(:default, @connection)
DataMapper.finalize
#Method that stores each playitem to database. Index is the id of the channel to associate the play with
def store_hash(item, index)
@albums = nil
mbid_hash = nil
duration = ChronicDuration.parse(item["duration"].to_s)
#there can be multiple artist seperated by '+' so we split them
artist_array = item['artist']['artistname'].split("+")
artist_array.each{ |artist_item|
begin
#for each item, lookup in musicbrainz. Returns hash with mbids for track, album and artist if found
mbid_hash = mbid_lookup(artist_item.strip, item['title'], item['album']['albumname'])
rescue StandardError => e
$LOG.info("Issue while processing #{artist_item.strip} - #{item['title']} - #{e.backtrace}")
end
#ARTIST
if !mbid_hash.nil? && !mbid_hash["artistmbid"].nil?
@artist = Artist.first_or_create({:artistmbid => mbid_hash["artistmbid"]},{:artistmbid => mbid_hash["artistmbid"],:artistname => artist_item.strip, :artistnote => item['artist']['artistnote'], :artistlink => item['artist']['artistlink']})
else
@artist = Artist.first_or_create({:artistname => artist_item.strip},{:artistname => artist_item.strip, :artistnote => item['artist']['artistnote'], :artistlink => item['artist']['artistlink']})
end
#store artist_id / channel_id to a lookup table, for faster selects
@artist_channels = @artist.channels << Channel.get(index)
@artist_channels.save
#ALBUM
#creating and saving album if not exists
if !item['album']['albumname'].empty?
if !mbid_hash.nil? && !mbid_hash["albummbid"].nil?
#puts "album mbid found for: " + mbid_hash["albummbid"]
@albums = Album.first_or_create({:albummbid => mbid_hash["albummbid"]},{:albummbid => mbid_hash["albummbid"], :albumname => item['album']['albumname'], :albumimage=>item['album']['albumimage']})
else
@albums = Album.first_or_create({:albumname => item['album']['albumname']},{:albumname => item['album']['albumname'], :albumimage=>item['album']['albumimage']})
end
end
#Track
#creating and saving track
if mbid_hash && !mbid_hash["trackmbid"].nil?
@tracks = Track.first_or_create({:trackmbid => mbid_hash["trackmbid"]},{:trackmbid => mbid_hash["trackmbid"],:title => item['title'],:show => item['show'],:talent => item['talent'],:aust => item['aust'],:tracklink => item['tracklink'],:tracknote => item['tracknote'],:publisher => item['publisher'], :datecopyrighted => item['datecopyrighted'].to_i})
else
@tracks = Track.first_or_create({:title => item['title'],:duration => duration},{:title => item['title'],:show => item['show'],:talent => item['talent'],:aust => item['aust'],:tracklink => item['tracklink'],:tracknote => item['tracknote'],:duration => duration,:publisher => item['publisher'],:datecopyrighted => item['datecopyrighted'].to_i})
end
#add the track to album - if album exists
if [email protected]?
@album_tracks = @albums.tracks << @tracks
@album_tracks.save
end
#add the track to the artist
@artist_tracks = @artist.tracks << @tracks
@artist_tracks.save
#adding play: only add if playedtime does not exsist in the database already
play_items = Play.count(:playedtime=>item['playedtime'], :channel_id=>index)
+ #if no program, dont insert anything
+ if item['program_id'] == ''
+ item['program_id'] = nil
+ end
if play_items < 1
@play = Play.create(:track_id =>@tracks.id, :channel_id => index, :playedtime=>item['playedtime'], :program_id => item['program_id'])
@plays = @tracks.plays << @play
@plays.save
end
}
end
def mbid_lookup(artist, track, album)
result_hash = {}
#we can only hit mbrainz once a second so we take a nap
sleep 1
service = MusicBrainz::Webservice::Webservice.new(:user_agent => 'pavapi/1.0')
q = MusicBrainz::Webservice::Query.new(service)
#TRACK
if !album.empty?
t_filter = MusicBrainz::Webservice::TrackFilter.new(:artist=>artist, :title=>track, :release=>album, :limit => 5)
else
t_filter = MusicBrainz::Webservice::TrackFilter.new(:artist=>artist, :title=>track, :limit => 5)
end
t_results = q.get_tracks(t_filter)
#No results from the 'advanced' query, so trying artist and album individualy
if t_results.count == 0
#ARTIST
sleep 1
t_filter = MusicBrainz::Webservice::ArtistFilter.new(:name=>artist)
t_results = q.get_artists(t_filter)
if t_results.count > 0
x = t_results.first
if x.score == 100 && is_ascii(String(x.entity.name)) && String(x.entity.name).casecmp(artist)==0
#puts 'ARTIST score: ' + String(x.score) + '- artist: ' + String(x.entity.name) + ' - artist mbid '+ String(x.entity.id.uuid)
result_hash["artistmbid"] = String(x.entity.id.uuid)
end
end
#ALBUM
if !album.empty?
sleep 1
t_filter = MusicBrainz::Webservice::ReleaseGroupFilter.new(:artist=>artist, :title=>album)
t_results = q.get_release_groups(t_filter)
#puts "album results count "+t_results.count.to_s
if t_results.count>0
x = t_results.first
#puts 'ALBUM score: ' + String(x.score) + '- artist: ' + String(x.entity.artist) + ' - artist mbid '+ String(x.entity.id.uuid) +' - release title '+ String(x.entity.title) + ' - orginal album title: '+album
if x.score == 100 && is_ascii(String(x.entity.title)) #&& String(x.entity.title).casecmp(album)==0
#puts 'abekat'+x.entity.id.uuid.inspect
result_hash["albummbid"] = String(x.entity.id.uuid)
end
end
end
elsif t_results.count > 0
t_results.each{ |x|
#puts 'score: ' + String(x.score) + '- artist: ' + String(x.entity.artist) + ' - artist mbid '+ String(x.entity.artist.id.uuid) + ' - track mbid: ' + String(x.entity.id.uuid) + ' - track: ' + String(x.entity.title) +' - album: ' + String(x.entity.releases[0]) +' - album mbid: '+ String(x.entity.releases[0].id.uuid)
if x.score == 100 && is_ascii(String(x.entity.artist))
sleep 1
t_include = MusicBrainz::Webservice::ReleaseIncludes.new(:release_groups=>true)
release = q.get_release_by_id(x.entity.releases[0].id.uuid, t_include)
result_hash["trackmbid"] = String(x.entity.id.uuid)
result_hash["artistmbid"] = String(x.entity.artist.id.uuid)
result_hash["albummbid"] = String(release.release_group.id.uuid)
end
}
end
return result_hash
end
def is_ascii(item)
cd = CharDet.detect(item)
encoding = cd['encoding']
return encoding == 'ascii'
end
job 'track.store' do |args|
store_hash(args['item'], args['channel'].to_i)
error do |e, job, args|
$LOG.info("error e #{e}")
$LOG.info("error job #{job.inspect}")
$LOG.info("error args #{args.inspect}")
end
end
diff --git a/routes/artist.rb b/routes/artist.rb
index c157787..e3230de 100644
--- a/routes/artist.rb
+++ b/routes/artist.rb
@@ -1,197 +1,202 @@
#show all artists, defaults to 10, ordered by created date
get "/#{@version}/artists" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist }
wants.xml { builder :artist }
wants.json { @artist.to_json }
end
end
get "/#{@version}/artist/:id/details" do
- channel = params[:channel]
+ result = Hash.new
+
+ #if no channel parameter provided, we assume all channels
+ channel = get_channel(params[:channel])
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
- result = Hash.new
- @play_count = repository(:default).adapter.select("SELECT plays.playedtime, tracks.title FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} AND plays.channel_id=#{channel} order by playedtime")
+
+ artist_result = Hash.new
+ artist_result['artist_id'] = @artist.id
+ artist_result['artistname'] = @artist.artistname
+ result["artist"] = artist_result
+
+ @play_count = repository(:default).adapter.select("SELECT plays.playedtime, tracks.title FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} #{channel} order by playedtime")
if !@play_count.empty?
@tracks = repository(:default).adapter.select("SELECT count(plays.id) as play_count, tracks.title, tracks.id FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} group by tracks.id order by playedtime")
result["tracks"] = @tracks.collect {|o| {:count => o.play_count, :title => o.title, :track_id => o.id} }
@albums = @artist.tracks.albums
result["albums"] = @albums.collect {|o| {:count => o.id, :album_id => o.id, :albumname => o.albumname, :albumimage => o.albumimage} }
result["play_count"] = @play_count.size
first_play = @play_count.first
#puts 'first played on '+Time.parse(first_play.playedtime.to_s).to_s
result["first_play"] = Time.parse(first_play.playedtime.to_s).to_s
last_play = @play_count.last
#puts 'last played on '+Time.parse(last_play.playedtime.to_s).to_s
result["last_play"] = Time.parse(last_play.playedtime.to_s).to_s
average_duration = @artist.tracks.avg(:duration)
#puts 'average track duration '+average_duration.inspect
result["avg_duration"] = average_duration
australian = @artist.tracks.first.aust
#puts 'australian? '+australian.inspect
result["australian"] = australian
- @artist_chart = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc")
+ @artist_chart = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{channel} group by artists.id order by cnt desc")
index_number = @artist_chart.index{|x|x[:id][email protected]}
real_index = 1+index_number.to_i
#puts 'Position on all time chart '+real_index.to_s
result["chart_pos"] = real_index
#@play_count_range
@time_range = (Time.parse(last_play.playedtime.to_s) - Time.parse(first_play.playedtime.to_s))
@slice = @time_range / 10
hat = Time.parse(first_play.playedtime.to_s)
- i = 1
+ i = 0
result_array = []
- while i < 11 do
+ while i < 10 do
from = hat
hat = hat + @slice
to = hat
to_from = "AND playedtime <= '#{to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime >= '#{from.strftime("%Y-%m-%d %H:%M:%S")}'"
- @play_counter = repository(:default).adapter.select("SELECT plays.playedtime, tracks.title FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} AND plays.channel_id=#{channel} #{to_from} order by playedtime")
+ @play_counter = repository(:default).adapter.select("SELECT plays.playedtime, tracks.title FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} #{channel} #{to_from} order by playedtime")
item = Hash.new
item["from"] = from.to_s
item["to"] = to.to_s
item["count"] = @play_counter.size.to_s
result_array[i] = item
i += 1
end
#puts 'time sliced play count '+result_array.inspect
result["time_sliced"] = result_array
#average play counts per week from first played to now
#@play_count.size
@new_time_range = (Time.now - Time.parse(first_play.playedtime.to_s))
avg = @play_count.size/(@new_time_range/(60*60*24*7))
#puts 'avg plays per week '+ avg.to_s
result["avg_play_week"] = avg
#played on other channels?
channel_result = Hash.new
channels = Channel.all
channels.each do |channel|
q = repository(:default).adapter.select("SELECT count(*) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} AND plays.channel_id=#{channel.id}")
if q.first.to_i>0
channel_result[channel.channelname] = q.first
#puts 'played on ' + channel.channelname+' '+q.first.to_s+' times'
end
end
result["channels"] = channel_result
end
-
respond_to do |wants|
- wants.html { erb :artist }
- wants.xml { builder :artist }
wants.json { result.to_json }
end
end
# edit artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id/edit" do
protected!
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist_edit }
end
end
post "/#{@version}/artist/:id/edit" do
protected!
@artist = Artist.get(params[:id])
raise not_found unless @artist
@artist.attributes = {
:artistname => params["artistname"],
:artistmbid => params["artistmbid"],
:artistlink => params["artistlink"],
:artistnote => params["artistnote"]
}
@artist.save
redirect "/v1/artist/#{@artist.id}"
end
# show tracks from artist
get "/#{@version}/artist/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@tracks = @artist.tracks
@tracks_json = repository(:default).adapter.select("SELECT count(plays.id) as play_count, tracks.title FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} group by tracks.id order by playedtime")
respond_to do |wants|
wants.html { erb :artist_tracks }
wants.xml { builder :artist_tracks }
wants.json { @tracks_json.to_json }
end
end
# show albums from artist
get "/#{@version}/artist/:id/albums" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@albums = @artist.tracks.albums
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
wants.json { @albums.to_json }
end
end
# show plays from artist
get "/#{@version}/artist/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@plays = @artist.tracks.plays
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
wants.json { @plays.to_json }
end
end
\ No newline at end of file
|
simonhn/pav-api
|
58e740cf734a7088daaf1b36f28fd165c292d486
|
adding some missing output data to xml template etc
|
diff --git a/routes/demo.rb b/routes/demo.rb
index 4df1038..24ce176 100644
--- a/routes/demo.rb
+++ b/routes/demo.rb
@@ -1,124 +1,124 @@
-get '/demo' do
+get '/demo/?' do
respond_to do |wants|
wants.html{erb :demo}
end
end
get '/demo/album-charts' do
from_date = DateTime.now - 7
@from_date_string = from_date.strftime("%b %e")
to_date = DateTime.now
@to_date_string = to_date.strftime("%b %e")
respond_to do |wants|
wants.html{erb :album_chart_all}
end
end
get '/demo/program-chart' do
redirect '/demo/program-chart/track'
end
get '/demo/program-chart/track' do
@program = params[:program]
@program ||= 'super_request'
@span = params[:span]
@span ||= 7
respond_to do |wants|
wants.html{erb :program_chart_track}
end
end
get '/demo/program-chart/artist' do
@program = params[:program]
@program ||= 'super_request'
@span = params[:span]
@span ||= 7
respond_to do |wants|
wants.html{erb :program_chart_artist}
end
end
get '/demo/program-chart/artist-expand' do
@program = params[:program]
@program ||= 'super_request'
@span = params[:span]
@span ||= 7
respond_to do |wants|
wants.html{erb :program_chart_artist_expand}
end
end
get '/demo/program-chart/album' do
@program = params[:program]
@program ||= 'super_request'
@span = params[:span]
@span ||= 7
respond_to do |wants|
wants.html{erb :program_chart_album}
end
end
get '/demo/jjj' do
cache_control :public, :max_age => 600
artistmbid = {}
har ='a'
hur = 'b'
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
#hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
all = Hash.new
@artists.each{ |o|
begin
if o.artistmbid
#puts o.artistname
begin
result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
if(result.code==200)
all[o.artistname] = Hash.new
all[o.artistname].store("media",Hash.new())
all[o.artistname].store("info",Hash.new())
all[o.artistname].fetch("info").store("mbid",o.artistmbid)
all[o.artistname].fetch("info").store("count",o.cnt)
xml = Crack::XML.parse(result)
if(xml["rss"]["channel"]["item"].kind_of?(Array))
xml["rss"]["channel"]["item"].each_with_index{|ha,i|
if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
har = ha["title"]
da = ha["media:thumbnail"]
if da.kind_of?(Array)
hur = da.first["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
else
hur = da["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
end
if ha["media:content"].kind_of?(Array)
all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
else
all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
end
end
}
else
if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
har = xml["rss"]["channel"]["item"]["title"]
hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
end
end
#john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
#puts john.inspect
end
rescue => e
end
end
end
}
@hat = all
respond_to do |wants|
wants.html { erb :jjj }
wants.json { all.to_json }
end
end
diff --git a/routes/play.rb b/routes/play.rb
index bd48464..3914a9a 100644
--- a/routes/play.rb
+++ b/routes/play.rb
@@ -1,34 +1,34 @@
#PLAY
get "/#{@version}/plays" do
#DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
artist_query = get_artist_query(params[:artist_query])
track_query = get_track_query(params[:track_query])
album_query = get_album_query(params[:album_query])
query_all = get_all_query(params[:q])
order_by = get_order_by(params[:order_by])
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
program = get_program(params[:program])
if channel
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} #{program} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
else
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} #{program} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
end
- hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
+ hat = @plays.collect {|o| {:title => o.title, :track_id => o.track_id, :trackmbid => o.trackmbid, :artistname => o.artistname, :artist_id => o.artist_id, :artistmbid => o.artistmbid, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage, :album_id => o.album_id, :albummbid => o.albummbid, :program_id => o.program_id, :channel_id => o.channel_id} }
respond_to do |wants|
wants.html { erb :plays }
wants.xml { builder :plays }
wants.json { hat.to_json }
end
end
get "/#{@version}/play/:id" do
@play = Play.get(params[:id])
respond_to do |wants|
wants.json { @play.to_json }
end
end
\ No newline at end of file
diff --git a/views/front.html.erb b/views/front.html.erb
index 58db17d..0ce773c 100644
--- a/views/front.html.erb
+++ b/views/front.html.erb
@@ -1,438 +1,438 @@
<section id="intro">
<p>The pav:api exposes playlist data and is currently under development.</p>
<p>Have a look at the <a href='/demo'>app gallery</a> to see what can be built using pav:api.</p>
<ul class="unstyled">
<li><a href="#general">general information</a></li>
<ul>
<li><a href="#general-query-parameters">query parameters</a></li>
<li><a href="#general-identifiers">identifiers</a></li>
<li><a href="#general-authentication">authentication</a></li>
<li><a href="#general-versioning">versioning</a></li>
<li><a href="#general-return-types">return types</a></li>
<li><a href="#general-response-codes">reponse codes</a></li>
<li><a href="#general-terms">terms</a></li>
</ul>
<li> </li>
<li><a href="#resources">resources</a></li>
<ul>
<li><a href="#resources-artists">artists</a></li>
<li><a href="#resources-tracks">tracks</a></li>
<li><a href="#resources-albums">albums</a></li>
<li><a href="#resources-channels">channels</a></li>
<li><a href="#resources-plays">plays</a></li>
<li><a href="#resources-chart">charts</a></li>
<li><a href="#resources-search">search</a></li>
</ul>
</ul>
</section>
<section id="general">
<h2 id="general">general information</h2>
<h3 id="general-query-parameters">query parameters</h3>
<div>Some paths accepts the following query parameters. See each <a href="#resources">resource</a> type for more specifics.</div>
<ul>
- <li><code>channel</code>, default is all channels, available on paths that return a list</li>
- <li><code>limit</code>, default is 10, available on paths that return a list</li>
+ <li><code>channel</code>, default is all channels, available on paths that returns a list of results</li>
+ <li><code>limit</code>, default is 10, available on paths that returns a list results</li>
<li><code>callback</code>, for cross-domain access jsonp is delivered to requests with 'callback' query parameter and json as return type</li>
<li><code>format</code>, return type format (html, json, xml)</li>
<li><code>type</code>, to specify lookup type, mbid</li>
- <li><code>to</code> (to date) in yyyy-mm-dd format</li>
- <li><code>from</code> (from date) in yyyy-mm-dd format</li>
+ <li><code>to</code> (to date) in yyyy-mm-dd hh:mm:ss format. The hh:mm:ss part is optional, assumes 12:00:00 if absent</li>
+ <li><code>from</code> (from date) in yyyy-mm-dd hh:mm:ss format. The hh:mm:ss part is optional, assumes 12:00:00 if absent</li>
<li><code>order_by</code>, for ordering results. Default is playedtime. Allowed values are artist and track</li>
<li><code>q</code>, a query for searching for track title, album name and artist name</li>
<li><code>artist_query</code>, searching for an artist name</li>
<li><code>track_query</code>, searching for a track title</li>
<li><code>album_query</code>, searching for an album name</li>
<li><code>program</code>, the program_id to limit result to a certain show</li>
</ul>
<p>
<h3 id="general-identifiers">identifiers</h3>
To lookup a specific artist/track/album you can use pav IDs or Musicbrainz IDs where available.
</p>
<p>
<h3 id="general-authentication">authentication</h3>
All put and post requests require authentication
</p>
<p>
<h3 id="general-versioning">versioning</h3>
The version of the api you wish to use is specified at the root path of resources. The current version is v1.
</p>
<p>
<h3 id="general-return-types">return types</h3>
Return type can selected by appending the desired content type to the url (.html, .xml, .json) or by adding ?format=(html, xml, json) to the query parameter. Use only one of these methods when doing a request.
<br />
Default return type is currently html but will change to json when the API is put in production.
</p>
<p>
<h3 id="general-response-codes">response codes</h3>
The API attempts to return appropriate HTTP status codes for every request.
<ul>
<li>200 OK: Request succeeded</li>
<li>400 Bad Request: Your request was invalid and we'll return an error message telling you why</li>
<li>401 Not Authorized: You did not provide the right credentials</li>
<li>404 Not Found: The URI requested is invalid or the resource requested, such as a user, does not exists</li>
<li>500 Internal Server Error: Something is broken.</li>
<li>503 Service Unavailable: You cannot make this request at this time. Servers are up, but overloaded with requests</li>
</ul>
</p>
<p>
<h3 id="general-terms">terms</h3>
Please be nice when using the api. If you plan to make massive amounts of calls please advise us.
</p>
</section>
<section id="resources">
<h2 id="resources">resources</h2>
The resources that can be accessed through the api follows the model below:
<div id="model-img">
<img id="resources-model" width="400px" src="images/models.png"/>
</div>
Some useful observation about the model:
<ul>
<li>An artist can have multiple tracks</li>
<li>A track can have multiple artists</li>
<li>A track can have multiple albums (a track appearing on different albums)</li>
<li>An album can have multiple tracks</li>
<li>A track can have multiple plays</li>
<li>A play belongs to one track</li>
<li>A play belongs to one channel</li>
<li>A channel can have multiple plays</li>
</ul>
<h3 id="resources-artists">artists</h3>
<h4>/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of artists</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/artists.json?channel=4">/v1/artists.json?channel=4</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967986.js"></script>
</div>
<h4>/artist/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/artist/1234.json">/v1/artist/1234.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967997.js"></script>
</div>
<h4>/artist/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code></p>
<h5>Example query</h5>
<code><a href="/v1/artist/1234/tracks.json">/v1/artist/1234/tracks.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968001.js"></script>
</div>
<h3 id="resources-tracks">tracks</h3>
<h4>/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of tracks</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/tracks.json?channel=4&limit=3">/v1/tracks.json?channel=4&limit=3</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968008.js"></script>
</div>
<h4>/track/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single track specified by an id.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324.json">/v1/track/324.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968013.js?file=gistfile1.json"></script>
</div>
<h4>post /track</h4>
<div class='resource'>
<h5>Description</h5>
<p>Post a track to pav. Requires authentication.</p>
<h5>Parameters</h5>
<p>A json payload</p>
<script src="https://gist.github.com/968015.js?file=gistfile1.json"></script>
<h5>Example response</h5>
<p><code>200</code></p>
</div>
<h4>/track/:id/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the artists related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324/artists.json">/v1/track/324/artists.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968022.js?file=gistfile1.json"></script>
</div>
<h4>/track/:id/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the albums related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324/albums.json">/v1/track/324/albums.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968023.js?file=gistfile1.json"></script>
</div>
<h4>/track/:id/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the plays related to a single track.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324/plays.json">/v1/track/324/plays.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968025.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-albums">albums</h3>
<h4>/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of albums.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/albums.json">/v1/albums.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968027.js?file=gistfile1.json"></script>
</div>
<h4>/album/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/album/15.json">/v1/album/15.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968029.js?file=gistfile1.json"></script>
</div>
<h4>/album/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/album/15/tracks.json">/v1/album/15/tracks.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968035.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-channels">channels</h3>
<h4>/channels</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of channels.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/channels.json">/v1/channels.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968054.js?file=gistfile1.json"></script>
</div>
<h4>/channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single channel.</p>
<h5>Example query</h5>
<code><a href="/v1/channel/1.json">/v1/channel/1.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968058.js?file=gistfile1.json"></script>
</div>
<h4>post channel</h4>
<div class='resource'>
<h5>Description</h5>
<p>Create a new channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
<h4>put channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Update a channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-plays">plays</h3>
<h4>/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a playlist.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>to</code>, <code>from</code>, <code>limit</code>, <code>channel</code>, <code>program</code>, <code>artist_query</code>, <code>track_query</code>, <code>album_query</code>, <code>q</code> (query artist, channel and track name), <code>order_by</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/plays.json?channel=1&limit=3">/v1/plays.json?channel=1&limit=3</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/956363.js"> </script>
</div>
<h4>/play/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single play.</p>
<h5>Example query</h5>
<code><a href="/v1/play/4356.json">/v1/play/4356.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968064.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-chart">charts</h3>
<h4>/chart/artist</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played artists for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>, <code>to</code>, <code>from</code>, <code>program</code>. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><a href="/v1/chart/artist.json?channel=1">/v1/chart/artist.json?channel=1</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973721.js?file=gistfile1.json"></script>
</div>
<h4>/chart/track</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played tracks for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>, <code>to</code>, <code>from</code>, <code>program</code>. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><a href="/v1/chart/track.json?from=2011-04-20">/v1/chart/track.json?from=2011-04-20</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973726.js?file=gistfile1.json"></script>
</div>
<h4>/chart/album</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played albums for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>, <code>to</code>, <code>from</code>, <code>program</code>. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><a href="/v1/chart/album.json?limit=5&channel=4">/v1/chart/album.json?limit=5&channel=4</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973730.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-search">search</h3>
<div class='resource'>
<h5>Description</h5>
<p>Search for artists (tracks and albums to come).</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/search/dylan.json?limit=5">/v1/search/dylan.json?limit=5</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973733.js?file=gistfile1.json"></script>
</div>
</section>
<style type="text/css" media="screen">
.gist-syntax .s2 {
color: black;
}
.gist .gist-file .gist-data{
font-size:75%;
}
.gist .gist-file .gist-meta{
display:none;
}
</style>
diff --git a/views/plays.xml.builder b/views/plays.xml.builder
index 6f05475..e9fb8c7 100644
--- a/views/plays.xml.builder
+++ b/views/plays.xml.builder
@@ -1,14 +1,20 @@
xml.instruct! :xml, :version => '1.0'
xml.plays do
@plays.each do |track|
xml.track do
- xml.trackid track.id
+ xml.trackid track.track_id
+ xml.trackmbid track.trackmbid
xml.tracktitle track.title
xml.artistname track.artistname
+ xml.artistid track.artist_id
+ xml.artistmbid track.artistmbid
+ xml.albumid track.album_id
+ xml.albummbid track.albummbid
xml.albumname track.albumname
xml.albumimage track.albumimage
xml.channelid track.channel_id
+ xml.programid track.program_id
xml.playedtime track.playedtime
end
end
end
\ No newline at end of file
|
simonhn/pav-api
|
b624a988e29fc6f4223894e14034ef0d776b16ab
|
adding artist detail and demo that uses it
|
diff --git a/public/css/bootstrap-1.0.0.css b/public/css/bootstrap-1.0.0.css
index e9453dc..ef78c6c 100644
--- a/public/css/bootstrap-1.0.0.css
+++ b/public/css/bootstrap-1.0.0.css
@@ -1,227 +1,227 @@
html,body{margin:0;padding:0;}
h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s,samp,small,strike,strong,sub,sup,tt,var,dd,dl,dt,li,ol,ul,fieldset,form,label,legend,button,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;font-weight:normal;font-style:normal;font-size:100%;line-height:1;font-family:inherit;}
table{border-collapse:collapse;border-spacing:0;}
ol,ul{list-style:none;}
q:before,q:after,blockquote:before,blockquote:after{content:"";}
header,section,footer,article,aside{display:block;}
.clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
.clearfix:after{clear:both;}
.center-block{display:block;margin:0 auto;}
.container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";}
.container:after{clear:both;}
.row{zoom:1;}.row:before,.row:after{display:table;content:"";}
.row:after{clear:both;}
.row .span1{float:left;width:40px;margin-left:20px;}.row .span1:first-child{margin-left:0;}
.row .span2{float:left;width:100px;margin-left:20px;}.row .span2:first-child{margin-left:0;}
.row .span3{float:left;width:160px;margin-left:20px;}.row .span3:first-child{margin-left:0;}
.row .span4{float:left;width:220px;margin-left:20px;}.row .span4:first-child{margin-left:0;}
.row .span5{float:left;width:280px;margin-left:20px;}.row .span5:first-child{margin-left:0;}
.row .span6{float:left;width:340px;margin-left:20px;}.row .span6:first-child{margin-left:0;}
.row .span7{float:left;width:400px;margin-left:20px;}.row .span7:first-child{margin-left:0;}
.row .span8{float:left;width:460px;margin-left:20px;}.row .span8:first-child{margin-left:0;}
.row .span9{float:left;width:520px;margin-left:20px;}.row .span9:first-child{margin-left:0;}
.row .span10{float:left;width:580px;margin-left:20px;}.row .span10:first-child{margin-left:0;}
.row .span11{float:left;width:640px;margin-left:20px;}.row .span11:first-child{margin-left:0;}
.row .span12{float:left;width:700px;margin-left:20px;}.row .span12:first-child{margin-left:0;}
.row .span13{float:left;width:760px;margin-left:20px;}.row .span13:first-child{margin-left:0;}
.row .span14{float:left;width:820px;margin-left:20px;}.row .span14:first-child{margin-left:0;}
.row .span15{float:left;width:880px;margin-left:20px;}.row .span15:first-child{margin-left:0;}
.row .span16{float:left;width:940px;margin-left:20px;}.row .span16:first-child{margin-left:0;}
.row .offset1{margin-left:80px !important;}.row .offset1:first-child{margin-left:60px !important;}
.row .offset2{margin-left:140px !important;}.row .offset2:first-child{margin-left:120px !important;}
.row .offset3{margin-left:200px !important;}.row .offset3:first-child{margin-left:180px !important;}
.row .offset4{margin-left:260px !important;}.row .offset4:first-child{margin-left:240px !important;}
.row .offset5{margin-left:320px !important;}.row .offset5:first-child{margin-left:300px !important;}
.row .offset6{margin-left:380px !important;}.row .offset6:first-child{margin-left:360px !important;}
.row .offset7{margin-left:440px !important;}.row .offset7:first-child{margin-left:420px !important;}
.row .offset8{margin-left:500px !important;}.row .offset8:first-child{margin-left:480px !important;}
.row .offset9{margin-left:500px !important;}.row .offset9:first-child{margin-left:480px !important;}
.row .offset10{margin-left:620px !important;}.row .offset10:first-child{margin-left:600px !important;}
.row .offset11{margin-left:680px !important;}.row .offset11:first-child{margin-left:660px !important;}
.row .offset12{margin-left:740px !important;}.row .offset12:first-child{margin-left:720px !important;}
html,body{background-color:#fff;}
-body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;}
+body{margin:60px 0 0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;}
div.container{width:940px;margin:0 auto;}
div.container-fluid{padding:0 20px;zoom:1;}div.container-fluid:before,div.container-fluid:after{display:table;content:"";}
div.container-fluid:after{clear:both;}
div.container-fluid div.sidebar{float:left;width:220px;}
div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;}
a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:18px;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;}
.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border:1px solid #004b9a;border-bottom-color:#003f81;}.primary:hover{color:#fff;}
.btn{-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn.primary{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;}
.btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
.btn.small{padding-right:9px;padding-left:9px;font-size:11px;}
.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;}
.btn:disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;color:#fff;}
.btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);}
button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;}
h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;}
h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}
h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;}
h3,h4,h5,h6{line-height:36px;}
h3{font-size:18px;}h3 small{font-size:14px;}
h4{font-size:16px;}h4 small{font-size:12px;}
h5{font-size:14px;}
h6{font-size:13px;color:#bfbfbf;text-transform:uppercase;}
ul,ol{margin:0 0 18px 25px;}
ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
ul{list-style:disc;}
ol{list-style:decimal;}
li{line-height:18px;color:#808080;}
ul.unstyled{list-style:none;margin-left:0;}
dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;}
dl dt{font-weight:bold;}
dl dd{margin-left:9px;}
hr{margin:0 0 19px;border:0;border-bottom:1px solid #eee;}
strong{font-style:inherit;font-weight:bold;line-height:inherit;}
em{font-style:italic;font-weight:inherit;line-height:inherit;}
.muted{color:#e6e6e6;}
blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:18px;margin-bottom:0;}
blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';}
address{display:block;line-height:18px;margin-bottom:18px;}
code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;}
pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre-wrap;}
form{margin-bottom:18px;}form fieldset{margin-bottom:18px;padding-top:18px;}form fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;*margin:0 0 5px 145px;*line-height:1.5;color:#404040;}
form .clearfix{margin-bottom:18px;}
form label,form input,form select,form textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;}
form label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
form div.input{margin-left:150px;}
form input[type=checkbox],form input[type=radio]{cursor:pointer;}
form input[type=text],form input[type=password],form textarea,form select,form .uneditable-input{display:inline-block;width:210px;margin:0;padding:4px;font-size:13px;line-height:18px;height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
form select,form input[type=file]{height:27px;line-height:27px;}
form textarea{height:auto;}
form .uneditable-input{background-color:#eee;display:block;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);}
form :-moz-placeholder{color:#bfbfbf;}
form ::-webkit-input-placeholder{color:#bfbfbf;}
form input[type=text],form input[type=password],form select,form textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);}
form input[type=text]:focus,form input[type=password]:focus,form textarea:focus{outline:none;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);}
form div.error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form div.error>label,form div.error span.help-inline,form div.error span.help-block{color:#9d261d;}
form div.error input[type=text],form div.error input[type=password],form div.error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form div.error input[type=text]:focus,form div.error input[type=password]:focus,form div.error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);}
form div.error .input-prepend span.add-on,form div.error .input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;}
form .input-mini,form input.mini,form textarea.mini,form select.mini{width:60px;}
form .input-small,form input.small,form textarea.small,form select.small{width:90px;}
form .input-medium,form input.medium,form textarea.medium,form select.medium{width:150px;}
form .input-large,form input.large,form textarea.large,form select.large{width:210px;}
form .input-xlarge,form input.xlarge,form textarea.xlarge,form select.xlarge{width:270px;}
form .input-xxlarge,form input.xxlarge,form textarea.xxlarge,form select.xxlarge{width:530px;}
form textarea.xxlarge{overflow-y:scroll;}
form input[readonly]:focus,form textarea[readonly]:focus,form input.disabled{background:#f5f5f5;border-color:#ddd;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}.actions .secondary-action{float:right;}.actions .secondary-action a{line-height:30px;}.actions .secondary-action a:hover{text-decoration:underline;}
.help-inline,.help-block{font-size:12px;line-height:18px;color:#bfbfbf;}
.help-inline{padding-left:5px;*position:relative;*top:-5px;}
.help-block{display:block;max-width:600px;}
.inline-inputs{color:#808080;}.inline-inputs span,.inline-inputs input[type=text]{display:inline-block;}
.inline-inputs input.mini{width:60px;}
.inline-inputs input.small{width:90px;}
.inline-inputs span{padding:0 2px 0 1px;}
.input-prepend input[type=text],.input-append input[type=text]{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
.input-prepend .add-on,.input-append .add-on{background:#f5f5f5;float:left;display:block;width:auto;min-width:16px;padding:4px 4px 4px 5px;color:#bfbfbf;font-weight:normal;line-height:18px;height:18px;text-align:center;text-shadow:0 1px 0 #fff;border:1px solid #ccc;border-right-width:0;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
.input-prepend .active,.input-append .active{background:#a9dba9;border-color:#46a546;}
.input-prepend .add-on{*margin-top:1px;}
.input-append input[type=text]{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;border-right-width:1px;border-left-width:0;}
.inputs-list{margin:0 0 5px;width:100%;}.inputs-list li{display:block;padding:0;width:100%;}.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}.inputs-list li label strong{color:#808080;}
.inputs-list li label small{font-size:12px;font-weight:normal;}
.inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;}
.inputs-list li:first-child{padding-top:5px;}
.inputs-list input[type=radio],.inputs-list input[type=checkbox]{margin-bottom:0;}
form.form-stacked{padding-left:20px;}form.form-stacked fieldset{padding-top:9px;}
form.form-stacked legend{margin-left:0;}
form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;}
form.form-stacked .clearfix{margin-bottom:9px;}form.form-stacked .clearfix div.input{margin-left:0;}
form.form-stacked .inputs-list{margin-bottom:0;}form.form-stacked .inputs-list li{padding-top:0;}form.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;}
form.form-stacked div.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;}
form.form-stacked .actions{margin-left:-20px;padding-left:20px;}
table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;}
table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;}
.zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;}
.zebra-striped tbody tr:hover td{background-color:#f5f5f5;}
.zebra-striped .header{cursor:pointer;}.zebra-striped .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;}
.zebra-striped .headerSortUp,.zebra-striped .headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
.zebra-striped .header:hover:after{visibility:visible;}
.zebra-striped .headerSortDown:after,.zebra-striped .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;}
.zebra-striped .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;}
table .blue{color:#049cdb;border-bottom-color:#049cdb;}
table .headerSortUp.blue,table .headerSortDown.blue{background-color:#ade6fe;}
table .green{color:#46a546;border-bottom-color:#46a546;}
table .headerSortUp.green,table .headerSortDown.green{background-color:#cdeacd;}
table .red{color:#9d261d;border-bottom-color:#9d261d;}
table .headerSortUp.red,table .headerSortDown.red{background-color:#f4c8c5;}
table .yellow{color:#ffc40d;border-bottom-color:#ffc40d;}
table .headerSortUp.yellow,table .headerSortDown.yellow{background-color:#fff6d9;}
table .orange{color:#f89406;border-bottom-color:#f89406;}
table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc;}
table .purple{color:#7a43b6;border-bottom-color:#7a43b6;}
table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;}
.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar .fill{background:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);background-image:linear-gradient(#333333, #222222);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
.topbar a:hover,.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;}
.topbar h3{position:relative;}.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}.topbar form input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}.topbar form input:-moz-placeholder{color:#e6e6e6;}
.topbar form input::-webkit-input-placeholder{color:#e6e6e6;}
.topbar form input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#fff;}
.topbar form input:focus,.topbar form input.focused{outline:none;background-color:#fff;color:#404040;text-shadow:0 1px 0 #fff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);}
.topbar ul{display:block;float:left;margin:0 10px 0 0;position:relative;}.topbar ul.secondary-nav{float:right;margin-left:10px;margin-right:0;}
.topbar ul li{display:block;float:left;font-size:13px;}.topbar ul li a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.topbar ul li a:hover{color:#fff;text-decoration:none;}
.topbar ul li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
.topbar ul.primary-nav li ul{left:0;}
.topbar ul.secondary-nav li ul{right:0;}
.topbar ul li.menu{position:relative;}.topbar ul li.menu a.menu:after{width:0px;height:0px;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}
.topbar ul li.menu.open a.menu,.topbar ul li.menu.open a:hover{background-color:#444;background-color:rgba(255, 255, 255, 0.1);*background-color:#444;color:#fff;}
.topbar ul li.menu.open ul{display:block;}.topbar ul li.menu.open ul li a{background-color:transparent;font-weight:normal;}.topbar ul li.menu.open ul li a:hover{background-color:rgba(255, 255, 255, 0.1);*background-color:#444;color:#fff;}
.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;}
.topbar ul li ul{background-color:#333;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:0;text-align:left;border:0;zoom:1;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);}.topbar ul li ul li{float:none;clear:both;display:block;background:none;font-size:12px;}.topbar ul li ul li a{display:block;padding:6px 15px;clear:both;font-weight:normal;line-height:19px;color:#bbb;}.topbar ul li ul li a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.25);color:#fff;}
.topbar ul li ul li.divider{height:1px;overflow:hidden;background:#222;background:rgba(0, 0, 0, 0.2);border-bottom:1px solid rgba(255, 255, 255, 0.1);margin:5px 0;}
.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0.2);padding:6px 15px;cursor:default;color:#808080;border-top:1px solid rgba(0, 0, 0, 0.2);}
.hero-unit{background-color:#f5f5f5;margin-top:60px;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;}
.hero-unit p{font-size:18px;font-weight:200;line-height:27px;}
footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;}
.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;}
.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);border-bottom:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.alert-message p{color:#fff;margin-bottom:0;}.alert-message p+p{margin-top:5px;}
.alert-message.error{background-color:#d83a2e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e));background-image:-moz-linear-gradient(#e4776f, #d83a2e);background-image:-ms-linear-gradient(#e4776f, #d83a2e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e));background-image:-webkit-linear-gradient(#e4776f, #d83a2e);background-image:-o-linear-gradient(#e4776f, #d83a2e);background-image:linear-gradient(#e4776f, #d83a2e);border-bottom-color:#b32b21;}
.alert-message.warning{background-color:#ffd040;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040));background-image:-moz-linear-gradient(#ffe38d, #ffd040);background-image:-ms-linear-gradient(#ffe38d, #ffd040);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040));background-image:-webkit-linear-gradient(#ffe38d, #ffd040);background-image:-o-linear-gradient(#ffe38d, #ffd040);background-image:linear-gradient(#ffe38d, #ffd040);border-bottom-color:#ffc40d;}
.alert-message.success{background-color:#62bc62;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62));background-image:-moz-linear-gradient(#97d397, #62bc62);background-image:-ms-linear-gradient(#97d397, #62bc62);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62));background-image:-webkit-linear-gradient(#97d397, #62bc62);background-image:-o-linear-gradient(#97d397, #62bc62);background-image:linear-gradient(#97d397, #62bc62);border-bottom-color:#46a546;}
.alert-message.info{background-color:#04aef4;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4));background-image:-moz-linear-gradient(#62cffc, #04aef4);background-image:-ms-linear-gradient(#62cffc, #04aef4);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4));background-image:-webkit-linear-gradient(#62cffc, #04aef4);background-image:-o-linear-gradient(#62cffc, #04aef4);background-image:linear-gradient(#62cffc, #04aef4);border-bottom-color:#049cdb;}
.alert-message .close{float:right;margin-top:-2px;color:#000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.alert-message .close:hover{text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;}
.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;margin-right:30px;margin-bottom:0;}
.block-message ul{margin-bottom:0;}
.block-message strong{display:block;}
.block-message.error{background:#f8dcda;border:1px solid #f4c8c5;}
.block-message.warning{background:#fff0c0;border:1px solid #ffe38d;}
.block-message.success{background:#dff1df;border:1px solid #bbe2bb;}
.block-message.info{background:#c7eefe;border:1px solid #ade6fe;}
.tabs,.pills{margin:0 0 20px;padding:0;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
.tabs:after,.pills:after{clear:both;}
.tabs li,.pills li{display:inline;}.tabs li a,.pills li a{float:left;width:auto;}
.tabs{width:100%;border-bottom:1px solid #bfbfbf;}.tabs li a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}.tabs li a:hover{background-color:#e6e6e6;border-bottom:1px solid #bfbfbf;}
.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;}
.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}.pagination ul li{display:inline;}.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;text-decoration:none;}
.pagination ul li a:hover,.pagination ul li.active a{background-color:#c7eefe;}
.pagination ul li.disabled a,.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;}
.pagination ul li.next a{border:0;}
.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}
.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}
.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
.modal .modal-body{padding:20px;}
.modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}.modal .modal-footer:before,.modal .modal-footer:after{display:table;content:"";}
.modal .modal-footer:after{clear:both;}
.modal .modal-footer .btn{float:right;margin-left:10px;}
.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
.twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
.twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
.twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
.twipsy .twipsy-inner{padding:3px 8px;background-color:#000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
.twipsy .twipsy-arrow{position:absolute;width:0;height:0;}
.popover{position:absolute;top:0;left:0;z-index:1000;padding:5px;display:none;}.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
.popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
.popover .arrow{position:absolute;width:0;height:0;}
.popover .inner{background-color:#333;background-color:rgba(0, 0, 0, 0.8);*background-color:#333;padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);}
.popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;}
.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
\ No newline at end of file
diff --git a/routes/artist.rb b/routes/artist.rb
index 27327a7..c157787 100644
--- a/routes/artist.rb
+++ b/routes/artist.rb
@@ -1,90 +1,197 @@
#show all artists, defaults to 10, ordered by created date
get "/#{@version}/artists" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
+
respond_to do |wants|
wants.html { erb :artist }
wants.xml { builder :artist }
wants.json { @artist.to_json }
end
end
+get "/#{@version}/artist/:id/details" do
+ channel = params[:channel]
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @artist = Artist.first(:artistmbid => params[:id])
+ else
+ @artist = Artist.get(params[:id])
+ end
+ result = Hash.new
+ @play_count = repository(:default).adapter.select("SELECT plays.playedtime, tracks.title FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} AND plays.channel_id=#{channel} order by playedtime")
+
+ if !@play_count.empty?
+ @tracks = repository(:default).adapter.select("SELECT count(plays.id) as play_count, tracks.title, tracks.id FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} group by tracks.id order by playedtime")
+ result["tracks"] = @tracks.collect {|o| {:count => o.play_count, :title => o.title, :track_id => o.id} }
+
+ @albums = @artist.tracks.albums
+ result["albums"] = @albums.collect {|o| {:count => o.id, :album_id => o.id, :albumname => o.albumname, :albumimage => o.albumimage} }
+
+ result["play_count"] = @play_count.size
+
+ first_play = @play_count.first
+ #puts 'first played on '+Time.parse(first_play.playedtime.to_s).to_s
+ result["first_play"] = Time.parse(first_play.playedtime.to_s).to_s
+
+ last_play = @play_count.last
+ #puts 'last played on '+Time.parse(last_play.playedtime.to_s).to_s
+ result["last_play"] = Time.parse(last_play.playedtime.to_s).to_s
+
+ average_duration = @artist.tracks.avg(:duration)
+ #puts 'average track duration '+average_duration.inspect
+ result["avg_duration"] = average_duration
+
+ australian = @artist.tracks.first.aust
+ #puts 'australian? '+australian.inspect
+ result["australian"] = australian
+
+ @artist_chart = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc")
+ index_number = @artist_chart.index{|x|x[:id][email protected]}
+ real_index = 1+index_number.to_i
+ #puts 'Position on all time chart '+real_index.to_s
+ result["chart_pos"] = real_index
+
+ #@play_count_range
+ @time_range = (Time.parse(last_play.playedtime.to_s) - Time.parse(first_play.playedtime.to_s))
+ @slice = @time_range / 10
+ hat = Time.parse(first_play.playedtime.to_s)
+ i = 1
+ result_array = []
+
+ while i < 11 do
+ from = hat
+ hat = hat + @slice
+ to = hat
+ to_from = "AND playedtime <= '#{to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime >= '#{from.strftime("%Y-%m-%d %H:%M:%S")}'"
+ @play_counter = repository(:default).adapter.select("SELECT plays.playedtime, tracks.title FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} AND plays.channel_id=#{channel} #{to_from} order by playedtime")
+ item = Hash.new
+ item["from"] = from.to_s
+ item["to"] = to.to_s
+ item["count"] = @play_counter.size.to_s
+ result_array[i] = item
+ i += 1
+ end
+ #puts 'time sliced play count '+result_array.inspect
+ result["time_sliced"] = result_array
+
+ #average play counts per week from first played to now
+ #@play_count.size
+ @new_time_range = (Time.now - Time.parse(first_play.playedtime.to_s))
+ avg = @play_count.size/(@new_time_range/(60*60*24*7))
+ #puts 'avg plays per week '+ avg.to_s
+ result["avg_play_week"] = avg
+
+ #played on other channels?
+ channel_result = Hash.new
+ channels = Channel.all
+ channels.each do |channel|
+ q = repository(:default).adapter.select("SELECT count(*) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} AND plays.channel_id=#{channel.id}")
+ if q.first.to_i>0
+ channel_result[channel.channelname] = q.first
+ #puts 'played on ' + channel.channelname+' '+q.first.to_s+' times'
+ end
+ end
+ result["channels"] = channel_result
+ end
+
+ respond_to do |wants|
+ wants.html { erb :artist }
+ wants.xml { builder :artist }
+ wants.json { result.to_json }
+ end
+end
# edit artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id/edit" do
protected!
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist_edit }
end
end
post "/#{@version}/artist/:id/edit" do
protected!
@artist = Artist.get(params[:id])
raise not_found unless @artist
@artist.attributes = {
:artistname => params["artistname"],
:artistmbid => params["artistmbid"],
:artistlink => params["artistlink"],
:artistnote => params["artistnote"]
}
@artist.save
redirect "/v1/artist/#{@artist.id}"
end
# show tracks from artist
get "/#{@version}/artist/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@tracks = @artist.tracks
-
+ @tracks_json = repository(:default).adapter.select("SELECT count(plays.id) as play_count, tracks.title FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `artists`.`id` = #{@artist.id} group by tracks.id order by playedtime")
+
respond_to do |wants|
wants.html { erb :artist_tracks }
wants.xml { builder :artist_tracks }
- wants.json { @tracks.to_json }
+ wants.json { @tracks_json.to_json }
end
end
+# show albums from artist
+get "/#{@version}/artist/:id/albums" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @artist = Artist.first(:artistmbid => params[:id])
+ else
+ @artist = Artist.get(params[:id])
+ end
+ @albums = @artist.tracks.albums
+
+ respond_to do |wants|
+ wants.html { erb :artist_plays }
+ wants.xml { builder :artist_plays }
+ wants.json { @albums.to_json }
+ end
+end
# show plays from artist
get "/#{@version}/artist/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@plays = @artist.tracks.plays
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
wants.json { @plays.to_json }
end
end
\ No newline at end of file
diff --git a/routes/demo.rb b/routes/demo.rb
index aaf040b..4df1038 100644
--- a/routes/demo.rb
+++ b/routes/demo.rb
@@ -1,114 +1,124 @@
get '/demo' do
respond_to do |wants|
wants.html{erb :demo}
end
end
get '/demo/album-charts' do
from_date = DateTime.now - 7
@from_date_string = from_date.strftime("%b %e")
to_date = DateTime.now
@to_date_string = to_date.strftime("%b %e")
respond_to do |wants|
wants.html{erb :album_chart_all}
end
end
get '/demo/program-chart' do
redirect '/demo/program-chart/track'
end
get '/demo/program-chart/track' do
@program = params[:program]
@program ||= 'super_request'
@span = params[:span]
@span ||= 7
respond_to do |wants|
wants.html{erb :program_chart_track}
end
end
get '/demo/program-chart/artist' do
@program = params[:program]
@program ||= 'super_request'
@span = params[:span]
@span ||= 7
respond_to do |wants|
wants.html{erb :program_chart_artist}
end
end
+get '/demo/program-chart/artist-expand' do
+ @program = params[:program]
+ @program ||= 'super_request'
+ @span = params[:span]
+ @span ||= 7
+ respond_to do |wants|
+ wants.html{erb :program_chart_artist_expand}
+ end
+end
+
get '/demo/program-chart/album' do
@program = params[:program]
@program ||= 'super_request'
@span = params[:span]
@span ||= 7
respond_to do |wants|
wants.html{erb :program_chart_album}
end
end
get '/demo/jjj' do
cache_control :public, :max_age => 600
artistmbid = {}
har ='a'
hur = 'b'
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
#hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
all = Hash.new
@artists.each{ |o|
begin
if o.artistmbid
#puts o.artistname
begin
result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
if(result.code==200)
all[o.artistname] = Hash.new
all[o.artistname].store("media",Hash.new())
all[o.artistname].store("info",Hash.new())
all[o.artistname].fetch("info").store("mbid",o.artistmbid)
all[o.artistname].fetch("info").store("count",o.cnt)
xml = Crack::XML.parse(result)
if(xml["rss"]["channel"]["item"].kind_of?(Array))
xml["rss"]["channel"]["item"].each_with_index{|ha,i|
if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
har = ha["title"]
da = ha["media:thumbnail"]
if da.kind_of?(Array)
hur = da.first["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
else
hur = da["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
end
if ha["media:content"].kind_of?(Array)
all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
else
all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
end
end
}
else
if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
har = xml["rss"]["channel"]["item"]["title"]
hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
end
end
#john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
#puts john.inspect
end
rescue => e
end
end
end
}
@hat = all
respond_to do |wants|
wants.html { erb :jjj }
wants.json { all.to_json }
end
end
diff --git a/views/demo.html.erb b/views/demo.html.erb
index 6d2254d..26bab12 100644
--- a/views/demo.html.erb
+++ b/views/demo.html.erb
@@ -1,8 +1,9 @@
<h2>App Gallery</h2>
<ul>
<li><a href="/demo/program-chart/track?program=super_request">Program Track Chart</a></li>
<li><a href="/demo/program-chart/artist?program=super_request">Program Artist Chart</a></li>
+ <li><a href="/demo/program-chart/artist-expand?program=super_request">Program Artist Chart with detailed information</a></li>
<li><a href="/demo/program-chart/album?program=super_request">Program Album Chart</a></li>
<li><a href="/demo/album-charts">Album Charts</a></li>
<!--<li><a href="/demo/jjj">Triple j media integrated into chart</a></li>-->
</ul>
\ No newline at end of file
diff --git a/views/program_chart_artist.html.erb b/views/program_chart_artist.html.erb
index 6aa5b3b..6ca0ef7 100644
--- a/views/program_chart_artist.html.erb
+++ b/views/program_chart_artist.html.erb
@@ -1,193 +1,193 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<style>
.same{
background-image:url('/images/same_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.new{
background-image:url('/images/new_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.up{
background-image:url('/images/up_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.down{
background-image:url('/images/down_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.album-image img{
width:60px;
height:60px;
}
</style>
<script>
var this_week, prev_week = null;
var new_chart = [];
var program_id = '<%=@program%>';
var span = '<%[email protected]_i%>';
function makeChart() {
//make sure that both jsonp calls have finished before making the chart
if (this_week && prev_week) {
//console.log('this week', this_week);
//console.log('prev week', prev_week);
$.each( this_week, function (i, item) {
var this_week_id = item.id;
//default to 'new' status
item.status = "new";
//default to empty diff
item.diff = '';
//default to empty prev count
item.prev_count = '';
//check that prev_week contains any items
if (prev_week.length > 0) {
//for each of this weeks items, run through prev weeks items
$.each(prev_week, function (is, item2) {
//check if track was played last week
if(this_week_id === item2.id) {
//UP
if( i< is) {
item.status = "up";
item.diff = is - i;
item.prev_count = item2.count;
}
//DOWN
else if(i > is) {
item.status = "down";
item.diff = i-is;
item.prev_count = item2.count;
}
//SAME
else if(i === is) {
item.status = "same";
item.diff = 0;
}
}//end if
//add item to new chart
new_chart[i] = item;
});//end for each. prev_week
}//end if: no previous week items to compare with
else {
new_chart[i] = item;
}
});//end outer (this_week) for each
//display new chart
$.each(new_chart, function (i, item) {
var number = i +1;
- var content = '<tr><td class="number">' + number + '</td><td class="status"><span class=' + item.status + '> </span></td><td class="name">' + item.artistname + '</td><td class="plays">' + item.count + '</td><td class="diff">' + item.diff + '</td><td class="prev=cnt">' + item.prev_count + '</td></tr>';
+ var content = '<tr><td class="number">' + number + '</td><td class="status"><span class=' + item.status + '> </span></td><td class="name">' + item.artistname + '</td><td class="plays">' + item.count + '</td><td class="diff">' + item.diff + '</td><td class="prev-cnt">' + item.prev_count + '</td></tr>';
$(content).appendTo("#artists");
});
}//end if
}
function formatDate(then) {
var month = then.getMonth() + 1;
if (month < 10) {
month = "0" + month;
}
var day = then.getDate();
if (day < 10) {
day = "0" + day;
}
var year = then.getFullYear();
var last_week = year + "-" + month + "-" + day;
return last_week;
}
function thisWeek() {
var from = new Date();
from.setDate(from.getDate() - span);
var from_date = formatDate(from);
$.ajax({
url: "http://96.126.96.51/v1/chart/artist",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'this_week_callback',
data: {
program: program_id,
from: from_date,
format: "json",
channel: 4
},
success: function(result) {
this_week = result;
makeChart();
}
});
}
function prevWeek() {
var from = new Date();
from.setDate(from.getDate() - (span*2));
var from_date = formatDate(from);
var to = new Date();
to.setDate(to.getDate() - span);
var to_date = formatDate(to);
$.ajax({
url: "http://96.126.96.51/v1/chart/artist",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'prev_week_callback',
data: {
program: program_id,
to: to_date,
from: from_date,
format: "json",
channel: 4
},
success: function(result) {
prev_week = result;
makeChart();
}
});
}
thisWeek();
prevWeek();
</script>
<h3>Artist Chart for <%=@program%></h3>
<p>Last <%=@span%> days compared with previous <%=@span%> days</p>
<table id="artists" class="common-table">
<thead>
<tr>
<th class="number">#</th>
<th class="status"></th>
<th class="name"></th>
<th class="plays">count</th>
<th class="diff">position diff</th>
<th class="prev-cnt">previous count</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
\ No newline at end of file
diff --git a/views/program_chart_artist_expand.html.erb b/views/program_chart_artist_expand.html.erb
new file mode 100644
index 0000000..893c905
--- /dev/null
+++ b/views/program_chart_artist_expand.html.erb
@@ -0,0 +1,261 @@
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>
+
+<style>
+
+.same{
+ background-image:url('/images/same_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+.new{
+ background-image:url('/images/new_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+
+}
+.up{
+ background-image:url('/images/up_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+.down{
+ background-image:url('/images/down_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+.album-image img{
+ width:60px;
+ height:60px;
+}
+#head{
+padding: 10px 10px 9px;
+line-height: 13.5px;
+text-align: left;
+vertical-align: middle;
+border-top: 1px solid #DDD;
+}
+#number,#status{
+ float: left;
+ width: 70px;
+}
+
+.hidden{
+ margin-top:10px;
+ margin-left:150px;
+}
+.hidden div{
+ margin-top:5px;
+}
+
+#album li{
+ display: inline;
+ list-style-type: none;
+ padding-right: 20px;
+ margin:0px;
+}
+#album{margin:0px;}
+
+</style>
+
+<script>
+var this_week, prev_week = null;
+var new_chart = [];
+var program_id = '<%=@program%>';
+var span = '<%[email protected]_i%>';
+
+function makeChart() {
+ //make sure that both jsonp calls have finished before making the chart
+ if (this_week && prev_week) {
+ //console.log('this week', this_week);
+ //console.log('prev week', prev_week);
+ $.each( this_week, function (i, item) {
+ var this_week_id = item.id;
+ //default to 'new' status
+ item.status = "new";
+
+ //default to empty diff
+ item.diff = '';
+
+ //default to empty prev count
+ item.prev_count = '';
+
+ //check that prev_week contains any items
+ if (prev_week.length > 0) {
+
+ //for each of this weeks items, run through prev weeks items
+ $.each(prev_week, function (is, item2) {
+ //check if track was played last week
+ if(this_week_id === item2.id) {
+ //UP
+ if( i< is) {
+ item.status = "up";
+ item.diff = is - i;
+ item.prev_count = item2.count;
+ }
+
+ //DOWN
+ else if(i > is) {
+ item.status = "down";
+ item.diff = i-is;
+ item.prev_count = item2.count;
+ }
+
+ //SAME
+ else if(i === is) {
+ item.status = "same";
+ item.diff = 0;
+ }
+ }//end if
+
+ //add item to new chart
+ new_chart[i] = item;
+ });//end for each. prev_week
+
+ }//end if: no previous week items to compare with
+ else {
+ new_chart[i] = item;
+ }
+
+ });//end outer (this_week) for each
+
+ //display new chart
+ $.each(new_chart, function (i, item) {
+ var number = i +1;
+ var content = '<li id="head"><span id="number">' + number + '</span><span id="status" class=' + item.status + '> </span><a class="header" id="' + item.id + '" href="javascript: void(0)">' + item.artistname + '</a><div class="hidden" id="' + item.id + '">Loading...</div></li>';
+ $(content).appendTo("#files-accordion");
+ });
+ $('#accordion > ul').accordion({ active: false, header:'.header',collapsible: true,clearStyle: true }).bind("accordionchange", function(event, ui) {
+ //console.dir(ui); // jQuery, activated header
+ if(ui.newHeader[0]){
+ doSomething(ui.newHeader[0].id);
+ }
+ })
+ }//end if
+}
+
+function roundNumber(num, dec) {
+ var result = Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);
+ return result;
+}
+
+var doSomething = function(paneId) {
+ $.ajax({
+ url: "http://96.126.96.51/v1/artist/"+paneId+"/details",
+ dataType: "jsonp",
+ timeout : 40000,
+ cache:true,
+ jsonpCallback:'details_callback',
+ data: {
+ format: "json",
+ channel: 4
+ },
+ success: function(result) {
+ //console.log(result);
+
+ var first = '<div>First played on '+result.first_play+'</div>';
+ var last = '<div>Last played on '+result.last_play+'</div>';
+ var avg_play_week = '<div>Played on average '+roundNumber(result.avg_play_week,1)+' times a week</div>';
+ var chart_pos = '<div>Number '+result.chart_pos+' on overall chart</div>';
+ var play_count = '<div>Played a total of '+result.play_count+' times</div>';
+ var avg_duration = '<div>Track are on average '+roundNumber(result.avg_duration,1)+' seconds long</div>';
+ var tracks = '<div>Tracks</div><ul>';
+ $.each(result.tracks, function(i,item){
+ tracks = tracks + '<li>'+item.title+'</li>';
+ });
+ tracks = tracks +'</ul>';
+
+ var albums = '<ul id="album">';
+ $.each(result.albums, function(i,item){
+ albums = albums + '<li><img src="'+item.albumimage+'" alt="'+item.albumname+'"/></li>';
+ });
+ albums = albums +'</ul>';
+ // australian: ""
+ // channels: Object
+ // time_sliced: Array[11]
+ $('#' + paneId).next().html(albums+first+last+avg_play_week+chart_pos+play_count+avg_duration+tracks);
+ }
+ });
+};
+
+function formatDate(then) {
+ var month = then.getMonth() + 1;
+ if (month < 10) {
+ month = "0" + month;
+ }
+ var day = then.getDate();
+ if (day < 10) {
+ day = "0" + day;
+ }
+ var year = then.getFullYear();
+ var last_week = year + "-" + month + "-" + day;
+ return last_week;
+}
+
+function thisWeek() {
+ var from = new Date();
+ from.setDate(from.getDate() - span);
+ var from_date = formatDate(from);
+
+ $.ajax({
+ url: "http://96.126.96.51/v1/chart/artist",
+ dataType: "jsonp",
+ timeout : 40000,
+ cache:true,
+ jsonpCallback:'this_week_callback',
+ data: {
+ program: program_id,
+ from: from_date,
+ format: "json",
+ channel: 4
+ },
+ success: function(result) {
+ this_week = result;
+ makeChart();
+ }
+ });
+}
+
+function prevWeek() {
+ var from = new Date();
+ from.setDate(from.getDate() - (span*2));
+ var from_date = formatDate(from);
+
+ var to = new Date();
+ to.setDate(to.getDate() - span);
+ var to_date = formatDate(to);
+
+ $.ajax({
+ url: "http://96.126.96.51/v1/chart/artist",
+ dataType: "jsonp",
+ timeout : 40000,
+ cache:true,
+ jsonpCallback:'prev_week_callback',
+ data: {
+ program: program_id,
+ to: to_date,
+ from: from_date,
+ format: "json",
+ channel: 4
+ },
+ success: function(result) {
+ prev_week = result;
+ makeChart();
+ }
+ });
+}
+thisWeek();
+prevWeek();
+</script>
+
+<h3>Artist Chart for <%=@program%></h3>
+<p>Last <%=@span%> days compared with previous <%=@span%> days</p>
+<div id="accordion">
+<ul class="unstyled" id="files-accordion">
+</ul>
+</div>
|
simonhn/pav-api
|
6dec397fa6e17f768dcca0dfd5f4972738f9931b
|
styling enmasse
|
diff --git a/public/css/bootstrap-1.0.0.css b/public/css/bootstrap-1.0.0.css
index d5e3434..e9453dc 100644
--- a/public/css/bootstrap-1.0.0.css
+++ b/public/css/bootstrap-1.0.0.css
@@ -1,223 +1,227 @@
html,body{margin:0;padding:0;}
h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s,samp,small,strike,strong,sub,sup,tt,var,dd,dl,dt,li,ol,ul,fieldset,form,label,legend,button,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;font-weight:normal;font-style:normal;font-size:100%;line-height:1;font-family:inherit;}
table{border-collapse:collapse;border-spacing:0;}
ol,ul{list-style:none;}
q:before,q:after,blockquote:before,blockquote:after{content:"";}
header,section,footer,article,aside{display:block;}
.clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
.clearfix:after{clear:both;}
.center-block{display:block;margin:0 auto;}
.container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";}
.container:after{clear:both;}
.row{zoom:1;}.row:before,.row:after{display:table;content:"";}
.row:after{clear:both;}
.row .span1{float:left;width:40px;margin-left:20px;}.row .span1:first-child{margin-left:0;}
.row .span2{float:left;width:100px;margin-left:20px;}.row .span2:first-child{margin-left:0;}
.row .span3{float:left;width:160px;margin-left:20px;}.row .span3:first-child{margin-left:0;}
.row .span4{float:left;width:220px;margin-left:20px;}.row .span4:first-child{margin-left:0;}
.row .span5{float:left;width:280px;margin-left:20px;}.row .span5:first-child{margin-left:0;}
.row .span6{float:left;width:340px;margin-left:20px;}.row .span6:first-child{margin-left:0;}
.row .span7{float:left;width:400px;margin-left:20px;}.row .span7:first-child{margin-left:0;}
.row .span8{float:left;width:460px;margin-left:20px;}.row .span8:first-child{margin-left:0;}
.row .span9{float:left;width:520px;margin-left:20px;}.row .span9:first-child{margin-left:0;}
.row .span10{float:left;width:580px;margin-left:20px;}.row .span10:first-child{margin-left:0;}
.row .span11{float:left;width:640px;margin-left:20px;}.row .span11:first-child{margin-left:0;}
.row .span12{float:left;width:700px;margin-left:20px;}.row .span12:first-child{margin-left:0;}
.row .span13{float:left;width:760px;margin-left:20px;}.row .span13:first-child{margin-left:0;}
.row .span14{float:left;width:820px;margin-left:20px;}.row .span14:first-child{margin-left:0;}
.row .span15{float:left;width:880px;margin-left:20px;}.row .span15:first-child{margin-left:0;}
.row .span16{float:left;width:940px;margin-left:20px;}.row .span16:first-child{margin-left:0;}
.row .offset1{margin-left:80px !important;}.row .offset1:first-child{margin-left:60px !important;}
.row .offset2{margin-left:140px !important;}.row .offset2:first-child{margin-left:120px !important;}
.row .offset3{margin-left:200px !important;}.row .offset3:first-child{margin-left:180px !important;}
.row .offset4{margin-left:260px !important;}.row .offset4:first-child{margin-left:240px !important;}
.row .offset5{margin-left:320px !important;}.row .offset5:first-child{margin-left:300px !important;}
.row .offset6{margin-left:380px !important;}.row .offset6:first-child{margin-left:360px !important;}
.row .offset7{margin-left:440px !important;}.row .offset7:first-child{margin-left:420px !important;}
.row .offset8{margin-left:500px !important;}.row .offset8:first-child{margin-left:480px !important;}
.row .offset9{margin-left:500px !important;}.row .offset9:first-child{margin-left:480px !important;}
.row .offset10{margin-left:620px !important;}.row .offset10:first-child{margin-left:600px !important;}
.row .offset11{margin-left:680px !important;}.row .offset11:first-child{margin-left:660px !important;}
.row .offset12{margin-left:740px !important;}.row .offset12:first-child{margin-left:720px !important;}
html,body{background-color:#fff;}
-body{margin:60px 0 0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;}
+body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;}
div.container{width:940px;margin:0 auto;}
div.container-fluid{padding:0 20px;zoom:1;}div.container-fluid:before,div.container-fluid:after{display:table;content:"";}
div.container-fluid:after{clear:both;}
div.container-fluid div.sidebar{float:left;width:220px;}
div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;}
-a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
-.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;}
-.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;}
+a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
+.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:18px;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;}
+.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border:1px solid #004b9a;border-bottom-color:#003f81;}.primary:hover{color:#fff;}
+.btn{-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn.primary{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;}
.btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
.btn.small{padding-right:9px;padding-left:9px;font-size:11px;}
-.btn:disabled,.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;}
+.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;}
+.btn:disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;color:#fff;}
.btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);}
button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;}
h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;}
h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}
h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;}
h3,h4,h5,h6{line-height:36px;}
h3{font-size:18px;}h3 small{font-size:14px;}
h4{font-size:16px;}h4 small{font-size:12px;}
h5{font-size:14px;}
h6{font-size:13px;color:#bfbfbf;text-transform:uppercase;}
ul,ol{margin:0 0 18px 25px;}
ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
ul{list-style:disc;}
ol{list-style:decimal;}
li{line-height:18px;color:#808080;}
ul.unstyled{list-style:none;margin-left:0;}
dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;}
dl dt{font-weight:bold;}
dl dd{margin-left:9px;}
hr{margin:0 0 19px;border:0;border-bottom:1px solid #eee;}
strong{font-style:inherit;font-weight:bold;line-height:inherit;}
em{font-style:italic;font-weight:inherit;line-height:inherit;}
.muted{color:#e6e6e6;}
blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:18px;margin-bottom:0;}
blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';}
address{display:block;line-height:18px;margin-bottom:18px;}
code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;}
pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre-wrap;}
-form{margin-bottom:18px;}form fieldset{margin-bottom:18px;padding-top:18px;}form fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;color:#404040;}
-form div.clearfix{margin-bottom:18px;}
+form{margin-bottom:18px;}form fieldset{margin-bottom:18px;padding-top:18px;}form fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;*margin:0 0 5px 145px;*line-height:1.5;color:#404040;}
+form .clearfix{margin-bottom:18px;}
form label,form input,form select,form textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;}
form label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
form div.input{margin-left:150px;}
form input[type=checkbox],form input[type=radio]{cursor:pointer;}
form input[type=text],form input[type=password],form textarea,form select,form .uneditable-input{display:inline-block;width:210px;margin:0;padding:4px;font-size:13px;line-height:18px;height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
form select,form input[type=file]{height:27px;line-height:27px;}
form textarea{height:auto;}
form .uneditable-input{background-color:#eee;display:block;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);}
form :-moz-placeholder{color:#bfbfbf;}
form ::-webkit-input-placeholder{color:#bfbfbf;}
form input[type=text],form input[type=password],form select,form textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);}
form input[type=text]:focus,form input[type=password]:focus,form textarea:focus{outline:none;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);}
form div.error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form div.error>label,form div.error span.help-inline,form div.error span.help-block{color:#9d261d;}
form div.error input[type=text],form div.error input[type=password],form div.error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form div.error input[type=text]:focus,form div.error input[type=password]:focus,form div.error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);}
-form div.error div.input-prepend span.add-on,form div.error div.input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;}
+form div.error .input-prepend span.add-on,form div.error .input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;}
form .input-mini,form input.mini,form textarea.mini,form select.mini{width:60px;}
form .input-small,form input.small,form textarea.small,form select.small{width:90px;}
form .input-medium,form input.medium,form textarea.medium,form select.medium{width:150px;}
form .input-large,form input.large,form textarea.large,form select.large{width:210px;}
form .input-xlarge,form input.xlarge,form textarea.xlarge,form select.xlarge{width:270px;}
form .input-xxlarge,form input.xxlarge,form textarea.xxlarge,form select.xxlarge{width:530px;}
form textarea.xxlarge{overflow-y:scroll;}
form input[readonly]:focus,form textarea[readonly]:focus,form input.disabled{background:#f5f5f5;border-color:#ddd;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-div.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}div.actions div.secondary-action{float:right;}div.actions div.secondary-action a{line-height:30px;}div.actions div.secondary-action a:hover{text-decoration:underline;}
+.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}.actions .secondary-action{float:right;}.actions .secondary-action a{line-height:30px;}.actions .secondary-action a:hover{text-decoration:underline;}
.help-inline,.help-block{font-size:12px;line-height:18px;color:#bfbfbf;}
-.help-inline{padding-left:5px;}
+.help-inline{padding-left:5px;*position:relative;*top:-5px;}
.help-block{display:block;max-width:600px;}
-div.inline-inputs{color:#808080;}div.inline-inputs span,div.inline-inputs input[type=text]{display:inline-block;}
-div.inline-inputs input.mini{width:60px;}
-div.inline-inputs input.small{width:90px;}
-div.inline-inputs span{padding:0 2px 0 1px;}
-div.input-prepend input[type=text],div.input-append input[type=text]{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
-div.input-prepend .add-on,div.input-append .add-on{background:#f5f5f5;float:left;display:block;width:auto;min-width:16px;padding:4px 4px 4px 5px;color:#bfbfbf;font-weight:normal;line-height:18px;height:18px;text-align:center;text-shadow:0 1px 0 #fff;border:1px solid #ccc;border-right-width:0;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
-div.input-prepend .active,div.input-append .active{background:#a9dba9;border-color:#46a546;}
-div.input-append input[type=text]{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
-div.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;border-right-width:1px;border-left-width:0;}
-ul.inputs-list{margin:0 0 5px;width:100%;}ul.inputs-list li{display:block;padding:0;width:100%;}ul.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}ul.inputs-list li label strong{color:#808080;}
-ul.inputs-list li label small{font-size:12px;font-weight:normal;}
-ul.inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;}
-ul.inputs-list li:first-child{padding-top:5px;}
-ul.inputs-list input[type=radio],ul.inputs-list input[type=checkbox]{margin-bottom:0;}
+.inline-inputs{color:#808080;}.inline-inputs span,.inline-inputs input[type=text]{display:inline-block;}
+.inline-inputs input.mini{width:60px;}
+.inline-inputs input.small{width:90px;}
+.inline-inputs span{padding:0 2px 0 1px;}
+.input-prepend input[type=text],.input-append input[type=text]{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.input-prepend .add-on,.input-append .add-on{background:#f5f5f5;float:left;display:block;width:auto;min-width:16px;padding:4px 4px 4px 5px;color:#bfbfbf;font-weight:normal;line-height:18px;height:18px;text-align:center;text-shadow:0 1px 0 #fff;border:1px solid #ccc;border-right-width:0;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-prepend .active,.input-append .active{background:#a9dba9;border-color:#46a546;}
+.input-prepend .add-on{*margin-top:1px;}
+.input-append input[type=text]{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;border-right-width:1px;border-left-width:0;}
+.inputs-list{margin:0 0 5px;width:100%;}.inputs-list li{display:block;padding:0;width:100%;}.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}.inputs-list li label strong{color:#808080;}
+.inputs-list li label small{font-size:12px;font-weight:normal;}
+.inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;}
+.inputs-list li:first-child{padding-top:5px;}
+.inputs-list input[type=radio],.inputs-list input[type=checkbox]{margin-bottom:0;}
form.form-stacked{padding-left:20px;}form.form-stacked fieldset{padding-top:9px;}
form.form-stacked legend{margin-left:0;}
form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;}
-form.form-stacked div.clearfix{margin-bottom:9px;}form.form-stacked div.clearfix div.input{margin-left:0;}
-form.form-stacked ul.inputs-list{margin-bottom:0;}form.form-stacked ul.inputs-list li{padding-top:0;}form.form-stacked ul.inputs-list li label{font-weight:normal;padding-top:0;}
-form.form-stacked div.actions{margin-left:-20px;padding-left:20px;}
-table{width:100%;margin-bottom:18px;padding:0;text-align:left;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;vertical-align:middle;border-bottom:1px solid #ddd;}
+form.form-stacked .clearfix{margin-bottom:9px;}form.form-stacked .clearfix div.input{margin-left:0;}
+form.form-stacked .inputs-list{margin-bottom:0;}form.form-stacked .inputs-list li{padding-top:0;}form.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;}
+form.form-stacked div.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;}
+form.form-stacked .actions{margin-left:-20px;padding-left:20px;}
+table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;}
table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;}
-table.zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;}
-table.zebra-striped tbody tr:hover td{background-color:#f5f5f5;}
-table.zebra-striped th.header{cursor:pointer;}table.zebra-striped th.header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;}
-table.zebra-striped th.headerSortUp,table.zebra-striped th.headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
-table.zebra-striped th.header:hover:after{visibility:visible;}
-table.zebra-striped th.actions:hover{background-image:none;}
-table.zebra-striped th.headerSortDown:after,table.zebra-striped th.headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;}
-table.zebra-striped th.headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;}
-table.zebra-striped th.blue{color:#049cdb;border-bottom-color:#049cdb;}
-table.zebra-striped th.headerSortUp.blue,table.zebra-striped th.headerSortDown.blue{background-color:#ade6fe;}
-table.zebra-striped th.green{color:#46a546;border-bottom-color:#46a546;}
-table.zebra-striped th.headerSortUp.green,table.zebra-striped th.headerSortDown.green{background-color:#cdeacd;}
-table.zebra-striped th.red{color:#9d261d;border-bottom-color:#9d261d;}
-table.zebra-striped th.headerSortUp.red,table.zebra-striped th.headerSortDown.red{background-color:#f4c8c5;}
-table.zebra-striped th.yellow{color:#ffc40d;border-bottom-color:#ffc40d;}
-table.zebra-striped th.headerSortUp.yellow,table.zebra-striped th.headerSortDown.yellow{background-color:#fff6d9;}
-table.zebra-striped th.orange{color:#f89406;border-bottom-color:#f89406;}
-table.zebra-striped th.headerSortUp.orange,table.zebra-striped th.headerSortDown.orange{background-color:#fee9cc;}
-table.zebra-striped th.purple{color:#7a43b6;border-bottom-color:#7a43b6;}
-table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown.purple{background-color:#e2d5f0;}
-div.topbar{background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
-div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;}
-div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
-div.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}div.topbar form input{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;}
-div.topbar form input::-webkit-input-placeholder{color:#e6e6e6;}
-div.topbar form input:hover{background-color:#444;background-color:rgba(255, 255, 255, 0.5);color:#fff;}
-div.topbar form input:focus,div.topbar form input.focused{outline:none;background-color:#fff;color:#404040;text-shadow:0 1px 0 #fff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);}
-div.topbar ul{display:block;float:left;margin:0 10px 0 0;position:relative;}div.topbar ul.secondary-nav{float:right;margin-left:10px;margin-right:0;}
-div.topbar ul li{display:block;float:left;font-size:13px;}div.topbar ul li a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}div.topbar ul li a:hover{color:#fff;text-decoration:none;}
-div.topbar ul li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
-div.topbar ul.primary-nav li ul{left:0;}
-div.topbar ul.secondary-nav li ul{right:0;}
-div.topbar ul li.menu{position:relative;}div.topbar ul li.menu a.menu:after{width:0px;height:0px;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}
-div.topbar ul li.menu.open a.menu,div.topbar ul li.menu.open a:hover{background-color:#00b4eb;background-color:rgba(255, 255, 255, 0.1);color:#fff;}
-div.topbar ul li.menu.open ul{display:block;}div.topbar ul li.menu.open ul li a{background-color:transparent;font-weight:normal;}div.topbar ul li.menu.open ul li a:hover{background-color:rgba(255, 255, 255, 0.1);color:#fff;}
-div.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;}
-div.topbar ul li ul{background-color:#333;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:0;text-align:left;border:0;zoom:1;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);}div.topbar ul li ul li{float:none;clear:both;display:block;background:none;font-size:12px;}div.topbar ul li ul li a{display:block;padding:6px 15px;clear:both;font-weight:normal;line-height:19px;color:#bbb;}div.topbar ul li ul li a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.25);color:#fff;}
-div.topbar ul li ul li.divider{height:1px;overflow:hidden;background:rgba(0, 0, 0, 0.2);border-bottom:1px solid rgba(255, 255, 255, 0.1);margin:5px 0;}
-div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0.2);padding:6px 15px;cursor:default;color:#808080;border-top:1px solid rgba(0, 0, 0, 0.2);}
-.hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;}
+.zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;}
+.zebra-striped tbody tr:hover td{background-color:#f5f5f5;}
+.zebra-striped .header{cursor:pointer;}.zebra-striped .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;}
+.zebra-striped .headerSortUp,.zebra-striped .headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
+.zebra-striped .header:hover:after{visibility:visible;}
+.zebra-striped .headerSortDown:after,.zebra-striped .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;}
+.zebra-striped .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;}
+table .blue{color:#049cdb;border-bottom-color:#049cdb;}
+table .headerSortUp.blue,table .headerSortDown.blue{background-color:#ade6fe;}
+table .green{color:#46a546;border-bottom-color:#46a546;}
+table .headerSortUp.green,table .headerSortDown.green{background-color:#cdeacd;}
+table .red{color:#9d261d;border-bottom-color:#9d261d;}
+table .headerSortUp.red,table .headerSortDown.red{background-color:#f4c8c5;}
+table .yellow{color:#ffc40d;border-bottom-color:#ffc40d;}
+table .headerSortUp.yellow,table .headerSortDown.yellow{background-color:#fff6d9;}
+table .orange{color:#f89406;border-bottom-color:#f89406;}
+table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc;}
+table .purple{color:#7a43b6;border-bottom-color:#7a43b6;}
+table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;}
+.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar .fill{background:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);background-image:linear-gradient(#333333, #222222);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
+.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
+.topbar a:hover,.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;}
+.topbar h3{position:relative;}.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
+.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}.topbar form input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}.topbar form input:-moz-placeholder{color:#e6e6e6;}
+.topbar form input::-webkit-input-placeholder{color:#e6e6e6;}
+.topbar form input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#fff;}
+.topbar form input:focus,.topbar form input.focused{outline:none;background-color:#fff;color:#404040;text-shadow:0 1px 0 #fff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);}
+.topbar ul{display:block;float:left;margin:0 10px 0 0;position:relative;}.topbar ul.secondary-nav{float:right;margin-left:10px;margin-right:0;}
+.topbar ul li{display:block;float:left;font-size:13px;}.topbar ul li a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.topbar ul li a:hover{color:#fff;text-decoration:none;}
+.topbar ul li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
+.topbar ul.primary-nav li ul{left:0;}
+.topbar ul.secondary-nav li ul{right:0;}
+.topbar ul li.menu{position:relative;}.topbar ul li.menu a.menu:after{width:0px;height:0px;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}
+.topbar ul li.menu.open a.menu,.topbar ul li.menu.open a:hover{background-color:#444;background-color:rgba(255, 255, 255, 0.1);*background-color:#444;color:#fff;}
+.topbar ul li.menu.open ul{display:block;}.topbar ul li.menu.open ul li a{background-color:transparent;font-weight:normal;}.topbar ul li.menu.open ul li a:hover{background-color:rgba(255, 255, 255, 0.1);*background-color:#444;color:#fff;}
+.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;}
+.topbar ul li ul{background-color:#333;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:0;text-align:left;border:0;zoom:1;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);}.topbar ul li ul li{float:none;clear:both;display:block;background:none;font-size:12px;}.topbar ul li ul li a{display:block;padding:6px 15px;clear:both;font-weight:normal;line-height:19px;color:#bbb;}.topbar ul li ul li a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.25);color:#fff;}
+.topbar ul li ul li.divider{height:1px;overflow:hidden;background:#222;background:rgba(0, 0, 0, 0.2);border-bottom:1px solid rgba(255, 255, 255, 0.1);margin:5px 0;}
+.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0.2);padding:6px 15px;cursor:default;color:#808080;border-top:1px solid rgba(0, 0, 0, 0.2);}
+.hero-unit{background-color:#f5f5f5;margin-top:60px;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;}
.hero-unit p{font-size:18px;font-weight:200;line-height:27px;}
-div.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}div.page-header h1{margin-bottom:8px;}
-div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;}
-div.alert-message.error{background-color:#e06359;}
-div.alert-message.warning{background-color:#ffd75a;}
-div.alert-message.success{background-color:#74c474;}
-div.alert-message.info{background-color:#30c0fb;}
-div.alert-message a.close{float:right;margin-top:-2px;color:#fff;font-size:20px;font-weight:bold;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}div.alert-message a.close:hover{text-decoration:none;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}
-div.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}div.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);margin-right:30px;margin-bottom:0;}
-div.block-message ul{margin-bottom:0;}
-div.block-message strong{display:block;}
-div.block-message a.close{display:block;color:#404040;color:rgba(0, 0, 0, 0.5);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);}
-div.block-message.error{background:#f8dcda;border:1px solid #f4c8c5;}
-div.block-message.warning{background:#fff0c0;border:1px solid #ffe38d;}
-div.block-message.success{background:#dff1df;border:1px solid #bbe2bb;}
-div.block-message.info{background:#c7eefe;border:1px solid #ade6fe;}
-ul.tabs,ul.pills{margin:0 0 20px;padding:0;zoom:1;}ul.tabs:before,ul.pills:before,ul.tabs:after,ul.pills:after{display:table;content:"";}
-ul.tabs:after,ul.pills:after{clear:both;}
-ul.tabs li,ul.pills li{display:inline;}ul.tabs li a,ul.pills li a{float:left;width:auto;}
-ul.tabs{width:100%;border-bottom:1px solid #bfbfbf;}ul.tabs li a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}ul.tabs li a:hover{background-color:#e6e6e6;border-bottom:1px solid #bfbfbf;}
-ul.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;}
-ul.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}ul.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
-ul.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
-div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid rgba(0, 0, 0, 0.15);text-decoration:none;}
-div.pagination ul li a:hover,div.pagination ul li.active a{background-color:#c7eefe;}
-div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;}
-div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;}
+footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;}
+.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;}
+.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);border-bottom:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.alert-message p{color:#fff;margin-bottom:0;}.alert-message p+p{margin-top:5px;}
+.alert-message.error{background-color:#d83a2e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e));background-image:-moz-linear-gradient(#e4776f, #d83a2e);background-image:-ms-linear-gradient(#e4776f, #d83a2e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e));background-image:-webkit-linear-gradient(#e4776f, #d83a2e);background-image:-o-linear-gradient(#e4776f, #d83a2e);background-image:linear-gradient(#e4776f, #d83a2e);border-bottom-color:#b32b21;}
+.alert-message.warning{background-color:#ffd040;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040));background-image:-moz-linear-gradient(#ffe38d, #ffd040);background-image:-ms-linear-gradient(#ffe38d, #ffd040);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040));background-image:-webkit-linear-gradient(#ffe38d, #ffd040);background-image:-o-linear-gradient(#ffe38d, #ffd040);background-image:linear-gradient(#ffe38d, #ffd040);border-bottom-color:#ffc40d;}
+.alert-message.success{background-color:#62bc62;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62));background-image:-moz-linear-gradient(#97d397, #62bc62);background-image:-ms-linear-gradient(#97d397, #62bc62);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62));background-image:-webkit-linear-gradient(#97d397, #62bc62);background-image:-o-linear-gradient(#97d397, #62bc62);background-image:linear-gradient(#97d397, #62bc62);border-bottom-color:#46a546;}
+.alert-message.info{background-color:#04aef4;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4));background-image:-moz-linear-gradient(#62cffc, #04aef4);background-image:-ms-linear-gradient(#62cffc, #04aef4);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4));background-image:-webkit-linear-gradient(#62cffc, #04aef4);background-image:-o-linear-gradient(#62cffc, #04aef4);background-image:linear-gradient(#62cffc, #04aef4);border-bottom-color:#049cdb;}
+.alert-message .close{float:right;margin-top:-2px;color:#000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.alert-message .close:hover{text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;}
+.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;margin-right:30px;margin-bottom:0;}
+.block-message ul{margin-bottom:0;}
+.block-message strong{display:block;}
+.block-message.error{background:#f8dcda;border:1px solid #f4c8c5;}
+.block-message.warning{background:#fff0c0;border:1px solid #ffe38d;}
+.block-message.success{background:#dff1df;border:1px solid #bbe2bb;}
+.block-message.info{background:#c7eefe;border:1px solid #ade6fe;}
+.tabs,.pills{margin:0 0 20px;padding:0;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
+.tabs:after,.pills:after{clear:both;}
+.tabs li,.pills li{display:inline;}.tabs li a,.pills li a{float:left;width:auto;}
+.tabs{width:100%;border-bottom:1px solid #bfbfbf;}.tabs li a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}.tabs li a:hover{background-color:#e6e6e6;border-bottom:1px solid #bfbfbf;}
+.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;}
+.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
+.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
+.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}.pagination ul li{display:inline;}.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;text-decoration:none;}
+.pagination ul li a:hover,.pagination ul li.active a{background-color:#c7eefe;}
+.pagination ul li.disabled a,.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;}
+.pagination ul li.next a{border:0;}
.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}
-div.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}
-div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}div.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}div.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
-div.modal .modal-body{padding:20px;}
-div.modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}div.modal .modal-footer:before,div.modal .modal-footer:after{display:table;content:"";}
-div.modal .modal-footer:after{clear:both;}
-div.modal .modal-footer .btn{float:right;margin-left:10px;}
-div.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}div.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
-div.twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
-div.twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
-div.twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
-div.twipsy .twipsy-inner{padding:3px 8px;background-color:#000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-div.twipsy .twipsy-arrow{position:absolute;width:0;height:0;}
+.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}
+.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
+.modal .modal-body{padding:20px;}
+.modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}.modal .modal-footer:before,.modal .modal-footer:after{display:table;content:"";}
+.modal .modal-footer:after{clear:both;}
+.modal .modal-footer .btn{float:right;margin-left:10px;}
+.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
+.twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
+.twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
+.twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
+.twipsy .twipsy-inner{padding:3px 8px;background-color:#000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.twipsy .twipsy-arrow{position:absolute;width:0;height:0;}
.popover{position:absolute;top:0;left:0;z-index:1000;padding:5px;display:none;}.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
.popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
.popover .arrow{position:absolute;width:0;height:0;}
-.popover .inner{background:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);}
-.popover .title{background:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;}
-.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
\ No newline at end of file
+.popover .inner{background-color:#333;background-color:rgba(0, 0, 0, 0.8);*background-color:#333;padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);}
+.popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;}
+.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
\ No newline at end of file
diff --git a/views/admin.html.erb b/views/admin.html.erb
index 51fb6cf..77649f0 100644
--- a/views/admin.html.erb
+++ b/views/admin.html.erb
@@ -1,7 +1,7 @@
<h2>Admin dashboard</h2>
<ul>
<li><a href="/admin/stats">Stats</a></li>
<li><a href="/admin/duplicate/artist">Duplicate artists</a></li>
<li><a href="/admin/duplicate/track">Duplicate tracks</a></li>
- <li><a href="/admin/duplicate/album">Duplicate artists</a></li>
+ <li><a href="/admin/duplicate/album">Duplicate albums</a></li>
</ul>
\ No newline at end of file
diff --git a/views/album.html.erb b/views/album.html.erb
index 064a994..4a46459 100644
--- a/views/album.html.erb
+++ b/views/album.html.erb
@@ -1,8 +1,8 @@
<h2>Album</h2>
<ul>
<% if [email protected]? %><li>id: <%= @album.id %></li><% end %>
- <% if [email protected]? %><li>mbid: <%= @album.albummbid %></li><% end %>
+ <% if [email protected]? %><li>mbid: <a href="http://musicbrainz.org/release-group/<%= @album.albummbid %>"><%= @album.albummbid %></a></li><% end %>
<% if [email protected]? %><li>albumname: <%= @album.albumname %></li><% end %>
- <% if [email protected]? %><li>albumimage: <%= @album.albumimage %></li><% end %>
<% if [email protected]_at.nil? %><li>created_at: <%= @album.created_at %></li><% end %>
+ <% if [email protected]? %><li>albumimage: <img src="<%= @album.albumimage %>"/></li><% end %>
</ul>
\ No newline at end of file
diff --git a/views/album_chart.html.erb b/views/album_chart.html.erb
index 595c4e3..4cec317 100644
--- a/views/album_chart.html.erb
+++ b/views/album_chart.html.erb
@@ -1,6 +1,5 @@
<h2>Albums</h2>
<% for album in @albums %>
<p><%= album.albumname %> - <%=album.cnt.to_i%></p>
<% if !album.albumimage.nil? %><img src="<%= album.albumimage %>" /><% end %>
-
<% end %>
diff --git a/views/album_tracks.html.erb b/views/album_tracks.html.erb
index 5b74c3e..fd27548 100644
--- a/views/album_tracks.html.erb
+++ b/views/album_tracks.html.erb
@@ -1,17 +1,17 @@
-<h1>Tracks for <%= @album.albumname %></h1>
+<h2>Tracks for <%= @album.albumname %></h2>
<% if [email protected]? %><img src="<%= @album.albumimage %>" /><% end %>
<% @tracks.each do |track| %>
<ul>
<% if !track.id.nil? %><li>id: <%= track.id %></li><% end %>
<% if !track.title.nil? %><li>title: <%= track.title %></li><% end %>
<% if !track.tracknote.nil? %><li><%= track.tracknote %></li><% end %>
<% if !track.tracklink.nil? %><li><%= track.tracklink %></li><% end %>
<% if !track.show.nil? %><li><%= track.show %></li><% end %>
<% if !track.talent.nil? %><li><%= track.talent %></li><% end %>
<% if !track.duration.nil? %><li><%= track.duration %></li><% end %>
<% if !track.publisher.nil? %><li><%= track.publisher %></li><% end %>
<% if !track.datecopyrighted.nil? %><li><%= track.datecopyrighted %></li><% end %>
<li>date: <%= track.date %></li>
</ul>
<% end %>
diff --git a/views/albums.html.erb b/views/albums.html.erb
index 83d51f1..594dab7 100644
--- a/views/albums.html.erb
+++ b/views/albums.html.erb
@@ -1,6 +1,6 @@
-<h1>Albums</h1>
+<h2>Albums</h2>
<% for album in @albums %>
<p><%= album.albumname %></p>
<% if !album.albumimage.nil? %><img src="<%= album.albumimage %>" /><% end %>
<% end %>
diff --git a/views/artist.html.erb b/views/artist.html.erb
index 6af971b..11edc0f 100644
--- a/views/artist.html.erb
+++ b/views/artist.html.erb
@@ -1,8 +1,8 @@
-<h1>Artist</h1>
+<h2>Artist</h2>
<p><%= @artist.artistname %></p>
-<p><% if [email protected]? %><%[email protected] %><% end %></p>
-<p><% if [email protected]? %><%[email protected] %><% end %></p>
-<p><% if [email protected]? %><%[email protected] %><% end %></p>
-<p><% if [email protected]? %><%[email protected] %><% end %></p>
+<p><% if [email protected]? %>id: <%[email protected] %><% end %></p>
+<p><% if [email protected]? %>mbid: <a href="http://musicbrainz.org/artist/<%= @artist.artistmbid %>"><%= @artist.artistmbid %></a><% end %></p>
+<p><% if [email protected]? %>link: <%[email protected] %><% end %></p>
+<p><% if [email protected]? %>note: <%[email protected] %><% end %></p>
diff --git a/views/artist_chart.html.erb b/views/artist_chart.html.erb
index 758424d..a121cc6 100644
--- a/views/artist_chart.html.erb
+++ b/views/artist_chart.html.erb
@@ -1,9 +1,8 @@
-<h1>TOP artists</h1>
+<h2>Top Artists</h2>
<% for artist in @artists %>
<ul>
<li>Play count: <%= artist.cnt %></li>
- <% if !artist.id.nil? %><li>id: <%= artist.id %></li><% end %>
- <% if !artist.artistname.empty? %><li>name: <%= artist.artistname %></li><% end %>
+ <% if !artist.id.nil? %><li>Id: <%= artist.id %></li><% end %>
+ <% if !artist.artistname.empty? %><li><%= artist.artistname %></li><% end %>
</ul>
-<% end %>
-</ul>
\ No newline at end of file
+<% end %>
\ No newline at end of file
diff --git a/views/artist_edit.html.erb b/views/artist_edit.html.erb
index 273deed..db34eb4 100644
--- a/views/artist_edit.html.erb
+++ b/views/artist_edit.html.erb
@@ -1,25 +1,25 @@
<style type="text/css" media="screen">
input,textarea{width:100%;}
</style>
-<h1>Artist</h1>
+<h2>Artist</h2>
<p><%= @artist.artistname %> - <%= @artist.id %></p>
<form action='/v1/artist/<%= @artist.id %>/edit' method="POST">
<label for="artistmbid">Artist name</label>
<input type="text" name="artistname" value="<%= @artist.artistname %>"/>
<br>
<label for="artistmbid">Artist MBID</label>
<input type="text" name="artistmbid" value="<%= @artist.artistmbid %>"/>
<br>
<label for="artistlink">Artist link</label>
<input type="text" name="artistlink" value="<%= @artist.artistlink %>"/>
<br>
<label for="artistnote">Artist Note</label>
<textarea name="artistnote"><%= @artist.artistnote %></textarea>
<br>
<input type="submit" value="Save" />
</form>
\ No newline at end of file
diff --git a/views/artist_tracks.html.erb b/views/artist_tracks.html.erb
index d39a146..1cf0377 100644
--- a/views/artist_tracks.html.erb
+++ b/views/artist_tracks.html.erb
@@ -1,17 +1,17 @@
-<h1>Tracks for <%= @artist.artistname %></h1>
+<h2>Tracks for <%= @artist.artistname %></h2>
<p>
<% @tracks.each do |track| %>
<ul>
<% if !track.id.nil? %><li>id: <%= track.id %></li><% end %>
<% if !track.title.empty? %><li>title: <%= track.title %></li><% end %>
<% if !track.tracknote.empty? %><li><%= track.tracknote %></li><% end %>
<% if !track.tracklink.empty? %><li><%= track.tracklink %></li><% end %>
<% if !track.show.empty? %><li><%= track.show %></li><% end %>
<% if !track.talent.empty? %><li><%= track.talent %></li><% end %>
<% if !track.duration.nil? %><li><%= track.duration %></li><% end %>
<% if !track.publisher.empty? %><li><%= track.publisher %></li><% end %>
<% if !track.datecopyrighted.nil? %><li><%= track.datecopyrighted %></li><% end %>
<li>date: <%= track.date %></li>
</ul>
<% end %>
</p>
\ No newline at end of file
diff --git a/views/artists.html.erb b/views/artists.html.erb
index 058158e..32a02ef 100644
--- a/views/artists.html.erb
+++ b/views/artists.html.erb
@@ -1,4 +1,4 @@
-<h1>Artists</h1>
+<h2>Artists</h2>
<% for artist in @artists %>
<p><%= artist.id %>: <%= artist.artistname %></p>
<% end %>
diff --git a/views/duplicate_albums.html.erb b/views/duplicate_albums.html.erb
index 68acb7d..9d08403 100644
--- a/views/duplicate_albums.html.erb
+++ b/views/duplicate_albums.html.erb
@@ -1,287 +1,33 @@
-
-<style type="text/css">
-
-body{font-size: 0.75em;}
-#just_played #song_list {
- float: left;
- margin: 2px 0 10px;
- }
-
- #just_played .sort_order {
- text-align: center;
- color: #808080;
- padding: 8px 0;
- }
-
- #just_played .sort_order .title {
- font-weight: 700;
- margin-right: 4px;
- color: #000000;
- }
-
- #just_played .sort_order a {
- text-decoration: underline;
- margin: 0 4px;
- }
-
- #just_played .sort_order a.current {
- text-decoration: none;
- color: #000000;
- }
-
- #just_played .pagination,
- #song_list .search-criteria {
- text-align: center;
- margin: 4px 0;
- float: left;
- padding: 8px 0;
- }
-
- #just_played #song_list .pagination {
- border-bottom-width: 1px;
- border-bottom-style: dotted;
- }
-
- #song_list .search-criteria {
- border-bottom-width: 4px;
- border-bottom-style: solid;
- }
-
- #just_played .pagination .title {
- font-weight: 700;
- margin-right: 8px;
- }
-
- #just_played .pagination .pages {
- word-spacing: 0.5em;
- margin-right: 8px;
- color: #808080;
- }
-
- #just_played .pagination a {
- color: #204ba1;
- text-decoration: underline;
- }
-
- #just_played .pagination .pages a.current {
- color: #000000;
- text-decoration: none;
- }
-
- #just_played .pagination a.next {
- color: #204ba1;
- text-decoration: none;
- font-weight: 700;
- }
-
- #clear-search {
- display: inline-block;
- font-size: 0.8em;
- margin-left: 10px;
- }
-
- #just_played .list_quantity {
- color: #204ba1;
- }
-
- #just_played .list_quantity img {
- margin-right: 4px;
- }
-
- #just_played .song {
- float: left;
- border-top: 1px dashed #C9C9C9;
- padding-top: 4px;
- }
-
- #just_played .song .date {
- font-size: 1.0em;
- padding: 3px 8px;
- margin: -4px 0 5px 60px;
- color: #fff;
- background-color: #1F2933;
- float: left;
- }
-
- #just_played .song .time {
- font-size: 0.8em;
- color: #999999;
- margin-bottom: 2px;
- }
-
- #just_played .song .album_image_container {
- float: left;
- width: 110px;
- height: 100px;
- background-image: url('http://abcdigmusic.net.au/sites/all/themes/dig2/images/background/no-cover.png');
- background-repeat: no-repeat;
- }
-
- #just_played .song .album_image_container img {
- border: 1px solid #FFFFFF;
- }
-
- #just_played .song .album_image_container img:hover {
- border: 1px solid #CAD4DD;
- }
-
- #just_played .song .australian_artist_container {
- z-index:2;
- position:absolute;
- left:75px;
- }
-
- #just_played .song .details {
- float: left;
- margin-left: 10px;
- width: 200px;
- }
-
- #just_played .song .details td {
- padding-bottom: 9px;
- }
-
- #just_played .song .details td.label {
- width: 80px;
- font-size: 0.9em;
- color: #4d4d4d;
- }
-
- #just_played .song .details td.info {
- width: 145px;
- font-size: 0.9em;
- font-weight: bold;
- }
-
- #just_played .song .details td a{
- color: #204ba1;
- }
-
- #just_played .song .social_data {
- float: left;
- margin: 0;
- color: #4d4d4d;
- font-size: 0.9em;
- padding-left: 10px;
- }
-
- #just_played .song .feature_album {
- position: relative;
- top: -4px;
- border: 0;
- }
-
- #just_played .song .social_data a {
- color: #2f57a7;
- }
-
- #just_played .song .social_data .community {
- float: left;
- border-bottom: 1px dotted #CAD4DD;
- margin-bottom: 2px;
- padding: 2px 1px;
- }
-
- #just_played .song .social_data .user {
- float: left;
- width: 110px;
- border-bottom: 1px dotted #CAD4DD;
- margin-bottom: 2px;
- padding: 2px 1px;
- margin-left: 15px;
- }
-
- #just_played .song .social_data .last {
- border-bottom: 0;
- }
-
- #just_played .song .social_data .icon {
- float: left;
- margin-right: 2px;
- }
-
- #just_played .song .social_data .community .text {
- float: left;
- line-height: 1.2em;
- }
-
- #just_played .song .social_data .user .text {
- float: left;
- width: 84px;
- line-height: 1.2em;
- }
-
- #just_played .song .social_data .note {
- float: left;
- clear: both;
- width: 310px;
- border-top: 1px dotted #CAD4DD;
- padding-top: 4px;
- padding-left: 21px;
- }
-
- #just_played .song .social_data .note .text {
- float: left;
- width: 320px;
- }
-
- #just_played .song .social_data .note .text p {
- color: #4d4d4d;
- }
-
- #just_played .song .social_data .note a {
- background-image: url(../images/icon_external.png);
- padding-right: 19px;
- background-repeat: no-repeat;
- background-position: right;
- }
-
- #just_played .disclaimer {
- text-align: right;
- padding-top: 8px;
- float: left;
- }
-.clear { clear: right; }
-
-</style>
<p>
-
-<form action='/admin/merge/album' method="POST">
- Album to delete<input type="text" name="id_old" />
-
-Album to keep
-<input type="text" name="id_new" />
-
- <input type="submit" value="Merge!" />
-</form>
+ <form action='/admin/merge/album' method="POST" class="form-stacked">
+ <label for="id_old">Album to delete</label>
+ <input type="text" name="id_old" />
+ <label for="id_new">Album to keep</label>
+ <input type="text" name="id_new" />
+ <input type="submit" value="Merge!" />
+ </form>
</p>
-
<p>
- <div id="just_played">
+ <table>
+ <thead>
+ <tr>
+ <th>id</th>
+ <th>name</th>
+ </tr>
+ </thead>
+ <tbody>
<% @list.each do |track| %>
- <div class="song">
- <br style="clear: both">
-
- <div class="details">
- <table><tbody>
-
- <tr>
- <td class="label">Album</td>
- <td class="label"><a href="/v1/album/<%= track.id %>"><%= track.id %></td>
-
- <td class="info">
-
- <span><% if !track.albummbid.nil? %><a href="http://musicbrainz.org/release-group/<%= track.albummbid %>.html"><%= track.albumname %></a>
- <% else %> <%= track.albumname %><% end %></span>
- </td>
- </tr>
-
- </tbody></table>
- </div>
-
- </div>
+ <tr>
+ <td><a href="/v1/album/<%= track.id %>"><%= track.id %></td>
+ <td>
+ <span><% if !track.albummbid.nil? %><a href="http://musicbrainz.org/release-group/<%= track.albummbid %>.html"><%= track.albumname %></a>
+ <% else %> <%= track.albumname %><% end %></span>
+ </span>
+ </td>
+ </tr>
<% end %>
- </div>
+ </tbody>
+ </table>
</p>
diff --git a/views/duplicate_artists.html.erb b/views/duplicate_artists.html.erb
index f7aea02..cb9aa23 100644
--- a/views/duplicate_artists.html.erb
+++ b/views/duplicate_artists.html.erb
@@ -1,287 +1,31 @@
-
-<style type="text/css">
-
-body{font-size: 0.75em;}
-#just_played #song_list {
- float: left;
- margin: 2px 0 10px;
- }
-
- #just_played .sort_order {
- text-align: center;
- color: #808080;
- padding: 8px 0;
- }
-
- #just_played .sort_order .title {
- font-weight: 700;
- margin-right: 4px;
- color: #000000;
- }
-
- #just_played .sort_order a {
- text-decoration: underline;
- margin: 0 4px;
- }
-
- #just_played .sort_order a.current {
- text-decoration: none;
- color: #000000;
- }
-
- #just_played .pagination,
- #song_list .search-criteria {
- text-align: center;
- margin: 4px 0;
- float: left;
- padding: 8px 0;
- }
-
- #just_played #song_list .pagination {
- border-bottom-width: 1px;
- border-bottom-style: dotted;
- }
-
- #song_list .search-criteria {
- border-bottom-width: 4px;
- border-bottom-style: solid;
- }
-
- #just_played .pagination .title {
- font-weight: 700;
- margin-right: 8px;
- }
-
- #just_played .pagination .pages {
- word-spacing: 0.5em;
- margin-right: 8px;
- color: #808080;
- }
-
- #just_played .pagination a {
- color: #204ba1;
- text-decoration: underline;
- }
-
- #just_played .pagination .pages a.current {
- color: #000000;
- text-decoration: none;
- }
-
- #just_played .pagination a.next {
- color: #204ba1;
- text-decoration: none;
- font-weight: 700;
- }
-
- #clear-search {
- display: inline-block;
- font-size: 0.8em;
- margin-left: 10px;
- }
-
- #just_played .list_quantity {
- color: #204ba1;
- }
-
- #just_played .list_quantity img {
- margin-right: 4px;
- }
-
- #just_played .song {
- float: left;
- border-top: 1px dashed #C9C9C9;
- padding-top: 4px;
- }
-
- #just_played .song .date {
- font-size: 1.0em;
- padding: 3px 8px;
- margin: -4px 0 5px 60px;
- color: #fff;
- background-color: #1F2933;
- float: left;
- }
-
- #just_played .song .time {
- font-size: 0.8em;
- color: #999999;
- margin-bottom: 2px;
- }
-
- #just_played .song .album_image_container {
- float: left;
- width: 110px;
- height: 100px;
- background-image: url('http://abcdigmusic.net.au/sites/all/themes/dig2/images/background/no-cover.png');
- background-repeat: no-repeat;
- }
-
- #just_played .song .album_image_container img {
- border: 1px solid #FFFFFF;
- }
-
- #just_played .song .album_image_container img:hover {
- border: 1px solid #CAD4DD;
- }
-
- #just_played .song .australian_artist_container {
- z-index:2;
- position:absolute;
- left:75px;
- }
-
- #just_played .song .details {
- float: left;
- margin-left: 10px;
- width: 200px;
- }
-
- #just_played .song .details td {
- padding-bottom: 9px;
- }
-
- #just_played .song .details td.label {
- width: 80px;
- font-size: 0.9em;
- color: #4d4d4d;
- }
-
- #just_played .song .details td.info {
- width: 145px;
- font-size: 0.9em;
- font-weight: bold;
- }
-
- #just_played .song .details td a{
- color: #204ba1;
- }
-
- #just_played .song .social_data {
- float: left;
- margin: 0;
- color: #4d4d4d;
- font-size: 0.9em;
- padding-left: 10px;
- }
-
- #just_played .song .feature_album {
- position: relative;
- top: -4px;
- border: 0;
- }
-
- #just_played .song .social_data a {
- color: #2f57a7;
- }
-
- #just_played .song .social_data .community {
- float: left;
- border-bottom: 1px dotted #CAD4DD;
- margin-bottom: 2px;
- padding: 2px 1px;
- }
-
- #just_played .song .social_data .user {
- float: left;
- width: 110px;
- border-bottom: 1px dotted #CAD4DD;
- margin-bottom: 2px;
- padding: 2px 1px;
- margin-left: 15px;
- }
-
- #just_played .song .social_data .last {
- border-bottom: 0;
- }
-
- #just_played .song .social_data .icon {
- float: left;
- margin-right: 2px;
- }
-
- #just_played .song .social_data .community .text {
- float: left;
- line-height: 1.2em;
- }
-
- #just_played .song .social_data .user .text {
- float: left;
- width: 84px;
- line-height: 1.2em;
- }
-
- #just_played .song .social_data .note {
- float: left;
- clear: both;
- width: 310px;
- border-top: 1px dotted #CAD4DD;
- padding-top: 4px;
- padding-left: 21px;
- }
-
- #just_played .song .social_data .note .text {
- float: left;
- width: 320px;
- }
-
- #just_played .song .social_data .note .text p {
- color: #4d4d4d;
- }
-
- #just_played .song .social_data .note a {
- background-image: url(../images/icon_external.png);
- padding-right: 19px;
- background-repeat: no-repeat;
- background-position: right;
- }
-
- #just_played .disclaimer {
- text-align: right;
- padding-top: 8px;
- float: left;
- }
-.clear { clear: right; }
-
-</style>
<p>
-
-<form action='/admin/merge/artist' method="POST">
- Artist to delete<input type="text" name="id_old" />
-
-Artist to keep
-<input type="text" name="id_new" />
-
- <input type="submit" value="Merge!" />
-</form>
+ <form action='/admin/merge/artist' method="POST" class="form-stacked">
+ <label for="id_old">Artist to delete</label>
+ <input type="text" name="id_old" />
+ <label for="id_new">Artist to keep</label>
+ <input type="text" name="id_new" />
+ <input type="submit" value="Merge!" />
+ </form>
</p>
-
<p>
- <div id="just_played">
+ <table>
+ <thead>
+ <tr>
+ <th>id</th>
+ <th>name</th>
+ </tr>
+ </thead>
+ <tbody>
<% @list.each do |track| %>
- <div class="song">
- <br style="clear: both">
-
- <div class="details">
- <table><tbody>
-
- <tr>
- <td class="label">Artist</td>
- <td class="label"><a href="/v1/artist/<%= track.id %>"><%= track.id %></td>
-
- <td class="info">
-
- <span><% if !track.artistmbid.nil? %><a href="http://musicbrainz.org/artist/<%= track.artistmbid %>.html"><%= track.artistname %></a>
- <% else %> <%= track.artistname %><% end %></span>
- </td>
- </tr>
-
- </tbody></table>
- </div>
-
- </div>
+ <tr>
+ <td><a href="/v1/artist/<%= track.id %>"><%= track.id %></td>
+ <td>
+ <span><% if !track.artistmbid.nil? %><a href="http://musicbrainz.org/artist/<%= track.artistmbid %>.html"><%= track.artistname %></a>
+ <% else %> <%= track.artistname %><% end %></span>
+ </span>
+ </td>
+ </tr>
<% end %>
- </div>
-</p>
-
-
+ </tbody>
+ </table>
+</p>
\ No newline at end of file
diff --git a/views/duplicate_tracks.html.erb b/views/duplicate_tracks.html.erb
index 4b313b7..5de5a57 100644
--- a/views/duplicate_tracks.html.erb
+++ b/views/duplicate_tracks.html.erb
@@ -1,287 +1,31 @@
-
-<style type="text/css">
-
-body{font-size: 0.75em;}
-#just_played #song_list {
- float: left;
- margin: 2px 0 10px;
- }
-
- #just_played .sort_order {
- text-align: center;
- color: #808080;
- padding: 8px 0;
- }
-
- #just_played .sort_order .title {
- font-weight: 700;
- margin-right: 4px;
- color: #000000;
- }
-
- #just_played .sort_order a {
- text-decoration: underline;
- margin: 0 4px;
- }
-
- #just_played .sort_order a.current {
- text-decoration: none;
- color: #000000;
- }
-
- #just_played .pagination,
- #song_list .search-criteria {
- text-align: center;
- margin: 4px 0;
- float: left;
- padding: 8px 0;
- }
-
- #just_played #song_list .pagination {
- border-bottom-width: 1px;
- border-bottom-style: dotted;
- }
-
- #song_list .search-criteria {
- border-bottom-width: 4px;
- border-bottom-style: solid;
- }
-
- #just_played .pagination .title {
- font-weight: 700;
- margin-right: 8px;
- }
-
- #just_played .pagination .pages {
- word-spacing: 0.5em;
- margin-right: 8px;
- color: #808080;
- }
-
- #just_played .pagination a {
- color: #204ba1;
- text-decoration: underline;
- }
-
- #just_played .pagination .pages a.current {
- color: #000000;
- text-decoration: none;
- }
-
- #just_played .pagination a.next {
- color: #204ba1;
- text-decoration: none;
- font-weight: 700;
- }
-
- #clear-search {
- display: inline-block;
- font-size: 0.8em;
- margin-left: 10px;
- }
-
- #just_played .list_quantity {
- color: #204ba1;
- }
-
- #just_played .list_quantity img {
- margin-right: 4px;
- }
-
- #just_played .song {
- float: left;
- border-top: 1px dashed #C9C9C9;
- padding-top: 4px;
- }
-
- #just_played .song .date {
- font-size: 1.0em;
- padding: 3px 8px;
- margin: -4px 0 5px 60px;
- color: #fff;
- background-color: #1F2933;
- float: left;
- }
-
- #just_played .song .time {
- font-size: 0.8em;
- color: #999999;
- margin-bottom: 2px;
- }
-
- #just_played .song .album_image_container {
- float: left;
- width: 110px;
- height: 100px;
- background-image: url('http://abcdigmusic.net.au/sites/all/themes/dig2/images/background/no-cover.png');
- background-repeat: no-repeat;
- }
-
- #just_played .song .album_image_container img {
- border: 1px solid #FFFFFF;
- }
-
- #just_played .song .album_image_container img:hover {
- border: 1px solid #CAD4DD;
- }
-
- #just_played .song .australian_artist_container {
- z-index:2;
- position:absolute;
- left:75px;
- }
-
- #just_played .song .details {
- float: left;
- margin-left: 10px;
- width: 200px;
- }
-
- #just_played .song .details td {
- padding-bottom: 9px;
- }
-
- #just_played .song .details td.label {
- width: 80px;
- font-size: 0.9em;
- color: #4d4d4d;
- }
-
- #just_played .song .details td.info {
- width: 145px;
- font-size: 0.9em;
- font-weight: bold;
- }
-
- #just_played .song .details td a{
- color: #204ba1;
- }
-
- #just_played .song .social_data {
- float: left;
- margin: 0;
- color: #4d4d4d;
- font-size: 0.9em;
- padding-left: 10px;
- }
-
- #just_played .song .feature_album {
- position: relative;
- top: -4px;
- border: 0;
- }
-
- #just_played .song .social_data a {
- color: #2f57a7;
- }
-
- #just_played .song .social_data .community {
- float: left;
- border-bottom: 1px dotted #CAD4DD;
- margin-bottom: 2px;
- padding: 2px 1px;
- }
-
- #just_played .song .social_data .user {
- float: left;
- width: 110px;
- border-bottom: 1px dotted #CAD4DD;
- margin-bottom: 2px;
- padding: 2px 1px;
- margin-left: 15px;
- }
-
- #just_played .song .social_data .last {
- border-bottom: 0;
- }
-
- #just_played .song .social_data .icon {
- float: left;
- margin-right: 2px;
- }
-
- #just_played .song .social_data .community .text {
- float: left;
- line-height: 1.2em;
- }
-
- #just_played .song .social_data .user .text {
- float: left;
- width: 84px;
- line-height: 1.2em;
- }
-
- #just_played .song .social_data .note {
- float: left;
- clear: both;
- width: 310px;
- border-top: 1px dotted #CAD4DD;
- padding-top: 4px;
- padding-left: 21px;
- }
-
- #just_played .song .social_data .note .text {
- float: left;
- width: 320px;
- }
-
- #just_played .song .social_data .note .text p {
- color: #4d4d4d;
- }
-
- #just_played .song .social_data .note a {
- background-image: url(../images/icon_external.png);
- padding-right: 19px;
- background-repeat: no-repeat;
- background-position: right;
- }
-
- #just_played .disclaimer {
- text-align: right;
- padding-top: 8px;
- float: left;
- }
-.clear { clear: right; }
-
-</style>
<p>
-
-<form action='/admin/merge/track' method="POST">
- Track to delete<input type="text" name="id_old" />
-
-Track to keep
-<input type="text" name="id_new" />
-
- <input type="submit" value="Merge!" />
-</form>
+ <form action='/admin/merge/track' method="POST" class="form-stacked">
+ <label for="id_old">Track to delete</label>
+ <input type="text" name="id_old" />
+ <label for="id_new">Track to keep</label>
+ <input type="text" name="id_new" />
+ <input type="submit" value="Merge!" />
+ </form>
</p>
-
<p>
- <div id="just_played">
+ <table>
+ <thead>
+ <tr>
+ <th>id</th>
+ <th>name</th>
+ </tr>
+ </thead>
+ <tbody>
<% @list.each do |track| %>
- <div class="song">
- <br style="clear: both">
-
- <div class="details">
- <table><tbody>
-
- <tr>
- <td class="label">Track</td>
- <td class="label"><a href="/v1/track/<%= track.id %>"><%= track.id %></td>
-
- <td class="info">
-
- <span><% if !track.trackmbid.nil? %><a href="http://musicbrainz.org/track/<%= track.trackmbid %>.html"><%= track.title %></a>
- <% else %> <%= track.title %><% end %></span>
- </td>
- </tr>
-
- </tbody></table>
- </div>
-
- </div>
+ <tr>
+ <td><a href="/v1/track/<%= track.id %>"><%= track.id %></td>
+ <td>
+ <span><% if !track.trackmbid.nil? %><a href="http://musicbrainz.org/track/<%= track.trackmbid %>.html"><%= track.title %></a>
+ <% else %> <%= track.title %><% end %></span>
+ </span>
+ </td>
+ </tr>
<% end %>
- </div>
-</p>
-
-
+ </tbody>
+ </table>
+</p>
\ No newline at end of file
diff --git a/views/front.html.erb b/views/front.html.erb
index dccbb3b..58db17d 100644
--- a/views/front.html.erb
+++ b/views/front.html.erb
@@ -1,438 +1,438 @@
<section id="intro">
<p>The pav:api exposes playlist data and is currently under development.</p>
<p>Have a look at the <a href='/demo'>app gallery</a> to see what can be built using pav:api.</p>
<ul class="unstyled">
<li><a href="#general">general information</a></li>
<ul>
<li><a href="#general-query-parameters">query parameters</a></li>
<li><a href="#general-identifiers">identifiers</a></li>
<li><a href="#general-authentication">authentication</a></li>
<li><a href="#general-versioning">versioning</a></li>
<li><a href="#general-return-types">return types</a></li>
<li><a href="#general-response-codes">reponse codes</a></li>
<li><a href="#general-terms">terms</a></li>
</ul>
+ <li> </li>
<li><a href="#resources">resources</a></li>
<ul>
<li><a href="#resources-artists">artists</a></li>
<li><a href="#resources-tracks">tracks</a></li>
<li><a href="#resources-albums">albums</a></li>
<li><a href="#resources-channels">channels</a></li>
<li><a href="#resources-plays">plays</a></li>
<li><a href="#resources-chart">charts</a></li>
<li><a href="#resources-search">search</a></li>
- <li><a href="#resources-stats">stats</a></li>
</ul>
</ul>
</section>
<section id="general">
<h2 id="general">general information</h2>
<h3 id="general-query-parameters">query parameters</h3>
<div>Some paths accepts the following query parameters. See each <a href="#resources">resource</a> type for more specifics.</div>
<ul>
<li><code>channel</code>, default is all channels, available on paths that return a list</li>
<li><code>limit</code>, default is 10, available on paths that return a list</li>
<li><code>callback</code>, for cross-domain access jsonp is delivered to requests with 'callback' query parameter and json as return type</li>
<li><code>format</code>, return type format (html, json, xml)</li>
<li><code>type</code>, to specify lookup type, mbid</li>
<li><code>to</code> (to date) in yyyy-mm-dd format</li>
<li><code>from</code> (from date) in yyyy-mm-dd format</li>
<li><code>order_by</code>, for ordering results. Default is playedtime. Allowed values are artist and track</li>
<li><code>q</code>, a query for searching for track title, album name and artist name</li>
<li><code>artist_query</code>, searching for an artist name</li>
<li><code>track_query</code>, searching for a track title</li>
<li><code>album_query</code>, searching for an album name</li>
<li><code>program</code>, the program_id to limit result to a certain show</li>
</ul>
<p>
<h3 id="general-identifiers">identifiers</h3>
To lookup a specific artist/track/album you can use pav IDs or Musicbrainz IDs where available.
</p>
<p>
<h3 id="general-authentication">authentication</h3>
All put and post requests require authentication
</p>
<p>
<h3 id="general-versioning">versioning</h3>
The version of the api you wish to use is specified at the root path of resources. The current version is v1.
</p>
<p>
<h3 id="general-return-types">return types</h3>
Return type can selected by appending the desired content type to the url (.html, .xml, .json) or by adding ?format=(html, xml, json) to the query parameter. Use only one of these methods when doing a request.
<br />
Default return type is currently html but will change to json when the API is put in production.
</p>
<p>
<h3 id="general-response-codes">response codes</h3>
The API attempts to return appropriate HTTP status codes for every request.
<ul>
<li>200 OK: Request succeeded</li>
<li>400 Bad Request: Your request was invalid and we'll return an error message telling you why</li>
<li>401 Not Authorized: You did not provide the right credentials</li>
<li>404 Not Found: The URI requested is invalid or the resource requested, such as a user, does not exists</li>
<li>500 Internal Server Error: Something is broken.</li>
<li>503 Service Unavailable: You cannot make this request at this time. Servers are up, but overloaded with requests</li>
</ul>
</p>
<p>
<h3 id="general-terms">terms</h3>
Please be nice when using the api. If you plan to make massive amounts of calls please advise us.
</p>
</section>
<section id="resources">
<h2 id="resources">resources</h2>
The resources that can be accessed through the api follows the model below:
<div id="model-img">
<img id="resources-model" width="400px" src="images/models.png"/>
</div>
Some useful observation about the model:
<ul>
<li>An artist can have multiple tracks</li>
<li>A track can have multiple artists</li>
<li>A track can have multiple albums (a track appearing on different albums)</li>
<li>An album can have multiple tracks</li>
<li>A track can have multiple plays</li>
<li>A play belongs to one track</li>
<li>A play belongs to one channel</li>
<li>A channel can have multiple plays</li>
</ul>
<h3 id="resources-artists">artists</h3>
<h4>/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of artists</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/artists.json?channel=4">/v1/artists.json?channel=4</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967986.js"></script>
</div>
<h4>/artist/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/artist/1234.json">/v1/artist/1234.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967997.js"></script>
</div>
<h4>/artist/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code></p>
<h5>Example query</h5>
<code><a href="/v1/artist/1234/tracks.json">/v1/artist/1234/tracks.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968001.js"></script>
</div>
<h3 id="resources-tracks">tracks</h3>
<h4>/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of tracks</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/tracks.json?channel=4&limit=3">/v1/tracks.json?channel=4&limit=3</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968008.js"></script>
</div>
<h4>/track/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single track specified by an id.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324.json">/v1/track/324.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968013.js?file=gistfile1.json"></script>
</div>
<h4>post /track</h4>
<div class='resource'>
<h5>Description</h5>
<p>Post a track to pav. Requires authentication.</p>
<h5>Parameters</h5>
<p>A json payload</p>
<script src="https://gist.github.com/968015.js?file=gistfile1.json"></script>
<h5>Example response</h5>
<p><code>200</code></p>
</div>
<h4>/track/:id/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the artists related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324/artists.json">/v1/track/324/artists.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968022.js?file=gistfile1.json"></script>
</div>
<h4>/track/:id/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the albums related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324/albums.json">/v1/track/324/albums.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968023.js?file=gistfile1.json"></script>
</div>
<h4>/track/:id/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the plays related to a single track.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324/plays.json">/v1/track/324/plays.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968025.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-albums">albums</h3>
<h4>/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of albums.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/albums.json">/v1/albums.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968027.js?file=gistfile1.json"></script>
</div>
<h4>/album/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/album/15.json">/v1/album/15.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968029.js?file=gistfile1.json"></script>
</div>
<h4>/album/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/album/15/tracks.json">/v1/album/15/tracks.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968035.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-channels">channels</h3>
<h4>/channels</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of channels.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/channels.json">/v1/channels.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968054.js?file=gistfile1.json"></script>
</div>
<h4>/channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single channel.</p>
<h5>Example query</h5>
<code><a href="/v1/channel/1.json">/v1/channel/1.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968058.js?file=gistfile1.json"></script>
</div>
<h4>post channel</h4>
<div class='resource'>
<h5>Description</h5>
<p>Create a new channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
<h4>put channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Update a channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-plays">plays</h3>
<h4>/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a playlist.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>to</code>, <code>from</code>, <code>limit</code>, <code>channel</code>, <code>program</code>, <code>artist_query</code>, <code>track_query</code>, <code>album_query</code>, <code>q</code> (query artist, channel and track name), <code>order_by</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/plays.json?channel=1&limit=3">/v1/plays.json?channel=1&limit=3</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/956363.js"> </script>
</div>
<h4>/play/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single play.</p>
<h5>Example query</h5>
<code><a href="/v1/play/4356.json">/v1/play/4356.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968064.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-chart">charts</h3>
<h4>/chart/artist</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played artists for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>, <code>to</code>, <code>from</code>, <code>program</code>. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><a href="/v1/chart/artist.json?channel=1">/v1/chart/artist.json?channel=1</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973721.js?file=gistfile1.json"></script>
</div>
<h4>/chart/track</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played tracks for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>, <code>to</code>, <code>from</code>, <code>program</code>. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><a href="/v1/chart/track.json?from=2011-04-20">/v1/chart/track.json?from=2011-04-20</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973726.js?file=gistfile1.json"></script>
</div>
<h4>/chart/album</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played albums for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>, <code>to</code>, <code>from</code>, <code>program</code>. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><a href="/v1/chart/album.json?limit=5&channel=4">/v1/chart/album.json?limit=5&channel=4</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973730.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-search">search</h3>
<div class='resource'>
<h5>Description</h5>
<p>Search for artists (tracks and albums to come).</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/search/dylan.json?limit=5">/v1/search/dylan.json?limit=5</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973733.js?file=gistfile1.json"></script>
</div>
</section>
<style type="text/css" media="screen">
.gist-syntax .s2 {
color: black;
}
.gist .gist-file .gist-data{
font-size:75%;
}
.gist .gist-file .gist-meta{
display:none;
}
</style>
diff --git a/views/layout.html.erb b/views/layout.html.erb
index 56554a7..68f96de 100644
--- a/views/layout.html.erb
+++ b/views/layout.html.erb
@@ -1,27 +1,27 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>pav api</title>
<!--<link rel="stylesheet" href="/css/master.css" type="text/css" />-->
<link rel="stylesheet" href="/css/bootstrap-1.0.0.css" type="text/css" />
<!--[if IE]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<link rel="shortcut icon" href="/images/favicon.ico"/>
</head>
<body>
<div class="container">
<a href="http://github.com/simonhn"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>
<header id="main">
<hgroup>
<a href="/"><h1>pav:api</h1></a>
</hgroup>
</header>
- <div>
+ <div id="main-content">
<%= yield %>
</div>
</div>
</body>
</html>
\ No newline at end of file
diff --git a/views/program_chart_album.html.erb b/views/program_chart_album.html.erb
index 90b171e..8fa8d7a 100644
--- a/views/program_chart_album.html.erb
+++ b/views/program_chart_album.html.erb
@@ -1,203 +1,196 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<style>
.same{
background-image:url('/images/same_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.new{
background-image:url('/images/new_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.up{
background-image:url('/images/up_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.down{
background-image:url('/images/down_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.album-image img{
width:60px;
height:60px;
}
</style>
<script>
var this_week, prev_week = null;
var new_chart = [];
var program_id = '<%=@program%>';
var span = '<%[email protected]_i%>';
function makeChart() {
//make sure that both jsonp calls have finished before making the chart
if (this_week && prev_week) {
//console.log('this week', this_week);
//console.log('prev week', prev_week);
$.each( this_week, function (i, item) {
var this_week_id = item.album_id;
//default to 'new' status
item.status = "new";
//default to empty diff
item.diff = '';
//default to empty prev count
item.prev_count = '';
//check that prev_week contains any items
if (prev_week.length > 0) {
//for each of this weeks items, run through prev weeks items
$.each(prev_week, function (is, item2) {
//check if track was played last week
if(this_week_id === item2.album_id) {
//UP
if( i< is) {
item.status = "up";
item.diff = is - i;
item.prev_count = item2.count;
}
//DOWN
else if(i > is) {
item.status = "down";
item.diff = i-is;
item.prev_count = item2.count;
}
//SAME
else if(i === is) {
item.status = "same";
item.diff = 0;
}
}//end if
//add item to new chart
new_chart[i] = item;
});//end for each. prev_week
}//end if: no previous week items to compare with
else {
new_chart[i] = item;
}
});//end outer (this_week) for each
//display new chart
$.each(new_chart, function (i, item) {
var number = i +1;
var content = '<tr><td class="number">' + number + '</td><td class="status"><span class=' + item.status + '> </span></td><td class="title">' + item.albumname + '</td><td class="name">' + item.artistname + '</td><td class="plays">' + item.count + '</td><td class="diff">' + item.diff + '</td><td class="prev=cnt">' + item.prev_count + '</td><td class="album-image"><img src="' + item.albumimage + '"/></td></tr>';
$(content).appendTo("#artists");
});
}//end if
}
function formatDate(then) {
var month = then.getMonth() + 1;
if (month < 10) {
month = "0" + month;
}
var day = then.getDate();
if (day < 10) {
day = "0" + day;
}
var year = then.getFullYear();
var last_week = year + "-" + month + "-" + day;
return last_week;
}
function thisWeek() {
var from = new Date();
from.setDate(from.getDate() - span);
var from_date = formatDate(from);
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'this_week_callback',
data: {
program: program_id,
from: from_date,
format: "json",
channel: 4
},
success: function(result) {
this_week = result;
makeChart();
}
});
}
function prevWeek() {
var from = new Date();
from.setDate(from.getDate() - (span*2));
var from_date = formatDate(from);
var to = new Date();
to.setDate(to.getDate() - span);
var to_date = formatDate(to);
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'prev_week_callback',
data: {
program: program_id,
to: to_date,
from: from_date,
format: "json",
channel: 4
},
success: function(result) {
prev_week = result;
makeChart();
}
});
}
thisWeek();
prevWeek();
</script>
-<div id="wrapper">
- <div class="demo">
- <p><h3>Album Chart for <%=@program%></h3></p>
- <p>Last <%=@span%> days compared with previous <%=@span%> days</p>
- <div id="chart">
- <table id="artists" class="common-table">
- <thead>
- <tr>
- <th class="number">#</th>
- <th class="status"></th>
- <th class="name"></th>
- <th class="title"></th>
- <th class="plays">count</th>
- <th class="diff">position diff</th>
- <th class="prev-cnt">previous count</th>
- <th class="album-image"></th>
- </tr>
- </thead>
- <tbody>
-
- </tbody>
- </table>
- </div>
- </div><!-- End demo -->
-</div>
\ No newline at end of file
+<h3>Album Chart for <%=@program%></h3>
+<p>Last <%=@span%> days compared with previous <%=@span%> days</p>
+<table id="artists" class="common-table">
+ <thead>
+ <tr>
+ <th class="number">#</th>
+ <th class="status"></th>
+ <th class="name"></th>
+ <th class="title"></th>
+ <th class="plays">count</th>
+ <th class="diff">position diff</th>
+ <th class="prev-cnt">previous count</th>
+ <th class="album-image"></th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/views/program_chart_artist.html.erb b/views/program_chart_artist.html.erb
index 810ab5d..6aa5b3b 100644
--- a/views/program_chart_artist.html.erb
+++ b/views/program_chart_artist.html.erb
@@ -1,201 +1,193 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<style>
.same{
background-image:url('/images/same_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.new{
background-image:url('/images/new_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.up{
background-image:url('/images/up_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.down{
background-image:url('/images/down_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.album-image img{
width:60px;
height:60px;
}
</style>
<script>
var this_week, prev_week = null;
var new_chart = [];
var program_id = '<%=@program%>';
var span = '<%[email protected]_i%>';
function makeChart() {
//make sure that both jsonp calls have finished before making the chart
if (this_week && prev_week) {
//console.log('this week', this_week);
//console.log('prev week', prev_week);
$.each( this_week, function (i, item) {
var this_week_id = item.id;
//default to 'new' status
item.status = "new";
//default to empty diff
item.diff = '';
//default to empty prev count
item.prev_count = '';
//check that prev_week contains any items
if (prev_week.length > 0) {
//for each of this weeks items, run through prev weeks items
$.each(prev_week, function (is, item2) {
//check if track was played last week
if(this_week_id === item2.id) {
//UP
if( i< is) {
item.status = "up";
item.diff = is - i;
item.prev_count = item2.count;
}
//DOWN
else if(i > is) {
item.status = "down";
item.diff = i-is;
item.prev_count = item2.count;
}
//SAME
else if(i === is) {
item.status = "same";
item.diff = 0;
}
}//end if
//add item to new chart
new_chart[i] = item;
});//end for each. prev_week
}//end if: no previous week items to compare with
else {
new_chart[i] = item;
}
});//end outer (this_week) for each
//display new chart
$.each(new_chart, function (i, item) {
var number = i +1;
var content = '<tr><td class="number">' + number + '</td><td class="status"><span class=' + item.status + '> </span></td><td class="name">' + item.artistname + '</td><td class="plays">' + item.count + '</td><td class="diff">' + item.diff + '</td><td class="prev=cnt">' + item.prev_count + '</td></tr>';
$(content).appendTo("#artists");
});
}//end if
}
function formatDate(then) {
var month = then.getMonth() + 1;
if (month < 10) {
month = "0" + month;
}
var day = then.getDate();
if (day < 10) {
day = "0" + day;
}
var year = then.getFullYear();
var last_week = year + "-" + month + "-" + day;
return last_week;
}
function thisWeek() {
var from = new Date();
from.setDate(from.getDate() - span);
var from_date = formatDate(from);
$.ajax({
url: "http://96.126.96.51/v1/chart/artist",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'this_week_callback',
data: {
program: program_id,
from: from_date,
format: "json",
channel: 4
},
success: function(result) {
this_week = result;
makeChart();
}
});
}
function prevWeek() {
var from = new Date();
from.setDate(from.getDate() - (span*2));
var from_date = formatDate(from);
var to = new Date();
to.setDate(to.getDate() - span);
var to_date = formatDate(to);
$.ajax({
url: "http://96.126.96.51/v1/chart/artist",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'prev_week_callback',
data: {
program: program_id,
to: to_date,
from: from_date,
format: "json",
channel: 4
},
success: function(result) {
prev_week = result;
makeChart();
}
});
}
thisWeek();
prevWeek();
-
</script>
-<div id="wrapper">
- <div class="demo">
- <p><h3>Artist Chart for <%=@program%></h3></p>
- <p>Last <%=@span%> days compared with previous <%=@span%> days</p>
- <div id="chart">
- <table id="artists" class="common-table">
- <thead>
- <tr>
- <th class="number">#</th>
- <th class="status"></th>
- <th class="name"></th>
- <th class="plays">count</th>
- <th class="diff">position diff</th>
- <th class="prev-cnt">previous count</th>
- </tr>
- </thead>
- <tbody>
-
- </tbody>
- </table>
- </div>
- </div><!-- End demo -->
-</div>
\ No newline at end of file
+<h3>Artist Chart for <%=@program%></h3>
+<p>Last <%=@span%> days compared with previous <%=@span%> days</p>
+<table id="artists" class="common-table">
+ <thead>
+ <tr>
+ <th class="number">#</th>
+ <th class="status"></th>
+ <th class="name"></th>
+ <th class="plays">count</th>
+ <th class="diff">position diff</th>
+ <th class="prev-cnt">previous count</th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/views/program_chart_track.html.erb b/views/program_chart_track.html.erb
index 7811865..bf48078 100644
--- a/views/program_chart_track.html.erb
+++ b/views/program_chart_track.html.erb
@@ -1,199 +1,192 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<style>
.same{
background-image:url('/images/same_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.new{
background-image:url('/images/new_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.up{
background-image:url('/images/up_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.down{
background-image:url('/images/down_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.album-image img{
width:60px;
height:60px;
}
-
</style>
<script>
var this_week, prev_week = null;
var new_chart = [];
var program_id = '<%=@program%>';
var span = '<%[email protected]_i%>';
function makeChart() {
//make sure that both jsonp calls have finished before making the chart
if (this_week && prev_week) {
//console.log('this week', this_week);
//console.log('prev week', prev_week);
$.each( this_week, function (i, item) {
var this_week_id = item.track_id;
//default to 'new' status
item.status = "new";
//default to empty diff
item.diff = '';
//default to empty prev count
item.prev_count = '';
//check that prev_week contains any items
if (prev_week.length > 0) {
//for each of this weeks items, run through prev weeks items
$.each(prev_week, function (is, item2) {
//check if track was played last week
if(this_week_id === item2.track_id) {
//UP
if( i< is) {
item.status = "up";
item.diff = is - i;
item.prev_count = item2.count;
}
//DOWN
else if(i > is) {
item.status = "down";
item.diff = i-is;
item.prev_count = item2.count;
}
//SAME
else if(i === is) {
item.status = "same";
item.diff = 0;
}
}//end if
//add item to new chart
new_chart[i] = item;
});//end for each. prev_week
}//end if: no previous week items to compare with
else {
new_chart[i] = item;
}
});//end outer (this_week) for each
//display new chart
$.each(new_chart, function (i, item) {
var number = i +1;
var content = '<tr><td class="number">' + number + '</td><td class="status"><span class=' + item.status + '> </span></td><td class="title">' + item.title + '</td><td class="name">' + item.artistname + '</td><td class="plays">' + item.count + '</td><td class="diff">' + item.diff + '</td><td class="prev=cnt">' + item.prev_count + '</td><td class="album-image"><img src="' + item.albumimage + '"/></td></tr>';
$(content).appendTo("#artists");
});
}//end if
}
function formatDate(then) {
var month = then.getMonth() + 1;
if (month < 10) {
month = "0" + month;
}
var day = then.getDate();
if (day < 10) {
day = "0" + day;
}
var year = then.getFullYear();
var last_week = year + "-" + month + "-" + day;
return last_week;
}
function thisWeek() {
var from = new Date();
from.setDate(from.getDate() - span);
var from_date = formatDate(from);
$.ajax({
url: "http://96.126.96.51/v1/chart/track",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'this_week_callback',
data: {
program: program_id,
from: from_date,
format: "json"
},
success: function(result) {
this_week = result;
makeChart();
}
});
}
function prevWeek() {
var from = new Date();
from.setDate(from.getDate() - (span*2));
var from_date = formatDate(from);
var to = new Date();
to.setDate(to.getDate() - span);
var to_date = formatDate(to);
$.ajax({
url: "http://96.126.96.51/v1/chart/track",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'prev_week_callback',
data: {
program: program_id,
to: to_date,
from: from_date,
format: "json"
},
success: function(result) {
prev_week = result;
makeChart();
}
});
}
thisWeek();
prevWeek();
</script>
-<div id="wrapper">
- <div class="demo">
- <p><h3>Track Chart for <%=@program%></h3></p>
- <p>Last <%=@span%> days compared with previous <%=@span%> days</p>
- <div id="chart">
- <table id="artists" border="0" class="common-table">
- <thead>
- <tr>
- <th class="number">#</th>
- <th class="status"></th>
- <th class="title"></th>
- <th class="name"></th>
- <th class="plays">count</th>
- <th class="diff">position diff</th>
- <th class="prev-cnt">previous count</th>
- <th class="album-image"></th>
- </tr>
- </thead>
- <tbody>
- </tbody>
- </table>
- </div>
- </div><!-- End demo -->
-</div>
\ No newline at end of file
+<h3>Track Chart for <%=@program%></h3>
+<p>Last <%=@span%> days compared with previous <%=@span%> days</p>
+<table id="artists" border="0" class="common-table">
+ <thead>
+ <tr>
+ <th class="number">#</th>
+ <th class="status"></th>
+ <th class="title"></th>
+ <th class="name"></th>
+ <th class="plays">count</th>
+ <th class="diff">position diff</th>
+ <th class="prev-cnt">previous count</th>
+ <th class="album-image"></th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/views/track.html.erb b/views/track.html.erb
index 819d1c2..7f8070b 100644
--- a/views/track.html.erb
+++ b/views/track.html.erb
@@ -1,14 +1,14 @@
-<h1>Track</h1>
+<h2>Track</h2>
<ul>
<% if [email protected]? %><li>id: <%= @track.id %></li><% end %>
+<% if [email protected]? %><li>mbid: <a href="http://musicbrainz.org/recording/<%= @track.trackmbid %>"><%= @track.trackmbid %></a></li><% end %>
<% if [email protected]? %><li>title: <%= @track.title %></li><% end %>
<% if [email protected]? %><li>tracknote: <%= @track.tracknote %></li><% end %>
<% if [email protected]? %><li>tracklink: <%= @track.tracklink %></li><% end %>
<% if [email protected]? %><li>aust: <%= @track.aust %></li><% end %>
-<% if [email protected]? %><li>show: <%= @track.show %></li><% end %>
<% if [email protected]? %><li>talent: <%= @track.talent %></li><% end %>
<% if [email protected]? %><li>duration: <%= @track.duration %></li><% end %>
<% if [email protected]? %><li>publisher: <%= @track.publisher %></li><% end %>
<% if [email protected]? %><li>datecopyrighted: <%= @track.datecopyrighted %></li><% end %>
<% if [email protected]_at %><li>date: <%= @track.created_at %></li><% end %>
</ul>
\ No newline at end of file
diff --git a/views/track_albums.html.erb b/views/track_albums.html.erb
index 8e03dba..9f42a7a 100644
--- a/views/track_albums.html.erb
+++ b/views/track_albums.html.erb
@@ -1,10 +1,10 @@
-<h1>Albums for <%= @track.title %></h1>
+<h2>Albums for <%= @track.title %></h2>
<p>
<% for album in @albums %>
<ul>
<li>id: <%= album.id %></li>
<li>album name: <%= album.albumname %></li>
<li>album image: <%= album.albumimage %></li>
</ul>
<% end %>
</p>
\ No newline at end of file
diff --git a/views/track_artists.html.erb b/views/track_artists.html.erb
index c542853..f7199db 100644
--- a/views/track_artists.html.erb
+++ b/views/track_artists.html.erb
@@ -1,9 +1,9 @@
-<h1>Artists for <%= @track.title %></h1>
+<h2>Artists for <%= @track.title %></h2>
<p>
<% for artist in @artists %>
<ul>
<li>id: <%= artist.id %></li>
<li>artist name: <%= artist.artistname %></li>
</ul>
<% end %>
</p>
\ No newline at end of file
diff --git a/views/track_chart.html.erb b/views/track_chart.html.erb
index af6b381..1aabb87 100644
--- a/views/track_chart.html.erb
+++ b/views/track_chart.html.erb
@@ -1,19 +1,17 @@
-
-<h1>TOP Tracks</h1>
+<h2>Top Tracks</h2>
<% for track in @tracks %>
<ul>
<li>Play count: <%= track.cnt %></li>
<% if !track.id.nil? %><li>id: <%= track.id %></li><% end %>
<% if !track.title.empty? %><li>title: <%= track.title %></li><% end %>
<li>artist name <%= track.artistname %></li>
<% if !track.tracknote.empty? %><li><%= track.tracknote %></li><% end %>
<% if !track.tracklink.empty? %><li><%= track.tracklink %></li><% end %>
<% if !track.show.empty? %><li><%= track.show %></li><% end %>
<% if !track.talent.empty? %><li><%= track.talent %></li><% end %>
<% if !track.duration.nil? %><li><%= track.duration %></li><% end %>
<% if !track.publisher.empty? %><li><%= track.publisher %></li><% end %>
<% if !track.datecopyrighted.nil? %><li><%= track.datecopyrighted %></li><% end %>
<li>date: <%= track.created_at.strftime "%Y-%m-%d %H:%M:%S" %></li>
</ul>
-<% end %>
-</ul>
+<% end %>
\ No newline at end of file
diff --git a/views/track_edit.html.erb b/views/track_edit.html.erb
index 01e86c3..23241d9 100644
--- a/views/track_edit.html.erb
+++ b/views/track_edit.html.erb
@@ -1,46 +1,46 @@
<style type="text/css" media="screen">
input,textarea{width:100%;}
</style>
-<h1>track</h1>
+<h2>track</h2>
<p><%= @track.title %> - <%= @track.id %></p>
<form action='/v1/track/<%= @track.id %>/edit' method="POST">
<label for="title">title</label>
<input type="text" name="title" value="<%= @track.title %>"/>
<br>
<label for="trackmbid">MBID</label>
<input type="text" name="trackmbid" value="<%= @track.trackmbid %>"/>
<br>
<label for="tracklink">link</label>
<input type="text" name="tracklink" value="<%= @track.tracklink %>"/>
<br>
<label for="tracknote">note</label>
<textarea name="tracknote"><%= @track.tracknote %></textarea>
<br>
<label for="show">show</label>
<input type="text" name="show" value="<%= @track.show %>"/>
<br>
<label for="aust">aust</label>
<input type="text" name="aust" value="<%= @track.aust %>"/>
<br>
<label for="talent">talent</label>
<input type="text" name="talent" value="<%= @track.talent %>"/>
<br>
<label for="publisher">publisher</label>
<input type="text" name="publisher" value="<%= @track.publisher %>"/>
<br>
<label for="datecopyrighted">datecopyrighted</label>
<input type="text" name="datecopyrighted" value="<%= @track.datecopyrighted %>"/>
<br>
<input type="submit" value="Save" />
</form>
\ No newline at end of file
diff --git a/views/track_plays.html.erb b/views/track_plays.html.erb
index 1cf2a3d..6ad76a9 100644
--- a/views/track_plays.html.erb
+++ b/views/track_plays.html.erb
@@ -1,10 +1,10 @@
-<h1>Plays for <%= @track.title %></h1>
+<h2>Plays for <%= @track.title %></h2>
<p>
<% for play in @plays %>
<ul>
<li>id: <%= play.id %></li>
<li>played time: <%= play.playedtime %></li>
<li>channel id: <%= play.channel_id %></li>
</ul>
<% end %>
</p>
\ No newline at end of file
diff --git a/views/tracks.html.erb b/views/tracks.html.erb
index e5f712b..600e82c 100644
--- a/views/tracks.html.erb
+++ b/views/tracks.html.erb
@@ -1,16 +1,16 @@
-<h1>Tracks</h1>
+<h2>Tracks</h2>
<% for track in @tracks %>
<ul>
<% if !track.id.nil? %><li>id: <%= track.id %></li><% end %>
<% if !track.title.empty? %><li>title: <%= track.title %></li><% end %>
<% if !track.tracknote.empty? %><li><%= track.tracknote %></li><% end %>
<% if !track.tracklink.empty? %><li><%= track.tracklink %></li><% end %>
<% if !track.show.empty? %><li><%= track.show %></li><% end %>
<% if !track.talent.empty? %><li><%= track.talent %></li><% end %>
<% if !track.duration.nil? %><li><%= track.duration %></li><% end %>
<% if !track.publisher.empty? %><li><%= track.publisher %></li><% end %>
<% if !track.datecopyrighted.nil? %><li><%= track.datecopyrighted %></li><% end %>
<li>date: <%= track.created_at.strftime "%Y-%m-%d %H:%M:%S" %></li>
</ul>
<% end %>
|
simonhn/pav-api
|
c0545bfc6bc62ea93f0e187c95e07a9fed7e3dfd
|
styling some more
|
diff --git a/views/admin.html.erb b/views/admin.html.erb
index 3ef163c..51fb6cf 100644
--- a/views/admin.html.erb
+++ b/views/admin.html.erb
@@ -1,7 +1,7 @@
-<h1>Admin dashboard</h1>
+<h2>Admin dashboard</h2>
<ul>
<li><a href="/admin/stats">Stats</a></li>
<li><a href="/admin/duplicate/artist">Duplicate artists</a></li>
<li><a href="/admin/duplicate/track">Duplicate tracks</a></li>
<li><a href="/admin/duplicate/album">Duplicate artists</a></li>
</ul>
\ No newline at end of file
diff --git a/views/album.html.erb b/views/album.html.erb
index 595814f..064a994 100644
--- a/views/album.html.erb
+++ b/views/album.html.erb
@@ -1,8 +1,8 @@
-<h1>Album</h1>
+<h2>Album</h2>
<ul>
<% if [email protected]? %><li>id: <%= @album.id %></li><% end %>
<% if [email protected]? %><li>mbid: <%= @album.albummbid %></li><% end %>
<% if [email protected]? %><li>albumname: <%= @album.albumname %></li><% end %>
<% if [email protected]? %><li>albumimage: <%= @album.albumimage %></li><% end %>
<% if [email protected]_at.nil? %><li>created_at: <%= @album.created_at %></li><% end %>
</ul>
\ No newline at end of file
diff --git a/views/album_chart.html.erb b/views/album_chart.html.erb
index 8002b7e..595c4e3 100644
--- a/views/album_chart.html.erb
+++ b/views/album_chart.html.erb
@@ -1,9 +1,6 @@
-
-
-
-<h1>Albums</h1>
+<h2>Albums</h2>
<% for album in @albums %>
<p><%= album.albumname %> - <%=album.cnt.to_i%></p>
<% if !album.albumimage.nil? %><img src="<%= album.albumimage %>" /><% end %>
<% end %>
diff --git a/views/album_edit.html.erb b/views/album_edit.html.erb
index ab947cf..ba350c5 100644
--- a/views/album_edit.html.erb
+++ b/views/album_edit.html.erb
@@ -1,25 +1,25 @@
<style type="text/css" media="screen">
input,textarea{width:100%;}
</style>
-<h1>album</h1>
+<h2>album</h2>
<p><%= @album.albumname %> - <%= @album.id %></p>
<form action='/v1/album/<%= @album.id %>/edit' method="POST">
<label for="albumname">title</label>
<input type="text" name="albumname" value="<%= @album.albumname %>"/>
<br>
<label for="albummbid">MBID</label>
<input type="text" name="albummbid" value="<%= @album.albummbid %>"/>
<br>
<label for="albumimage">image</label>
<input type="text" name="albumimage" value="<%= @album.albumimage %>"/>
<br>
<label for="created_at">created date</label>
<input type="text" name="created_at" value="<%= @album.created_at %>"/>
<br>
<input type="submit" value="Save" />
</form>
\ No newline at end of file
diff --git a/views/demo.html.erb b/views/demo.html.erb
index 0a64e2c..6d2254d 100644
--- a/views/demo.html.erb
+++ b/views/demo.html.erb
@@ -1,8 +1,8 @@
-<h1>App gallery</h1>
+<h2>App Gallery</h2>
<ul>
- <li><a href="/demo/program-chart/track?program=super_request">Program track chart</a></li>
- <li><a href="/demo/program-chart/artist?program=super_request">Program artist chart</a></li>
- <li><a href="/demo/program-chart/album?program=super_request">Program album chart</a></li>
- <li><a href="/demo/album-charts">Album charts</a></li>
- <li><a href="/demo/jjj">Triple j media integrated into chart</a></li>
+ <li><a href="/demo/program-chart/track?program=super_request">Program Track Chart</a></li>
+ <li><a href="/demo/program-chart/artist?program=super_request">Program Artist Chart</a></li>
+ <li><a href="/demo/program-chart/album?program=super_request">Program Album Chart</a></li>
+ <li><a href="/demo/album-charts">Album Charts</a></li>
+ <!--<li><a href="/demo/jjj">Triple j media integrated into chart</a></li>-->
</ul>
\ No newline at end of file
diff --git a/views/front.html.erb b/views/front.html.erb
index 3999d48..dccbb3b 100644
--- a/views/front.html.erb
+++ b/views/front.html.erb
@@ -1,445 +1,438 @@
<section id="intro">
<p>The pav:api exposes playlist data and is currently under development.</p>
+<p>Have a look at the <a href='/demo'>app gallery</a> to see what can be built using pav:api.</p>
+
<ul class="unstyled">
<li><a href="#general">general information</a></li>
<ul>
<li><a href="#general-query-parameters">query parameters</a></li>
<li><a href="#general-identifiers">identifiers</a></li>
<li><a href="#general-authentication">authentication</a></li>
<li><a href="#general-versioning">versioning</a></li>
<li><a href="#general-return-types">return types</a></li>
<li><a href="#general-response-codes">reponse codes</a></li>
<li><a href="#general-terms">terms</a></li>
</ul>
<li><a href="#resources">resources</a></li>
<ul>
<li><a href="#resources-artists">artists</a></li>
<li><a href="#resources-tracks">tracks</a></li>
<li><a href="#resources-albums">albums</a></li>
<li><a href="#resources-channels">channels</a></li>
<li><a href="#resources-plays">plays</a></li>
<li><a href="#resources-chart">charts</a></li>
<li><a href="#resources-search">search</a></li>
<li><a href="#resources-stats">stats</a></li>
</ul>
</ul>
</section>
<section id="general">
<h2 id="general">general information</h2>
<h3 id="general-query-parameters">query parameters</h3>
<div>Some paths accepts the following query parameters. See each <a href="#resources">resource</a> type for more specifics.</div>
<ul>
<li><code>channel</code>, default is all channels, available on paths that return a list</li>
<li><code>limit</code>, default is 10, available on paths that return a list</li>
<li><code>callback</code>, for cross-domain access jsonp is delivered to requests with 'callback' query parameter and json as return type</li>
<li><code>format</code>, return type format (html, json, xml)</li>
<li><code>type</code>, to specify lookup type, mbid</li>
<li><code>to</code> (to date) in yyyy-mm-dd format</li>
<li><code>from</code> (from date) in yyyy-mm-dd format</li>
<li><code>order_by</code>, for ordering results. Default is playedtime. Allowed values are artist and track</li>
<li><code>q</code>, a query for searching for track title, album name and artist name</li>
<li><code>artist_query</code>, searching for an artist name</li>
<li><code>track_query</code>, searching for a track title</li>
<li><code>album_query</code>, searching for an album name</li>
<li><code>program</code>, the program_id to limit result to a certain show</li>
</ul>
<p>
<h3 id="general-identifiers">identifiers</h3>
To lookup a specific artist/track/album you can use pav IDs or Musicbrainz IDs where available.
</p>
<p>
<h3 id="general-authentication">authentication</h3>
All put and post requests require authentication
</p>
<p>
<h3 id="general-versioning">versioning</h3>
The version of the api you wish to use is specified at the root path of resources. The current version is v1.
</p>
<p>
<h3 id="general-return-types">return types</h3>
Return type can selected by appending the desired content type to the url (.html, .xml, .json) or by adding ?format=(html, xml, json) to the query parameter. Use only one of these methods when doing a request.
<br />
Default return type is currently html but will change to json when the API is put in production.
</p>
<p>
<h3 id="general-response-codes">response codes</h3>
The API attempts to return appropriate HTTP status codes for every request.
<ul>
<li>200 OK: Request succeeded</li>
<li>400 Bad Request: Your request was invalid and we'll return an error message telling you why</li>
<li>401 Not Authorized: You did not provide the right credentials</li>
<li>404 Not Found: The URI requested is invalid or the resource requested, such as a user, does not exists</li>
<li>500 Internal Server Error: Something is broken.</li>
<li>503 Service Unavailable: You cannot make this request at this time. Servers are up, but overloaded with requests</li>
</ul>
</p>
<p>
<h3 id="general-terms">terms</h3>
Please be nice when using the api. If you plan to make massive amounts of calls please advise us.
</p>
</section>
<section id="resources">
<h2 id="resources">resources</h2>
The resources that can be accessed through the api follows the model below:
<div id="model-img">
<img id="resources-model" width="400px" src="images/models.png"/>
</div>
Some useful observation about the model:
<ul>
<li>An artist can have multiple tracks</li>
<li>A track can have multiple artists</li>
<li>A track can have multiple albums (a track appearing on different albums)</li>
<li>An album can have multiple tracks</li>
<li>A track can have multiple plays</li>
<li>A play belongs to one track</li>
<li>A play belongs to one channel</li>
<li>A channel can have multiple plays</li>
</ul>
<h3 id="resources-artists">artists</h3>
<h4>/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of artists</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/artists.json?channel=4">/v1/artists.json?channel=4</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967986.js"></script>
</div>
<h4>/artist/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/artist/1234.json">/v1/artist/1234.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967997.js"></script>
</div>
<h4>/artist/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code></p>
<h5>Example query</h5>
<code><a href="/v1/artist/1234/tracks.json">/v1/artist/1234/tracks.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968001.js"></script>
</div>
<h3 id="resources-tracks">tracks</h3>
<h4>/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of tracks</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/tracks.json?channel=4&limit=3">/v1/tracks.json?channel=4&limit=3</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968008.js"></script>
</div>
<h4>/track/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single track specified by an id.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324.json">/v1/track/324.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968013.js?file=gistfile1.json"></script>
</div>
<h4>post /track</h4>
<div class='resource'>
<h5>Description</h5>
<p>Post a track to pav. Requires authentication.</p>
<h5>Parameters</h5>
<p>A json payload</p>
<script src="https://gist.github.com/968015.js?file=gistfile1.json"></script>
<h5>Example response</h5>
<p><code>200</code></p>
</div>
<h4>/track/:id/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the artists related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324/artists.json">/v1/track/324/artists.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968022.js?file=gistfile1.json"></script>
</div>
<h4>/track/:id/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the albums related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324/albums.json">/v1/track/324/albums.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968023.js?file=gistfile1.json"></script>
</div>
<h4>/track/:id/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the plays related to a single track.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/track/324/plays.json">/v1/track/324/plays.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968025.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-albums">albums</h3>
<h4>/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of albums.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/albums.json">/v1/albums.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968027.js?file=gistfile1.json"></script>
</div>
<h4>/album/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/album/15.json">/v1/album/15.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968029.js?file=gistfile1.json"></script>
</div>
<h4>/album/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>type</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/album/15/tracks.json">/v1/album/15/tracks.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968035.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-channels">channels</h3>
<h4>/channels</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of channels.</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/channels.json">/v1/channels.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968054.js?file=gistfile1.json"></script>
</div>
<h4>/channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single channel.</p>
<h5>Example query</h5>
<code><a href="/v1/channel/1.json">/v1/channel/1.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968058.js?file=gistfile1.json"></script>
</div>
<h4>post channel</h4>
<div class='resource'>
<h5>Description</h5>
<p>Create a new channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
<h4>put channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Update a channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-plays">plays</h3>
<h4>/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a playlist.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>to</code>, <code>from</code>, <code>limit</code>, <code>channel</code>, <code>program</code>, <code>artist_query</code>, <code>track_query</code>, <code>album_query</code>, <code>q</code> (query artist, channel and track name), <code>order_by</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/plays.json?channel=1&limit=3">/v1/plays.json?channel=1&limit=3</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/956363.js"> </script>
</div>
<h4>/play/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single play.</p>
<h5>Example query</h5>
<code><a href="/v1/play/4356.json">/v1/play/4356.json</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968064.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-chart">charts</h3>
<h4>/chart/artist</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played artists for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>, <code>to</code>, <code>from</code>, <code>program</code>. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><a href="/v1/chart/artist.json?channel=1">/v1/chart/artist.json?channel=1</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973721.js?file=gistfile1.json"></script>
</div>
<h4>/chart/track</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played tracks for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>, <code>to</code>, <code>from</code>, <code>program</code>. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><a href="/v1/chart/track.json?from=2011-04-20">/v1/chart/track.json?from=2011-04-20</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973726.js?file=gistfile1.json"></script>
</div>
<h4>/chart/album</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played albums for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: <code>channel</code>, <code>limit</code>, <code>to</code>, <code>from</code>, <code>program</code>. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><a href="/v1/chart/album.json?limit=5&channel=4">/v1/chart/album.json?limit=5&channel=4</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973730.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-search">search</h3>
<div class='resource'>
<h5>Description</h5>
<p>Search for artists (tracks and albums to come).</p>
<h5>Parameters</h5>
<p>Supports the following parameter: <code>limit</code>.</p>
<h5>Example query</h5>
<code><a href="/v1/search/dylan.json?limit=5">/v1/search/dylan.json?limit=5</a></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973733.js?file=gistfile1.json"></script>
</div>
-<h3 id="resources-stats">stats</h3>
-<div class='resource'>
- <h5>Description</h5>
- <p>Statistics for the pav datastore.</p>
-
- <h5>Example query</h5>
- <code><a href="/v1/stats">/v1/stats</a></code>
-</div>
-
</section>
<style type="text/css" media="screen">
.gist-syntax .s2 {
color: black;
}
.gist .gist-file .gist-data{
font-size:75%;
}
.gist .gist-file .gist-meta{
display:none;
}
</style>
diff --git a/views/program_chart_album.html.erb b/views/program_chart_album.html.erb
index a9d358b..90b171e 100644
--- a/views/program_chart_album.html.erb
+++ b/views/program_chart_album.html.erb
@@ -1,203 +1,203 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<style>
.same{
background-image:url('/images/same_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.new{
background-image:url('/images/new_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.up{
background-image:url('/images/up_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.down{
background-image:url('/images/down_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.album-image img{
width:60px;
height:60px;
}
</style>
<script>
var this_week, prev_week = null;
var new_chart = [];
var program_id = '<%=@program%>';
var span = '<%[email protected]_i%>';
function makeChart() {
//make sure that both jsonp calls have finished before making the chart
if (this_week && prev_week) {
//console.log('this week', this_week);
//console.log('prev week', prev_week);
$.each( this_week, function (i, item) {
var this_week_id = item.album_id;
//default to 'new' status
item.status = "new";
//default to empty diff
item.diff = '';
//default to empty prev count
item.prev_count = '';
//check that prev_week contains any items
if (prev_week.length > 0) {
//for each of this weeks items, run through prev weeks items
$.each(prev_week, function (is, item2) {
//check if track was played last week
if(this_week_id === item2.album_id) {
//UP
if( i< is) {
item.status = "up";
item.diff = is - i;
item.prev_count = item2.count;
}
//DOWN
else if(i > is) {
item.status = "down";
item.diff = i-is;
item.prev_count = item2.count;
}
//SAME
else if(i === is) {
item.status = "same";
item.diff = 0;
}
}//end if
//add item to new chart
new_chart[i] = item;
});//end for each. prev_week
}//end if: no previous week items to compare with
else {
new_chart[i] = item;
}
});//end outer (this_week) for each
//display new chart
$.each(new_chart, function (i, item) {
var number = i +1;
var content = '<tr><td class="number">' + number + '</td><td class="status"><span class=' + item.status + '> </span></td><td class="title">' + item.albumname + '</td><td class="name">' + item.artistname + '</td><td class="plays">' + item.count + '</td><td class="diff">' + item.diff + '</td><td class="prev=cnt">' + item.prev_count + '</td><td class="album-image"><img src="' + item.albumimage + '"/></td></tr>';
$(content).appendTo("#artists");
});
}//end if
}
function formatDate(then) {
var month = then.getMonth() + 1;
if (month < 10) {
month = "0" + month;
}
var day = then.getDate();
if (day < 10) {
day = "0" + day;
}
var year = then.getFullYear();
var last_week = year + "-" + month + "-" + day;
return last_week;
}
function thisWeek() {
var from = new Date();
from.setDate(from.getDate() - span);
var from_date = formatDate(from);
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'this_week_callback',
data: {
program: program_id,
from: from_date,
format: "json",
channel: 4
},
success: function(result) {
this_week = result;
makeChart();
}
});
}
function prevWeek() {
var from = new Date();
from.setDate(from.getDate() - (span*2));
var from_date = formatDate(from);
var to = new Date();
to.setDate(to.getDate() - span);
var to_date = formatDate(to);
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'prev_week_callback',
data: {
program: program_id,
to: to_date,
from: from_date,
format: "json",
channel: 4
},
success: function(result) {
prev_week = result;
makeChart();
}
});
}
thisWeek();
prevWeek();
</script>
<div id="wrapper">
<div class="demo">
<p><h3>Album Chart for <%=@program%></h3></p>
<p>Last <%=@span%> days compared with previous <%=@span%> days</p>
<div id="chart">
- <table id="artists" class="common-table zebra-striped">
+ <table id="artists" class="common-table">
<thead>
<tr>
<th class="number">#</th>
<th class="status"></th>
<th class="name"></th>
<th class="title"></th>
- <th class="plays">cnt</th>
- <th class="diff">pos diff</th>
- <th class="prev-cnt">prev cnt</th>
+ <th class="plays">count</th>
+ <th class="diff">position diff</th>
+ <th class="prev-cnt">previous count</th>
<th class="album-image"></th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div><!-- End demo -->
</div>
\ No newline at end of file
diff --git a/views/program_chart_artist.html.erb b/views/program_chart_artist.html.erb
index bcd3dc1..810ab5d 100644
--- a/views/program_chart_artist.html.erb
+++ b/views/program_chart_artist.html.erb
@@ -1,201 +1,201 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<style>
.same{
background-image:url('/images/same_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.new{
background-image:url('/images/new_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.up{
background-image:url('/images/up_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.down{
background-image:url('/images/down_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.album-image img{
width:60px;
height:60px;
}
</style>
<script>
var this_week, prev_week = null;
var new_chart = [];
var program_id = '<%=@program%>';
var span = '<%[email protected]_i%>';
function makeChart() {
//make sure that both jsonp calls have finished before making the chart
if (this_week && prev_week) {
//console.log('this week', this_week);
//console.log('prev week', prev_week);
$.each( this_week, function (i, item) {
var this_week_id = item.id;
//default to 'new' status
item.status = "new";
//default to empty diff
item.diff = '';
//default to empty prev count
item.prev_count = '';
//check that prev_week contains any items
if (prev_week.length > 0) {
//for each of this weeks items, run through prev weeks items
$.each(prev_week, function (is, item2) {
//check if track was played last week
if(this_week_id === item2.id) {
//UP
if( i< is) {
item.status = "up";
item.diff = is - i;
item.prev_count = item2.count;
}
//DOWN
else if(i > is) {
item.status = "down";
item.diff = i-is;
item.prev_count = item2.count;
}
//SAME
else if(i === is) {
item.status = "same";
item.diff = 0;
}
}//end if
//add item to new chart
new_chart[i] = item;
});//end for each. prev_week
}//end if: no previous week items to compare with
else {
new_chart[i] = item;
}
});//end outer (this_week) for each
//display new chart
$.each(new_chart, function (i, item) {
var number = i +1;
var content = '<tr><td class="number">' + number + '</td><td class="status"><span class=' + item.status + '> </span></td><td class="name">' + item.artistname + '</td><td class="plays">' + item.count + '</td><td class="diff">' + item.diff + '</td><td class="prev=cnt">' + item.prev_count + '</td></tr>';
$(content).appendTo("#artists");
});
}//end if
}
function formatDate(then) {
var month = then.getMonth() + 1;
if (month < 10) {
month = "0" + month;
}
var day = then.getDate();
if (day < 10) {
day = "0" + day;
}
var year = then.getFullYear();
var last_week = year + "-" + month + "-" + day;
return last_week;
}
function thisWeek() {
var from = new Date();
from.setDate(from.getDate() - span);
var from_date = formatDate(from);
$.ajax({
url: "http://96.126.96.51/v1/chart/artist",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'this_week_callback',
data: {
program: program_id,
from: from_date,
format: "json",
channel: 4
},
success: function(result) {
this_week = result;
makeChart();
}
});
}
function prevWeek() {
var from = new Date();
from.setDate(from.getDate() - (span*2));
var from_date = formatDate(from);
var to = new Date();
to.setDate(to.getDate() - span);
var to_date = formatDate(to);
$.ajax({
url: "http://96.126.96.51/v1/chart/artist",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'prev_week_callback',
data: {
program: program_id,
to: to_date,
from: from_date,
format: "json",
channel: 4
},
success: function(result) {
prev_week = result;
makeChart();
}
});
}
thisWeek();
prevWeek();
</script>
<div id="wrapper">
<div class="demo">
<p><h3>Artist Chart for <%=@program%></h3></p>
<p>Last <%=@span%> days compared with previous <%=@span%> days</p>
<div id="chart">
- <table id="artists" class="common-table zebra-striped">
+ <table id="artists" class="common-table">
<thead>
<tr>
<th class="number">#</th>
<th class="status"></th>
<th class="name"></th>
- <th class="plays">cnt</th>
- <th class="diff">pos diff</th>
- <th class="prev-cnt">prev cnt</th>
+ <th class="plays">count</th>
+ <th class="diff">position diff</th>
+ <th class="prev-cnt">previous count</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div><!-- End demo -->
</div>
\ No newline at end of file
diff --git a/views/program_chart_track.html.erb b/views/program_chart_track.html.erb
index 0627b5d..7811865 100644
--- a/views/program_chart_track.html.erb
+++ b/views/program_chart_track.html.erb
@@ -1,199 +1,199 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<style>
.same{
background-image:url('/images/same_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.new{
background-image:url('/images/new_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.up{
background-image:url('/images/up_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.down{
background-image:url('/images/down_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.album-image img{
width:60px;
height:60px;
}
</style>
<script>
var this_week, prev_week = null;
var new_chart = [];
var program_id = '<%=@program%>';
var span = '<%[email protected]_i%>';
function makeChart() {
//make sure that both jsonp calls have finished before making the chart
if (this_week && prev_week) {
//console.log('this week', this_week);
//console.log('prev week', prev_week);
$.each( this_week, function (i, item) {
var this_week_id = item.track_id;
//default to 'new' status
item.status = "new";
//default to empty diff
item.diff = '';
//default to empty prev count
item.prev_count = '';
//check that prev_week contains any items
if (prev_week.length > 0) {
//for each of this weeks items, run through prev weeks items
$.each(prev_week, function (is, item2) {
//check if track was played last week
if(this_week_id === item2.track_id) {
//UP
if( i< is) {
item.status = "up";
item.diff = is - i;
item.prev_count = item2.count;
}
//DOWN
else if(i > is) {
item.status = "down";
item.diff = i-is;
item.prev_count = item2.count;
}
//SAME
else if(i === is) {
item.status = "same";
item.diff = 0;
}
}//end if
//add item to new chart
new_chart[i] = item;
});//end for each. prev_week
}//end if: no previous week items to compare with
else {
new_chart[i] = item;
}
});//end outer (this_week) for each
//display new chart
$.each(new_chart, function (i, item) {
var number = i +1;
var content = '<tr><td class="number">' + number + '</td><td class="status"><span class=' + item.status + '> </span></td><td class="title">' + item.title + '</td><td class="name">' + item.artistname + '</td><td class="plays">' + item.count + '</td><td class="diff">' + item.diff + '</td><td class="prev=cnt">' + item.prev_count + '</td><td class="album-image"><img src="' + item.albumimage + '"/></td></tr>';
$(content).appendTo("#artists");
});
}//end if
}
function formatDate(then) {
var month = then.getMonth() + 1;
if (month < 10) {
month = "0" + month;
}
var day = then.getDate();
if (day < 10) {
day = "0" + day;
}
var year = then.getFullYear();
var last_week = year + "-" + month + "-" + day;
return last_week;
}
function thisWeek() {
var from = new Date();
from.setDate(from.getDate() - span);
var from_date = formatDate(from);
$.ajax({
url: "http://96.126.96.51/v1/chart/track",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'this_week_callback',
data: {
program: program_id,
from: from_date,
format: "json"
},
success: function(result) {
this_week = result;
makeChart();
}
});
}
function prevWeek() {
var from = new Date();
from.setDate(from.getDate() - (span*2));
var from_date = formatDate(from);
var to = new Date();
to.setDate(to.getDate() - span);
var to_date = formatDate(to);
$.ajax({
url: "http://96.126.96.51/v1/chart/track",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'prev_week_callback',
data: {
program: program_id,
to: to_date,
from: from_date,
format: "json"
},
success: function(result) {
prev_week = result;
makeChart();
}
});
}
thisWeek();
prevWeek();
</script>
<div id="wrapper">
<div class="demo">
<p><h3>Track Chart for <%=@program%></h3></p>
<p>Last <%=@span%> days compared with previous <%=@span%> days</p>
<div id="chart">
- <table id="artists" border="0" class="common-table zebra-striped">
+ <table id="artists" border="0" class="common-table">
<thead>
<tr>
<th class="number">#</th>
<th class="status"></th>
<th class="title"></th>
<th class="name"></th>
<th class="plays">count</th>
- <th class="diff">pos diff</th>
- <th class="prev-cnt">prev count</th>
+ <th class="diff">position diff</th>
+ <th class="prev-cnt">previous count</th>
<th class="album-image"></th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div><!-- End demo -->
</div>
\ No newline at end of file
|
simonhn/pav-api
|
9c634fca5952fe8fc3480a4049ce002011965dba
|
styling
|
diff --git a/views/plays.html.erb b/views/plays.html.erb
index a35654f..a2006a1 100644
--- a/views/plays.html.erb
+++ b/views/plays.html.erb
@@ -1,290 +1,30 @@
-
-<style type="text/css">
-
-body{font-size: 0.75em;}
-#just_played #song_list {
- float: left;
- margin: 2px 0 10px;
- }
-
- #just_played .sort_order {
- text-align: center;
- color: #808080;
- padding: 8px 0;
- }
-
- #just_played .sort_order .title {
- font-weight: 700;
- margin-right: 4px;
- color: #000000;
- }
-
- #just_played .sort_order a {
- text-decoration: underline;
- margin: 0 4px;
- }
-
- #just_played .sort_order a.current {
- text-decoration: none;
- color: #000000;
- }
-
- #just_played .pagination,
- #song_list .search-criteria {
- text-align: center;
- margin: 4px 0;
- float: left;
- padding: 8px 0;
- }
-
- #just_played #song_list .pagination {
- border-bottom-width: 1px;
- border-bottom-style: dotted;
- }
-
- #song_list .search-criteria {
- border-bottom-width: 4px;
- border-bottom-style: solid;
- }
-
- #just_played .pagination .title {
- font-weight: 700;
- margin-right: 8px;
- }
-
- #just_played .pagination .pages {
- word-spacing: 0.5em;
- margin-right: 8px;
- color: #808080;
- }
-
- #just_played .pagination a {
- color: #204ba1;
- text-decoration: underline;
- }
-
- #just_played .pagination .pages a.current {
- color: #000000;
- text-decoration: none;
- }
-
- #just_played .pagination a.next {
- color: #204ba1;
- text-decoration: none;
- font-weight: 700;
- }
-
- #clear-search {
- display: inline-block;
- font-size: 0.8em;
- margin-left: 10px;
- }
-
- #just_played .list_quantity {
- color: #204ba1;
- }
-
- #just_played .list_quantity img {
- margin-right: 4px;
- }
-
- #just_played .song {
- float: left;
- border-top: 1px dashed #C9C9C9;
- padding-top: 4px;
- }
-
- #just_played .song .date {
- font-size: 1.0em;
- padding: 3px 8px;
- margin: -4px 0 5px 60px;
- color: #fff;
- background-color: #1F2933;
- float: left;
- }
-
- #just_played .song .time {
- font-size: 0.8em;
- color: #999999;
- margin-bottom: 2px;
- }
-
- #just_played .song .album_image_container {
- float: left;
- width: 110px;
- height: 100px;
- background-image: url('http://abcdigmusic.net.au/sites/all/themes/dig2/images/background/no-cover.png');
- background-repeat: no-repeat;
- }
-
- #just_played .song .album_image_container img {
- border: 1px solid #FFFFFF;
- }
-
- #just_played .song .album_image_container img:hover {
- border: 1px solid #CAD4DD;
- }
-
- #just_played .song .australian_artist_container {
- z-index:2;
- position:absolute;
- left:75px;
- }
-
- #just_played .song .details {
- float: left;
- margin-left: 10px;
- width: 200px;
- }
-
- #just_played .song .details td {
- padding-bottom: 9px;
- }
-
- #just_played .song .details td.label {
- width: 80px;
- font-size: 0.9em;
- color: #4d4d4d;
- }
-
- #just_played .song .details td.info {
- width: 145px;
- font-size: 0.9em;
- font-weight: bold;
- }
-
- #just_played .song .details td a{
- color: #204ba1;
- }
-
- #just_played .song .social_data {
- float: left;
- margin: 0;
- color: #4d4d4d;
- font-size: 0.9em;
- padding-left: 10px;
- }
-
- #just_played .song .feature_album {
- position: relative;
- top: -4px;
- border: 0;
- }
-
- #just_played .song .social_data a {
- color: #2f57a7;
- }
-
- #just_played .song .social_data .community {
- float: left;
- border-bottom: 1px dotted #CAD4DD;
- margin-bottom: 2px;
- padding: 2px 1px;
- }
-
- #just_played .song .social_data .user {
- float: left;
- width: 110px;
- border-bottom: 1px dotted #CAD4DD;
- margin-bottom: 2px;
- padding: 2px 1px;
- margin-left: 15px;
- }
-
- #just_played .song .social_data .last {
- border-bottom: 0;
- }
-
- #just_played .song .social_data .icon {
- float: left;
- margin-right: 2px;
- }
-
- #just_played .song .social_data .community .text {
- float: left;
- line-height: 1.2em;
- }
-
- #just_played .song .social_data .user .text {
- float: left;
- width: 84px;
- line-height: 1.2em;
- }
-
- #just_played .song .social_data .note {
- float: left;
- clear: both;
- width: 310px;
- border-top: 1px dotted #CAD4DD;
- padding-top: 4px;
- padding-left: 21px;
- }
-
- #just_played .song .social_data .note .text {
- float: left;
- width: 320px;
- }
-
- #just_played .song .social_data .note .text p {
- color: #4d4d4d;
- }
-
- #just_played .song .social_data .note a {
- background-image: url(../images/icon_external.png);
- padding-right: 19px;
- background-repeat: no-repeat;
- background-position: right;
- }
-
- #just_played .disclaimer {
- text-align: right;
- padding-top: 8px;
- float: left;
- }
-.clear { clear: right; }
-
-</style>
-
-<p>
- <div id="just_played">
- <% @plays.each do |track| %>
- <div class="song">
- <br style="clear: both">
- <div class="time"><%= track.playedtime.strftime "%R on %B %d, %Y" %></div>
- <div class="album_image_container">
- <img alt="album cover" src="<%= track.albumimage %>" width="100" height="100">
- </div>
- <div class="details">
- <table><tbody>
- <tr><td class="label">Song</td><td class="info"><% if !track.trackmbid.nil? %><a href="http://musicbrainz.org/track/<%= track.trackmbid %>.html"><%= track.title %></a>
- <% else %> <%= track.title %><% end %></td></tr>
- <tr>
- <td class="label">Artist</td>
- <td class="info">
-
- <span><% if !track.artistmbid.nil? %><a href="http://musicbrainz.org/artist/<%= track.artistmbid %>.html"><%= track.artistname %></a>
- <% else %> <%= track.artistname %><% end %></span>
- </td>
- </tr>
- <tr>
- <td class="label">Album</td>
- <td class="info"><% if !track.albummbid.nil? %><a href="http://musicbrainz.org/release-group/<%= track.albummbid %>.html"><%= track.albumname %></a><% else %> <%= track.albumname %><% end %></td>
- </tr>
- <tr>
- <td class="label">Label</td>
- <td class="info"></td>
- </tr>
- <tr>
- <td class="label">Year</td>
- <td class="info"></td>
- </tr>
-
- </tbody></table>
- </div>
-
- </div>
- <% end %>
- </div>
-</p>
-
-
+<table>
+ <thead>
+ <tr>
+ <td>played time</td>
+ <td></td>
+ <td>artist</td>
+ <td>track</td>
+ <td>album</td>
+ </tr>
+ </thead>
+ <tbody>
+ <% @plays.each do |track| %>
+ <tr>
+ <td><%= track.playedtime.strftime "%R %d/%m" %></td>
+ <td>
+ <img alt="album cover" src="<%= track.albumimage %>" width="100" height="100">
+ </td>
+ <td>
+ <span>
+ <% if !track.artistmbid.nil? %><a href="http://musicbrainz.org/artist/<%= track.artistmbid %>.html"><%= track.artistname %></a>
+ <% else %> <%= track.artistname %><% end %>
+ </span>
+ </td>
+ <td><% if !track.trackmbid.nil? %><a href="http://musicbrainz.org/track/<%= track.trackmbid %>.html"><%= track.title %></a>
+ <% else %> <%= track.title %><% end %></td>
+ <td><% if !track.albummbid.nil? %><a href="http://musicbrainz.org/release-group/<%= track.albummbid %>.html"><%= track.albumname %></a><% else %> <%= track.albumname %><% end %></td>
+ </tr>
+ <% end %>
+ </tbody>
+</table>
\ No newline at end of file
diff --git a/views/program_chart_album.html.erb b/views/program_chart_album.html.erb
index 6ac1977..0a7d402 100644
--- a/views/program_chart_album.html.erb
+++ b/views/program_chart_album.html.erb
@@ -1,191 +1,191 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<style>
.same{
background-image:url('/images/same_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.new{
background-image:url('/images/new_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.up{
background-image:url('/images/up_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.down{
background-image:url('/images/down_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.album-image img{
width:60px;
height:60px;
}
</style>
<script>
var this_week, prev_week = null;
var new_chart = [];
var program_id = '<%=@program%>';
var span = '<%[email protected]_i%>';
function makeChart() {
//make sure that both jsonp calls have finished before making the chart
if (this_week && prev_week) {
- console.log('this week', this_week);
- console.log('prev week', prev_week);
+ //console.log('this week', this_week);
+ //console.log('prev week', prev_week);
$.each( this_week, function (i, item) {
var this_week_id = item.album_id;
//default to 'new' status
item.status = "new";
//default to empty diff
item.diff = '';
//default to empty prev count
item.prev_count = '';
//check that prev_week contains any items
if (prev_week.length > 0) {
//for each of this weeks items, run through prev weeks items
$.each(prev_week, function (is, item2) {
//check if track was played last week
if(this_week_id === item2.album_id) {
//UP
if( i< is) {
item.status = "up";
item.diff = is - i;
item.prev_count = item2.count;
}
//DOWN
else if(i > is) {
item.status = "down";
item.diff = i-is;
item.prev_count = item2.count;
}
//SAME
else if(i === is) {
item.status = "same";
item.diff = 0;
}
}//end if
//add item to new chart
new_chart[i] = item;
});//end for each. prev_week
}//end if: no previous week items to compare with
else {
new_chart[i] = item;
}
});//end outer (this_week) for each
//display new chart
$.each(new_chart, function (i, item) {
var number = i +1;
var content = '<tr><td class="number">' + number + '</td><td class="status"><span class=' + item.status + '> </span></td><td class="title">' + item.albumname + '</td><td class="name">' + item.artistname + '</td><td class="plays">' + item.count + '</td><td class="diff">' + item.diff + '</td><td class="prev=cnt">' + item.prev_count + '</td><td class="album-image"><img src="' + item.albumimage + '"/></td></tr>';
$(content).appendTo("#artists");
});
}//end if
}
function formatDate(then) {
var month = then.getMonth() + 1;
if (month < 10) {
month = "0" + month;
}
var day = then.getDate();
if (day < 10) {
day = "0" + day;
}
var year = then.getFullYear();
var last_week = year + "-" + month + "-" + day;
return last_week;
}
function thisWeek() {
var from = new Date();
from.setDate(from.getDate() - span);
var from_date = formatDate(from);
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'this_week_callback',
data: {
program: program_id,
from: from_date,
format: "json",
channel: 4
},
success: function(result) {
this_week = result;
makeChart();
}
});
}
function prevWeek() {
var from = new Date();
from.setDate(from.getDate() - (span*2));
var from_date = formatDate(from);
var to = new Date();
to.setDate(to.getDate() - span);
var to_date = formatDate(to);
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'prev_week_callback',
data: {
program: program_id,
to: to_date,
from: from_date,
format: "json",
channel: 4
},
success: function(result) {
prev_week = result;
makeChart();
}
});
}
thisWeek();
prevWeek();
</script>
<div id="wrapper">
<div class="demo">
<p><h3>Album Chart for <%=@program%></h3></p>
<p>Last <%=@span%> days compared with previous <%=@span%> days</p>
<div id="chart">
<table id="artists" border="0">
<tbody>
<tr><td class="number"></td><td class="status"><span class='+item.status+'></span></td><td class="name"></td><td class="title"></td><td class="plays">cnt</td><td class="diff">pos diff</td><td class="prev-cnt">prev cnt</td><td class="album-image"></td></tr>
</tbody>
</table>
</div>
</div><!-- End demo -->
</div>
\ No newline at end of file
diff --git a/views/program_chart_artist.html.erb b/views/program_chart_artist.html.erb
index 91bae73..74a8825 100644
--- a/views/program_chart_artist.html.erb
+++ b/views/program_chart_artist.html.erb
@@ -1,191 +1,191 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<style>
.same{
background-image:url('/images/same_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.new{
background-image:url('/images/new_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.up{
background-image:url('/images/up_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.down{
background-image:url('/images/down_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.album-image img{
width:60px;
height:60px;
}
</style>
<script>
var this_week, prev_week = null;
var new_chart = [];
var program_id = '<%=@program%>';
var span = '<%[email protected]_i%>';
function makeChart() {
//make sure that both jsonp calls have finished before making the chart
if (this_week && prev_week) {
- console.log('this week', this_week);
- console.log('prev week', prev_week);
+ //console.log('this week', this_week);
+ //console.log('prev week', prev_week);
$.each( this_week, function (i, item) {
var this_week_id = item.id;
//default to 'new' status
item.status = "new";
//default to empty diff
item.diff = '';
//default to empty prev count
item.prev_count = '';
//check that prev_week contains any items
if (prev_week.length > 0) {
//for each of this weeks items, run through prev weeks items
$.each(prev_week, function (is, item2) {
//check if track was played last week
if(this_week_id === item2.id) {
//UP
if( i< is) {
item.status = "up";
item.diff = is - i;
item.prev_count = item2.count;
}
//DOWN
else if(i > is) {
item.status = "down";
item.diff = i-is;
item.prev_count = item2.count;
}
//SAME
else if(i === is) {
item.status = "same";
item.diff = 0;
}
}//end if
//add item to new chart
new_chart[i] = item;
});//end for each. prev_week
}//end if: no previous week items to compare with
else {
new_chart[i] = item;
}
});//end outer (this_week) for each
//display new chart
$.each(new_chart, function (i, item) {
var number = i +1;
var content = '<tr><td class="number">' + number + '</td><td class="status"><span class=' + item.status + '> </span></td><td class="name">' + item.artistname + '</td><td class="plays">' + item.count + '</td><td class="diff">' + item.diff + '</td><td class="prev=cnt">' + item.prev_count + '</td></tr>';
$(content).appendTo("#artists");
});
}//end if
}
function formatDate(then) {
var month = then.getMonth() + 1;
if (month < 10) {
month = "0" + month;
}
var day = then.getDate();
if (day < 10) {
day = "0" + day;
}
var year = then.getFullYear();
var last_week = year + "-" + month + "-" + day;
return last_week;
}
function thisWeek() {
var from = new Date();
from.setDate(from.getDate() - span);
var from_date = formatDate(from);
$.ajax({
url: "http://96.126.96.51/v1/chart/artist",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'this_week_callback',
data: {
program: program_id,
from: from_date,
format: "json",
channel: 4
},
success: function(result) {
this_week = result;
makeChart();
}
});
}
function prevWeek() {
var from = new Date();
from.setDate(from.getDate() - (span*2));
var from_date = formatDate(from);
var to = new Date();
to.setDate(to.getDate() - span);
var to_date = formatDate(to);
$.ajax({
url: "http://96.126.96.51/v1/chart/artist",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'prev_week_callback',
data: {
program: program_id,
to: to_date,
from: from_date,
format: "json",
channel: 4
},
success: function(result) {
prev_week = result;
makeChart();
}
});
}
thisWeek();
prevWeek();
</script>
<div id="wrapper">
<div class="demo">
<p><h3>Artist Chart for <%=@program%></h3></p>
<p>Last <%=@span%> days compared with previous <%=@span%> days</p>
<div id="chart">
<table id="artists" border="0">
<tbody>
<tr><td class="number"></td><td class="status"><span class='+item.status+'></span></td><td class="name"></td><td class="plays">cnt</td><td class="diff">pos diff</td><td class="prev-cnt">prev cnt</td></tr>
</tbody>
</table>
</div>
</div><!-- End demo -->
</div>
\ No newline at end of file
diff --git a/views/program_chart_track.html.erb b/views/program_chart_track.html.erb
index 3899dc9..4875550 100644
--- a/views/program_chart_track.html.erb
+++ b/views/program_chart_track.html.erb
@@ -1,188 +1,188 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<style>
.same{
background-image:url('/images/same_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.new{
background-image:url('/images/new_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.up{
background-image:url('/images/up_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.down{
background-image:url('/images/down_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.album-image img{
width:60px;
height:60px;
}
</style>
<script>
var this_week, prev_week = null;
var new_chart = [];
var program_id = '<%=@program%>';
var span = '<%[email protected]_i%>';
function makeChart() {
//make sure that both jsonp calls have finished before making the chart
if (this_week && prev_week) {
- console.log('this week', this_week);
- console.log('prev week', prev_week);
+ //console.log('this week', this_week);
+ //console.log('prev week', prev_week);
$.each( this_week, function (i, item) {
var this_week_id = item.track_id;
//default to 'new' status
item.status = "new";
//default to empty diff
item.diff = '';
//default to empty prev count
item.prev_count = '';
//check that prev_week contains any items
if (prev_week.length > 0) {
//for each of this weeks items, run through prev weeks items
$.each(prev_week, function (is, item2) {
//check if track was played last week
if(this_week_id === item2.track_id) {
//UP
if( i< is) {
item.status = "up";
item.diff = is - i;
item.prev_count = item2.count;
}
//DOWN
else if(i > is) {
item.status = "down";
item.diff = i-is;
item.prev_count = item2.count;
}
//SAME
else if(i === is) {
item.status = "same";
item.diff = 0;
}
}//end if
//add item to new chart
new_chart[i] = item;
});//end for each. prev_week
}//end if: no previous week items to compare with
else {
new_chart[i] = item;
}
});//end outer (this_week) for each
//display new chart
$.each(new_chart, function (i, item) {
var number = i +1;
var content = '<tr><td class="number">' + number + '</td><td class="status"><span class=' + item.status + '> </span></td><td class="title">' + item.title + '</td><td class="name">' + item.artistname + '</td><td class="plays">' + item.count + '</td><td class="diff">' + item.diff + '</td><td class="prev=cnt">' + item.prev_count + '</td><td class="album-image"><img src="' + item.albumimage + '"/></td></tr>';
$(content).appendTo("#artists");
});
}//end if
}
function formatDate(then) {
var month = then.getMonth() + 1;
if (month < 10) {
month = "0" + month;
}
var day = then.getDate();
if (day < 10) {
day = "0" + day;
}
var year = then.getFullYear();
var last_week = year + "-" + month + "-" + day;
return last_week;
}
function thisWeek() {
var from = new Date();
from.setDate(from.getDate() - span);
var from_date = formatDate(from);
$.ajax({
url: "http://96.126.96.51/v1/chart/track",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'this_week_callback',
data: {
program: program_id,
from: from_date,
format: "json"
},
success: function(result) {
this_week = result;
makeChart();
}
});
}
function prevWeek() {
var from = new Date();
from.setDate(from.getDate() - (span*2));
var from_date = formatDate(from);
var to = new Date();
to.setDate(to.getDate() - span);
var to_date = formatDate(to);
$.ajax({
url: "http://96.126.96.51/v1/chart/track",
dataType: "jsonp",
timeout : 40000,
cache:true,
jsonpCallback:'prev_week_callback',
data: {
program: program_id,
to: to_date,
from: from_date,
format: "json"
},
success: function(result) {
prev_week = result;
makeChart();
}
});
}
thisWeek();
prevWeek();
</script>
<div id="wrapper">
<div class="demo">
<p><h3>Track Chart for <%=@program%></h3></p>
<p>Last <%=@span%> days compared with previous <%=@span%> days</p>
<div id="chart">
<table id="artists" border="0">
<tbody>
<tr><td class="number"></td><td class="status"><span class='+item.status+'></span></td><td class="title"></td><td class="name"></td><td class="plays">count</td><td class="diff">pos diff</td><td class="prev-cnt">prev count</td><td class="album-image"></td></tr>
</tbody>
</table>
</div>
</div><!-- End demo -->
</div>
\ No newline at end of file
|
simonhn/pav-api
|
218c9a80b2eec1de7da9d50323ef7dc9b5321d30
|
styling up the demos a bit
|
diff --git a/public/css/bootstrap-1.0.0.css b/public/css/bootstrap-1.0.0.css
new file mode 100644
index 0000000..d5e3434
--- /dev/null
+++ b/public/css/bootstrap-1.0.0.css
@@ -0,0 +1,223 @@
+html,body{margin:0;padding:0;}
+h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s,samp,small,strike,strong,sub,sup,tt,var,dd,dl,dt,li,ol,ul,fieldset,form,label,legend,button,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;font-weight:normal;font-style:normal;font-size:100%;line-height:1;font-family:inherit;}
+table{border-collapse:collapse;border-spacing:0;}
+ol,ul{list-style:none;}
+q:before,q:after,blockquote:before,blockquote:after{content:"";}
+header,section,footer,article,aside{display:block;}
+.clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
+.clearfix:after{clear:both;}
+.center-block{display:block;margin:0 auto;}
+.container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";}
+.container:after{clear:both;}
+.row{zoom:1;}.row:before,.row:after{display:table;content:"";}
+.row:after{clear:both;}
+.row .span1{float:left;width:40px;margin-left:20px;}.row .span1:first-child{margin-left:0;}
+.row .span2{float:left;width:100px;margin-left:20px;}.row .span2:first-child{margin-left:0;}
+.row .span3{float:left;width:160px;margin-left:20px;}.row .span3:first-child{margin-left:0;}
+.row .span4{float:left;width:220px;margin-left:20px;}.row .span4:first-child{margin-left:0;}
+.row .span5{float:left;width:280px;margin-left:20px;}.row .span5:first-child{margin-left:0;}
+.row .span6{float:left;width:340px;margin-left:20px;}.row .span6:first-child{margin-left:0;}
+.row .span7{float:left;width:400px;margin-left:20px;}.row .span7:first-child{margin-left:0;}
+.row .span8{float:left;width:460px;margin-left:20px;}.row .span8:first-child{margin-left:0;}
+.row .span9{float:left;width:520px;margin-left:20px;}.row .span9:first-child{margin-left:0;}
+.row .span10{float:left;width:580px;margin-left:20px;}.row .span10:first-child{margin-left:0;}
+.row .span11{float:left;width:640px;margin-left:20px;}.row .span11:first-child{margin-left:0;}
+.row .span12{float:left;width:700px;margin-left:20px;}.row .span12:first-child{margin-left:0;}
+.row .span13{float:left;width:760px;margin-left:20px;}.row .span13:first-child{margin-left:0;}
+.row .span14{float:left;width:820px;margin-left:20px;}.row .span14:first-child{margin-left:0;}
+.row .span15{float:left;width:880px;margin-left:20px;}.row .span15:first-child{margin-left:0;}
+.row .span16{float:left;width:940px;margin-left:20px;}.row .span16:first-child{margin-left:0;}
+.row .offset1{margin-left:80px !important;}.row .offset1:first-child{margin-left:60px !important;}
+.row .offset2{margin-left:140px !important;}.row .offset2:first-child{margin-left:120px !important;}
+.row .offset3{margin-left:200px !important;}.row .offset3:first-child{margin-left:180px !important;}
+.row .offset4{margin-left:260px !important;}.row .offset4:first-child{margin-left:240px !important;}
+.row .offset5{margin-left:320px !important;}.row .offset5:first-child{margin-left:300px !important;}
+.row .offset6{margin-left:380px !important;}.row .offset6:first-child{margin-left:360px !important;}
+.row .offset7{margin-left:440px !important;}.row .offset7:first-child{margin-left:420px !important;}
+.row .offset8{margin-left:500px !important;}.row .offset8:first-child{margin-left:480px !important;}
+.row .offset9{margin-left:500px !important;}.row .offset9:first-child{margin-left:480px !important;}
+.row .offset10{margin-left:620px !important;}.row .offset10:first-child{margin-left:600px !important;}
+.row .offset11{margin-left:680px !important;}.row .offset11:first-child{margin-left:660px !important;}
+.row .offset12{margin-left:740px !important;}.row .offset12:first-child{margin-left:720px !important;}
+html,body{background-color:#fff;}
+body{margin:60px 0 0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;}
+div.container{width:940px;margin:0 auto;}
+div.container-fluid{padding:0 20px;zoom:1;}div.container-fluid:before,div.container-fluid:after{display:table;content:"";}
+div.container-fluid:after{clear:both;}
+div.container-fluid div.sidebar{float:left;width:220px;}
+div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;}
+a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
+.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;}
+.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;}
+.btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
+.btn.small{padding-right:9px;padding-left:9px;font-size:11px;}
+.btn:disabled,.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;}
+.btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);}
+button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
+p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;}
+h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;}
+h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}
+h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;}
+h3,h4,h5,h6{line-height:36px;}
+h3{font-size:18px;}h3 small{font-size:14px;}
+h4{font-size:16px;}h4 small{font-size:12px;}
+h5{font-size:14px;}
+h6{font-size:13px;color:#bfbfbf;text-transform:uppercase;}
+ul,ol{margin:0 0 18px 25px;}
+ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
+ul{list-style:disc;}
+ol{list-style:decimal;}
+li{line-height:18px;color:#808080;}
+ul.unstyled{list-style:none;margin-left:0;}
+dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;}
+dl dt{font-weight:bold;}
+dl dd{margin-left:9px;}
+hr{margin:0 0 19px;border:0;border-bottom:1px solid #eee;}
+strong{font-style:inherit;font-weight:bold;line-height:inherit;}
+em{font-style:italic;font-weight:inherit;line-height:inherit;}
+.muted{color:#e6e6e6;}
+blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:18px;margin-bottom:0;}
+blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';}
+address{display:block;line-height:18px;margin-bottom:18px;}
+code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;}
+pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre-wrap;}
+form{margin-bottom:18px;}form fieldset{margin-bottom:18px;padding-top:18px;}form fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;color:#404040;}
+form div.clearfix{margin-bottom:18px;}
+form label,form input,form select,form textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;}
+form label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
+form div.input{margin-left:150px;}
+form input[type=checkbox],form input[type=radio]{cursor:pointer;}
+form input[type=text],form input[type=password],form textarea,form select,form .uneditable-input{display:inline-block;width:210px;margin:0;padding:4px;font-size:13px;line-height:18px;height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+form select,form input[type=file]{height:27px;line-height:27px;}
+form textarea{height:auto;}
+form .uneditable-input{background-color:#eee;display:block;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);}
+form :-moz-placeholder{color:#bfbfbf;}
+form ::-webkit-input-placeholder{color:#bfbfbf;}
+form input[type=text],form input[type=password],form select,form textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);}
+form input[type=text]:focus,form input[type=password]:focus,form textarea:focus{outline:none;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);}
+form div.error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form div.error>label,form div.error span.help-inline,form div.error span.help-block{color:#9d261d;}
+form div.error input[type=text],form div.error input[type=password],form div.error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form div.error input[type=text]:focus,form div.error input[type=password]:focus,form div.error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);}
+form div.error div.input-prepend span.add-on,form div.error div.input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;}
+form .input-mini,form input.mini,form textarea.mini,form select.mini{width:60px;}
+form .input-small,form input.small,form textarea.small,form select.small{width:90px;}
+form .input-medium,form input.medium,form textarea.medium,form select.medium{width:150px;}
+form .input-large,form input.large,form textarea.large,form select.large{width:210px;}
+form .input-xlarge,form input.xlarge,form textarea.xlarge,form select.xlarge{width:270px;}
+form .input-xxlarge,form input.xxlarge,form textarea.xxlarge,form select.xxlarge{width:530px;}
+form textarea.xxlarge{overflow-y:scroll;}
+form input[readonly]:focus,form textarea[readonly]:focus,form input.disabled{background:#f5f5f5;border-color:#ddd;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+div.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}div.actions div.secondary-action{float:right;}div.actions div.secondary-action a{line-height:30px;}div.actions div.secondary-action a:hover{text-decoration:underline;}
+.help-inline,.help-block{font-size:12px;line-height:18px;color:#bfbfbf;}
+.help-inline{padding-left:5px;}
+.help-block{display:block;max-width:600px;}
+div.inline-inputs{color:#808080;}div.inline-inputs span,div.inline-inputs input[type=text]{display:inline-block;}
+div.inline-inputs input.mini{width:60px;}
+div.inline-inputs input.small{width:90px;}
+div.inline-inputs span{padding:0 2px 0 1px;}
+div.input-prepend input[type=text],div.input-append input[type=text]{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+div.input-prepend .add-on,div.input-append .add-on{background:#f5f5f5;float:left;display:block;width:auto;min-width:16px;padding:4px 4px 4px 5px;color:#bfbfbf;font-weight:normal;line-height:18px;height:18px;text-align:center;text-shadow:0 1px 0 #fff;border:1px solid #ccc;border-right-width:0;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+div.input-prepend .active,div.input-append .active{background:#a9dba9;border-color:#46a546;}
+div.input-append input[type=text]{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+div.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;border-right-width:1px;border-left-width:0;}
+ul.inputs-list{margin:0 0 5px;width:100%;}ul.inputs-list li{display:block;padding:0;width:100%;}ul.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}ul.inputs-list li label strong{color:#808080;}
+ul.inputs-list li label small{font-size:12px;font-weight:normal;}
+ul.inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;}
+ul.inputs-list li:first-child{padding-top:5px;}
+ul.inputs-list input[type=radio],ul.inputs-list input[type=checkbox]{margin-bottom:0;}
+form.form-stacked{padding-left:20px;}form.form-stacked fieldset{padding-top:9px;}
+form.form-stacked legend{margin-left:0;}
+form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;}
+form.form-stacked div.clearfix{margin-bottom:9px;}form.form-stacked div.clearfix div.input{margin-left:0;}
+form.form-stacked ul.inputs-list{margin-bottom:0;}form.form-stacked ul.inputs-list li{padding-top:0;}form.form-stacked ul.inputs-list li label{font-weight:normal;padding-top:0;}
+form.form-stacked div.actions{margin-left:-20px;padding-left:20px;}
+table{width:100%;margin-bottom:18px;padding:0;text-align:left;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;vertical-align:middle;border-bottom:1px solid #ddd;}
+table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;}
+table.zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;}
+table.zebra-striped tbody tr:hover td{background-color:#f5f5f5;}
+table.zebra-striped th.header{cursor:pointer;}table.zebra-striped th.header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;}
+table.zebra-striped th.headerSortUp,table.zebra-striped th.headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
+table.zebra-striped th.header:hover:after{visibility:visible;}
+table.zebra-striped th.actions:hover{background-image:none;}
+table.zebra-striped th.headerSortDown:after,table.zebra-striped th.headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;}
+table.zebra-striped th.headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;}
+table.zebra-striped th.blue{color:#049cdb;border-bottom-color:#049cdb;}
+table.zebra-striped th.headerSortUp.blue,table.zebra-striped th.headerSortDown.blue{background-color:#ade6fe;}
+table.zebra-striped th.green{color:#46a546;border-bottom-color:#46a546;}
+table.zebra-striped th.headerSortUp.green,table.zebra-striped th.headerSortDown.green{background-color:#cdeacd;}
+table.zebra-striped th.red{color:#9d261d;border-bottom-color:#9d261d;}
+table.zebra-striped th.headerSortUp.red,table.zebra-striped th.headerSortDown.red{background-color:#f4c8c5;}
+table.zebra-striped th.yellow{color:#ffc40d;border-bottom-color:#ffc40d;}
+table.zebra-striped th.headerSortUp.yellow,table.zebra-striped th.headerSortDown.yellow{background-color:#fff6d9;}
+table.zebra-striped th.orange{color:#f89406;border-bottom-color:#f89406;}
+table.zebra-striped th.headerSortUp.orange,table.zebra-striped th.headerSortDown.orange{background-color:#fee9cc;}
+table.zebra-striped th.purple{color:#7a43b6;border-bottom-color:#7a43b6;}
+table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown.purple{background-color:#e2d5f0;}
+div.topbar{background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
+div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;}
+div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
+div.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}div.topbar form input{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;}
+div.topbar form input::-webkit-input-placeholder{color:#e6e6e6;}
+div.topbar form input:hover{background-color:#444;background-color:rgba(255, 255, 255, 0.5);color:#fff;}
+div.topbar form input:focus,div.topbar form input.focused{outline:none;background-color:#fff;color:#404040;text-shadow:0 1px 0 #fff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);}
+div.topbar ul{display:block;float:left;margin:0 10px 0 0;position:relative;}div.topbar ul.secondary-nav{float:right;margin-left:10px;margin-right:0;}
+div.topbar ul li{display:block;float:left;font-size:13px;}div.topbar ul li a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}div.topbar ul li a:hover{color:#fff;text-decoration:none;}
+div.topbar ul li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
+div.topbar ul.primary-nav li ul{left:0;}
+div.topbar ul.secondary-nav li ul{right:0;}
+div.topbar ul li.menu{position:relative;}div.topbar ul li.menu a.menu:after{width:0px;height:0px;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}
+div.topbar ul li.menu.open a.menu,div.topbar ul li.menu.open a:hover{background-color:#00b4eb;background-color:rgba(255, 255, 255, 0.1);color:#fff;}
+div.topbar ul li.menu.open ul{display:block;}div.topbar ul li.menu.open ul li a{background-color:transparent;font-weight:normal;}div.topbar ul li.menu.open ul li a:hover{background-color:rgba(255, 255, 255, 0.1);color:#fff;}
+div.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;}
+div.topbar ul li ul{background-color:#333;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:0;text-align:left;border:0;zoom:1;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);}div.topbar ul li ul li{float:none;clear:both;display:block;background:none;font-size:12px;}div.topbar ul li ul li a{display:block;padding:6px 15px;clear:both;font-weight:normal;line-height:19px;color:#bbb;}div.topbar ul li ul li a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.25);color:#fff;}
+div.topbar ul li ul li.divider{height:1px;overflow:hidden;background:rgba(0, 0, 0, 0.2);border-bottom:1px solid rgba(255, 255, 255, 0.1);margin:5px 0;}
+div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0.2);padding:6px 15px;cursor:default;color:#808080;border-top:1px solid rgba(0, 0, 0, 0.2);}
+.hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;}
+.hero-unit p{font-size:18px;font-weight:200;line-height:27px;}
+div.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}div.page-header h1{margin-bottom:8px;}
+div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;}
+div.alert-message.error{background-color:#e06359;}
+div.alert-message.warning{background-color:#ffd75a;}
+div.alert-message.success{background-color:#74c474;}
+div.alert-message.info{background-color:#30c0fb;}
+div.alert-message a.close{float:right;margin-top:-2px;color:#fff;font-size:20px;font-weight:bold;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}div.alert-message a.close:hover{text-decoration:none;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}
+div.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}div.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);margin-right:30px;margin-bottom:0;}
+div.block-message ul{margin-bottom:0;}
+div.block-message strong{display:block;}
+div.block-message a.close{display:block;color:#404040;color:rgba(0, 0, 0, 0.5);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);}
+div.block-message.error{background:#f8dcda;border:1px solid #f4c8c5;}
+div.block-message.warning{background:#fff0c0;border:1px solid #ffe38d;}
+div.block-message.success{background:#dff1df;border:1px solid #bbe2bb;}
+div.block-message.info{background:#c7eefe;border:1px solid #ade6fe;}
+ul.tabs,ul.pills{margin:0 0 20px;padding:0;zoom:1;}ul.tabs:before,ul.pills:before,ul.tabs:after,ul.pills:after{display:table;content:"";}
+ul.tabs:after,ul.pills:after{clear:both;}
+ul.tabs li,ul.pills li{display:inline;}ul.tabs li a,ul.pills li a{float:left;width:auto;}
+ul.tabs{width:100%;border-bottom:1px solid #bfbfbf;}ul.tabs li a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}ul.tabs li a:hover{background-color:#e6e6e6;border-bottom:1px solid #bfbfbf;}
+ul.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;}
+ul.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}ul.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
+ul.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
+div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid rgba(0, 0, 0, 0.15);text-decoration:none;}
+div.pagination ul li a:hover,div.pagination ul li.active a{background-color:#c7eefe;}
+div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;}
+div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;}
+.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}
+div.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}
+div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}div.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}div.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
+div.modal .modal-body{padding:20px;}
+div.modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}div.modal .modal-footer:before,div.modal .modal-footer:after{display:table;content:"";}
+div.modal .modal-footer:after{clear:both;}
+div.modal .modal-footer .btn{float:right;margin-left:10px;}
+div.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}div.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
+div.twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
+div.twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
+div.twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
+div.twipsy .twipsy-inner{padding:3px 8px;background-color:#000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+div.twipsy .twipsy-arrow{position:absolute;width:0;height:0;}
+.popover{position:absolute;top:0;left:0;z-index:1000;padding:5px;display:none;}.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
+.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
+.popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
+.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
+.popover .arrow{position:absolute;width:0;height:0;}
+.popover .inner{background:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);}
+.popover .title{background:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;}
+.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
\ No newline at end of file
diff --git a/routes/demo.rb b/routes/demo.rb
index aee0eba..aaf040b 100644
--- a/routes/demo.rb
+++ b/routes/demo.rb
@@ -1,87 +1,114 @@
get '/demo' do
respond_to do |wants|
wants.html{erb :demo}
end
end
get '/demo/album-charts' do
from_date = DateTime.now - 7
@from_date_string = from_date.strftime("%b %e")
to_date = DateTime.now
@to_date_string = to_date.strftime("%b %e")
respond_to do |wants|
wants.html{erb :album_chart_all}
end
end
get '/demo/program-chart' do
+ redirect '/demo/program-chart/track'
+end
+
+get '/demo/program-chart/track' do
+ @program = params[:program]
+ @program ||= 'super_request'
+ @span = params[:span]
+ @span ||= 7
+ respond_to do |wants|
+ wants.html{erb :program_chart_track}
+ end
+end
+
+get '/demo/program-chart/artist' do
+ @program = params[:program]
+ @program ||= 'super_request'
+ @span = params[:span]
+ @span ||= 7
+ respond_to do |wants|
+ wants.html{erb :program_chart_artist}
+ end
+end
+
+get '/demo/program-chart/album' do
@program = params[:program]
+ @program ||= 'super_request'
+ @span = params[:span]
+ @span ||= 7
respond_to do |wants|
- wants.html{erb :program_chart}
+ wants.html{erb :program_chart_album}
end
end
get '/demo/jjj' do
cache_control :public, :max_age => 600
artistmbid = {}
har ='a'
hur = 'b'
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
#hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
all = Hash.new
@artists.each{ |o|
begin
if o.artistmbid
#puts o.artistname
begin
result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
if(result.code==200)
all[o.artistname] = Hash.new
all[o.artistname].store("media",Hash.new())
all[o.artistname].store("info",Hash.new())
all[o.artistname].fetch("info").store("mbid",o.artistmbid)
all[o.artistname].fetch("info").store("count",o.cnt)
xml = Crack::XML.parse(result)
if(xml["rss"]["channel"]["item"].kind_of?(Array))
xml["rss"]["channel"]["item"].each_with_index{|ha,i|
if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
har = ha["title"]
da = ha["media:thumbnail"]
if da.kind_of?(Array)
hur = da.first["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
else
hur = da["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
end
if ha["media:content"].kind_of?(Array)
all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
else
all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
end
end
}
else
if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
har = xml["rss"]["channel"]["item"]["title"]
hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
end
end
#john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
#puts john.inspect
end
rescue => e
end
end
end
}
@hat = all
respond_to do |wants|
wants.html { erb :jjj }
wants.json { all.to_json }
end
end
diff --git a/views/album_chart_all.html.erb b/views/album_chart_all.html.erb
index 45053a5..7526bda 100644
--- a/views/album_chart_all.html.erb
+++ b/views/album_chart_all.html.erb
@@ -1,292 +1,293 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<script src="http://jmar777.googlecode.com/svn/trunk/js/jquery.easing.1.3.js" type="text/javascript"></script>
<script src="http://kwicks.googlecode.com/svn/branches/v1.5.1/Kwicks/jquery.kwicks-1.5.1.pack.js" type="text/javascript"></script>
<div>
<h2>Demo of Most Played Albums <%=@from_date_string%> to <%=@to_date_string%></h2>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/triplejlogo.gif'>
<ul class="kwicks-jjj">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcdigmusiclogo.gif'>
<ul class="kwicks-dig">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcjazzlogo.gif'>
<ul class="kwicks-jazz">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abccountrylogo.gif'>
<ul class="kwicks-country">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcradiologo.gif'>
<h5>Combined view of triple j, ABC Dig Music, ABC Jazz and ABC Country</h5>
<ul class="kwicks-combined">
</ul>
</div>
</div>
</div>
<script type="text/javascript">
$().ready(function() {
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-jjj");
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
cache:true,
jsonpCallback:'c1',
dataType: "jsonp",
data: {
format:"json",
channel: 4
},
success: function(data){
$(".kwicks-jjj #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-jjj");
});
$('.kwicks-jjj').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
}
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-dig");
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
cache:true,
jsonpCallback:'c2',
dataType: "jsonp",
data: {
format:"json",
channel: 1
},
success: function(data){
$(".kwicks-dig #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-dig");
});
$('.kwicks-dig').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
}
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-jazz");
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
jsonpCallback:'c3',
cache:true,
dataType: "jsonp",
data: {
format:"json",
channel: 2
},
success: function(data){
$(".kwicks-jazz #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-jazz");
});
$('.kwicks-jazz').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
}
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-country");
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
cache:true,
jsonpCallback:'c4',
dataType: "jsonp",
data: {
format:"json",
channel: 3
},
success: function(data){
$(".kwicks-country #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-country");
});
$('.kwicks-country').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
}
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-combined");
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
cache:true,
jsonpCallback:'c5',
dataType: "jsonp",
data: {
format:"json"
},
success: function(data){
$(".kwicks-combined #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-combined");
});
$('.kwicks-combined').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
}
});
});
</script>
<style type="text/css" media="screen">
header#main,div#wrapper{
width:700px;
}
#number_overlay{
display: block;
position: absolute;
width: 100%;
top: 7%;
+ top: 50%;
left: -5;
z-index: 2;
text-align: right;
font-size: 70px;
letter-spacing: -13px;
font-weight: bold;
font-family:arial,helvetica,sans-serif;
}
#front_page_playlist_section
{height:145px;}
#front_page_playlist_section .top_wrapper{
border-top: 0px dotted #C9C9C9;
padding-top: 20px;
}
/* defaults for all examples */
.kwicks-combined, .kwicks-jjj, .kwicks-dig, .kwicks-jazz, .kwicks-country {
list-style: none;
position: relative;
margin: 0;
padding: 0;
padding-top:10px;
}
.kwicks-combined li, .kwicks-jjj li, .kwicks-dig li,.kwicks-jazz li,.kwicks-country li{
display: block;
overflow: hidden;
padding: 0;
width: 69px
}
.kwicks_inner {
width: 180px;
}
.bigLetter {
float: left;
margin-right:8px;
position:relative;
z-index:1;
color:white;
}
.bigLetter img{
width: 69px;
height:69px;
}
.smallLetters {
display: none;
font-size: 12px;
width:100px;
float:right;
word-wrap: break-word;
}
#kwick_albumname{
color: #204BA1;
}
li.active .smallLetters {
display: block;
}
</style>
diff --git a/views/demo.html.erb b/views/demo.html.erb
index e5ecbcf..0a64e2c 100644
--- a/views/demo.html.erb
+++ b/views/demo.html.erb
@@ -1,6 +1,8 @@
<h1>App gallery</h1>
<ul>
- <li><a href="/demo/program-chart?program=super_request">Program chart</a></li>
+ <li><a href="/demo/program-chart/track?program=super_request">Program track chart</a></li>
+ <li><a href="/demo/program-chart/artist?program=super_request">Program artist chart</a></li>
+ <li><a href="/demo/program-chart/album?program=super_request">Program album chart</a></li>
<li><a href="/demo/album-charts">Album charts</a></li>
<li><a href="/demo/jjj">Triple j media integrated into chart</a></li>
</ul>
\ No newline at end of file
diff --git a/views/layout.html.erb b/views/layout.html.erb
index b7798ef..aaac3b7 100644
--- a/views/layout.html.erb
+++ b/views/layout.html.erb
@@ -1,29 +1,31 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>pav api</title>
-<link rel="stylesheet" href="/css/master.css" type="text/css" />
+<!--<link rel="stylesheet" href="/css/master.css" type="text/css" />-->
+<link rel="stylesheet" href="/css/bootstrap-1.0.0.css" type="text/css" />
+
<!--[if IE]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<link rel="shortcut icon" href="/images/favicon.ico">
</head>
<body>
- <div id="wrapper">
+ <div class="container">
<a href="http://github.com/simonhn"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
</a>
<header id="main">
<hgroup>
- <h1><a href="/">pav:api</a></h1>
+ <a href="/"><h1>pav:api</h1></a>
</hgroup>
</header>
<section>
<%= yield %>
</section>
</div>
</body>
</html>
diff --git a/views/program_chart_album.html.erb b/views/program_chart_album.html.erb
new file mode 100644
index 0000000..6ac1977
--- /dev/null
+++ b/views/program_chart_album.html.erb
@@ -0,0 +1,191 @@
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
+<style>
+
+.same{
+ background-image:url('/images/same_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+.new{
+ background-image:url('/images/new_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+
+}
+.up{
+ background-image:url('/images/up_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+.down{
+ background-image:url('/images/down_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+.album-image img{
+ width:60px;
+ height:60px;
+}
+
+</style>
+
+<script>
+var this_week, prev_week = null;
+var new_chart = [];
+var program_id = '<%=@program%>';
+var span = '<%[email protected]_i%>';
+
+function makeChart() {
+ //make sure that both jsonp calls have finished before making the chart
+ if (this_week && prev_week) {
+ console.log('this week', this_week);
+ console.log('prev week', prev_week);
+ $.each( this_week, function (i, item) {
+ var this_week_id = item.album_id;
+ //default to 'new' status
+ item.status = "new";
+
+ //default to empty diff
+ item.diff = '';
+
+ //default to empty prev count
+ item.prev_count = '';
+
+ //check that prev_week contains any items
+ if (prev_week.length > 0) {
+
+ //for each of this weeks items, run through prev weeks items
+ $.each(prev_week, function (is, item2) {
+ //check if track was played last week
+ if(this_week_id === item2.album_id) {
+ //UP
+ if( i< is) {
+ item.status = "up";
+ item.diff = is - i;
+ item.prev_count = item2.count;
+ }
+
+ //DOWN
+ else if(i > is) {
+ item.status = "down";
+ item.diff = i-is;
+ item.prev_count = item2.count;
+ }
+
+ //SAME
+ else if(i === is) {
+ item.status = "same";
+ item.diff = 0;
+ }
+ }//end if
+
+ //add item to new chart
+ new_chart[i] = item;
+ });//end for each. prev_week
+
+ }//end if: no previous week items to compare with
+ else {
+ new_chart[i] = item;
+ }
+
+ });//end outer (this_week) for each
+
+ //display new chart
+ $.each(new_chart, function (i, item) {
+ var number = i +1;
+ var content = '<tr><td class="number">' + number + '</td><td class="status"><span class=' + item.status + '> </span></td><td class="title">' + item.albumname + '</td><td class="name">' + item.artistname + '</td><td class="plays">' + item.count + '</td><td class="diff">' + item.diff + '</td><td class="prev=cnt">' + item.prev_count + '</td><td class="album-image"><img src="' + item.albumimage + '"/></td></tr>';
+ $(content).appendTo("#artists");
+ });
+ }//end if
+}
+
+
+function formatDate(then) {
+ var month = then.getMonth() + 1;
+ if (month < 10) {
+ month = "0" + month;
+ }
+ var day = then.getDate();
+ if (day < 10) {
+ day = "0" + day;
+ }
+ var year = then.getFullYear();
+ var last_week = year + "-" + month + "-" + day;
+ return last_week;
+}
+
+function thisWeek() {
+ var from = new Date();
+ from.setDate(from.getDate() - span);
+ var from_date = formatDate(from);
+
+ $.ajax({
+ url: "http://96.126.96.51/v1/chart/album",
+ dataType: "jsonp",
+ timeout : 40000,
+ cache:true,
+ jsonpCallback:'this_week_callback',
+ data: {
+ program: program_id,
+ from: from_date,
+ format: "json",
+ channel: 4
+ },
+ success: function(result) {
+ this_week = result;
+ makeChart();
+ }
+ });
+}
+
+function prevWeek() {
+ var from = new Date();
+ from.setDate(from.getDate() - (span*2));
+ var from_date = formatDate(from);
+
+ var to = new Date();
+ to.setDate(to.getDate() - span);
+ var to_date = formatDate(to);
+
+ $.ajax({
+ url: "http://96.126.96.51/v1/chart/album",
+ dataType: "jsonp",
+ timeout : 40000,
+ cache:true,
+ jsonpCallback:'prev_week_callback',
+ data: {
+ program: program_id,
+ to: to_date,
+ from: from_date,
+ format: "json",
+ channel: 4
+ },
+ success: function(result) {
+ prev_week = result;
+ makeChart();
+ }
+ });
+}
+thisWeek();
+prevWeek();
+
+</script>
+
+<div id="wrapper">
+ <div class="demo">
+ <p><h3>Album Chart for <%=@program%></h3></p>
+ <p>Last <%=@span%> days compared with previous <%=@span%> days</p>
+ <div id="chart">
+ <table id="artists" border="0">
+ <tbody>
+ <tr><td class="number"></td><td class="status"><span class='+item.status+'></span></td><td class="name"></td><td class="title"></td><td class="plays">cnt</td><td class="diff">pos diff</td><td class="prev-cnt">prev cnt</td><td class="album-image"></td></tr>
+ </tbody>
+ </table>
+ </div>
+ </div><!-- End demo -->
+</div>
\ No newline at end of file
diff --git a/views/program_chart_artist.html.erb b/views/program_chart_artist.html.erb
new file mode 100644
index 0000000..91bae73
--- /dev/null
+++ b/views/program_chart_artist.html.erb
@@ -0,0 +1,191 @@
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
+<style>
+
+.same{
+ background-image:url('/images/same_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+.new{
+ background-image:url('/images/new_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+
+}
+.up{
+ background-image:url('/images/up_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+.down{
+ background-image:url('/images/down_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+.album-image img{
+ width:60px;
+ height:60px;
+}
+
+</style>
+
+<script>
+var this_week, prev_week = null;
+var new_chart = [];
+var program_id = '<%=@program%>';
+var span = '<%[email protected]_i%>';
+
+function makeChart() {
+ //make sure that both jsonp calls have finished before making the chart
+ if (this_week && prev_week) {
+ console.log('this week', this_week);
+ console.log('prev week', prev_week);
+ $.each( this_week, function (i, item) {
+ var this_week_id = item.id;
+ //default to 'new' status
+ item.status = "new";
+
+ //default to empty diff
+ item.diff = '';
+
+ //default to empty prev count
+ item.prev_count = '';
+
+ //check that prev_week contains any items
+ if (prev_week.length > 0) {
+
+ //for each of this weeks items, run through prev weeks items
+ $.each(prev_week, function (is, item2) {
+ //check if track was played last week
+ if(this_week_id === item2.id) {
+ //UP
+ if( i< is) {
+ item.status = "up";
+ item.diff = is - i;
+ item.prev_count = item2.count;
+ }
+
+ //DOWN
+ else if(i > is) {
+ item.status = "down";
+ item.diff = i-is;
+ item.prev_count = item2.count;
+ }
+
+ //SAME
+ else if(i === is) {
+ item.status = "same";
+ item.diff = 0;
+ }
+ }//end if
+
+ //add item to new chart
+ new_chart[i] = item;
+ });//end for each. prev_week
+
+ }//end if: no previous week items to compare with
+ else {
+ new_chart[i] = item;
+ }
+
+ });//end outer (this_week) for each
+
+ //display new chart
+ $.each(new_chart, function (i, item) {
+ var number = i +1;
+ var content = '<tr><td class="number">' + number + '</td><td class="status"><span class=' + item.status + '> </span></td><td class="name">' + item.artistname + '</td><td class="plays">' + item.count + '</td><td class="diff">' + item.diff + '</td><td class="prev=cnt">' + item.prev_count + '</td></tr>';
+ $(content).appendTo("#artists");
+ });
+ }//end if
+}
+
+
+function formatDate(then) {
+ var month = then.getMonth() + 1;
+ if (month < 10) {
+ month = "0" + month;
+ }
+ var day = then.getDate();
+ if (day < 10) {
+ day = "0" + day;
+ }
+ var year = then.getFullYear();
+ var last_week = year + "-" + month + "-" + day;
+ return last_week;
+}
+
+function thisWeek() {
+ var from = new Date();
+ from.setDate(from.getDate() - span);
+ var from_date = formatDate(from);
+
+ $.ajax({
+ url: "http://96.126.96.51/v1/chart/artist",
+ dataType: "jsonp",
+ timeout : 40000,
+ cache:true,
+ jsonpCallback:'this_week_callback',
+ data: {
+ program: program_id,
+ from: from_date,
+ format: "json",
+ channel: 4
+ },
+ success: function(result) {
+ this_week = result;
+ makeChart();
+ }
+ });
+}
+
+function prevWeek() {
+ var from = new Date();
+ from.setDate(from.getDate() - (span*2));
+ var from_date = formatDate(from);
+
+ var to = new Date();
+ to.setDate(to.getDate() - span);
+ var to_date = formatDate(to);
+
+ $.ajax({
+ url: "http://96.126.96.51/v1/chart/artist",
+ dataType: "jsonp",
+ timeout : 40000,
+ cache:true,
+ jsonpCallback:'prev_week_callback',
+ data: {
+ program: program_id,
+ to: to_date,
+ from: from_date,
+ format: "json",
+ channel: 4
+ },
+ success: function(result) {
+ prev_week = result;
+ makeChart();
+ }
+ });
+}
+thisWeek();
+prevWeek();
+
+</script>
+
+<div id="wrapper">
+ <div class="demo">
+ <p><h3>Artist Chart for <%=@program%></h3></p>
+ <p>Last <%=@span%> days compared with previous <%=@span%> days</p>
+ <div id="chart">
+ <table id="artists" border="0">
+ <tbody>
+ <tr><td class="number"></td><td class="status"><span class='+item.status+'></span></td><td class="name"></td><td class="plays">cnt</td><td class="diff">pos diff</td><td class="prev-cnt">prev cnt</td></tr>
+ </tbody>
+ </table>
+ </div>
+ </div><!-- End demo -->
+</div>
\ No newline at end of file
diff --git a/views/program_chart.html.erb b/views/program_chart_track.html.erb
similarity index 67%
rename from views/program_chart.html.erb
rename to views/program_chart_track.html.erb
index cf11777..3899dc9 100644
--- a/views/program_chart.html.erb
+++ b/views/program_chart_track.html.erb
@@ -1,172 +1,188 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<style>
.same{
background-image:url('/images/same_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.new{
background-image:url('/images/new_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.up{
background-image:url('/images/up_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.down{
background-image:url('/images/down_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.album-image img{
width:60px;
height:60px;
}
</style>
<script>
var this_week, prev_week = null;
var new_chart = [];
var program_id = '<%=@program%>';
+var span = '<%[email protected]_i%>';
+
function makeChart() {
//make sure that both jsonp calls have finished before making the chart
if (this_week && prev_week) {
- //console.log('this week', this_week);
- //console.log('prev week', prev_week);
+ console.log('this week', this_week);
+ console.log('prev week', prev_week);
$.each( this_week, function (i, item) {
var this_week_id = item.track_id;
//default to 'new' status
item.status = "new";
//default to empty diff
item.diff = '';
-
+
+ //default to empty prev count
item.prev_count = '';
-
- //for each of this weeks items, run through prev weeks items
- $.each(prev_week, function (is, item2) {
- //check if track was played last week
- if(this_week_id === item2.track_id) {
- //UP
- if( i< is) {
- item.status = "up";
- item.diff = is - i;
- item.prev_count = item2.count;
- }
+ //check that prev_week contains any items
+ if (prev_week.length > 0) {
+
+ //for each of this weeks items, run through prev weeks items
+ $.each(prev_week, function (is, item2) {
+ //check if track was played last week
+ if(this_week_id === item2.track_id) {
+ //UP
+ if( i< is) {
+ item.status = "up";
+ item.diff = is - i;
+ item.prev_count = item2.count;
+ }
- //DOWN
- else if(i > is) {
- item.status = "down";
- item.diff = i-is;
- item.prev_count = item2.count;
- }
+ //DOWN
+ else if(i > is) {
+ item.status = "down";
+ item.diff = i-is;
+ item.prev_count = item2.count;
+ }
- //SAME
- else if(i === is) {
- item.status = "same";
- item.diff = 0;
- }
- }//end if
+ //SAME
+ else if(i === is) {
+ item.status = "same";
+ item.diff = 0;
+ }
+ }//end if
- //add item to new chart
- new_chart[i] = item;
- });//end for each
+ //add item to new chart
+ new_chart[i] = item;
+ });//end for each. prev_week
- });//end outer for each
+ }//end if: no previous week items to compare with
+ else {
+ new_chart[i] = item;
+ }
+
+ });//end outer (this_week) for each
//display new chart
$.each(new_chart, function (i, item) {
var number = i +1;
var content = '<tr><td class="number">' + number + '</td><td class="status"><span class=' + item.status + '> </span></td><td class="title">' + item.title + '</td><td class="name">' + item.artistname + '</td><td class="plays">' + item.count + '</td><td class="diff">' + item.diff + '</td><td class="prev=cnt">' + item.prev_count + '</td><td class="album-image"><img src="' + item.albumimage + '"/></td></tr>';
$(content).appendTo("#artists");
});
}//end if
}
function formatDate(then) {
var month = then.getMonth() + 1;
if (month < 10) {
month = "0" + month;
}
var day = then.getDate();
if (day < 10) {
day = "0" + day;
}
var year = then.getFullYear();
var last_week = year + "-" + month + "-" + day;
return last_week;
}
function thisWeek() {
var from = new Date();
- from.setDate(from.getDate() - 3);
+ from.setDate(from.getDate() - span);
var from_date = formatDate(from);
$.ajax({
url: "http://96.126.96.51/v1/chart/track",
dataType: "jsonp",
+ timeout : 40000,
+ cache:true,
+ jsonpCallback:'this_week_callback',
data: {
program: program_id,
from: from_date,
format: "json"
},
success: function(result) {
this_week = result;
makeChart();
}
});
}
function prevWeek() {
var from = new Date();
- from.setDate(from.getDate() - 6);
+ from.setDate(from.getDate() - (span*2));
var from_date = formatDate(from);
var to = new Date();
- to.setDate(to.getDate() - 3);
+ to.setDate(to.getDate() - span);
var to_date = formatDate(to);
$.ajax({
url: "http://96.126.96.51/v1/chart/track",
dataType: "jsonp",
+ timeout : 40000,
+ cache:true,
+ jsonpCallback:'prev_week_callback',
data: {
program: program_id,
to: to_date,
from: from_date,
format: "json"
},
success: function(result) {
prev_week = result;
makeChart();
}
});
}
thisWeek();
prevWeek();
</script>
<div id="wrapper">
<div class="demo">
- <p><h1>Track Chart for a program</h1></p>
- <p>Last 3 days compared with previous 3 days</p>
+ <p><h3>Track Chart for <%=@program%></h3></p>
+ <p>Last <%=@span%> days compared with previous <%=@span%> days</p>
<div id="chart">
<table id="artists" border="0">
<tbody>
- <tr><td class="number"></td><td class="status"><span class='+item.status+'></span></td><td class="title"></td><td class="name"></td><td class="plays">cnt</td><td class="diff">pos diff</td><td class="prev-cnt">prev cnt</td><td class="album-image"></td></tr>
+ <tr><td class="number"></td><td class="status"><span class='+item.status+'></span></td><td class="title"></td><td class="name"></td><td class="plays">count</td><td class="diff">pos diff</td><td class="prev-cnt">prev count</td><td class="album-image"></td></tr>
</tbody>
</table>
</div>
</div><!-- End demo -->
</div>
\ No newline at end of file
|
simonhn/pav-api
|
dea965c035045ac3d96c8c3a02b3869c07f8ac7b
|
linting the js
|
diff --git a/views/program_chart.html.erb b/views/program_chart.html.erb
index 28ecdd3..cf11777 100644
--- a/views/program_chart.html.erb
+++ b/views/program_chart.html.erb
@@ -1,173 +1,172 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<style>
.same{
background-image:url('/images/same_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.new{
background-image:url('/images/new_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.up{
background-image:url('/images/up_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.down{
background-image:url('/images/down_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.album-image img{
width:60px;
height:60px;
}
</style>
<script>
var this_week, prev_week = null;
-var new_chart = new Array();
+var new_chart = [];
var program_id = '<%=@program%>';
-thisWeek();
-prevWeek();
-
function makeChart() {
//make sure that both jsonp calls have finished before making the chart
- if ( this_week && prev_week ){
- console.log('this week',this_week);
- console.log('prev week',prev_week);
- $.each( this_week, function(i,item) {
+ if (this_week && prev_week) {
+ //console.log('this week', this_week);
+ //console.log('prev week', prev_week);
+ $.each( this_week, function (i, item) {
var this_week_id = item.track_id;
//default to 'new' status
- item["status"] = "new";
+ item.status = "new";
//default to empty diff
- item["diff"] = '';
+ item.diff = '';
- item["prev_count"] = '';
+ item.prev_count = '';
//for each of this weeks items, run through prev weeks items
- $.each( prev_week, function(is,item2) {
+ $.each(prev_week, function (is, item2) {
//check if track was played last week
- if(this_week_id==item2.track_id){
+ if(this_week_id === item2.track_id) {
//UP
- if(i<is){
- item["status"] = "up";
- item["diff"] = is-i;
- item["prev_count"] = item2.count;
+ if( i< is) {
+ item.status = "up";
+ item.diff = is - i;
+ item.prev_count = item2.count;
}
//DOWN
- else if(i>is){
- item["status"] = "down";
- item["diff"] = i-is;
- item["prev_count"] = item2.count;
+ else if(i > is) {
+ item.status = "down";
+ item.diff = i-is;
+ item.prev_count = item2.count;
}
//SAME
- else if(i===is){
- item["status"] = "same";
- item["diff"] = 0;
+ else if(i === is) {
+ item.status = "same";
+ item.diff = 0;
}
}//end if
//add item to new chart
new_chart[i] = item;
});//end for each
});//end outer for each
//display new chart
- $.each( new_chart, function(i,item) {
+ $.each(new_chart, function (i, item) {
var number = i +1;
- content = '<tr><td class="number">'+ number+ '</td><td class="status"><span class='+item.status+'> </span></td><td class="title">'+ item.title + '</td><td class="name">'+ item.artistname +'</td><td class="plays">'+item.count+'</td><td class="diff">'+item.diff+'</td><td class="prev=cnt">'+item.prev_count+'</td><td class="album-image"><img src="'+item.albumimage+'"/></td></tr>';
- $(content).appendTo("#artists");
+ var content = '<tr><td class="number">' + number + '</td><td class="status"><span class=' + item.status + '> </span></td><td class="title">' + item.title + '</td><td class="name">' + item.artistname + '</td><td class="plays">' + item.count + '</td><td class="diff">' + item.diff + '</td><td class="prev=cnt">' + item.prev_count + '</td><td class="album-image"><img src="' + item.albumimage + '"/></td></tr>';
+ $(content).appendTo("#artists");
});
}//end if
}
-function thisWeek(){
- from = new Date();
+function formatDate(then) {
+ var month = then.getMonth() + 1;
+ if (month < 10) {
+ month = "0" + month;
+ }
+ var day = then.getDate();
+ if (day < 10) {
+ day = "0" + day;
+ }
+ var year = then.getFullYear();
+ var last_week = year + "-" + month + "-" + day;
+ return last_week;
+}
+
+function thisWeek() {
+ var from = new Date();
from.setDate(from.getDate() - 3);
- from_date = formatDate(from);
+ var from_date = formatDate(from);
$.ajax({
url: "http://96.126.96.51/v1/chart/track",
dataType: "jsonp",
data: {
program: program_id,
- from:from_date,
- format:"json"
+ from: from_date,
+ format: "json"
},
- success: function(result){
+ success: function(result) {
this_week = result;
makeChart();
}
});
}
-function prevWeek(){
- from = new Date();
+function prevWeek() {
+ var from = new Date();
from.setDate(from.getDate() - 6);
- from_date = formatDate(from);
+ var from_date = formatDate(from);
- to = new Date();
+ var to = new Date();
to.setDate(to.getDate() - 3);
- to_date = formatDate(to);
+ var to_date = formatDate(to);
$.ajax({
url: "http://96.126.96.51/v1/chart/track",
dataType: "jsonp",
data: {
program: program_id,
- to:to_date,
- from:from_date,
- format:"json"
+ to: to_date,
+ from: from_date,
+ format: "json"
},
- success: function(result){
+ success: function(result) {
prev_week = result;
makeChart();
- }
- });
-}
-
-function formatDate(then){
- var month = then.getMonth()+1;
- if (month < 10)
- month = "0" + month
-
- var day = then.getDate();
- if (day < 10)
- day = "0" + day
-
- var year = then.getFullYear();
- last_week = year + "-" + month + "-" + day;
- return last_week;
+ }
+ });
}
+thisWeek();
+prevWeek();
</script>
<div id="wrapper">
<div class="demo">
<p><h1>Track Chart for a program</h1></p>
<p>Last 3 days compared with previous 3 days</p>
<div id="chart">
<table id="artists" border="0">
<tbody>
<tr><td class="number"></td><td class="status"><span class='+item.status+'></span></td><td class="title"></td><td class="name"></td><td class="plays">cnt</td><td class="diff">pos diff</td><td class="prev-cnt">prev cnt</td><td class="album-image"></td></tr>
</tbody>
</table>
</div>
</div><!-- End demo -->
</div>
\ No newline at end of file
|
simonhn/pav-api
|
e7de1906a7af9a593f35d0a939181b33a3163254
|
using track id to compare
|
diff --git a/views/program_chart.html.erb b/views/program_chart.html.erb
index d52f977..28ecdd3 100644
--- a/views/program_chart.html.erb
+++ b/views/program_chart.html.erb
@@ -1,175 +1,173 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<style>
.same{
background-image:url('/images/same_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.new{
background-image:url('/images/new_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.up{
background-image:url('/images/up_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.down{
background-image:url('/images/down_icon.png');
background-repeat: no-repeat;
padding-left: 5px;
padding-right: 5px;
}
.album-image img{
width:60px;
height:60px;
}
</style>
<script>
var this_week, prev_week = null;
var new_chart = new Array();
var program_id = '<%=@program%>';
thisWeek();
prevWeek();
function makeChart() {
//make sure that both jsonp calls have finished before making the chart
if ( this_week && prev_week ){
- console.log(this_week);
- console.log(prev_week);
+ console.log('this week',this_week);
+ console.log('prev week',prev_week);
$.each( this_week, function(i,item) {
- var this_week_id = item.id;
-
+ var this_week_id = item.track_id;
//default to 'new' status
item["status"] = "new";
//default to empty diff
item["diff"] = '';
item["prev_count"] = '';
//for each of this weeks items, run through prev weeks items
$.each( prev_week, function(is,item2) {
//check if track was played last week
- if(this_week_id==item2.id){
-
+ if(this_week_id==item2.track_id){
//UP
if(i<is){
item["status"] = "up";
item["diff"] = is-i;
item["prev_count"] = item2.count;
}
//DOWN
else if(i>is){
item["status"] = "down";
item["diff"] = i-is;
item["prev_count"] = item2.count;
}
//SAME
else if(i===is){
item["status"] = "same";
item["diff"] = 0;
}
}//end if
//add item to new chart
new_chart[i] = item;
});//end for each
});//end outer for each
//display new chart
$.each( new_chart, function(i,item) {
var number = i +1;
content = '<tr><td class="number">'+ number+ '</td><td class="status"><span class='+item.status+'> </span></td><td class="title">'+ item.title + '</td><td class="name">'+ item.artistname +'</td><td class="plays">'+item.count+'</td><td class="diff">'+item.diff+'</td><td class="prev=cnt">'+item.prev_count+'</td><td class="album-image"><img src="'+item.albumimage+'"/></td></tr>';
$(content).appendTo("#artists");
});
}//end if
}
function thisWeek(){
from = new Date();
from.setDate(from.getDate() - 3);
from_date = formatDate(from);
$.ajax({
url: "http://96.126.96.51/v1/chart/track",
dataType: "jsonp",
data: {
program: program_id,
from:from_date,
format:"json"
},
success: function(result){
this_week = result;
makeChart();
}
});
}
function prevWeek(){
from = new Date();
from.setDate(from.getDate() - 6);
from_date = formatDate(from);
to = new Date();
to.setDate(to.getDate() - 3);
to_date = formatDate(to);
$.ajax({
url: "http://96.126.96.51/v1/chart/track",
dataType: "jsonp",
data: {
program: program_id,
to:to_date,
from:from_date,
format:"json"
},
success: function(result){
prev_week = result;
makeChart();
}
});
}
function formatDate(then){
var month = then.getMonth()+1;
if (month < 10)
month = "0" + month
var day = then.getDate();
if (day < 10)
day = "0" + day
var year = then.getFullYear();
last_week = year + "-" + month + "-" + day;
return last_week;
}
</script>
<div id="wrapper">
<div class="demo">
<p><h1>Track Chart for a program</h1></p>
<p>Last 3 days compared with previous 3 days</p>
<div id="chart">
<table id="artists" border="0">
<tbody>
<tr><td class="number"></td><td class="status"><span class='+item.status+'></span></td><td class="title"></td><td class="name"></td><td class="plays">cnt</td><td class="diff">pos diff</td><td class="prev-cnt">prev cnt</td><td class="album-image"></td></tr>
</tbody>
</table>
</div>
</div><!-- End demo -->
</div>
\ No newline at end of file
|
simonhn/pav-api
|
b331a29507bd037482716d87ca437949848b41f8
|
adding program chart to demos
|
diff --git a/public/images/down_icon.png b/public/images/down_icon.png
new file mode 100644
index 0000000..698e9e7
Binary files /dev/null and b/public/images/down_icon.png differ
diff --git a/public/images/new_icon.png b/public/images/new_icon.png
new file mode 100644
index 0000000..bd2dbd7
Binary files /dev/null and b/public/images/new_icon.png differ
diff --git a/public/images/same_icon.png b/public/images/same_icon.png
new file mode 100644
index 0000000..5cd0ad6
Binary files /dev/null and b/public/images/same_icon.png differ
diff --git a/public/images/up_icon.png b/public/images/up_icon.png
new file mode 100644
index 0000000..412f256
Binary files /dev/null and b/public/images/up_icon.png differ
diff --git a/routes/chart.rb b/routes/chart.rb
index 71df357..26e0e0a 100644
--- a/routes/chart.rb
+++ b/routes/chart.rb
@@ -1,47 +1,47 @@
# chart of top tracks
get "/#{@version}/chart/track" do
program = get_program(params[:program])
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = get_channel(params[:channel])
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id where tracks.id #{channel} #{to_from} #{program} group by tracks.id order by cnt DESC limit #{limit}")
- hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid, :albumname => o.albumname, :albummbid => o.albummbid, :albumimage => o.albumimage} }
+ hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :track_id => o.id, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid, :albumname => o.albumname, :albummbid => o.albummbid, :albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :track_chart }
wants.xml { builder :track_chart }
wants.json { hat.to_json }
end
end
# chart of top artist by name
get "/#{@version}/chart/artist" do
program = get_program(params[:program])
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{channel} #{to_from} #{program} group by artists.id order by cnt desc limit #{limit}")
#@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
respond_to do |wants|
wants.html { erb :artist_chart }
wants.xml { builder :artist_chart }
wants.json {hat.to_json}
end
end
get "/#{@version}/chart/album" do
program = get_program(params[:program])
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
@albums = repository(:default).adapter.select("select artists.artistname, artists.artistmbid, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{channel} #{to_from} #{program} group by albums.id order by cnt DESC limit #{limit}")
hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :artistmbid => o.artistmbid, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :album_chart }
wants.xml { builder :album_chart }
wants.json {hat.to_json}
end
end
\ No newline at end of file
diff --git a/routes/demo.rb b/routes/demo.rb
index 5166be2..aee0eba 100644
--- a/routes/demo.rb
+++ b/routes/demo.rb
@@ -1,74 +1,87 @@
+get '/demo' do
+ respond_to do |wants|
+ wants.html{erb :demo}
+ end
+end
+
get '/demo/album-charts' do
from_date = DateTime.now - 7
@from_date_string = from_date.strftime("%b %e")
to_date = DateTime.now
@to_date_string = to_date.strftime("%b %e")
respond_to do |wants|
wants.html{erb :album_chart_all}
end
end
+get '/demo/program-chart' do
+ @program = params[:program]
+ respond_to do |wants|
+ wants.html{erb :program_chart}
+ end
+end
+
get '/demo/jjj' do
cache_control :public, :max_age => 600
artistmbid = {}
har ='a'
hur = 'b'
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
#hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
all = Hash.new
@artists.each{ |o|
begin
if o.artistmbid
#puts o.artistname
begin
result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
if(result.code==200)
all[o.artistname] = Hash.new
all[o.artistname].store("media",Hash.new())
all[o.artistname].store("info",Hash.new())
all[o.artistname].fetch("info").store("mbid",o.artistmbid)
all[o.artistname].fetch("info").store("count",o.cnt)
xml = Crack::XML.parse(result)
if(xml["rss"]["channel"]["item"].kind_of?(Array))
xml["rss"]["channel"]["item"].each_with_index{|ha,i|
if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
har = ha["title"]
da = ha["media:thumbnail"]
if da.kind_of?(Array)
hur = da.first["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
else
hur = da["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
end
if ha["media:content"].kind_of?(Array)
all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
else
all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
end
end
}
else
if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
har = xml["rss"]["channel"]["item"]["title"]
hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
end
end
#john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
#puts john.inspect
end
rescue => e
end
end
end
}
@hat = all
respond_to do |wants|
wants.html { erb :jjj }
wants.json { all.to_json }
end
end
diff --git a/views/demo.html.erb b/views/demo.html.erb
new file mode 100644
index 0000000..e5ecbcf
--- /dev/null
+++ b/views/demo.html.erb
@@ -0,0 +1,6 @@
+<h1>App gallery</h1>
+<ul>
+ <li><a href="/demo/program-chart?program=super_request">Program chart</a></li>
+ <li><a href="/demo/album-charts">Album charts</a></li>
+ <li><a href="/demo/jjj">Triple j media integrated into chart</a></li>
+</ul>
\ No newline at end of file
diff --git a/views/program_chart.html.erb b/views/program_chart.html.erb
new file mode 100644
index 0000000..d52f977
--- /dev/null
+++ b/views/program_chart.html.erb
@@ -0,0 +1,175 @@
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
+<style>
+
+.same{
+ background-image:url('/images/same_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+.new{
+ background-image:url('/images/new_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+
+}
+.up{
+ background-image:url('/images/up_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+.down{
+ background-image:url('/images/down_icon.png');
+ background-repeat: no-repeat;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+.album-image img{
+ width:60px;
+ height:60px;
+}
+
+</style>
+
+<script>
+var this_week, prev_week = null;
+var new_chart = new Array();
+var program_id = '<%=@program%>';
+thisWeek();
+prevWeek();
+
+function makeChart() {
+ //make sure that both jsonp calls have finished before making the chart
+ if ( this_week && prev_week ){
+ console.log(this_week);
+ console.log(prev_week);
+ $.each( this_week, function(i,item) {
+ var this_week_id = item.id;
+
+ //default to 'new' status
+ item["status"] = "new";
+
+ //default to empty diff
+ item["diff"] = '';
+
+ item["prev_count"] = '';
+
+
+ //for each of this weeks items, run through prev weeks items
+ $.each( prev_week, function(is,item2) {
+ //check if track was played last week
+ if(this_week_id==item2.id){
+
+ //UP
+ if(i<is){
+ item["status"] = "up";
+ item["diff"] = is-i;
+ item["prev_count"] = item2.count;
+ }
+
+ //DOWN
+ else if(i>is){
+ item["status"] = "down";
+ item["diff"] = i-is;
+ item["prev_count"] = item2.count;
+ }
+
+ //SAME
+ else if(i===is){
+ item["status"] = "same";
+ item["diff"] = 0;
+ }
+ }//end if
+
+ //add item to new chart
+ new_chart[i] = item;
+ });//end for each
+
+ });//end outer for each
+
+ //display new chart
+ $.each( new_chart, function(i,item) {
+ var number = i +1;
+ content = '<tr><td class="number">'+ number+ '</td><td class="status"><span class='+item.status+'> </span></td><td class="title">'+ item.title + '</td><td class="name">'+ item.artistname +'</td><td class="plays">'+item.count+'</td><td class="diff">'+item.diff+'</td><td class="prev=cnt">'+item.prev_count+'</td><td class="album-image"><img src="'+item.albumimage+'"/></td></tr>';
+ $(content).appendTo("#artists");
+ });
+ }//end if
+}
+
+function thisWeek(){
+ from = new Date();
+ from.setDate(from.getDate() - 3);
+ from_date = formatDate(from);
+
+ $.ajax({
+ url: "http://96.126.96.51/v1/chart/track",
+ dataType: "jsonp",
+ data: {
+ program: program_id,
+ from:from_date,
+ format:"json"
+ },
+ success: function(result){
+ this_week = result;
+ makeChart();
+ }
+ });
+}
+
+function prevWeek(){
+ from = new Date();
+ from.setDate(from.getDate() - 6);
+ from_date = formatDate(from);
+
+ to = new Date();
+ to.setDate(to.getDate() - 3);
+ to_date = formatDate(to);
+
+ $.ajax({
+ url: "http://96.126.96.51/v1/chart/track",
+ dataType: "jsonp",
+ data: {
+ program: program_id,
+ to:to_date,
+ from:from_date,
+ format:"json"
+ },
+ success: function(result){
+ prev_week = result;
+ makeChart();
+ }
+ });
+}
+
+function formatDate(then){
+ var month = then.getMonth()+1;
+ if (month < 10)
+ month = "0" + month
+
+ var day = then.getDate();
+ if (day < 10)
+ day = "0" + day
+
+ var year = then.getFullYear();
+ last_week = year + "-" + month + "-" + day;
+ return last_week;
+}
+
+</script>
+
+<div id="wrapper">
+ <div class="demo">
+ <p><h1>Track Chart for a program</h1></p>
+ <p>Last 3 days compared with previous 3 days</p>
+ <div id="chart">
+ <table id="artists" border="0">
+ <tbody>
+ <tr><td class="number"></td><td class="status"><span class='+item.status+'></span></td><td class="title"></td><td class="name"></td><td class="plays">cnt</td><td class="diff">pos diff</td><td class="prev-cnt">prev cnt</td><td class="album-image"></td></tr>
+ </tbody>
+ </table>
+ </div>
+ </div><!-- End demo -->
+</div>
\ No newline at end of file
|
simonhn/pav-api
|
14a29193aed2fffbb56b5bee71964a5e33457de3
|
new track chart query
|
diff --git a/pavapi.rb b/pavapi.rb
index ebae49f..9131321 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -1,279 +1,279 @@
#versioning
@version = "v1"
#core stuff
require 'rubygems'
require 'sinatra'
require './models'
require './store_methods'
#Queueing with delayed job
#require 'delayed_job'
#require 'delayed_job_data_mapper'
#require './storetrackjob'
require 'stalker'
#template systems
require 'yajl/json_gem'
require 'rack/contrib/jsonp'
require 'builder'
use Rack::JSONP
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
# Enable New Relic
#configure :production do
#require 'newrelic_rpm'
#end
#throttling
#require 'rack/throttle'
#require 'memcached'
#require './throttler'
#for serving different content types
require 'sinatra/respond_to'
Sinatra::Application.register Sinatra::RespondTo
require 'bigdecimal'
configure do
#use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
#use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
#logging
DataMapper::Logger.new('log/datamapper.log', :warn )
DataMapper::Model.raise_on_save_failure = true
$LOG = Logger.new('log/pavstore.log', 'monthly')
# MySQL connection:
@config = YAML::load( File.open( 'config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#DataMapper.auto_upgrade!
#DataMapper::auto_migrate!
set :default_content, :html
end
#Caching
before '/*' do
cache_control :public, :must_revalidate, :max_age => 60 unless development?
end
before '/demo/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
before '*/chart/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
-
+
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
- from_date = played_to - 7
-
+ #one week = 60*60*24*7
+ from_date = played_to - 604800
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
def get_artist_query(q)
if (!q.nil?)
return "AND artists.artistname LIKE '%#{q}%' "
end
end
def get_track_query(q)
if (!q.nil?)
return "AND tracks.title LIKE '%#{q}%' "
end
end
def get_album_query(q)
if (!q.nil?)
return "AND albums.albumname LIKE '%#{q}%' "
end
end
def get_all_query(q)
if (!q.nil?)
return "AND (albums.albumname LIKE '%#{q}%' OR albums.albumname LIKE '%#{q}%' OR artists.artistname LIKE '%#{q}%') "
end
end
def get_order_by(order)
if (order=='artist')
return "artists.artistname ASC, plays.playedtime DESC"
elsif (order=='track')
return "tracks.title ASC, plays.playedtime DESC"
else
return "plays.playedtime DESC"
end
end
def get_channel(channel)
if(!channel.nil?)
- return "plays.channel_id=#{channel} AND"
+ return "AND plays.channel_id=#{channel}"
end
end
def get_program(program)
if(!program.nil?)
return "AND plays.program_id='#{program}'"
end
end
def merge_tracks(old_id, new_id)
old_track = Track.get(old_id)
new_track = Track.get(new_id)
if(old_track&&new_track)
#album
#move tracks from old album to new album
link = AlbumTrack.all(:track_id => old_track.id)
link.each{ |link_item|
@album_load = Album.get(link_item.album_id)
@moved = @album_load.tracks << new_track
@moved.save
}
#delete old album_track relations
link.destroy!
#artist
#move tracks from old artist to new artist
link = ArtistTrack.all(:track_id => old_track.id)
link.each{ |link_item|
@artist_load = Artist.get(link_item.artist_id)
@moved = @artist_load.tracks << new_track
@moved.save
}
#delete old artist_track relations
link.destroy!
#plays
plays = Play.all(:track_id => old_track.id)
plays.each{ |link_item|
link_item.update(:track_id => new_id)
}
#delete old track
old_track.destroy!
end
end
end
#ROUTES
# Front page
get '/' do
erb :front
end
require './routes/admin'
require './routes/artist'
require './routes/track'
require './routes/album'
require './routes/channel'
require './routes/play'
require './routes/chart'
require './routes/demo'
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
\ No newline at end of file
diff --git a/routes/admin.rb b/routes/admin.rb
index a9af404..e2195ef 100644
--- a/routes/admin.rb
+++ b/routes/admin.rb
@@ -1,138 +1,152 @@
#admin dashboard
get "/admin" do
protected!
respond_to do |wants|
wants.html { erb :admin }
end
end
#Count all artists
get "/admin/stats" do
+ json_outout = {}
+
+ @dig_duration_avg = repository(:default).adapter.select("SELECT ROUND(AVG(duration),0) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE tracks.duration < 500 AND`plays`.`channel_id` = 1")
+ json_outout['dig_duration_avg'] = @dig_duration_avg.first.to_i.to_s
+
+ @all_duration_avg = Track.avg(:duration, :duration.lt => 500)
+ json_outout['all_duration_avg'] = @all_duration_avg.to_i.to_s
+
@artistcount = Artist.count
+ json_outout['all_artistcount'] = @artistcount
@artistmbid = (Artist.count(:artistmbid).to_f/@artistcount.to_f)*100
@trackcount = Track.count
+ json_outout['all_trackcount'] = @trackcount
@trackmbid = (Track.count(:trackmbid).to_f/@trackcount.to_f)*100
@playcount = Play.count
+ json_outout['all_playcount'] = @playcount
@albumcount = Album.count
+ json_outout['all_albumcount'] = @albumcount
@albummbid = (Album.count(:albummbid).to_f/@albumcount.to_f)*100
@dig_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_play = Play.all('channel_id'=>1).count
@jazz_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_play = Play.all('channel_id'=>2).count
@country_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_play = Play.all('channel_id'=>3).count
@jjj_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_play = Play.all('channel_id'=>4).count
+
respond_to do |wants|
wants.html { erb :stats }
+ wants.json {json_outout.to_json}
end
end
get "/admin/duplicate/artist" do
protected!
@list = repository(:default).adapter.select("SELECT distinct d2.id, d2.artistname, d2.artistmbid FROM artists d1 JOIN artists d2 ON d2.artistname = d1.artistname AND d2.id <> d1.id order by artistname, id")
respond_to do |wants|
wants.html { erb :duplicate_artists }
end
end
post "/admin/merge/artist" do
protected!
old_artist = Artist.get(params[:id_old])
new_artist = Artist.get(params[:id_new])
if(old_artist&&new_artist)
#move tracks from old artist to new artist
link = ArtistTrack.all(:artist_id => old_artist.id)
link.each{ |link_item|
@track_load = Track.get(link_item.track_id)
@moved = new_artist.tracks << @track_load
@moved.save
}
#delete old artist_track relations
link.destroy!
#delete old artist
old_artist.destroy!
end
end
get "/admin/duplicate/album" do
protected!
@list = repository(:default).adapter.select("SELECT distinct d2.id, d2.albumname, d2.albummbid FROM albums d1 JOIN albums d2 ON d2.albumname = d1.albumname AND d2.id <> d1.id order by albumname, id")
respond_to do |wants|
wants.html { erb :duplicate_albums }
end
end
post "/admin/merge/album" do
protected!
old_album = Album.get(params[:id_old])
old_album_tracks = old_album.tracks
new_album = Album.get(params[:id_new])
new_album_tracks = new_album.tracks
if(old_album&&new_album)
#if there are similar track on the two albums,
# move the 'old' tracks to the 'new' tracks before moving album links
old_album_tracks.each{ |old_track|
new_track = new_album_tracks.find {|e| e.title==old_track.title&&e.id!=old_track.id }
if(new_track)
merge_tracks(old_track.id, new_track.id)
end
}
#move tracks from old album to new album
link = AlbumTrack.all(:album_id => old_album.id)
link.each{ |link_item|
@track_load = Track.get(link_item.track_id)
@moved = new_album.tracks << @track_load
@moved.save
}
#delete old album_track relations
link.destroy!
#delete old album
old_album.destroy!
end
end
get "/admin/duplicate/track" do
protected!
@list = repository(:default).adapter.select("SELECT distinct d2.id, d2.title, d2.trackmbid FROM tracks d1 JOIN tracks d2 ON d2.title = d1.title AND d2.id <> d1.id order by title, id")
respond_to do |wants|
wants.html { erb :duplicate_tracks }
end
end
post "/admin/merge/track" do
protected!
merge_tracks(params[:id_old], params[:id_new])
end
\ No newline at end of file
diff --git a/routes/chart.rb b/routes/chart.rb
index 2ae357d..71df357 100644
--- a/routes/chart.rb
+++ b/routes/chart.rb
@@ -1,48 +1,47 @@
# chart of top tracks
get "/#{@version}/chart/track" do
program = get_program(params[:program])
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = get_channel(params[:channel])
- #SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
- @tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} #{program} group by tracks.id order by cnt DESC limit #{limit}")
- hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
+ @tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id where tracks.id #{channel} #{to_from} #{program} group by tracks.id order by cnt DESC limit #{limit}")
+ hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid, :albumname => o.albumname, :albummbid => o.albummbid, :albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :track_chart }
wants.xml { builder :track_chart }
wants.json { hat.to_json }
end
end
# chart of top artist by name
get "/#{@version}/chart/artist" do
program = get_program(params[:program])
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
- @artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} #{program} group by artists.id order by cnt desc limit #{limit}")
+ @artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{channel} #{to_from} #{program} group by artists.id order by cnt desc limit #{limit}")
#@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
respond_to do |wants|
wants.html { erb :artist_chart }
wants.xml { builder :artist_chart }
wants.json {hat.to_json}
end
end
get "/#{@version}/chart/album" do
program = get_program(params[:program])
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
- @albums = repository(:default).adapter.select("select artists.artistname, artists.artistmbid, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where #{channel} tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} #{program} group by albums.id order by cnt DESC limit #{limit}")
+ @albums = repository(:default).adapter.select("select artists.artistname, artists.artistmbid, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{channel} #{to_from} #{program} group by albums.id order by cnt DESC limit #{limit}")
hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :artistmbid => o.artistmbid, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :album_chart }
wants.xml { builder :album_chart }
wants.json {hat.to_json}
end
end
\ No newline at end of file
|
simonhn/pav-api
|
060271a5f9cba9079776bc4d8ef963e340a03120
|
adding program filter to artist album and plays
|
diff --git a/routes/chart.rb b/routes/chart.rb
index c9669d4..2ae357d 100644
--- a/routes/chart.rb
+++ b/routes/chart.rb
@@ -1,46 +1,48 @@
# chart of top tracks
get "/#{@version}/chart/track" do
program = get_program(params[:program])
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = get_channel(params[:channel])
#SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} #{program} group by tracks.id order by cnt DESC limit #{limit}")
hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
respond_to do |wants|
wants.html { erb :track_chart }
wants.xml { builder :track_chart }
wants.json { hat.to_json }
end
end
# chart of top artist by name
get "/#{@version}/chart/artist" do
+ program = get_program(params[:program])
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
- @artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
+ @artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} #{program} group by artists.id order by cnt desc limit #{limit}")
#@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
respond_to do |wants|
wants.html { erb :artist_chart }
wants.xml { builder :artist_chart }
wants.json {hat.to_json}
end
end
get "/#{@version}/chart/album" do
+ program = get_program(params[:program])
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
- @albums = repository(:default).adapter.select("select artists.artistname, artists.artistmbid, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where #{channel} tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
+ @albums = repository(:default).adapter.select("select artists.artistname, artists.artistmbid, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where #{channel} tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} #{program} group by albums.id order by cnt DESC limit #{limit}")
hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :artistmbid => o.artistmbid, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :album_chart }
wants.xml { builder :album_chart }
wants.json {hat.to_json}
end
end
\ No newline at end of file
diff --git a/routes/play.rb b/routes/play.rb
index ce2362f..bd48464 100644
--- a/routes/play.rb
+++ b/routes/play.rb
@@ -1,33 +1,34 @@
#PLAY
get "/#{@version}/plays" do
#DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
artist_query = get_artist_query(params[:artist_query])
track_query = get_track_query(params[:track_query])
album_query = get_album_query(params[:album_query])
query_all = get_all_query(params[:q])
order_by = get_order_by(params[:order_by])
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
+ program = get_program(params[:program])
if channel
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
- @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
+ @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} #{program} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
else
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
- @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
+ @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} #{program} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
end
hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :plays }
wants.xml { builder :plays }
wants.json { hat.to_json }
end
end
get "/#{@version}/play/:id" do
@play = Play.get(params[:id])
respond_to do |wants|
wants.json { @play.to_json }
end
end
\ No newline at end of file
diff --git a/views/front.html.erb b/views/front.html.erb
index be48983..5307835 100644
--- a/views/front.html.erb
+++ b/views/front.html.erb
@@ -1,446 +1,446 @@
<div>
<p>
The pav:api exposes playlist data and is currently under development.
</p>
<ul>
<li><a href="#general">general information</a></li>
<ul>
<li><a href="#general-query-parameters">query parameters</a></li>
<li><a href="#general-identifiers">identifiers</a></li>
<li><a href="#general-authentication">authentication</a></li>
<li><a href="#general-versioning">versioning</a></li>
<li><a href="#general-return-types">return types</a></li>
<li><a href="#general-response-codes">reponse codes</a></li>
<li><a href="#general-terms">terms</a></li>
</ul>
<li><a href="#resources">resources</a></li>
<ul>
<li><a href="#resources-artists">artists</a></li>
<li><a href="#resources-tracks">tracks</a></li>
<li><a href="#resources-albums">albums</a></li>
<li><a href="#resources-channels">channels</a></li>
<li><a href="#resources-plays">plays</a></li>
<li><a href="#resources-chart">charts</a></li>
<li><a href="#resources-search">search</a></li>
<li><a href="#resources-stats">stats</a></li>
</ul>
</ul>
<p>
<h2 id="general">general information</h2>
<h3 id="general-query-parameters">query parameters</h3>
<span>Some paths accepts the following query parameters. See each <a href="#resources">resource</a> type for more specifics.
<ul>
<li>channel, default is all channels, available on paths that return a list</li>
<li>limit, default is 10, available on paths that return a list</li>
<li>callback, for cross-domain access jsonp is delivered to requests with 'callback' query parameter and json as return type</li>
<li>format, return type format (html, json, xml)</li>
<li>type, to specify lookup type, mbid</li>
<li>to (to date) in yyyy-mm-dd format</li>
<li>from (from date) in yyyy-mm-dd format</li>
<li>order_by, for ordering results. Default is playedtime. Allowed values are artist and track</li>
<li>q, a query for searching for track title, album name and artist name</li>
<li>artist_query, searching for an artist name</li>
<li>track_query, searching for a track title</li>
<li>album_query, searching for an album name</li>
<li>program, the program_id to limit result to a certain show</li>
</ul>
</p>
<p>
<h3 id="general-identifiers">identifiers</h3>
To lookup a specific artist/track/album you can use pav IDs or Musicbrainz IDs where available.
</p>
<p>
<h3 id="general-authentication">authentication</h3>
All put and post requests require authentication
</p>
<p>
<h3 id="general-versioning">versioning</h3>
The version of the api you wish to use is specified at the root path of resources. The current version is v1.
</p>
<p>
<h3 id="general-return-types">return types</h3>
Return type can selected by appending the desired content type to the url (.html, .xml, .json) or by adding ?format=(html, xml, json) to the query parameter. Use only one of these methods when doing a request.
<br />
Default return type is currently html but will change to json when the API is put in production.
</p>
<p>
<h3 id="general-response-codes">response codes</h3>
The API attempts to return appropriate HTTP status codes for every request.
<ul>
<li>200 OK: Request succeeded</li>
<li>400 Bad Request: Your request was invalid and we'll return an error message telling you why</li>
<li>401 Not Authorized: You did not provide the right credentials</li>
<li>404 Not Found: The URI requested is invalid or the resource requested, such as a user, does not exists</li>
<li>500 Internal Server Error: Something is broken.</li>
<li>503 Service Unavailable: You cannot make this request at this time. Servers are up, but overloaded with requests</li>
</ul>
</p>
<p>
<h3 id="general-terms">terms</h3>
Please be nice when using the api. If you plan to make massive amounts of calls please advise us.
</p>
<h2 id="resources">resources</h2>
The resources that can be accessed through the api follows the model below:
<img id="resources-model" width="400px" src="images/models.png"/>
<br />
Some useful observation about the model:
<ul>
<li>An artist can have multiple tracks</li>
<li>A track can have multiple artists</li>
<li>A track can have multiple albums (a track appearing on different albums)</li>
<li>An album can have multiple tracks</li>
<li>A track can have multiple plays</li>
<li>A play belongs to one track</li>
<li>A play belongs to one channel</li>
<li>A channel can have multiple plays</li>
</ul>
<h3 id="resources-artists">artists</h3>
<h4>/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of artists</p>
<h5>Parameters</h5>
<p>Supports the following parameters: channel, limit.</p>
<h5>Example query</h5>
<code><div class="inner-code"><div class="inner-code"><a href="/v1/artists.json?channel=4">/v1/artists.json?channel=4</a></div></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967986.js"></script>
</div>
<h4>/artist/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/artist/1234.json">/v1/artist/1234.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967997.js"></script>
</div>
<h4>/artist/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/artist/1234/tracks.json">/v1/artist/1234/tracks.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968001.js"></script>
</div>
<h3 id="resources-tracks">tracks</h3>
<h4>/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of tracks</p>
<h5>Parameters</h5>
<p>Supports the following parameters: channel, limit.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/tracks.json?channel=4&limit=3">/v1/tracks.json?channel=4&limit=3</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968008.js"></script>
</div>
<h4>/track/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single track specified by an id.</p>
<h5>Parameters</h5>
Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/track/324.json">/v1/track/324.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968013.js?file=gistfile1.json"></script>
</div>
<h4>post /track</h4>
<div class='resource'>
<h5>Description</h5>
<p>Post a track to pav. Requires authentication.</p>
<h5>Parameters</h5>
<p>A json payload
<script src="https://gist.github.com/968015.js?file=gistfile1.json"></script>
<h5>Example response</h5>
<p>200</p>
</div>
<h4>/track/:id/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the artists related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/track/324/artists.json">/v1/track/324/artists.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968022.js?file=gistfile1.json"></script>
</div>
<h4>/track/:id/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the albums related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/track/324/albums.json">/v1/track/324/albums.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968023.js?file=gistfile1.json"></script>
</div>
<h4>/track/:id/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the plays related to a single track.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/track/324/plays.json">/v1/track/324/plays.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968025.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-albums">albums</h3>
<h4>/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of albums.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: channel, limit.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/albums.json">/v1/albums.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968027.js?file=gistfile1.json"></script>
</div>
<h4>/album/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/album/15.json">/v1/album/15.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968029.js?file=gistfile1.json"></script>
</div>
<h4>/album/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/album/15/tracks.json">/v1/album/15/tracks.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968035.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-channels">channels</h3>
<h4>/channels</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of channels.</p>
<h5>Parameters</h5>
Supports the following parameters: limit.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/channels.json">/v1/channels.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968054.js?file=gistfile1.json"></script>
</div>
<h4>/channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single channel.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/channel/1.json">/v1/channel/1.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968058.js?file=gistfile1.json"></script>
</div>
<h4>post channel</h4>
<div class='resource'>
<h5>Description</h5>
<p>Create a new channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
<h4>put channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Update a channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-plays">plays</h3>
<h4>/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a playlist.</p>
<h5>Parameters</h5>
- <p>Supports the following parameters: to, from, limit, channel, artist_query, track_query, album_query, q (query artist, channel and track name), order_by.</p>
+ <p>Supports the following parameters: to, from, limit, channel, program, artist_query, track_query, album_query, q (query artist, channel and track name), order_by.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/plays.json?channel=1&limit=3">/v1/plays.json?channel=1&limit=3</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/956363.js"> </script>
</div>
<h4>/play/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single play.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/play/4356.json">/v1/play/4356.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968064.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-chart">charts</h3>
<h4>/chart/artist</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played artists for a given period.</p>
<h5>Parameters</h5>
- <p>Supports the following parameters: channel, limit, to, from. If no to/from parameter is provided we return a chart from the last 7 days.</p>
+ <p>Supports the following parameters: channel, limit, to, from, program. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/chart/artist.json?channel=1">/v1/chart/artist.json?channel=1</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973721.js?file=gistfile1.json"></script>
</div>
<h4>/chart/track</h4>
<div class='resource'>
<h5>Description</h5>
A chart of most played tracks for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: channel, limit, to, from, program. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/chart/track.json?from=2011-04-20">/v1/chart/track.json?from=2011-04-20</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973726.js?file=gistfile1.json"></script>
</div>
<h4>/chart/album</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played albums for a given period.</p>
<h5>Parameters</h5>
- <p>Supports the following parameters: channel, limit, to, from. If no to/from parameter is provided we return a chart from the last 7 days.</p>
+ <p>Supports the following parameters: channel, limit, to, from, program. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/chart/album.json?limit=5&channel=4">/v1/chart/album.json?limit=5&channel=4</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973730.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-search">search</h3>
<div class='resource'>
<h5>Description</h5>
<p>Search for artists (tracks and albums to come).</p>
<h5>Parameters</h5>
<p>Supports the following parameters: limit.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/search/dylan.json?limit=5">/v1/search/dylan.json?limit=5</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973733.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-stats">stats</h3>
<div class='resource'>
<h5>Description</h5>
<p>Statistics for the pav datastore.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/stats">/v1/stats</a></div></code>
</div>
</div>
<style type="text/css" media="screen">
.gist-syntax .s2 {
color: black;
}
.gist .gist-file .gist-data{
font-size:75%;
}
.gist .gist-file .gist-meta{
display:none;
}
</style>
|
simonhn/pav-api
|
df39666d0657f735cabdb338ad1f8a6dddd4bee0
|
adding program as a parameter to track chart
|
diff --git a/pavapi.rb b/pavapi.rb
index 79ceb82..ebae49f 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -1,281 +1,279 @@
#versioning
@version = "v1"
#core stuff
require 'rubygems'
require 'sinatra'
require './models'
require './store_methods'
#Queueing with delayed job
#require 'delayed_job'
#require 'delayed_job_data_mapper'
#require './storetrackjob'
require 'stalker'
#template systems
require 'yajl/json_gem'
require 'rack/contrib/jsonp'
require 'builder'
use Rack::JSONP
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
# Enable New Relic
#configure :production do
#require 'newrelic_rpm'
#end
#throttling
#require 'rack/throttle'
#require 'memcached'
#require './throttler'
#for serving different content types
require 'sinatra/respond_to'
Sinatra::Application.register Sinatra::RespondTo
require 'bigdecimal'
configure do
#use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
#use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
#logging
DataMapper::Logger.new('log/datamapper.log', :warn )
DataMapper::Model.raise_on_save_failure = true
$LOG = Logger.new('log/pavstore.log', 'monthly')
# MySQL connection:
@config = YAML::load( File.open( 'config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
- #DataMapper.finalize
+ DataMapper.finalize
- DataMapper.auto_upgrade!
+ #DataMapper.auto_upgrade!
#DataMapper::auto_migrate!
set :default_content, :html
end
#Caching
before '/*' do
cache_control :public, :must_revalidate, :max_age => 60 unless development?
end
before '/demo/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
before '*/chart/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
from_date = played_to - 7
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
-
- def get_channel(cha)
- if isNumeric(cha)
- channel = cha
- elsif cha.nil?
- channel = false
- end
- end
-
+
def get_artist_query(q)
if (!q.nil?)
return "AND artists.artistname LIKE '%#{q}%' "
end
end
def get_track_query(q)
if (!q.nil?)
return "AND tracks.title LIKE '%#{q}%' "
end
end
def get_album_query(q)
if (!q.nil?)
return "AND albums.albumname LIKE '%#{q}%' "
end
end
def get_all_query(q)
if (!q.nil?)
return "AND (albums.albumname LIKE '%#{q}%' OR albums.albumname LIKE '%#{q}%' OR artists.artistname LIKE '%#{q}%') "
end
end
def get_order_by(order)
if (order=='artist')
return "artists.artistname ASC, plays.playedtime DESC"
elsif (order=='track')
return "tracks.title ASC, plays.playedtime DESC"
else
return "plays.playedtime DESC"
end
end
def get_channel(channel)
if(!channel.nil?)
return "plays.channel_id=#{channel} AND"
end
end
+ def get_program(program)
+ if(!program.nil?)
+ return "AND plays.program_id='#{program}'"
+ end
+ end
+
def merge_tracks(old_id, new_id)
old_track = Track.get(old_id)
new_track = Track.get(new_id)
if(old_track&&new_track)
#album
#move tracks from old album to new album
link = AlbumTrack.all(:track_id => old_track.id)
link.each{ |link_item|
@album_load = Album.get(link_item.album_id)
@moved = @album_load.tracks << new_track
@moved.save
}
#delete old album_track relations
link.destroy!
#artist
#move tracks from old artist to new artist
link = ArtistTrack.all(:track_id => old_track.id)
link.each{ |link_item|
@artist_load = Artist.get(link_item.artist_id)
@moved = @artist_load.tracks << new_track
@moved.save
}
#delete old artist_track relations
link.destroy!
#plays
plays = Play.all(:track_id => old_track.id)
plays.each{ |link_item|
link_item.update(:track_id => new_id)
}
#delete old track
old_track.destroy!
end
end
end
#ROUTES
# Front page
get '/' do
erb :front
end
require './routes/admin'
require './routes/artist'
require './routes/track'
require './routes/album'
require './routes/channel'
require './routes/play'
require './routes/chart'
require './routes/demo'
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
\ No newline at end of file
diff --git a/routes/chart.rb b/routes/chart.rb
index b181d51..c9669d4 100644
--- a/routes/chart.rb
+++ b/routes/chart.rb
@@ -1,45 +1,46 @@
# chart of top tracks
get "/#{@version}/chart/track" do
+ program = get_program(params[:program])
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = get_channel(params[:channel])
#SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
- @tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
+ @tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} #{program} group by tracks.id order by cnt DESC limit #{limit}")
hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
respond_to do |wants|
wants.html { erb :track_chart }
wants.xml { builder :track_chart }
wants.json { hat.to_json }
end
end
# chart of top artist by name
get "/#{@version}/chart/artist" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
#@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
respond_to do |wants|
wants.html { erb :artist_chart }
wants.xml { builder :artist_chart }
wants.json {hat.to_json}
end
end
get "/#{@version}/chart/album" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
@albums = repository(:default).adapter.select("select artists.artistname, artists.artistmbid, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where #{channel} tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :artistmbid => o.artistmbid, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :album_chart }
wants.xml { builder :album_chart }
wants.json {hat.to_json}
end
end
\ No newline at end of file
diff --git a/views/front.html.erb b/views/front.html.erb
index 8bced63..be48983 100644
--- a/views/front.html.erb
+++ b/views/front.html.erb
@@ -1,445 +1,446 @@
<div>
<p>
The pav:api exposes playlist data and is currently under development.
</p>
<ul>
<li><a href="#general">general information</a></li>
<ul>
<li><a href="#general-query-parameters">query parameters</a></li>
<li><a href="#general-identifiers">identifiers</a></li>
<li><a href="#general-authentication">authentication</a></li>
<li><a href="#general-versioning">versioning</a></li>
<li><a href="#general-return-types">return types</a></li>
<li><a href="#general-response-codes">reponse codes</a></li>
<li><a href="#general-terms">terms</a></li>
</ul>
<li><a href="#resources">resources</a></li>
<ul>
<li><a href="#resources-artists">artists</a></li>
<li><a href="#resources-tracks">tracks</a></li>
<li><a href="#resources-albums">albums</a></li>
<li><a href="#resources-channels">channels</a></li>
<li><a href="#resources-plays">plays</a></li>
<li><a href="#resources-chart">charts</a></li>
<li><a href="#resources-search">search</a></li>
<li><a href="#resources-stats">stats</a></li>
</ul>
</ul>
<p>
<h2 id="general">general information</h2>
<h3 id="general-query-parameters">query parameters</h3>
<span>Some paths accepts the following query parameters. See each <a href="#resources">resource</a> type for more specifics.
<ul>
<li>channel, default is all channels, available on paths that return a list</li>
<li>limit, default is 10, available on paths that return a list</li>
<li>callback, for cross-domain access jsonp is delivered to requests with 'callback' query parameter and json as return type</li>
<li>format, return type format (html, json, xml)</li>
<li>type, to specify lookup type, mbid</li>
<li>to (to date) in yyyy-mm-dd format</li>
<li>from (from date) in yyyy-mm-dd format</li>
<li>order_by, for ordering results. Default is playedtime. Allowed values are artist and track</li>
<li>q, a query for searching for track title, album name and artist name</li>
<li>artist_query, searching for an artist name</li>
<li>track_query, searching for a track title</li>
<li>album_query, searching for an album name</li>
+ <li>program, the program_id to limit result to a certain show</li>
</ul>
</p>
<p>
<h3 id="general-identifiers">identifiers</h3>
To lookup a specific artist/track/album you can use pav IDs or Musicbrainz IDs where available.
</p>
<p>
<h3 id="general-authentication">authentication</h3>
All put and post requests require authentication
</p>
<p>
<h3 id="general-versioning">versioning</h3>
The version of the api you wish to use is specified at the root path of resources. The current version is v1.
</p>
<p>
<h3 id="general-return-types">return types</h3>
Return type can selected by appending the desired content type to the url (.html, .xml, .json) or by adding ?format=(html, xml, json) to the query parameter. Use only one of these methods when doing a request.
<br />
Default return type is currently html but will change to json when the API is put in production.
</p>
<p>
<h3 id="general-response-codes">response codes</h3>
The API attempts to return appropriate HTTP status codes for every request.
<ul>
<li>200 OK: Request succeeded</li>
<li>400 Bad Request: Your request was invalid and we'll return an error message telling you why</li>
<li>401 Not Authorized: You did not provide the right credentials</li>
<li>404 Not Found: The URI requested is invalid or the resource requested, such as a user, does not exists</li>
<li>500 Internal Server Error: Something is broken.</li>
<li>503 Service Unavailable: You cannot make this request at this time. Servers are up, but overloaded with requests</li>
</ul>
</p>
<p>
<h3 id="general-terms">terms</h3>
Please be nice when using the api. If you plan to make massive amounts of calls please advise us.
</p>
<h2 id="resources">resources</h2>
The resources that can be accessed through the api follows the model below:
<img id="resources-model" width="400px" src="images/models.png"/>
<br />
Some useful observation about the model:
<ul>
<li>An artist can have multiple tracks</li>
<li>A track can have multiple artists</li>
<li>A track can have multiple albums (a track appearing on different albums)</li>
<li>An album can have multiple tracks</li>
<li>A track can have multiple plays</li>
<li>A play belongs to one track</li>
<li>A play belongs to one channel</li>
<li>A channel can have multiple plays</li>
</ul>
<h3 id="resources-artists">artists</h3>
<h4>/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of artists</p>
<h5>Parameters</h5>
<p>Supports the following parameters: channel, limit.</p>
<h5>Example query</h5>
<code><div class="inner-code"><div class="inner-code"><a href="/v1/artists.json?channel=4">/v1/artists.json?channel=4</a></div></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967986.js"></script>
</div>
<h4>/artist/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/artist/1234.json">/v1/artist/1234.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967997.js"></script>
</div>
<h4>/artist/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/artist/1234/tracks.json">/v1/artist/1234/tracks.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968001.js"></script>
</div>
<h3 id="resources-tracks">tracks</h3>
<h4>/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of tracks</p>
<h5>Parameters</h5>
<p>Supports the following parameters: channel, limit.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/tracks.json?channel=4&limit=3">/v1/tracks.json?channel=4&limit=3</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968008.js"></script>
</div>
<h4>/track/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single track specified by an id.</p>
<h5>Parameters</h5>
Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/track/324.json">/v1/track/324.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968013.js?file=gistfile1.json"></script>
</div>
<h4>post /track</h4>
<div class='resource'>
<h5>Description</h5>
<p>Post a track to pav. Requires authentication.</p>
<h5>Parameters</h5>
<p>A json payload
<script src="https://gist.github.com/968015.js?file=gistfile1.json"></script>
<h5>Example response</h5>
<p>200</p>
</div>
<h4>/track/:id/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the artists related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/track/324/artists.json">/v1/track/324/artists.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968022.js?file=gistfile1.json"></script>
</div>
<h4>/track/:id/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the albums related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/track/324/albums.json">/v1/track/324/albums.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968023.js?file=gistfile1.json"></script>
</div>
<h4>/track/:id/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the plays related to a single track.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/track/324/plays.json">/v1/track/324/plays.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968025.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-albums">albums</h3>
<h4>/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of albums.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: channel, limit.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/albums.json">/v1/albums.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968027.js?file=gistfile1.json"></script>
</div>
<h4>/album/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/album/15.json">/v1/album/15.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968029.js?file=gistfile1.json"></script>
</div>
<h4>/album/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/album/15/tracks.json">/v1/album/15/tracks.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968035.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-channels">channels</h3>
<h4>/channels</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of channels.</p>
<h5>Parameters</h5>
Supports the following parameters: limit.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/channels.json">/v1/channels.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968054.js?file=gistfile1.json"></script>
</div>
<h4>/channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single channel.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/channel/1.json">/v1/channel/1.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968058.js?file=gistfile1.json"></script>
</div>
<h4>post channel</h4>
<div class='resource'>
<h5>Description</h5>
<p>Create a new channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
<h4>put channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Update a channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-plays">plays</h3>
<h4>/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a playlist.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: to, from, limit, channel, artist_query, track_query, album_query, q (query artist, channel and track name), order_by.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/plays.json?channel=1&limit=3">/v1/plays.json?channel=1&limit=3</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/956363.js"> </script>
</div>
<h4>/play/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single play.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/play/4356.json">/v1/play/4356.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968064.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-chart">charts</h3>
<h4>/chart/artist</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played artists for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: channel, limit, to, from. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/chart/artist.json?channel=1">/v1/chart/artist.json?channel=1</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973721.js?file=gistfile1.json"></script>
</div>
<h4>/chart/track</h4>
<div class='resource'>
<h5>Description</h5>
A chart of most played tracks for a given period.</p>
<h5>Parameters</h5>
- <p>Supports the following parameters: channel, limit, to, from. If no to/from parameter is provided we return a chart from the last 7 days.</p>
+ <p>Supports the following parameters: channel, limit, to, from, program. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/chart/track.json?from=2011-04-20">/v1/chart/track.json?from=2011-04-20</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973726.js?file=gistfile1.json"></script>
</div>
<h4>/chart/album</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played albums for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: channel, limit, to, from. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/chart/album.json?limit=5&channel=4">/v1/chart/album.json?limit=5&channel=4</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973730.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-search">search</h3>
<div class='resource'>
<h5>Description</h5>
<p>Search for artists (tracks and albums to come).</p>
<h5>Parameters</h5>
<p>Supports the following parameters: limit.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/search/dylan.json?limit=5">/v1/search/dylan.json?limit=5</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973733.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-stats">stats</h3>
<div class='resource'>
<h5>Description</h5>
<p>Statistics for the pav datastore.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/stats">/v1/stats</a></div></code>
</div>
</div>
<style type="text/css" media="screen">
.gist-syntax .s2 {
color: black;
}
.gist .gist-file .gist-data{
font-size:75%;
}
.gist .gist-file .gist-meta{
display:none;
}
</style>
|
simonhn/pav-api
|
47850c618d30d566a3f7e0fa5ef7ad1af45dac3f
|
adding programs into the mix
|
diff --git a/Gemfile.lock b/Gemfile.lock
index 98d3732..7a71b32 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,114 +1,114 @@
GEM
remote: http://rubygems.org/
specs:
activesupport (3.0.9)
addressable (2.2.6)
beanstalk-client (1.1.0)
builder (3.0.0)
- chronic (0.5.0)
+ chronic (0.6.2)
chronic_duration (0.9.6)
numerizer (~> 0.1.1)
crack (0.1.8)
daemons (1.1.4)
data_objects (0.10.6)
addressable (~> 2.1)
delayed_job (2.1.4)
activesupport (~> 3.0)
daemons
delayed_job_data_mapper (1.0.0.rc)
delayed_job (~> 2.1)
dm-aggregates
dm-core
dm-observer
dm-aggregates (1.1.0)
dm-core (~> 1.1.0)
dm-core (1.1.0)
addressable (~> 2.2.4)
dm-do-adapter (1.1.0)
data_objects (~> 0.10.2)
dm-core (~> 1.1.0)
dm-migrations (1.1.0)
dm-core (~> 1.1.0)
dm-mysql-adapter (1.1.0)
dm-do-adapter (~> 1.1.0)
do_mysql (~> 0.10.2)
dm-observer (1.1.0)
dm-core (~> 1.1.0)
dm-serializer (1.1.0)
dm-core (~> 1.1.0)
fastercsv (~> 1.5.4)
json (~> 1.4.6)
dm-timestamps (1.1.0)
dm-core (~> 1.1.0)
do_mysql (0.10.6)
data_objects (= 0.10.6)
fastercsv (1.5.4)
foreman (0.19.0)
term-ansicolor (~> 1.0.5)
thor (>= 0.13.6)
httparty (0.7.8)
crack (= 0.1.8)
i18n (0.6.0)
json (1.4.6)
json_pure (1.5.3)
- memcached (1.2.7.1)
+ memcached (1.3)
meta-spotify (0.1.5)
crack (>= 0.1.4)
httparty (>= 0.4.5)
mime-types (1.16)
- newrelic_rpm (3.1.0)
+ newrelic_rpm (3.1.1)
numerizer (0.1.1)
- rack (1.3.1)
+ rack (1.3.2)
rack-contrib (1.1.0)
rack (>= 0.9.1)
rack-throttle (0.3.0)
rack (>= 1.0.0)
rbrainz (0.5.2)
rchardet19 (1.3.5)
rest-client (1.6.3)
mime-types (>= 1.16)
sinatra (1.2.6)
rack (~> 1.1)
tilt (< 2.0, >= 1.2.2)
sinatra-respond_to (0.7.0)
sinatra (~> 1.2)
stalker (0.9.0)
beanstalk-client
json_pure
- term-ansicolor (1.0.5)
+ term-ansicolor (1.0.6)
thor (0.14.6)
tilt (1.3.2)
yajl-ruby (0.8.2)
PLATFORMS
ruby
DEPENDENCIES
builder
chronic
chronic_duration
crack
delayed_job
delayed_job_data_mapper
dm-aggregates
dm-core
dm-migrations
dm-mysql-adapter
dm-serializer
dm-timestamps
foreman
i18n
json
memcached
meta-spotify
newrelic_rpm
rack
rack-contrib
rack-throttle
rbrainz
rchardet19
rest-client
sinatra
sinatra-respond_to
stalker
yajl-ruby
diff --git a/jobs.rb b/jobs.rb
index 2b4af26..a4c81d0 100644
--- a/jobs.rb
+++ b/jobs.rb
@@ -1,250 +1,252 @@
#datamapper stuff
require 'dm-core'
require 'dm-timestamps'
require 'dm-aggregates'
require 'dm-migrations'
#require
#Models - to be moved to individual files
class Artist
include DataMapper::Resource
property :id, Serial
property :artistmbid, String, :length => 36
property :artistname, String, :length => 512
property :artistnote, Text
property :artistlink, Text
property :created_at, DateTime
has n, :tracks, :through => Resource
has n, :channels, :through => Resource
end
class Album
include DataMapper::Resource
property :id, Serial
property :albummbid, String, :length => 36
property :albumname, String, :length => 512
property :albumimage, Text
property :created_at, DateTime
has n, :tracks, :through => Resource
end
class Track
include DataMapper::Resource
property :id, Serial
property :trackmbid, String, :length => 36
property :title, String, :length => 512
property :tracknote, Text
property :tracklink, Text
property :show, Text
property :talent, Text
property :aust, String, :length => 512
property :duration, Integer
property :publisher, Text
property :datecopyrighted, Integer
property :created_at, DateTime
has n, :artists, :through => Resource
has n, :albums, :through => Resource
has n, :plays
def date
created_at.strftime "%R on %B %d, %Y"
end
def playcount
Play.count(:track_id => self.id);
end
end
class Play
include DataMapper::Resource
property :id, Serial
property :playedtime, DateTime
+ property :program_id, String, :length => 512
belongs_to :track
belongs_to :channel
def date
#converting from utc to aussie time
#playedtime.new_offset(Rational(+20,24)).strftime "%R on %B %d, %Y"
playedtime.strftime "%Y-%m-%d %H:%M:%S"
end
end
class Channel
include DataMapper::Resource
property :id, Serial
property :channelname, String, :length => 512
property :channelxml, String, :length => 512
property :logo, String, :length => 512
property :channellink, String, :length => 512
+ property :programxml, String, :length => 512
has n, :plays
has n, :artists, :through => Resource
end
#template systems
require 'yajl/json_gem'
require 'builder'
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
pwd = File.dirname(File.expand_path(__FILE__))
$LOG = Logger.new(pwd+'/log/queue.log', 'monthly')
#setup MySQL connection:
@config = YAML::load( File.open(pwd +'/config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#Method that stores each playitem to database. Index is the id of the channel to associate the play with
def store_hash(item, index)
@albums = nil
mbid_hash = nil
duration = ChronicDuration.parse(item["duration"].to_s)
#there can be multiple artist seperated by '+' so we split them
artist_array = item['artist']['artistname'].split("+")
artist_array.each{ |artist_item|
begin
#for each item, lookup in musicbrainz. Returns hash with mbids for track, album and artist if found
mbid_hash = mbid_lookup(artist_item.strip, item['title'], item['album']['albumname'])
rescue StandardError => e
$LOG.info("Issue while processing #{artist_item.strip} - #{item['title']} - #{e.backtrace}")
end
#ARTIST
if !mbid_hash.nil? && !mbid_hash["artistmbid"].nil?
@artist = Artist.first_or_create({:artistmbid => mbid_hash["artistmbid"]},{:artistmbid => mbid_hash["artistmbid"],:artistname => artist_item.strip, :artistnote => item['artist']['artistnote'], :artistlink => item['artist']['artistlink']})
else
@artist = Artist.first_or_create({:artistname => artist_item.strip},{:artistname => artist_item.strip, :artistnote => item['artist']['artistnote'], :artistlink => item['artist']['artistlink']})
end
#store artist_id / channel_id to a lookup table, for faster selects
@artist_channels = @artist.channels << Channel.get(index)
@artist_channels.save
#ALBUM
#creating and saving album if not exists
if !item['album']['albumname'].empty?
if !mbid_hash.nil? && !mbid_hash["albummbid"].nil?
#puts "album mbid found for: " + mbid_hash["albummbid"]
@albums = Album.first_or_create({:albummbid => mbid_hash["albummbid"]},{:albummbid => mbid_hash["albummbid"], :albumname => item['album']['albumname'], :albumimage=>item['album']['albumimage']})
else
@albums = Album.first_or_create({:albumname => item['album']['albumname']},{:albumname => item['album']['albumname'], :albumimage=>item['album']['albumimage']})
end
end
#Track
#creating and saving track
if mbid_hash && !mbid_hash["trackmbid"].nil?
@tracks = Track.first_or_create({:trackmbid => mbid_hash["trackmbid"]},{:trackmbid => mbid_hash["trackmbid"],:title => item['title'],:show => item['show'],:talent => item['talent'],:aust => item['aust'],:tracklink => item['tracklink'],:tracknote => item['tracknote'],:publisher => item['publisher'], :datecopyrighted => item['datecopyrighted'].to_i})
else
@tracks = Track.first_or_create({:title => item['title'],:duration => duration},{:title => item['title'],:show => item['show'],:talent => item['talent'],:aust => item['aust'],:tracklink => item['tracklink'],:tracknote => item['tracknote'],:duration => duration,:publisher => item['publisher'],:datecopyrighted => item['datecopyrighted'].to_i})
end
#add the track to album - if album exists
if [email protected]?
@album_tracks = @albums.tracks << @tracks
@album_tracks.save
end
#add the track to the artist
@artist_tracks = @artist.tracks << @tracks
@artist_tracks.save
#adding play: only add if playedtime does not exsist in the database already
play_items = Play.count(:playedtime=>item['playedtime'], :channel_id=>index)
if play_items < 1
- @play = Play.create(:track_id =>@tracks.id, :channel_id => index, :playedtime=>item['playedtime'])
+ @play = Play.create(:track_id =>@tracks.id, :channel_id => index, :playedtime=>item['playedtime'], :program_id => item['program_id'])
@plays = @tracks.plays << @play
@plays.save
end
}
end
def mbid_lookup(artist, track, album)
result_hash = {}
#we can only hit mbrainz once a second so we take a nap
sleep 1
service = MusicBrainz::Webservice::Webservice.new(:user_agent => 'pavapi/1.0')
q = MusicBrainz::Webservice::Query.new(service)
#TRACK
if !album.empty?
t_filter = MusicBrainz::Webservice::TrackFilter.new(:artist=>artist, :title=>track, :release=>album, :limit => 5)
else
t_filter = MusicBrainz::Webservice::TrackFilter.new(:artist=>artist, :title=>track, :limit => 5)
end
t_results = q.get_tracks(t_filter)
#No results from the 'advanced' query, so trying artist and album individualy
if t_results.count == 0
#ARTIST
sleep 1
t_filter = MusicBrainz::Webservice::ArtistFilter.new(:name=>artist)
t_results = q.get_artists(t_filter)
if t_results.count > 0
x = t_results.first
if x.score == 100 && is_ascii(String(x.entity.name)) && String(x.entity.name).casecmp(artist)==0
#puts 'ARTIST score: ' + String(x.score) + '- artist: ' + String(x.entity.name) + ' - artist mbid '+ String(x.entity.id.uuid)
result_hash["artistmbid"] = String(x.entity.id.uuid)
end
end
#ALBUM
if !album.empty?
sleep 1
t_filter = MusicBrainz::Webservice::ReleaseGroupFilter.new(:artist=>artist, :title=>album)
t_results = q.get_release_groups(t_filter)
#puts "album results count "+t_results.count.to_s
if t_results.count>0
x = t_results.first
#puts 'ALBUM score: ' + String(x.score) + '- artist: ' + String(x.entity.artist) + ' - artist mbid '+ String(x.entity.id.uuid) +' - release title '+ String(x.entity.title) + ' - orginal album title: '+album
if x.score == 100 && is_ascii(String(x.entity.title)) #&& String(x.entity.title).casecmp(album)==0
#puts 'abekat'+x.entity.id.uuid.inspect
result_hash["albummbid"] = String(x.entity.id.uuid)
end
end
end
elsif t_results.count > 0
t_results.each{ |x|
#puts 'score: ' + String(x.score) + '- artist: ' + String(x.entity.artist) + ' - artist mbid '+ String(x.entity.artist.id.uuid) + ' - track mbid: ' + String(x.entity.id.uuid) + ' - track: ' + String(x.entity.title) +' - album: ' + String(x.entity.releases[0]) +' - album mbid: '+ String(x.entity.releases[0].id.uuid)
if x.score == 100 && is_ascii(String(x.entity.artist))
sleep 1
t_include = MusicBrainz::Webservice::ReleaseIncludes.new(:release_groups=>true)
release = q.get_release_by_id(x.entity.releases[0].id.uuid, t_include)
result_hash["trackmbid"] = String(x.entity.id.uuid)
result_hash["artistmbid"] = String(x.entity.artist.id.uuid)
result_hash["albummbid"] = String(release.release_group.id.uuid)
end
}
end
return result_hash
end
def is_ascii(item)
cd = CharDet.detect(item)
encoding = cd['encoding']
return encoding == 'ascii'
end
job 'track.store' do |args|
store_hash(args['item'], args['channel'].to_i)
error do |e, job, args|
$LOG.info("error e #{e}")
$LOG.info("error job #{job.inspect}")
$LOG.info("error args #{args.inspect}")
end
end
diff --git a/models.rb b/models.rb
index 6c63f57..5fffdb2 100644
--- a/models.rb
+++ b/models.rb
@@ -1,79 +1,81 @@
#datamapper stuff
require 'dm-core'
require 'dm-serializer'
require 'dm-timestamps'
require 'dm-aggregates'
require 'dm-migrations'
#require
#Models - to be moved to individual files
class Artist
include DataMapper::Resource
property :id, Serial
property :artistmbid, String, :length => 36
property :artistname, String, :length => 512
property :artistnote, Text
property :artistlink, Text
property :created_at, DateTime
has n, :tracks, :through => Resource
has n, :channels, :through => Resource
end
class Album
include DataMapper::Resource
property :id, Serial
property :albummbid, String, :length => 36
property :albumname, String, :length => 512
property :albumimage, Text
property :created_at, DateTime
has n, :tracks, :through => Resource
end
class Track
include DataMapper::Resource
property :id, Serial
property :trackmbid, String, :length => 36
property :title, String, :length => 512
property :tracknote, Text
property :tracklink, Text
property :show, Text
property :talent, Text
property :aust, String, :length => 512
property :duration, Integer
property :publisher, Text
property :datecopyrighted, Integer
property :created_at, DateTime
has n, :artists, :through => Resource
has n, :albums, :through => Resource
has n, :plays
def date
created_at.strftime "%R on %B %d, %Y"
end
def playcount
Play.count(:track_id => self.id);
end
end
class Play
include DataMapper::Resource
property :id, Serial
property :playedtime, DateTime
+ property :program_id, String, :length => 512
belongs_to :track
belongs_to :channel
def date
#converting from utc to aussie time
#playedtime.new_offset(Rational(+20,24)).strftime "%R on %B %d, %Y"
playedtime.strftime "%Y-%m-%d %H:%M:%S"
end
end
class Channel
include DataMapper::Resource
property :id, Serial
property :channelname, String, :length => 512
property :channelxml, String, :length => 512
property :logo, String, :length => 512
property :channellink, String, :length => 512
+ property :programxml, String, :length => 512
has n, :plays
has n, :artists, :through => Resource
end
diff --git a/pavapi.rb b/pavapi.rb
index 982893f..79ceb82 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -1,279 +1,281 @@
#versioning
@version = "v1"
#core stuff
require 'rubygems'
require 'sinatra'
require './models'
require './store_methods'
#Queueing with delayed job
#require 'delayed_job'
#require 'delayed_job_data_mapper'
#require './storetrackjob'
require 'stalker'
#template systems
require 'yajl/json_gem'
require 'rack/contrib/jsonp'
require 'builder'
use Rack::JSONP
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
# Enable New Relic
#configure :production do
#require 'newrelic_rpm'
#end
#throttling
#require 'rack/throttle'
#require 'memcached'
#require './throttler'
#for serving different content types
require 'sinatra/respond_to'
Sinatra::Application.register Sinatra::RespondTo
-
+require 'bigdecimal'
configure do
#use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
#use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
#logging
DataMapper::Logger.new('log/datamapper.log', :warn )
DataMapper::Model.raise_on_save_failure = true
$LOG = Logger.new('log/pavstore.log', 'monthly')
# MySQL connection:
@config = YAML::load( File.open( 'config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
- DataMapper.finalize
+ #DataMapper.finalize
- #DataMapper.auto_upgrade!
+ DataMapper.auto_upgrade!
#DataMapper::auto_migrate!
set :default_content, :html
end
#Caching
before '/*' do
cache_control :public, :must_revalidate, :max_age => 60 unless development?
end
before '/demo/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
before '*/chart/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
from_date = played_to - 7
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
def get_channel(cha)
if isNumeric(cha)
channel = cha
elsif cha.nil?
channel = false
end
end
def get_artist_query(q)
if (!q.nil?)
return "AND artists.artistname LIKE '%#{q}%' "
end
end
def get_track_query(q)
if (!q.nil?)
return "AND tracks.title LIKE '%#{q}%' "
end
end
def get_album_query(q)
if (!q.nil?)
return "AND albums.albumname LIKE '%#{q}%' "
end
end
def get_all_query(q)
if (!q.nil?)
return "AND (albums.albumname LIKE '%#{q}%' OR albums.albumname LIKE '%#{q}%' OR artists.artistname LIKE '%#{q}%') "
end
end
def get_order_by(order)
if (order=='artist')
return "artists.artistname ASC, plays.playedtime DESC"
elsif (order=='track')
return "tracks.title ASC, plays.playedtime DESC"
else
return "plays.playedtime DESC"
end
end
def get_channel(channel)
if(!channel.nil?)
return "plays.channel_id=#{channel} AND"
end
end
def merge_tracks(old_id, new_id)
old_track = Track.get(old_id)
new_track = Track.get(new_id)
if(old_track&&new_track)
#album
#move tracks from old album to new album
link = AlbumTrack.all(:track_id => old_track.id)
link.each{ |link_item|
@album_load = Album.get(link_item.album_id)
@moved = @album_load.tracks << new_track
@moved.save
}
#delete old album_track relations
link.destroy!
#artist
#move tracks from old artist to new artist
link = ArtistTrack.all(:track_id => old_track.id)
link.each{ |link_item|
@artist_load = Artist.get(link_item.artist_id)
@moved = @artist_load.tracks << new_track
@moved.save
}
#delete old artist_track relations
link.destroy!
#plays
plays = Play.all(:track_id => old_track.id)
plays.each{ |link_item|
link_item.update(:track_id => new_id)
}
#delete old track
old_track.destroy!
end
end
end
#ROUTES
# Front page
get '/' do
erb :front
end
require './routes/admin'
require './routes/artist'
require './routes/track'
require './routes/album'
require './routes/channel'
require './routes/play'
require './routes/chart'
+require './routes/demo'
+
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
\ No newline at end of file
|
simonhn/pav-api
|
45d849d90b452d8db3eb7102dc89395a2135a24a
|
massive refactoring and admin paths
|
diff --git a/pavapi.rb b/pavapi.rb
index 2ea99bc..982893f 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -1,789 +1,279 @@
+#versioning
+@version = "v1"
+
#core stuff
require 'rubygems'
require 'sinatra'
require './models'
require './store_methods'
-
#Queueing with delayed job
#require 'delayed_job'
#require 'delayed_job_data_mapper'
#require './storetrackjob'
require 'stalker'
#template systems
require 'yajl/json_gem'
require 'rack/contrib/jsonp'
require 'builder'
use Rack::JSONP
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
# Enable New Relic
#configure :production do
#require 'newrelic_rpm'
#end
#throttling
#require 'rack/throttle'
#require 'memcached'
#require './throttler'
#for serving different content types
require 'sinatra/respond_to'
Sinatra::Application.register Sinatra::RespondTo
-#versioning
-@version = "v1"
+
configure do
#use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
#use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
#logging
- DataMapper::Logger.new('log/datamapper.log', :warn)
+ DataMapper::Logger.new('log/datamapper.log', :warn )
DataMapper::Model.raise_on_save_failure = true
$LOG = Logger.new('log/pavstore.log', 'monthly')
# MySQL connection:
@config = YAML::load( File.open( 'config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#DataMapper.auto_upgrade!
#DataMapper::auto_migrate!
set :default_content, :html
end
-#Caching 1 minute - must adjust
+#Caching
before '/*' do
cache_control :public, :must_revalidate, :max_age => 60 unless development?
end
before '/demo/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
before '*/chart/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
from_date = played_to - 7
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
def get_channel(cha)
if isNumeric(cha)
channel = cha
elsif cha.nil?
channel = false
end
end
def get_artist_query(q)
if (!q.nil?)
return "AND artists.artistname LIKE '%#{q}%' "
end
end
def get_track_query(q)
if (!q.nil?)
return "AND tracks.title LIKE '%#{q}%' "
end
end
def get_album_query(q)
if (!q.nil?)
return "AND albums.albumname LIKE '%#{q}%' "
end
end
def get_all_query(q)
if (!q.nil?)
return "AND (albums.albumname LIKE '%#{q}%' OR albums.albumname LIKE '%#{q}%' OR artists.artistname LIKE '%#{q}%') "
end
end
def get_order_by(order)
if (order=='artist')
return "artists.artistname ASC, plays.playedtime DESC"
elsif (order=='track')
return "tracks.title ASC, plays.playedtime DESC"
else
return "plays.playedtime DESC"
end
end
def get_channel(channel)
if(!channel.nil?)
return "plays.channel_id=#{channel} AND"
end
end
def merge_tracks(old_id, new_id)
old_track = Track.get(old_id)
new_track = Track.get(new_id)
if(old_track&&new_track)
#album
#move tracks from old album to new album
link = AlbumTrack.all(:track_id => old_track.id)
link.each{ |link_item|
@album_load = Album.get(link_item.album_id)
@moved = @album_load.tracks << new_track
@moved.save
}
#delete old album_track relations
link.destroy!
#artist
#move tracks from old artist to new artist
link = ArtistTrack.all(:track_id => old_track.id)
link.each{ |link_item|
@artist_load = Artist.get(link_item.artist_id)
@moved = @artist_load.tracks << new_track
@moved.save
}
#delete old artist_track relations
link.destroy!
#plays
plays = Play.all(:track_id => old_track.id)
plays.each{ |link_item|
link_item.update(:track_id => new_id)
}
#delete old track
old_track.destroy!
end
end
end
#ROUTES
# Front page
get '/' do
erb :front
end
-#show all artists, defaults to 10, ordered by created date
-get "/#{@version}/artists" do
- limit = get_limit(params[:limit])
- channel = get_channel(params[:channel])
- if channel
- @artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
- else
- @artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
- end
- respond_to do |wants|
- wants.html { erb :artists }
- wants.xml { builder :artists }
- wants.json { @artists.to_json }
- end
-end
-
-# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
-get "/#{@version}/artist/:id" do
- if params[:type] == 'mbid' || params[:id].length == 36
- @artist = Artist.first(:artistmbid => params[:id])
- else
- @artist = Artist.get(params[:id])
- end
- respond_to do |wants|
- wants.html { erb :artist }
- wants.xml { builder :artist }
- wants.json { @artist.to_json }
- end
-end
-
-# show tracks from artist
-get "/#{@version}/artist/:id/tracks" do
- if params[:type] == 'mbid' || params[:id].length == 36
- @artist = Artist.first(:artistmbid => params[:id])
- else
- @artist = Artist.get(params[:id])
- end
- @tracks = @artist.tracks
-
- respond_to do |wants|
- wants.html { erb :artist_tracks }
- wants.xml { builder :artist_tracks }
- wants.json { @tracks.to_json }
- end
-end
-
-
-# show plays from artist
-get "/#{@version}/artist/:id/plays" do
- if params[:type] == 'mbid' || params[:id].length == 36
- @artist = Artist.first(:artistmbid => params[:id])
- else
- @artist = Artist.get(params[:id])
- end
- @plays = @artist.tracks.plays
- respond_to do |wants|
- wants.html { erb :artist_plays }
- wants.xml { builder :artist_plays }
- wants.json { @plays.to_json }
- end
-end
-
-#add new track item (an item in the playout xml)
-post "/#{@version}/track" do
- protected!
- begin
-
- data = JSON.parse params[:payload].to_json
- if !data['item']['artist']['artistname'].nil? && Play.count(:playedtime => data['item']['playedtime'], :channel_id => data['channel'])==0
- Stalker.enqueue('track.store', :item => data['item'],:channel => data['channel'])
-
- #Delayed::Job.enqueue StoreTrackJob.new(data['item'], data['channel'])
- #store_hash(data['item'], data['channel'])
- end
-
- rescue StandardError => e
- $LOG.info("Post method end: Issue while processing #{data['item']['artist']['artistname']} - #{data['channel']}, #{e.backtrace}")
- end
-end
-
-#show tracks
-get "/#{@version}/tracks" do
- limit = get_limit(params[:limit])
- channel = params[:channel]
- if channel
- @tracks = Track.all(Track.plays.channel_id => channel, :limit=>limit.to_i, :order => [:created_at.desc])
- else
- @tracks = Track.all(:limit => limit.to_i, :order => [:created_at.desc ])
- end
- respond_to do |wants|
- wants.html { erb :tracks }
- wants.xml { builder :tracks }
- wants.json {@tracks.to_json}
- end
-end
-
-# show track
-get "/#{@version}/track/:id" do
- if params[:type] == 'mbid' || params[:id].length == 36
- @track = Track.first(:trackmbid => params[:id])
- else
- @track = Track.get(params[:id])
- end
- respond_to do |wants|
- wants.html { erb :track }
- wants.xml { builder :track }
- wants.json {@track.to_json}
- end
-end
-
-#show artists for a track
-get "/#{@version}/track/:id/artists" do
- if params[:type] == 'mbid' || params[:id].length == 36
- @track = Track.first(:trackmbid => params[:id])
- else
- @track = Track.get(params[:id])
- end
- @artists = @track.artists
-
- respond_to do |wants|
- wants.html { erb :track_artists }
- wants.xml { builder :track_artists }
- wants.json {@artists.to_json}
- end
-end
-
-#show albums for a track
-get "/#{@version}/track/:id/albums" do
- if params[:type] == 'mbid' || params[:id].length == 36
- @track = Track.first(:trackmbid => params[:id])
- else
- @track = Track.get(params[:id])
- end
-
- @albums = @track.albums
- respond_to do |wants|
- wants.html { erb :track_albums }
- wants.xml { builder :track_albums }
- wants.json {@albums.to_json}
- end
-end
-
-# show plays for a track
-get "/#{@version}/track/:id/plays" do
- if params[:type] == 'mbid' || params[:id].length == 36
- @track = Track.first(:trackmbid => params[:id])
- else
- @track = Track.get(params[:id])
- end
- @plays = @track.plays
- respond_to do |wants|
- wants.html { erb :track_plays }
- wants.xml { builder :track_plays }
- wants.json {@plays.to_json}
- end
-end
-
-#show all albums
-get "/#{@version}/albums" do
- limit = get_limit(params[:limit])
- channel = params[:channel]
- if channel
- @albums = Album.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
- else
- @albums = Album.all(:limit => limit.to_i, :order => [:created_at.desc ])
- end
- respond_to do |wants|
- wants.html { erb :albums }
- wants.xml { builder :albums }
- wants.json { @albums.to_json }
- end
-end
-
-# show album from id
-get "/#{@version}/album/:id" do
- if params[:type] == 'mbid' || params[:id].length == 36
- @album = Album.first(:albummbid => params[:id])
- else
- @album = Album.get(params[:id])
- end
- respond_to do |wants|
- wants.html { erb :album }
- wants.xml { builder :album }
- wants.json {@album.to_json}
- end
-end
-
-# show tracks for an album
-get "/#{@version}/album/:id/tracks" do
- if params[:type] == 'mbid' || params[:id].length == 36
- @album = Album.first(:albummbid => params[:id])
- else
- @album = Album.get(params[:id])
- end
- @tracks = @album.tracks
- respond_to do |wants|
- wants.html { erb :album_tracks }
- wants.xml { builder :album_tracks }
- wants.json {@tracks.to_json }
- end
-end
-
-#PLAY
-get "/#{@version}/plays" do
- #DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
- artist_query = get_artist_query(params[:artist_query])
- track_query = get_track_query(params[:track_query])
- album_query = get_album_query(params[:album_query])
- query_all = get_all_query(params[:q])
- order_by = get_order_by(params[:order_by])
- limit = get_limit(params[:limit])
- to_from = make_to_from(params[:from], params[:to])
- channel = params[:channel]
- if channel
- #@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
- @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
- else
- #@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
- @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
- end
- hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
-
- respond_to do |wants|
- wants.html { erb :plays }
- wants.xml { builder :plays }
- wants.json { hat.to_json }
- end
-end
-
-get "/#{@version}/play/:id" do
-@play = Play.get(params[:id])
- respond_to do |wants|
- wants.json { @play.to_json }
- end
-end
-
-# show all channels
-get "/#{@version}/channels" do
- @channels = Channel.all
- respond_to do |wants|
- wants.xml { @channels.to_xml }
- wants.json { @channels.to_json }
- end
-end
+require './routes/admin'
-#create new channel
-post "/#{@version}/channel" do
- protected!
- data = JSON.parse params[:payload].to_json
- channel = Channel.first_or_create({ :channelname => data['channelname'] }, { :channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'] })
-end
+require './routes/artist'
-#update a channel
-put "/#{@version}/channel/:id" do
- protected!
- channel = Channel.get(params[:id])
- data = JSON.parse params[:payload].to_json
- channel = channel.update(:channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'])
-end
+require './routes/track'
-# show channel from id
-get "/#{@version}/channel/:id" do
- @channel = Channel.get(params[:id])
- respond_to do |wants|
- wants.xml { @channel.to_xml }
- wants.json { @channel.to_json }
- end
-end
+require './routes/album'
+require './routes/channel'
+require './routes/play'
-# chart of top tracks
-get "/#{@version}/chart/track" do
- limit = get_limit(params[:limit])
- to_from = make_to_from(params[:from], params[:to])
- channel = get_channel(params[:channel])
- #SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
- @tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
- hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
- respond_to do |wants|
- wants.html { erb :track_chart }
- wants.xml { builder :track_chart }
- wants.json { hat.to_json }
- end
-end
+require './routes/chart'
-# chart of top artist by name
-get "/#{@version}/chart/artist" do
- to_from = make_to_from(params[:from], params[:to])
- limit = get_limit(params[:limit])
- channel = get_channel(params[:channel])
- @artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
-
- #@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
- hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
- respond_to do |wants|
- wants.html { erb :artist_chart }
- wants.xml { builder :artist_chart }
- wants.json {hat.to_json}
- end
-end
-
-get "/#{@version}/chart/album" do
- to_from = make_to_from(params[:from], params[:to])
- limit = get_limit(params[:limit])
- channel = get_channel(params[:channel])
- @albums = repository(:default).adapter.select("select artists.artistname, artists.artistmbid, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where #{channel} tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
- hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :artistmbid => o.artistmbid, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
-
- respond_to do |wants|
- wants.html { erb :album_chart }
- wants.xml { builder :album_chart }
- wants.json {hat.to_json}
- end
-end
-
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
-end
-
-#Count all artists
-get "/#{@version}/stats" do
- @artistcount = Artist.count
- @artistmbid = (Artist.count(:artistmbid).to_f/@artistcount.to_f)*100
-
- @trackcount = Track.count
- @trackmbid = (Track.count(:trackmbid).to_f/@trackcount.to_f)*100
-
- @playcount = Play.count
-
- @albumcount = Album.count
- @albummbid = (Album.count(:albummbid).to_f/@albumcount.to_f)*100
-
- @dig_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
- @dig_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
- @dig_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
- @dig_play = Play.all('channel_id'=>1).count
-
-
- @jazz_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
- @jazz_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
- @jazz_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
- @jazz_play = Play.all('channel_id'=>2).count
-
-
- @country_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
- @country_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
- @country_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
- @country_play = Play.all('channel_id'=>3).count
-
-
- @jjj_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
- @jjj_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
- @jjj_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
- @jjj_play = Play.all('channel_id'=>4).count
-
- respond_to do |wants|
- wants.html { erb :stats }
- end
-
-end
-
-get "/#{@version}/admin/duplicate/artist" do
- protected!
- @list = repository(:default).adapter.select("SELECT distinct d2.id, d2.artistname, d2.artistmbid FROM artists d1 JOIN artists d2 ON d2.artistname = d1.artistname AND d2.id <> d1.id order by artistname, id")
- respond_to do |wants|
- wants.html { erb :duplicate_artists }
- end
-end
-
-post "/#{@version}/admin/merge/artist" do
- protected!
- old_artist = Artist.get(params[:id_old])
- new_artist = Artist.get(params[:id_new])
-
- if(old_artist&&new_artist)
- #move tracks from old artist to new artist
- link = ArtistTrack.all(:artist_id => old_artist.id)
- link.each{ |link_item|
- @track_load = Track.get(link_item.track_id)
- @moved = new_artist.tracks << @track_load
- @moved.save
- }
-
- #delete old artist_track relations
- link.destroy!
-
- #delete old artist
- old_artist.destroy!
- end
-end
-
-get "/#{@version}/admin/duplicate/album" do
- protected!
- @list = repository(:default).adapter.select("SELECT distinct d2.id, d2.albumname, d2.albummbid FROM albums d1 JOIN albums d2 ON d2.albumname = d1.albumname AND d2.id <> d1.id order by albumname, id")
- respond_to do |wants|
- wants.html { erb :duplicate_albums }
- end
-end
-
-post "/#{@version}/admin/merge/album" do
- protected!
-
- old_album = Album.get(params[:id_old])
- old_album_tracks = old_album.tracks
-
- new_album = Album.get(params[:id_new])
- new_album_tracks = new_album.tracks
-
- if(old_album&&new_album)
-
- #if there are similar track on the two albums,
- # move the 'old' tracks to the 'new' tracks before moving album links
- old_album_tracks.each{ |old_track|
- new_track = new_album_tracks.find {|e| e.title==old_track.title&&e.id!=old_track.id }
- if(new_track)
- merge_tracks(old_track.id, new_track.id)
- end
- }
-
- #move tracks from old album to new album
- link = AlbumTrack.all(:album_id => old_album.id)
- link.each{ |link_item|
- @track_load = Track.get(link_item.track_id)
- @moved = new_album.tracks << @track_load
- @moved.save
- }
-
- #delete old album_track relations
- link.destroy!
-
- #delete old album
- old_album.destroy!
- end
-
-end
-
-get "/#{@version}/admin/duplicate/track" do
- protected!
- @list = repository(:default).adapter.select("SELECT distinct d2.id, d2.title, d2.trackmbid FROM tracks d1 JOIN tracks d2 ON d2.title = d1.title AND d2.id <> d1.id order by title, id")
- respond_to do |wants|
- wants.html { erb :duplicate_tracks }
- end
-end
-
-post "/#{@version}/admin/merge/track" do
- protected!
-
- merge_tracks(params[:id_old], params[:id_new])
-end
-
-
-
-
-get '/demo/album-charts' do
- from_date = DateTime.now - 7
- @from_date_string = from_date.strftime("%b %e")
-
- to_date = DateTime.now
- @to_date_string = to_date.strftime("%b %e")
-
- respond_to do |wants|
- wants.html{erb :album_chart_all}
- end
-end
-
-get '/jjj' do
- cache_control :public, :max_age => 600
- artistmbid = {}
- har ='a'
- hur = 'b'
- @artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
- #hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
-all = Hash.new
- @artists.each{ |o|
- begin
- if o.artistmbid
- #puts o.artistname
- begin
- result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
-
- if(result.code==200)
- all[o.artistname] = Hash.new
- all[o.artistname].store("media",Hash.new())
- all[o.artistname].store("info",Hash.new())
- all[o.artistname].fetch("info").store("mbid",o.artistmbid)
- all[o.artistname].fetch("info").store("count",o.cnt)
- xml = Crack::XML.parse(result)
- if(xml["rss"]["channel"]["item"].kind_of?(Array))
- xml["rss"]["channel"]["item"].each_with_index{|ha,i|
- if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
- har = ha["title"]
- da = ha["media:thumbnail"]
- if da.kind_of?(Array)
- hur = da.first["url"]
- all[o.artistname].fetch("media").store(ha["title"],hur)
- else
- hur = da["url"]
- all[o.artistname].fetch("media").store(ha["title"],hur)
- end
- if ha["media:content"].kind_of?(Array)
- all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
- else
- all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
-
- end
- end
- }
- else
- if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
- har = xml["rss"]["channel"]["item"]["title"]
- hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
- end
- end
- #john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
- #puts john.inspect
- end
- rescue => e
- end
- end
- end
- }
- @hat = all
- respond_to do |wants|
- wants.html { erb :jjj }
- wants.json { all.to_json }
- end
end
\ No newline at end of file
diff --git a/routes/admin.rb b/routes/admin.rb
new file mode 100644
index 0000000..a9af404
--- /dev/null
+++ b/routes/admin.rb
@@ -0,0 +1,138 @@
+#admin dashboard
+get "/admin" do
+ protected!
+ respond_to do |wants|
+ wants.html { erb :admin }
+ end
+end
+
+#Count all artists
+get "/admin/stats" do
+ @artistcount = Artist.count
+ @artistmbid = (Artist.count(:artistmbid).to_f/@artistcount.to_f)*100
+
+ @trackcount = Track.count
+ @trackmbid = (Track.count(:trackmbid).to_f/@trackcount.to_f)*100
+
+ @playcount = Play.count
+
+ @albumcount = Album.count
+ @albummbid = (Album.count(:albummbid).to_f/@albumcount.to_f)*100
+
+ @dig_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
+ @dig_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
+ @dig_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
+ @dig_play = Play.all('channel_id'=>1).count
+
+
+ @jazz_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
+ @jazz_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
+ @jazz_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
+ @jazz_play = Play.all('channel_id'=>2).count
+
+
+ @country_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
+ @country_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
+ @country_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
+ @country_play = Play.all('channel_id'=>3).count
+
+
+ @jjj_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
+ @jjj_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
+ @jjj_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
+ @jjj_play = Play.all('channel_id'=>4).count
+
+ respond_to do |wants|
+ wants.html { erb :stats }
+ end
+
+end
+
+get "/admin/duplicate/artist" do
+ protected!
+ @list = repository(:default).adapter.select("SELECT distinct d2.id, d2.artistname, d2.artistmbid FROM artists d1 JOIN artists d2 ON d2.artistname = d1.artistname AND d2.id <> d1.id order by artistname, id")
+ respond_to do |wants|
+ wants.html { erb :duplicate_artists }
+ end
+end
+
+post "/admin/merge/artist" do
+ protected!
+ old_artist = Artist.get(params[:id_old])
+ new_artist = Artist.get(params[:id_new])
+
+ if(old_artist&&new_artist)
+ #move tracks from old artist to new artist
+ link = ArtistTrack.all(:artist_id => old_artist.id)
+ link.each{ |link_item|
+ @track_load = Track.get(link_item.track_id)
+ @moved = new_artist.tracks << @track_load
+ @moved.save
+ }
+
+ #delete old artist_track relations
+ link.destroy!
+
+ #delete old artist
+ old_artist.destroy!
+ end
+end
+
+get "/admin/duplicate/album" do
+ protected!
+ @list = repository(:default).adapter.select("SELECT distinct d2.id, d2.albumname, d2.albummbid FROM albums d1 JOIN albums d2 ON d2.albumname = d1.albumname AND d2.id <> d1.id order by albumname, id")
+ respond_to do |wants|
+ wants.html { erb :duplicate_albums }
+ end
+end
+
+post "/admin/merge/album" do
+ protected!
+
+ old_album = Album.get(params[:id_old])
+ old_album_tracks = old_album.tracks
+
+ new_album = Album.get(params[:id_new])
+ new_album_tracks = new_album.tracks
+
+ if(old_album&&new_album)
+
+ #if there are similar track on the two albums,
+ # move the 'old' tracks to the 'new' tracks before moving album links
+ old_album_tracks.each{ |old_track|
+ new_track = new_album_tracks.find {|e| e.title==old_track.title&&e.id!=old_track.id }
+ if(new_track)
+ merge_tracks(old_track.id, new_track.id)
+ end
+ }
+
+ #move tracks from old album to new album
+ link = AlbumTrack.all(:album_id => old_album.id)
+ link.each{ |link_item|
+ @track_load = Track.get(link_item.track_id)
+ @moved = new_album.tracks << @track_load
+ @moved.save
+ }
+
+ #delete old album_track relations
+ link.destroy!
+
+ #delete old album
+ old_album.destroy!
+ end
+
+end
+
+get "/admin/duplicate/track" do
+ protected!
+ @list = repository(:default).adapter.select("SELECT distinct d2.id, d2.title, d2.trackmbid FROM tracks d1 JOIN tracks d2 ON d2.title = d1.title AND d2.id <> d1.id order by title, id")
+ respond_to do |wants|
+ wants.html { erb :duplicate_tracks }
+ end
+end
+
+post "/admin/merge/track" do
+ protected!
+
+ merge_tracks(params[:id_old], params[:id_new])
+end
\ No newline at end of file
diff --git a/routes/album.rb b/routes/album.rb
new file mode 100644
index 0000000..f918440
--- /dev/null
+++ b/routes/album.rb
@@ -0,0 +1,73 @@
+#show all albums
+get "/#{@version}/albums" do
+ limit = get_limit(params[:limit])
+ channel = params[:channel]
+ if channel
+ @albums = Album.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
+ else
+ @albums = Album.all(:limit => limit.to_i, :order => [:created_at.desc ])
+ end
+ respond_to do |wants|
+ wants.html { erb :albums }
+ wants.xml { builder :albums }
+ wants.json { @albums.to_json }
+ end
+end
+
+# show album from id
+get "/#{@version}/album/:id" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @album = Album.first(:albummbid => params[:id])
+ else
+ @album = Album.get(params[:id])
+ end
+ respond_to do |wants|
+ wants.html { erb :album }
+ wants.xml { builder :album }
+ wants.json {@album.to_json}
+ end
+end
+
+# edit track from id. if ?type=mbid is added, it will perform a mbid lookup
+get "/#{@version}/album/:id/edit" do
+ protected!
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @album = Album.first(:albummbid => params[:id])
+ else
+ @album = Album.get(params[:id])
+ end
+ respond_to do |wants|
+ wants.html { erb :album_edit }
+ end
+end
+
+post "/#{@version}/album/:id/edit" do
+ protected!
+ @album = Album.get(params[:id])
+ raise not_found unless @album
+
+ @album.attributes = {
+ :albumname => params["albumname"],
+ :albummbid => params["albummbid"],
+ :albumimage => params["albumimage"],
+ :created_at => params["created_at"]
+ }
+
+ @album.save
+ redirect "/v1/album/#{@album.id}"
+end
+
+# show tracks for an album
+get "/#{@version}/album/:id/tracks" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @album = Album.first(:albummbid => params[:id])
+ else
+ @album = Album.get(params[:id])
+ end
+ @tracks = @album.tracks
+ respond_to do |wants|
+ wants.html { erb :album_tracks }
+ wants.xml { builder :album_tracks }
+ wants.json {@tracks.to_json }
+ end
+end
diff --git a/routes/artist.rb b/routes/artist.rb
new file mode 100644
index 0000000..27327a7
--- /dev/null
+++ b/routes/artist.rb
@@ -0,0 +1,90 @@
+#show all artists, defaults to 10, ordered by created date
+get "/#{@version}/artists" do
+ limit = get_limit(params[:limit])
+ channel = params[:channel]
+ if channel
+ @artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
+ else
+ @artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
+ end
+ respond_to do |wants|
+ wants.html { erb :artists }
+ wants.xml { builder :artists }
+ wants.json { @artists.to_json }
+ end
+end
+
+# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
+get "/#{@version}/artist/:id" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @artist = Artist.first(:artistmbid => params[:id])
+ else
+ @artist = Artist.get(params[:id])
+ end
+ respond_to do |wants|
+ wants.html { erb :artist }
+ wants.xml { builder :artist }
+ wants.json { @artist.to_json }
+ end
+end
+
+# edit artist from id. if ?type=mbid is added, it will perform a mbid lookup
+get "/#{@version}/artist/:id/edit" do
+ protected!
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @artist = Artist.first(:artistmbid => params[:id])
+ else
+ @artist = Artist.get(params[:id])
+ end
+ respond_to do |wants|
+ wants.html { erb :artist_edit }
+ end
+end
+
+post "/#{@version}/artist/:id/edit" do
+ protected!
+ @artist = Artist.get(params[:id])
+ raise not_found unless @artist
+
+ @artist.attributes = {
+ :artistname => params["artistname"],
+ :artistmbid => params["artistmbid"],
+ :artistlink => params["artistlink"],
+ :artistnote => params["artistnote"]
+ }
+ @artist.save
+ redirect "/v1/artist/#{@artist.id}"
+end
+
+
+# show tracks from artist
+get "/#{@version}/artist/:id/tracks" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @artist = Artist.first(:artistmbid => params[:id])
+ else
+ @artist = Artist.get(params[:id])
+ end
+ @tracks = @artist.tracks
+
+ respond_to do |wants|
+ wants.html { erb :artist_tracks }
+ wants.xml { builder :artist_tracks }
+ wants.json { @tracks.to_json }
+ end
+end
+
+
+# show plays from artist
+get "/#{@version}/artist/:id/plays" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @artist = Artist.first(:artistmbid => params[:id])
+ else
+ @artist = Artist.get(params[:id])
+ end
+ @plays = @artist.tracks.plays
+ respond_to do |wants|
+ wants.html { erb :artist_plays }
+ wants.xml { builder :artist_plays }
+ wants.json { @plays.to_json }
+ end
+end
\ No newline at end of file
diff --git a/routes/channel.rb b/routes/channel.rb
new file mode 100644
index 0000000..c285d3d
--- /dev/null
+++ b/routes/channel.rb
@@ -0,0 +1,32 @@
+# show all channels
+get "/#{@version}/channels" do
+ @channels = Channel.all
+ respond_to do |wants|
+ wants.xml { @channels.to_xml }
+ wants.json { @channels.to_json }
+ end
+end
+
+#create new channel
+post "/#{@version}/channel" do
+ protected!
+ data = JSON.parse params[:payload].to_json
+ channel = Channel.first_or_create({ :channelname => data['channelname'] }, { :channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'] })
+end
+
+#update a channel
+put "/#{@version}/channel/:id" do
+ protected!
+ channel = Channel.get(params[:id])
+ data = JSON.parse params[:payload].to_json
+ channel = channel.update(:channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'])
+end
+
+# show channel from id
+get "/#{@version}/channel/:id" do
+ @channel = Channel.get(params[:id])
+ respond_to do |wants|
+ wants.xml { @channel.to_xml }
+ wants.json { @channel.to_json }
+ end
+end
\ No newline at end of file
diff --git a/routes/chart.rb b/routes/chart.rb
new file mode 100644
index 0000000..b181d51
--- /dev/null
+++ b/routes/chart.rb
@@ -0,0 +1,45 @@
+# chart of top tracks
+get "/#{@version}/chart/track" do
+ limit = get_limit(params[:limit])
+ to_from = make_to_from(params[:from], params[:to])
+ channel = get_channel(params[:channel])
+ #SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
+ @tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
+ hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
+ respond_to do |wants|
+ wants.html { erb :track_chart }
+ wants.xml { builder :track_chart }
+ wants.json { hat.to_json }
+ end
+end
+
+
+# chart of top artist by name
+get "/#{@version}/chart/artist" do
+ to_from = make_to_from(params[:from], params[:to])
+ limit = get_limit(params[:limit])
+ channel = get_channel(params[:channel])
+ @artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
+
+ #@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
+ hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
+ respond_to do |wants|
+ wants.html { erb :artist_chart }
+ wants.xml { builder :artist_chart }
+ wants.json {hat.to_json}
+ end
+end
+
+get "/#{@version}/chart/album" do
+ to_from = make_to_from(params[:from], params[:to])
+ limit = get_limit(params[:limit])
+ channel = get_channel(params[:channel])
+ @albums = repository(:default).adapter.select("select artists.artistname, artists.artistmbid, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where #{channel} tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
+ hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :artistmbid => o.artistmbid, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
+
+ respond_to do |wants|
+ wants.html { erb :album_chart }
+ wants.xml { builder :album_chart }
+ wants.json {hat.to_json}
+ end
+end
\ No newline at end of file
diff --git a/routes/demo.rb b/routes/demo.rb
new file mode 100644
index 0000000..5166be2
--- /dev/null
+++ b/routes/demo.rb
@@ -0,0 +1,74 @@
+get '/demo/album-charts' do
+ from_date = DateTime.now - 7
+ @from_date_string = from_date.strftime("%b %e")
+
+ to_date = DateTime.now
+ @to_date_string = to_date.strftime("%b %e")
+
+ respond_to do |wants|
+ wants.html{erb :album_chart_all}
+ end
+end
+
+get '/demo/jjj' do
+ cache_control :public, :max_age => 600
+ artistmbid = {}
+ har ='a'
+ hur = 'b'
+ @artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
+ #hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
+all = Hash.new
+ @artists.each{ |o|
+ begin
+ if o.artistmbid
+ #puts o.artistname
+ begin
+ result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
+
+ if(result.code==200)
+ all[o.artistname] = Hash.new
+ all[o.artistname].store("media",Hash.new())
+ all[o.artistname].store("info",Hash.new())
+ all[o.artistname].fetch("info").store("mbid",o.artistmbid)
+ all[o.artistname].fetch("info").store("count",o.cnt)
+ xml = Crack::XML.parse(result)
+ if(xml["rss"]["channel"]["item"].kind_of?(Array))
+ xml["rss"]["channel"]["item"].each_with_index{|ha,i|
+ if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
+ har = ha["title"]
+ da = ha["media:thumbnail"]
+ if da.kind_of?(Array)
+ hur = da.first["url"]
+ all[o.artistname].fetch("media").store(ha["title"],hur)
+ else
+ hur = da["url"]
+ all[o.artistname].fetch("media").store(ha["title"],hur)
+ end
+ if ha["media:content"].kind_of?(Array)
+ all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
+ else
+ all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
+
+ end
+ end
+ }
+ else
+ if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
+ har = xml["rss"]["channel"]["item"]["title"]
+ hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
+ end
+ end
+ #john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
+ #puts john.inspect
+ end
+ rescue => e
+ end
+ end
+ end
+ }
+ @hat = all
+ respond_to do |wants|
+ wants.html { erb :jjj }
+ wants.json { all.to_json }
+ end
+end
diff --git a/routes/play.rb b/routes/play.rb
new file mode 100644
index 0000000..ce2362f
--- /dev/null
+++ b/routes/play.rb
@@ -0,0 +1,33 @@
+#PLAY
+get "/#{@version}/plays" do
+ #DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
+ artist_query = get_artist_query(params[:artist_query])
+ track_query = get_track_query(params[:track_query])
+ album_query = get_album_query(params[:album_query])
+ query_all = get_all_query(params[:q])
+ order_by = get_order_by(params[:order_by])
+ limit = get_limit(params[:limit])
+ to_from = make_to_from(params[:from], params[:to])
+ channel = params[:channel]
+ if channel
+ #@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
+ @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
+ else
+ #@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
+ @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
+ end
+ hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
+
+ respond_to do |wants|
+ wants.html { erb :plays }
+ wants.xml { builder :plays }
+ wants.json { hat.to_json }
+ end
+end
+
+get "/#{@version}/play/:id" do
+@play = Play.get(params[:id])
+ respond_to do |wants|
+ wants.json { @play.to_json }
+ end
+end
\ No newline at end of file
diff --git a/routes/track.rb b/routes/track.rb
new file mode 100644
index 0000000..ed3a789
--- /dev/null
+++ b/routes/track.rb
@@ -0,0 +1,129 @@
+#add new track item (an item in the playout xml)
+post "/#{@version}/track" do
+ protected!
+ begin
+
+ data = JSON.parse params[:payload].to_json
+ if !data['item']['artist']['artistname'].nil? && Play.count(:playedtime => data['item']['playedtime'], :channel_id => data['channel'])==0
+ Stalker.enqueue('track.store', :item => data['item'],:channel => data['channel'])
+
+ #Delayed::Job.enqueue StoreTrackJob.new(data['item'], data['channel'])
+ #store_hash(data['item'], data['channel'])
+ end
+
+ rescue StandardError => e
+ $LOG.info("Post method end: Issue while processing #{data['item']['artist']['artistname']} - #{data['channel']}, #{e.backtrace}")
+ end
+end
+
+#show tracks
+get "/#{@version}/tracks" do
+ limit = get_limit(params[:limit])
+ channel = params[:channel]
+ if channel
+ @tracks = Track.all(Track.plays.channel_id => channel, :limit=>limit.to_i, :order => [:created_at.desc])
+ else
+ @tracks = Track.all(:limit => limit.to_i, :order => [:created_at.desc ])
+ end
+ respond_to do |wants|
+ wants.html { erb :tracks }
+ wants.xml { builder :tracks }
+ wants.json {@tracks.to_json}
+ end
+end
+
+# show track
+get "/#{@version}/track/:id" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @track = Track.first(:trackmbid => params[:id])
+ else
+ @track = Track.get(params[:id])
+ end
+ respond_to do |wants|
+ wants.html { erb :track }
+ wants.xml { builder :track }
+ wants.json {@track.to_json}
+ end
+end
+
+# edit track from id. if ?type=mbid is added, it will perform a mbid lookup
+get "/#{@version}/track/:id/edit" do
+ protected!
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @track = Track.first(:trackmbid => params[:id])
+ else
+ @track = Track.get(params[:id])
+ end
+ respond_to do |wants|
+ wants.html { erb :track_edit }
+ end
+end
+
+post "/#{@version}/track/:id/edit" do
+ protected!
+ @track = Track.get(params[:id])
+ raise not_found unless @track
+
+ @track.attributes = {
+ :title => params["title"],
+ :trackmbid => params["trackmbid"],
+ :tracklink => params["tracklink"],
+ :tracknote => params["tracknote"],
+ :talent => params["talent"],
+ :aust => params["aust"],
+ :datecopyrighted => params["datecopyrighted"],
+ :show => params["show"],
+ :publisher => params["publisher"],
+ :created_at => params["created_at"]
+ }
+
+ @track.save
+ redirect "/v1/track/#{@track.id}"
+end
+
+#show artists for a track
+get "/#{@version}/track/:id/artists" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @track = Track.first(:trackmbid => params[:id])
+ else
+ @track = Track.get(params[:id])
+ end
+ @artists = @track.artists
+
+ respond_to do |wants|
+ wants.html { erb :track_artists }
+ wants.xml { builder :track_artists }
+ wants.json {@artists.to_json}
+ end
+end
+
+#show albums for a track
+get "/#{@version}/track/:id/albums" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @track = Track.first(:trackmbid => params[:id])
+ else
+ @track = Track.get(params[:id])
+ end
+
+ @albums = @track.albums
+ respond_to do |wants|
+ wants.html { erb :track_albums }
+ wants.xml { builder :track_albums }
+ wants.json {@albums.to_json}
+ end
+end
+
+# show plays for a track
+get "/#{@version}/track/:id/plays" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @track = Track.first(:trackmbid => params[:id])
+ else
+ @track = Track.get(params[:id])
+ end
+ @plays = @track.plays
+ respond_to do |wants|
+ wants.html { erb :track_plays }
+ wants.xml { builder :track_plays }
+ wants.json {@plays.to_json}
+ end
+end
diff --git a/views/admin.html.erb b/views/admin.html.erb
new file mode 100644
index 0000000..3ef163c
--- /dev/null
+++ b/views/admin.html.erb
@@ -0,0 +1,7 @@
+<h1>Admin dashboard</h1>
+<ul>
+ <li><a href="/admin/stats">Stats</a></li>
+ <li><a href="/admin/duplicate/artist">Duplicate artists</a></li>
+ <li><a href="/admin/duplicate/track">Duplicate tracks</a></li>
+ <li><a href="/admin/duplicate/album">Duplicate artists</a></li>
+</ul>
\ No newline at end of file
diff --git a/views/album.html.erb b/views/album.html.erb
index b61bc79..595814f 100644
--- a/views/album.html.erb
+++ b/views/album.html.erb
@@ -1,5 +1,8 @@
<h1>Album</h1>
-<%= @album.id %>
-<%= @album.albumname %>
-<%= @album.albumimage %>
-<%= @album.created_at %>
\ No newline at end of file
+<ul>
+ <% if [email protected]? %><li>id: <%= @album.id %></li><% end %>
+ <% if [email protected]? %><li>mbid: <%= @album.albummbid %></li><% end %>
+ <% if [email protected]? %><li>albumname: <%= @album.albumname %></li><% end %>
+ <% if [email protected]? %><li>albumimage: <%= @album.albumimage %></li><% end %>
+ <% if [email protected]_at.nil? %><li>created_at: <%= @album.created_at %></li><% end %>
+</ul>
\ No newline at end of file
diff --git a/views/album_edit.html.erb b/views/album_edit.html.erb
new file mode 100644
index 0000000..ab947cf
--- /dev/null
+++ b/views/album_edit.html.erb
@@ -0,0 +1,25 @@
+<style type="text/css" media="screen">
+ input,textarea{width:100%;}
+</style>
+<h1>album</h1>
+<p><%= @album.albumname %> - <%= @album.id %></p>
+
+<form action='/v1/album/<%= @album.id %>/edit' method="POST">
+
+ <label for="albumname">title</label>
+ <input type="text" name="albumname" value="<%= @album.albumname %>"/>
+ <br>
+ <label for="albummbid">MBID</label>
+ <input type="text" name="albummbid" value="<%= @album.albummbid %>"/>
+ <br>
+
+ <label for="albumimage">image</label>
+ <input type="text" name="albumimage" value="<%= @album.albumimage %>"/>
+ <br>
+
+ <label for="created_at">created date</label>
+ <input type="text" name="created_at" value="<%= @album.created_at %>"/>
+ <br>
+
+ <input type="submit" value="Save" />
+</form>
\ No newline at end of file
diff --git a/views/artist_edit.html.erb b/views/artist_edit.html.erb
new file mode 100644
index 0000000..273deed
--- /dev/null
+++ b/views/artist_edit.html.erb
@@ -0,0 +1,25 @@
+<style type="text/css" media="screen">
+ input,textarea{width:100%;}
+</style>
+<h1>Artist</h1>
+<p><%= @artist.artistname %> - <%= @artist.id %></p>
+
+<form action='/v1/artist/<%= @artist.id %>/edit' method="POST">
+
+ <label for="artistmbid">Artist name</label>
+ <input type="text" name="artistname" value="<%= @artist.artistname %>"/>
+<br>
+ <label for="artistmbid">Artist MBID</label>
+ <input type="text" name="artistmbid" value="<%= @artist.artistmbid %>"/>
+ <br>
+
+ <label for="artistlink">Artist link</label>
+ <input type="text" name="artistlink" value="<%= @artist.artistlink %>"/>
+ <br>
+
+ <label for="artistnote">Artist Note</label>
+ <textarea name="artistnote"><%= @artist.artistnote %></textarea>
+ <br>
+
+ <input type="submit" value="Save" />
+</form>
\ No newline at end of file
diff --git a/views/duplicate_albums.html.erb b/views/duplicate_albums.html.erb
index 07e3c4a..68acb7d 100644
--- a/views/duplicate_albums.html.erb
+++ b/views/duplicate_albums.html.erb
@@ -1,287 +1,287 @@
<style type="text/css">
body{font-size: 0.75em;}
#just_played #song_list {
float: left;
margin: 2px 0 10px;
}
#just_played .sort_order {
text-align: center;
color: #808080;
padding: 8px 0;
}
#just_played .sort_order .title {
font-weight: 700;
margin-right: 4px;
color: #000000;
}
#just_played .sort_order a {
text-decoration: underline;
margin: 0 4px;
}
#just_played .sort_order a.current {
text-decoration: none;
color: #000000;
}
#just_played .pagination,
#song_list .search-criteria {
text-align: center;
margin: 4px 0;
float: left;
padding: 8px 0;
}
#just_played #song_list .pagination {
border-bottom-width: 1px;
border-bottom-style: dotted;
}
#song_list .search-criteria {
border-bottom-width: 4px;
border-bottom-style: solid;
}
#just_played .pagination .title {
font-weight: 700;
margin-right: 8px;
}
#just_played .pagination .pages {
word-spacing: 0.5em;
margin-right: 8px;
color: #808080;
}
#just_played .pagination a {
color: #204ba1;
text-decoration: underline;
}
#just_played .pagination .pages a.current {
color: #000000;
text-decoration: none;
}
#just_played .pagination a.next {
color: #204ba1;
text-decoration: none;
font-weight: 700;
}
#clear-search {
display: inline-block;
font-size: 0.8em;
margin-left: 10px;
}
#just_played .list_quantity {
color: #204ba1;
}
#just_played .list_quantity img {
margin-right: 4px;
}
#just_played .song {
float: left;
border-top: 1px dashed #C9C9C9;
padding-top: 4px;
}
#just_played .song .date {
font-size: 1.0em;
padding: 3px 8px;
margin: -4px 0 5px 60px;
color: #fff;
background-color: #1F2933;
float: left;
}
#just_played .song .time {
font-size: 0.8em;
color: #999999;
margin-bottom: 2px;
}
#just_played .song .album_image_container {
float: left;
width: 110px;
height: 100px;
background-image: url('http://abcdigmusic.net.au/sites/all/themes/dig2/images/background/no-cover.png');
background-repeat: no-repeat;
}
#just_played .song .album_image_container img {
border: 1px solid #FFFFFF;
}
#just_played .song .album_image_container img:hover {
border: 1px solid #CAD4DD;
}
#just_played .song .australian_artist_container {
z-index:2;
position:absolute;
left:75px;
}
#just_played .song .details {
float: left;
margin-left: 10px;
width: 200px;
}
#just_played .song .details td {
padding-bottom: 9px;
}
#just_played .song .details td.label {
width: 80px;
font-size: 0.9em;
color: #4d4d4d;
}
#just_played .song .details td.info {
width: 145px;
font-size: 0.9em;
font-weight: bold;
}
#just_played .song .details td a{
color: #204ba1;
}
#just_played .song .social_data {
float: left;
margin: 0;
color: #4d4d4d;
font-size: 0.9em;
padding-left: 10px;
}
#just_played .song .feature_album {
position: relative;
top: -4px;
border: 0;
}
#just_played .song .social_data a {
color: #2f57a7;
}
#just_played .song .social_data .community {
float: left;
border-bottom: 1px dotted #CAD4DD;
margin-bottom: 2px;
padding: 2px 1px;
}
#just_played .song .social_data .user {
float: left;
width: 110px;
border-bottom: 1px dotted #CAD4DD;
margin-bottom: 2px;
padding: 2px 1px;
margin-left: 15px;
}
#just_played .song .social_data .last {
border-bottom: 0;
}
#just_played .song .social_data .icon {
float: left;
margin-right: 2px;
}
#just_played .song .social_data .community .text {
float: left;
line-height: 1.2em;
}
#just_played .song .social_data .user .text {
float: left;
width: 84px;
line-height: 1.2em;
}
#just_played .song .social_data .note {
float: left;
clear: both;
width: 310px;
border-top: 1px dotted #CAD4DD;
padding-top: 4px;
padding-left: 21px;
}
#just_played .song .social_data .note .text {
float: left;
width: 320px;
}
#just_played .song .social_data .note .text p {
color: #4d4d4d;
}
#just_played .song .social_data .note a {
background-image: url(../images/icon_external.png);
padding-right: 19px;
background-repeat: no-repeat;
background-position: right;
}
#just_played .disclaimer {
text-align: right;
padding-top: 8px;
float: left;
}
.clear { clear: right; }
</style>
<p>
-<form action='/v1/admin/merge/album' method="POST">
+<form action='/admin/merge/album' method="POST">
Album to delete<input type="text" name="id_old" />
Album to keep
<input type="text" name="id_new" />
<input type="submit" value="Merge!" />
</form>
</p>
<p>
<div id="just_played">
<% @list.each do |track| %>
<div class="song">
<br style="clear: both">
<div class="details">
<table><tbody>
<tr>
<td class="label">Album</td>
<td class="label"><a href="/v1/album/<%= track.id %>"><%= track.id %></td>
<td class="info">
<span><% if !track.albummbid.nil? %><a href="http://musicbrainz.org/release-group/<%= track.albummbid %>.html"><%= track.albumname %></a>
<% else %> <%= track.albumname %><% end %></span>
</td>
</tr>
</tbody></table>
</div>
</div>
<% end %>
</div>
</p>
diff --git a/views/duplicate_artists.html.erb b/views/duplicate_artists.html.erb
index 737f381..f7aea02 100644
--- a/views/duplicate_artists.html.erb
+++ b/views/duplicate_artists.html.erb
@@ -1,287 +1,287 @@
<style type="text/css">
body{font-size: 0.75em;}
#just_played #song_list {
float: left;
margin: 2px 0 10px;
}
#just_played .sort_order {
text-align: center;
color: #808080;
padding: 8px 0;
}
#just_played .sort_order .title {
font-weight: 700;
margin-right: 4px;
color: #000000;
}
#just_played .sort_order a {
text-decoration: underline;
margin: 0 4px;
}
#just_played .sort_order a.current {
text-decoration: none;
color: #000000;
}
#just_played .pagination,
#song_list .search-criteria {
text-align: center;
margin: 4px 0;
float: left;
padding: 8px 0;
}
#just_played #song_list .pagination {
border-bottom-width: 1px;
border-bottom-style: dotted;
}
#song_list .search-criteria {
border-bottom-width: 4px;
border-bottom-style: solid;
}
#just_played .pagination .title {
font-weight: 700;
margin-right: 8px;
}
#just_played .pagination .pages {
word-spacing: 0.5em;
margin-right: 8px;
color: #808080;
}
#just_played .pagination a {
color: #204ba1;
text-decoration: underline;
}
#just_played .pagination .pages a.current {
color: #000000;
text-decoration: none;
}
#just_played .pagination a.next {
color: #204ba1;
text-decoration: none;
font-weight: 700;
}
#clear-search {
display: inline-block;
font-size: 0.8em;
margin-left: 10px;
}
#just_played .list_quantity {
color: #204ba1;
}
#just_played .list_quantity img {
margin-right: 4px;
}
#just_played .song {
float: left;
border-top: 1px dashed #C9C9C9;
padding-top: 4px;
}
#just_played .song .date {
font-size: 1.0em;
padding: 3px 8px;
margin: -4px 0 5px 60px;
color: #fff;
background-color: #1F2933;
float: left;
}
#just_played .song .time {
font-size: 0.8em;
color: #999999;
margin-bottom: 2px;
}
#just_played .song .album_image_container {
float: left;
width: 110px;
height: 100px;
background-image: url('http://abcdigmusic.net.au/sites/all/themes/dig2/images/background/no-cover.png');
background-repeat: no-repeat;
}
#just_played .song .album_image_container img {
border: 1px solid #FFFFFF;
}
#just_played .song .album_image_container img:hover {
border: 1px solid #CAD4DD;
}
#just_played .song .australian_artist_container {
z-index:2;
position:absolute;
left:75px;
}
#just_played .song .details {
float: left;
margin-left: 10px;
width: 200px;
}
#just_played .song .details td {
padding-bottom: 9px;
}
#just_played .song .details td.label {
width: 80px;
font-size: 0.9em;
color: #4d4d4d;
}
#just_played .song .details td.info {
width: 145px;
font-size: 0.9em;
font-weight: bold;
}
#just_played .song .details td a{
color: #204ba1;
}
#just_played .song .social_data {
float: left;
margin: 0;
color: #4d4d4d;
font-size: 0.9em;
padding-left: 10px;
}
#just_played .song .feature_album {
position: relative;
top: -4px;
border: 0;
}
#just_played .song .social_data a {
color: #2f57a7;
}
#just_played .song .social_data .community {
float: left;
border-bottom: 1px dotted #CAD4DD;
margin-bottom: 2px;
padding: 2px 1px;
}
#just_played .song .social_data .user {
float: left;
width: 110px;
border-bottom: 1px dotted #CAD4DD;
margin-bottom: 2px;
padding: 2px 1px;
margin-left: 15px;
}
#just_played .song .social_data .last {
border-bottom: 0;
}
#just_played .song .social_data .icon {
float: left;
margin-right: 2px;
}
#just_played .song .social_data .community .text {
float: left;
line-height: 1.2em;
}
#just_played .song .social_data .user .text {
float: left;
width: 84px;
line-height: 1.2em;
}
#just_played .song .social_data .note {
float: left;
clear: both;
width: 310px;
border-top: 1px dotted #CAD4DD;
padding-top: 4px;
padding-left: 21px;
}
#just_played .song .social_data .note .text {
float: left;
width: 320px;
}
#just_played .song .social_data .note .text p {
color: #4d4d4d;
}
#just_played .song .social_data .note a {
background-image: url(../images/icon_external.png);
padding-right: 19px;
background-repeat: no-repeat;
background-position: right;
}
#just_played .disclaimer {
text-align: right;
padding-top: 8px;
float: left;
}
.clear { clear: right; }
</style>
<p>
-<form action='/v1/admin/merge/artist' method="POST">
+<form action='/admin/merge/artist' method="POST">
Artist to delete<input type="text" name="id_old" />
Artist to keep
<input type="text" name="id_new" />
<input type="submit" value="Merge!" />
</form>
</p>
<p>
<div id="just_played">
<% @list.each do |track| %>
<div class="song">
<br style="clear: both">
<div class="details">
<table><tbody>
<tr>
<td class="label">Artist</td>
<td class="label"><a href="/v1/artist/<%= track.id %>"><%= track.id %></td>
<td class="info">
<span><% if !track.artistmbid.nil? %><a href="http://musicbrainz.org/artist/<%= track.artistmbid %>.html"><%= track.artistname %></a>
<% else %> <%= track.artistname %><% end %></span>
</td>
</tr>
</tbody></table>
</div>
</div>
<% end %>
</div>
</p>
diff --git a/views/duplicate_tracks.html.erb b/views/duplicate_tracks.html.erb
index d5fce4b..4b313b7 100644
--- a/views/duplicate_tracks.html.erb
+++ b/views/duplicate_tracks.html.erb
@@ -1,287 +1,287 @@
<style type="text/css">
body{font-size: 0.75em;}
#just_played #song_list {
float: left;
margin: 2px 0 10px;
}
#just_played .sort_order {
text-align: center;
color: #808080;
padding: 8px 0;
}
#just_played .sort_order .title {
font-weight: 700;
margin-right: 4px;
color: #000000;
}
#just_played .sort_order a {
text-decoration: underline;
margin: 0 4px;
}
#just_played .sort_order a.current {
text-decoration: none;
color: #000000;
}
#just_played .pagination,
#song_list .search-criteria {
text-align: center;
margin: 4px 0;
float: left;
padding: 8px 0;
}
#just_played #song_list .pagination {
border-bottom-width: 1px;
border-bottom-style: dotted;
}
#song_list .search-criteria {
border-bottom-width: 4px;
border-bottom-style: solid;
}
#just_played .pagination .title {
font-weight: 700;
margin-right: 8px;
}
#just_played .pagination .pages {
word-spacing: 0.5em;
margin-right: 8px;
color: #808080;
}
#just_played .pagination a {
color: #204ba1;
text-decoration: underline;
}
#just_played .pagination .pages a.current {
color: #000000;
text-decoration: none;
}
#just_played .pagination a.next {
color: #204ba1;
text-decoration: none;
font-weight: 700;
}
#clear-search {
display: inline-block;
font-size: 0.8em;
margin-left: 10px;
}
#just_played .list_quantity {
color: #204ba1;
}
#just_played .list_quantity img {
margin-right: 4px;
}
#just_played .song {
float: left;
border-top: 1px dashed #C9C9C9;
padding-top: 4px;
}
#just_played .song .date {
font-size: 1.0em;
padding: 3px 8px;
margin: -4px 0 5px 60px;
color: #fff;
background-color: #1F2933;
float: left;
}
#just_played .song .time {
font-size: 0.8em;
color: #999999;
margin-bottom: 2px;
}
#just_played .song .album_image_container {
float: left;
width: 110px;
height: 100px;
background-image: url('http://abcdigmusic.net.au/sites/all/themes/dig2/images/background/no-cover.png');
background-repeat: no-repeat;
}
#just_played .song .album_image_container img {
border: 1px solid #FFFFFF;
}
#just_played .song .album_image_container img:hover {
border: 1px solid #CAD4DD;
}
#just_played .song .australian_artist_container {
z-index:2;
position:absolute;
left:75px;
}
#just_played .song .details {
float: left;
margin-left: 10px;
width: 200px;
}
#just_played .song .details td {
padding-bottom: 9px;
}
#just_played .song .details td.label {
width: 80px;
font-size: 0.9em;
color: #4d4d4d;
}
#just_played .song .details td.info {
width: 145px;
font-size: 0.9em;
font-weight: bold;
}
#just_played .song .details td a{
color: #204ba1;
}
#just_played .song .social_data {
float: left;
margin: 0;
color: #4d4d4d;
font-size: 0.9em;
padding-left: 10px;
}
#just_played .song .feature_album {
position: relative;
top: -4px;
border: 0;
}
#just_played .song .social_data a {
color: #2f57a7;
}
#just_played .song .social_data .community {
float: left;
border-bottom: 1px dotted #CAD4DD;
margin-bottom: 2px;
padding: 2px 1px;
}
#just_played .song .social_data .user {
float: left;
width: 110px;
border-bottom: 1px dotted #CAD4DD;
margin-bottom: 2px;
padding: 2px 1px;
margin-left: 15px;
}
#just_played .song .social_data .last {
border-bottom: 0;
}
#just_played .song .social_data .icon {
float: left;
margin-right: 2px;
}
#just_played .song .social_data .community .text {
float: left;
line-height: 1.2em;
}
#just_played .song .social_data .user .text {
float: left;
width: 84px;
line-height: 1.2em;
}
#just_played .song .social_data .note {
float: left;
clear: both;
width: 310px;
border-top: 1px dotted #CAD4DD;
padding-top: 4px;
padding-left: 21px;
}
#just_played .song .social_data .note .text {
float: left;
width: 320px;
}
#just_played .song .social_data .note .text p {
color: #4d4d4d;
}
#just_played .song .social_data .note a {
background-image: url(../images/icon_external.png);
padding-right: 19px;
background-repeat: no-repeat;
background-position: right;
}
#just_played .disclaimer {
text-align: right;
padding-top: 8px;
float: left;
}
.clear { clear: right; }
</style>
<p>
-<form action='/v1/admin/merge/track' method="POST">
+<form action='/admin/merge/track' method="POST">
Track to delete<input type="text" name="id_old" />
Track to keep
<input type="text" name="id_new" />
<input type="submit" value="Merge!" />
</form>
</p>
<p>
<div id="just_played">
<% @list.each do |track| %>
<div class="song">
<br style="clear: both">
<div class="details">
<table><tbody>
<tr>
<td class="label">Track</td>
<td class="label"><a href="/v1/track/<%= track.id %>"><%= track.id %></td>
<td class="info">
<span><% if !track.trackmbid.nil? %><a href="http://musicbrainz.org/track/<%= track.trackmbid %>.html"><%= track.title %></a>
<% else %> <%= track.title %><% end %></span>
</td>
</tr>
</tbody></table>
</div>
</div>
<% end %>
</div>
</p>
diff --git a/views/merge_artists.html.erb b/views/merge_artists.html.erb
deleted file mode 100644
index 671058a..0000000
--- a/views/merge_artists.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<form action='/v1/admin/merge-artists' method="POST">
- Artist to delete<input type="text" name="id_old" />
-
-Artist to keep
-<input type="text" name="id_new" />
-
- <input type="submit" value="Merge!" />
-</form>
\ No newline at end of file
diff --git a/views/track.html.erb b/views/track.html.erb
index 9e98dc1..819d1c2 100644
--- a/views/track.html.erb
+++ b/views/track.html.erb
@@ -1,13 +1,14 @@
<h1>Track</h1>
<ul>
<% if [email protected]? %><li>id: <%= @track.id %></li><% end %>
<% if [email protected]? %><li>title: <%= @track.title %></li><% end %>
<% if [email protected]? %><li>tracknote: <%= @track.tracknote %></li><% end %>
<% if [email protected]? %><li>tracklink: <%= @track.tracklink %></li><% end %>
+<% if [email protected]? %><li>aust: <%= @track.aust %></li><% end %>
<% if [email protected]? %><li>show: <%= @track.show %></li><% end %>
<% if [email protected]? %><li>talent: <%= @track.talent %></li><% end %>
<% if [email protected]? %><li>duration: <%= @track.duration %></li><% end %>
<% if [email protected]? %><li>publisher: <%= @track.publisher %></li><% end %>
<% if [email protected]? %><li>datecopyrighted: <%= @track.datecopyrighted %></li><% end %>
-<li>date: <%= @track.date %></li>
+<% if [email protected]_at %><li>date: <%= @track.created_at %></li><% end %>
</ul>
\ No newline at end of file
diff --git a/views/track_edit.html.erb b/views/track_edit.html.erb
new file mode 100644
index 0000000..01e86c3
--- /dev/null
+++ b/views/track_edit.html.erb
@@ -0,0 +1,46 @@
+<style type="text/css" media="screen">
+ input,textarea{width:100%;}
+</style>
+<h1>track</h1>
+<p><%= @track.title %> - <%= @track.id %></p>
+
+<form action='/v1/track/<%= @track.id %>/edit' method="POST">
+
+ <label for="title">title</label>
+ <input type="text" name="title" value="<%= @track.title %>"/>
+<br>
+ <label for="trackmbid">MBID</label>
+ <input type="text" name="trackmbid" value="<%= @track.trackmbid %>"/>
+ <br>
+
+ <label for="tracklink">link</label>
+ <input type="text" name="tracklink" value="<%= @track.tracklink %>"/>
+ <br>
+
+ <label for="tracknote">note</label>
+ <textarea name="tracknote"><%= @track.tracknote %></textarea>
+ <br>
+
+ <label for="show">show</label>
+ <input type="text" name="show" value="<%= @track.show %>"/>
+ <br>
+
+ <label for="aust">aust</label>
+ <input type="text" name="aust" value="<%= @track.aust %>"/>
+ <br>
+
+ <label for="talent">talent</label>
+ <input type="text" name="talent" value="<%= @track.talent %>"/>
+ <br>
+
+
+ <label for="publisher">publisher</label>
+ <input type="text" name="publisher" value="<%= @track.publisher %>"/>
+ <br>
+
+ <label for="datecopyrighted">datecopyrighted</label>
+ <input type="text" name="datecopyrighted" value="<%= @track.datecopyrighted %>"/>
+ <br>
+
+ <input type="submit" value="Save" />
+</form>
\ No newline at end of file
|
simonhn/pav-api
|
7b63724b768cf3347ee29b56314f645939cb3f0b
|
adding better merging
|
diff --git a/pavapi.rb b/pavapi.rb
index 80ea982..2ea99bc 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -1,805 +1,789 @@
#core stuff
require 'rubygems'
require 'sinatra'
require './models'
require './store_methods'
#Queueing with delayed job
#require 'delayed_job'
#require 'delayed_job_data_mapper'
#require './storetrackjob'
require 'stalker'
#template systems
require 'yajl/json_gem'
require 'rack/contrib/jsonp'
require 'builder'
use Rack::JSONP
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
# Enable New Relic
#configure :production do
#require 'newrelic_rpm'
#end
#throttling
#require 'rack/throttle'
#require 'memcached'
#require './throttler'
#for serving different content types
require 'sinatra/respond_to'
Sinatra::Application.register Sinatra::RespondTo
#versioning
@version = "v1"
configure do
#use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
#use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
#logging
- DataMapper::Logger.new('log/datamapper.log', :debug)
+ DataMapper::Logger.new('log/datamapper.log', :warn)
DataMapper::Model.raise_on_save_failure = true
$LOG = Logger.new('log/pavstore.log', 'monthly')
# MySQL connection:
@config = YAML::load( File.open( 'config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#DataMapper.auto_upgrade!
#DataMapper::auto_migrate!
set :default_content, :html
end
#Caching 1 minute - must adjust
before '/*' do
cache_control :public, :must_revalidate, :max_age => 60 unless development?
end
before '/demo/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
before '*/chart/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
from_date = played_to - 7
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
def get_channel(cha)
if isNumeric(cha)
channel = cha
elsif cha.nil?
channel = false
end
end
def get_artist_query(q)
if (!q.nil?)
return "AND artists.artistname LIKE '%#{q}%' "
end
end
def get_track_query(q)
if (!q.nil?)
return "AND tracks.title LIKE '%#{q}%' "
end
end
def get_album_query(q)
if (!q.nil?)
return "AND albums.albumname LIKE '%#{q}%' "
end
end
def get_all_query(q)
if (!q.nil?)
return "AND (albums.albumname LIKE '%#{q}%' OR albums.albumname LIKE '%#{q}%' OR artists.artistname LIKE '%#{q}%') "
end
end
def get_order_by(order)
if (order=='artist')
return "artists.artistname ASC, plays.playedtime DESC"
elsif (order=='track')
return "tracks.title ASC, plays.playedtime DESC"
else
return "plays.playedtime DESC"
end
end
def get_channel(channel)
if(!channel.nil?)
return "plays.channel_id=#{channel} AND"
end
end
def merge_tracks(old_id, new_id)
old_track = Track.get(old_id)
new_track = Track.get(new_id)
-puts old_track.title
-puts new_track.title
+
if(old_track&&new_track)
#album
#move tracks from old album to new album
link = AlbumTrack.all(:track_id => old_track.id)
link.each{ |link_item|
@album_load = Album.get(link_item.album_id)
@moved = @album_load.tracks << new_track
@moved.save
}
#delete old album_track relations
link.destroy!
#artist
#move tracks from old artist to new artist
link = ArtistTrack.all(:track_id => old_track.id)
link.each{ |link_item|
@artist_load = Artist.get(link_item.artist_id)
@moved = @artist_load.tracks << new_track
@moved.save
}
#delete old artist_track relations
link.destroy!
#plays
plays = Play.all(:track_id => old_track.id)
plays.each{ |link_item|
link_item.update(:track_id => new_id)
}
+ #delete old track
+ old_track.destroy!
end
-
- #delete old track
- old_track.destroy!
end
end
#ROUTES
# Front page
get '/' do
erb :front
end
#show all artists, defaults to 10, ordered by created date
get "/#{@version}/artists" do
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
if channel
@artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist }
wants.xml { builder :artist }
wants.json { @artist.to_json }
end
end
# show tracks from artist
get "/#{@version}/artist/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@tracks = @artist.tracks
respond_to do |wants|
wants.html { erb :artist_tracks }
wants.xml { builder :artist_tracks }
wants.json { @tracks.to_json }
end
end
# show plays from artist
get "/#{@version}/artist/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@plays = @artist.tracks.plays
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
wants.json { @plays.to_json }
end
end
#add new track item (an item in the playout xml)
post "/#{@version}/track" do
protected!
begin
data = JSON.parse params[:payload].to_json
if !data['item']['artist']['artistname'].nil? && Play.count(:playedtime => data['item']['playedtime'], :channel_id => data['channel'])==0
Stalker.enqueue('track.store', :item => data['item'],:channel => data['channel'])
#Delayed::Job.enqueue StoreTrackJob.new(data['item'], data['channel'])
#store_hash(data['item'], data['channel'])
end
rescue StandardError => e
$LOG.info("Post method end: Issue while processing #{data['item']['artist']['artistname']} - #{data['channel']}, #{e.backtrace}")
end
end
#show tracks
get "/#{@version}/tracks" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@tracks = Track.all(Track.plays.channel_id => channel, :limit=>limit.to_i, :order => [:created_at.desc])
else
@tracks = Track.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :tracks }
wants.xml { builder :tracks }
wants.json {@tracks.to_json}
end
end
# show track
get "/#{@version}/track/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
respond_to do |wants|
wants.html { erb :track }
wants.xml { builder :track }
wants.json {@track.to_json}
end
end
#show artists for a track
get "/#{@version}/track/:id/artists" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@artists = @track.artists
respond_to do |wants|
wants.html { erb :track_artists }
wants.xml { builder :track_artists }
wants.json {@artists.to_json}
end
end
#show albums for a track
get "/#{@version}/track/:id/albums" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@albums = @track.albums
respond_to do |wants|
wants.html { erb :track_albums }
wants.xml { builder :track_albums }
wants.json {@albums.to_json}
end
end
# show plays for a track
get "/#{@version}/track/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@plays = @track.plays
respond_to do |wants|
wants.html { erb :track_plays }
wants.xml { builder :track_plays }
wants.json {@plays.to_json}
end
end
#show all albums
get "/#{@version}/albums" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = Album.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@albums = Album.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :albums }
wants.xml { builder :albums }
wants.json { @albums.to_json }
end
end
# show album from id
get "/#{@version}/album/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
respond_to do |wants|
wants.html { erb :album }
wants.xml { builder :album }
wants.json {@album.to_json}
end
end
# show tracks for an album
get "/#{@version}/album/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
@tracks = @album.tracks
respond_to do |wants|
wants.html { erb :album_tracks }
wants.xml { builder :album_tracks }
wants.json {@tracks.to_json }
end
end
#PLAY
get "/#{@version}/plays" do
#DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
artist_query = get_artist_query(params[:artist_query])
track_query = get_track_query(params[:track_query])
album_query = get_album_query(params[:album_query])
query_all = get_all_query(params[:q])
order_by = get_order_by(params[:order_by])
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
if channel
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
else
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
end
hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :plays }
wants.xml { builder :plays }
wants.json { hat.to_json }
end
end
get "/#{@version}/play/:id" do
@play = Play.get(params[:id])
respond_to do |wants|
wants.json { @play.to_json }
end
end
# show all channels
get "/#{@version}/channels" do
@channels = Channel.all
respond_to do |wants|
wants.xml { @channels.to_xml }
wants.json { @channels.to_json }
end
end
#create new channel
post "/#{@version}/channel" do
protected!
data = JSON.parse params[:payload].to_json
channel = Channel.first_or_create({ :channelname => data['channelname'] }, { :channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'] })
end
#update a channel
put "/#{@version}/channel/:id" do
protected!
channel = Channel.get(params[:id])
data = JSON.parse params[:payload].to_json
channel = channel.update(:channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'])
end
# show channel from id
get "/#{@version}/channel/:id" do
@channel = Channel.get(params[:id])
respond_to do |wants|
wants.xml { @channel.to_xml }
wants.json { @channel.to_json }
end
end
# chart of top tracks
get "/#{@version}/chart/track" do
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = get_channel(params[:channel])
#SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
respond_to do |wants|
wants.html { erb :track_chart }
wants.xml { builder :track_chart }
wants.json { hat.to_json }
end
end
# chart of top artist by name
get "/#{@version}/chart/artist" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
#@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
respond_to do |wants|
wants.html { erb :artist_chart }
wants.xml { builder :artist_chart }
wants.json {hat.to_json}
end
end
get "/#{@version}/chart/album" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
@albums = repository(:default).adapter.select("select artists.artistname, artists.artistmbid, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where #{channel} tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :artistmbid => o.artistmbid, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :album_chart }
wants.xml { builder :album_chart }
wants.json {hat.to_json}
end
end
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
#Count all artists
get "/#{@version}/stats" do
@artistcount = Artist.count
@artistmbid = (Artist.count(:artistmbid).to_f/@artistcount.to_f)*100
@trackcount = Track.count
@trackmbid = (Track.count(:trackmbid).to_f/@trackcount.to_f)*100
@playcount = Play.count
@albumcount = Album.count
@albummbid = (Album.count(:albummbid).to_f/@albumcount.to_f)*100
@dig_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_play = Play.all('channel_id'=>1).count
@jazz_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_play = Play.all('channel_id'=>2).count
@country_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_play = Play.all('channel_id'=>3).count
@jjj_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_play = Play.all('channel_id'=>4).count
respond_to do |wants|
wants.html { erb :stats }
end
end
get "/#{@version}/admin/duplicate/artist" do
protected!
@list = repository(:default).adapter.select("SELECT distinct d2.id, d2.artistname, d2.artistmbid FROM artists d1 JOIN artists d2 ON d2.artistname = d1.artistname AND d2.id <> d1.id order by artistname, id")
respond_to do |wants|
wants.html { erb :duplicate_artists }
end
end
post "/#{@version}/admin/merge/artist" do
protected!
old_artist = Artist.get(params[:id_old])
new_artist = Artist.get(params[:id_new])
if(old_artist&&new_artist)
#move tracks from old artist to new artist
link = ArtistTrack.all(:artist_id => old_artist.id)
link.each{ |link_item|
@track_load = Track.get(link_item.track_id)
@moved = new_artist.tracks << @track_load
@moved.save
}
#delete old artist_track relations
link.destroy!
#delete old artist
old_artist.destroy!
end
end
get "/#{@version}/admin/duplicate/album" do
protected!
@list = repository(:default).adapter.select("SELECT distinct d2.id, d2.albumname, d2.albummbid FROM albums d1 JOIN albums d2 ON d2.albumname = d1.albumname AND d2.id <> d1.id order by albumname, id")
respond_to do |wants|
wants.html { erb :duplicate_albums }
end
end
post "/#{@version}/admin/merge/album" do
protected!
old_album = Album.get(params[:id_old])
old_album_tracks = old_album.tracks
-
+
new_album = Album.get(params[:id_new])
new_album_tracks = new_album.tracks
- old_album_tracks.each{ |old_track|
- new_track = new_album_tracks.find {|e| e.title==old_track.title&&e.id!=old_track.id }
- merge_tracks(old_track.id, new_track.id)
- }
+ if(old_album&&new_album)
+
+ #if there are similar track on the two albums,
+ # move the 'old' tracks to the 'new' tracks before moving album links
+ old_album_tracks.each{ |old_track|
+ new_track = new_album_tracks.find {|e| e.title==old_track.title&&e.id!=old_track.id }
+ if(new_track)
+ merge_tracks(old_track.id, new_track.id)
+ end
+ }
+
+ #move tracks from old album to new album
+ link = AlbumTrack.all(:album_id => old_album.id)
+ link.each{ |link_item|
+ @track_load = Track.get(link_item.track_id)
+ @moved = new_album.tracks << @track_load
+ @moved.save
+ }
+
+ #delete old album_track relations
+ link.destroy!
+
+ #delete old album
+ old_album.destroy!
+ end
end
get "/#{@version}/admin/duplicate/track" do
protected!
@list = repository(:default).adapter.select("SELECT distinct d2.id, d2.title, d2.trackmbid FROM tracks d1 JOIN tracks d2 ON d2.title = d1.title AND d2.id <> d1.id order by title, id")
respond_to do |wants|
wants.html { erb :duplicate_tracks }
end
end
post "/#{@version}/admin/merge/track" do
protected!
- old_track = Track.get(params[:id_old])
- new_track = Track.get(params[:id_new])
-
- if(old_track&&new_track)
-
- #album
- #move tracks from old album to new album
- link = AlbumTrack.all(:track_id => old_track.id)
- link.each{ |link_item|
- @album_load = Album.get(link_item.album_id)
- @moved = @album_load.tracks << new_track
- @moved.save
- }
- #delete old album_track relations
- link.destroy!
-
- #artist
- #move tracks from old artist to new artist
- link = ArtistTrack.all(:track_id => old_track.id)
- link.each{ |link_item|
- @artist_load = Artist.get(link_item.artist_id)
- @moved = @artist_load.tracks << new_track
- @moved.save
- }
- #delete old artist_track relations
- link.destroy!
-
- #plays
- plays = Play.all(:track_id => old_track.id)
- plays.each{ |link_item|
- link_item.update(:track_id => params[:id_new])
- }
-
- end
- #delete old album
- old_track.destroy!
+ merge_tracks(params[:id_old], params[:id_new])
end
get '/demo/album-charts' do
from_date = DateTime.now - 7
@from_date_string = from_date.strftime("%b %e")
to_date = DateTime.now
@to_date_string = to_date.strftime("%b %e")
respond_to do |wants|
wants.html{erb :album_chart_all}
end
end
get '/jjj' do
cache_control :public, :max_age => 600
artistmbid = {}
har ='a'
hur = 'b'
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
#hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
all = Hash.new
@artists.each{ |o|
begin
if o.artistmbid
#puts o.artistname
begin
result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
if(result.code==200)
all[o.artistname] = Hash.new
all[o.artistname].store("media",Hash.new())
all[o.artistname].store("info",Hash.new())
all[o.artistname].fetch("info").store("mbid",o.artistmbid)
all[o.artistname].fetch("info").store("count",o.cnt)
xml = Crack::XML.parse(result)
if(xml["rss"]["channel"]["item"].kind_of?(Array))
xml["rss"]["channel"]["item"].each_with_index{|ha,i|
if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
har = ha["title"]
da = ha["media:thumbnail"]
if da.kind_of?(Array)
hur = da.first["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
else
hur = da["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
end
if ha["media:content"].kind_of?(Array)
all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
else
all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
end
end
}
else
if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
har = xml["rss"]["channel"]["item"]["title"]
hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
end
end
#john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
#puts john.inspect
end
rescue => e
end
end
end
}
@hat = all
respond_to do |wants|
wants.html { erb :jjj }
wants.json { all.to_json }
end
end
\ No newline at end of file
|
simonhn/pav-api
|
8464b12cbae964a74eff52de9d0d4616b7eb3fb6
|
better album merge
|
diff --git a/pavapi.rb b/pavapi.rb
index cab1b91..80ea982 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -1,770 +1,805 @@
#core stuff
require 'rubygems'
require 'sinatra'
require './models'
require './store_methods'
#Queueing with delayed job
#require 'delayed_job'
#require 'delayed_job_data_mapper'
#require './storetrackjob'
require 'stalker'
#template systems
require 'yajl/json_gem'
require 'rack/contrib/jsonp'
require 'builder'
use Rack::JSONP
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
# Enable New Relic
#configure :production do
#require 'newrelic_rpm'
#end
#throttling
#require 'rack/throttle'
#require 'memcached'
#require './throttler'
#for serving different content types
require 'sinatra/respond_to'
Sinatra::Application.register Sinatra::RespondTo
#versioning
@version = "v1"
configure do
#use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
#use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
#logging
- DataMapper::Logger.new('log/datamapper.log', :warn)
+ DataMapper::Logger.new('log/datamapper.log', :debug)
DataMapper::Model.raise_on_save_failure = true
$LOG = Logger.new('log/pavstore.log', 'monthly')
# MySQL connection:
@config = YAML::load( File.open( 'config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#DataMapper.auto_upgrade!
#DataMapper::auto_migrate!
set :default_content, :html
end
#Caching 1 minute - must adjust
before '/*' do
cache_control :public, :must_revalidate, :max_age => 60 unless development?
end
before '/demo/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
before '*/chart/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
from_date = played_to - 7
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
def get_channel(cha)
if isNumeric(cha)
channel = cha
elsif cha.nil?
channel = false
end
end
def get_artist_query(q)
if (!q.nil?)
return "AND artists.artistname LIKE '%#{q}%' "
end
end
def get_track_query(q)
if (!q.nil?)
return "AND tracks.title LIKE '%#{q}%' "
end
end
def get_album_query(q)
if (!q.nil?)
return "AND albums.albumname LIKE '%#{q}%' "
end
end
def get_all_query(q)
if (!q.nil?)
return "AND (albums.albumname LIKE '%#{q}%' OR albums.albumname LIKE '%#{q}%' OR artists.artistname LIKE '%#{q}%') "
end
end
def get_order_by(order)
if (order=='artist')
return "artists.artistname ASC, plays.playedtime DESC"
elsif (order=='track')
return "tracks.title ASC, plays.playedtime DESC"
else
return "plays.playedtime DESC"
end
end
def get_channel(channel)
if(!channel.nil?)
return "plays.channel_id=#{channel} AND"
end
end
+
+ def merge_tracks(old_id, new_id)
+ old_track = Track.get(old_id)
+ new_track = Track.get(new_id)
+puts old_track.title
+puts new_track.title
+ if(old_track&&new_track)
+
+ #album
+ #move tracks from old album to new album
+ link = AlbumTrack.all(:track_id => old_track.id)
+ link.each{ |link_item|
+ @album_load = Album.get(link_item.album_id)
+ @moved = @album_load.tracks << new_track
+ @moved.save
+ }
+ #delete old album_track relations
+ link.destroy!
+
+ #artist
+ #move tracks from old artist to new artist
+ link = ArtistTrack.all(:track_id => old_track.id)
+ link.each{ |link_item|
+ @artist_load = Artist.get(link_item.artist_id)
+ @moved = @artist_load.tracks << new_track
+ @moved.save
+ }
+ #delete old artist_track relations
+ link.destroy!
+
+ #plays
+ plays = Play.all(:track_id => old_track.id)
+ plays.each{ |link_item|
+ link_item.update(:track_id => new_id)
+ }
+
+ end
+
+ #delete old track
+ old_track.destroy!
+ end
end
#ROUTES
# Front page
get '/' do
erb :front
end
#show all artists, defaults to 10, ordered by created date
get "/#{@version}/artists" do
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
if channel
@artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist }
wants.xml { builder :artist }
wants.json { @artist.to_json }
end
end
# show tracks from artist
get "/#{@version}/artist/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@tracks = @artist.tracks
respond_to do |wants|
wants.html { erb :artist_tracks }
wants.xml { builder :artist_tracks }
wants.json { @tracks.to_json }
end
end
# show plays from artist
get "/#{@version}/artist/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@plays = @artist.tracks.plays
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
wants.json { @plays.to_json }
end
end
#add new track item (an item in the playout xml)
post "/#{@version}/track" do
protected!
begin
data = JSON.parse params[:payload].to_json
if !data['item']['artist']['artistname'].nil? && Play.count(:playedtime => data['item']['playedtime'], :channel_id => data['channel'])==0
Stalker.enqueue('track.store', :item => data['item'],:channel => data['channel'])
#Delayed::Job.enqueue StoreTrackJob.new(data['item'], data['channel'])
#store_hash(data['item'], data['channel'])
end
rescue StandardError => e
$LOG.info("Post method end: Issue while processing #{data['item']['artist']['artistname']} - #{data['channel']}, #{e.backtrace}")
end
end
#show tracks
get "/#{@version}/tracks" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@tracks = Track.all(Track.plays.channel_id => channel, :limit=>limit.to_i, :order => [:created_at.desc])
else
@tracks = Track.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :tracks }
wants.xml { builder :tracks }
wants.json {@tracks.to_json}
end
end
# show track
get "/#{@version}/track/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
respond_to do |wants|
wants.html { erb :track }
wants.xml { builder :track }
wants.json {@track.to_json}
end
end
#show artists for a track
get "/#{@version}/track/:id/artists" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@artists = @track.artists
respond_to do |wants|
wants.html { erb :track_artists }
wants.xml { builder :track_artists }
wants.json {@artists.to_json}
end
end
#show albums for a track
get "/#{@version}/track/:id/albums" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@albums = @track.albums
respond_to do |wants|
wants.html { erb :track_albums }
wants.xml { builder :track_albums }
wants.json {@albums.to_json}
end
end
# show plays for a track
get "/#{@version}/track/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@plays = @track.plays
respond_to do |wants|
wants.html { erb :track_plays }
wants.xml { builder :track_plays }
wants.json {@plays.to_json}
end
end
#show all albums
get "/#{@version}/albums" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = Album.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@albums = Album.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :albums }
wants.xml { builder :albums }
wants.json { @albums.to_json }
end
end
# show album from id
get "/#{@version}/album/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
respond_to do |wants|
wants.html { erb :album }
wants.xml { builder :album }
wants.json {@album.to_json}
end
end
# show tracks for an album
get "/#{@version}/album/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
@tracks = @album.tracks
respond_to do |wants|
wants.html { erb :album_tracks }
wants.xml { builder :album_tracks }
wants.json {@tracks.to_json }
end
end
#PLAY
get "/#{@version}/plays" do
#DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
artist_query = get_artist_query(params[:artist_query])
track_query = get_track_query(params[:track_query])
album_query = get_album_query(params[:album_query])
query_all = get_all_query(params[:q])
order_by = get_order_by(params[:order_by])
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
if channel
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
else
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
end
hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :plays }
wants.xml { builder :plays }
wants.json { hat.to_json }
end
end
get "/#{@version}/play/:id" do
@play = Play.get(params[:id])
respond_to do |wants|
wants.json { @play.to_json }
end
end
# show all channels
get "/#{@version}/channels" do
@channels = Channel.all
respond_to do |wants|
wants.xml { @channels.to_xml }
wants.json { @channels.to_json }
end
end
#create new channel
post "/#{@version}/channel" do
protected!
data = JSON.parse params[:payload].to_json
channel = Channel.first_or_create({ :channelname => data['channelname'] }, { :channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'] })
end
#update a channel
put "/#{@version}/channel/:id" do
protected!
channel = Channel.get(params[:id])
data = JSON.parse params[:payload].to_json
channel = channel.update(:channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'])
end
# show channel from id
get "/#{@version}/channel/:id" do
@channel = Channel.get(params[:id])
respond_to do |wants|
wants.xml { @channel.to_xml }
wants.json { @channel.to_json }
end
end
# chart of top tracks
get "/#{@version}/chart/track" do
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = get_channel(params[:channel])
#SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
respond_to do |wants|
wants.html { erb :track_chart }
wants.xml { builder :track_chart }
wants.json { hat.to_json }
end
end
# chart of top artist by name
get "/#{@version}/chart/artist" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
#@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
respond_to do |wants|
wants.html { erb :artist_chart }
wants.xml { builder :artist_chart }
wants.json {hat.to_json}
end
end
get "/#{@version}/chart/album" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
@albums = repository(:default).adapter.select("select artists.artistname, artists.artistmbid, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where #{channel} tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :artistmbid => o.artistmbid, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :album_chart }
wants.xml { builder :album_chart }
wants.json {hat.to_json}
end
end
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
#Count all artists
get "/#{@version}/stats" do
@artistcount = Artist.count
@artistmbid = (Artist.count(:artistmbid).to_f/@artistcount.to_f)*100
@trackcount = Track.count
@trackmbid = (Track.count(:trackmbid).to_f/@trackcount.to_f)*100
@playcount = Play.count
@albumcount = Album.count
@albummbid = (Album.count(:albummbid).to_f/@albumcount.to_f)*100
@dig_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_play = Play.all('channel_id'=>1).count
@jazz_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_play = Play.all('channel_id'=>2).count
@country_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_play = Play.all('channel_id'=>3).count
@jjj_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_play = Play.all('channel_id'=>4).count
respond_to do |wants|
wants.html { erb :stats }
end
end
get "/#{@version}/admin/duplicate/artist" do
protected!
@list = repository(:default).adapter.select("SELECT distinct d2.id, d2.artistname, d2.artistmbid FROM artists d1 JOIN artists d2 ON d2.artistname = d1.artistname AND d2.id <> d1.id order by artistname, id")
respond_to do |wants|
wants.html { erb :duplicate_artists }
end
end
post "/#{@version}/admin/merge/artist" do
protected!
old_artist = Artist.get(params[:id_old])
new_artist = Artist.get(params[:id_new])
if(old_artist&&new_artist)
#move tracks from old artist to new artist
link = ArtistTrack.all(:artist_id => old_artist.id)
link.each{ |link_item|
@track_load = Track.get(link_item.track_id)
@moved = new_artist.tracks << @track_load
@moved.save
}
#delete old artist_track relations
link.destroy!
#delete old artist
old_artist.destroy!
end
end
get "/#{@version}/admin/duplicate/album" do
protected!
@list = repository(:default).adapter.select("SELECT distinct d2.id, d2.albumname, d2.albummbid FROM albums d1 JOIN albums d2 ON d2.albumname = d1.albumname AND d2.id <> d1.id order by albumname, id")
respond_to do |wants|
wants.html { erb :duplicate_albums }
end
end
post "/#{@version}/admin/merge/album" do
protected!
+
old_album = Album.get(params[:id_old])
+ old_album_tracks = old_album.tracks
+
new_album = Album.get(params[:id_new])
+ new_album_tracks = new_album.tracks
- if(old_album&&new_album)
- #move tracks from old album to new album
- link = AlbumTrack.all(:album_id => old_album.id)
- link.each{ |link_item|
- @track_load = Track.get(link_item.track_id)
- @moved = new_album.tracks << @track_load
- @moved.save
- }
-
- #delete old album_track relations
- link.destroy!
+ old_album_tracks.each{ |old_track|
+ new_track = new_album_tracks.find {|e| e.title==old_track.title&&e.id!=old_track.id }
+ merge_tracks(old_track.id, new_track.id)
+ }
- #delete old album
- old_album.destroy!
- end
end
get "/#{@version}/admin/duplicate/track" do
protected!
@list = repository(:default).adapter.select("SELECT distinct d2.id, d2.title, d2.trackmbid FROM tracks d1 JOIN tracks d2 ON d2.title = d1.title AND d2.id <> d1.id order by title, id")
respond_to do |wants|
wants.html { erb :duplicate_tracks }
end
end
post "/#{@version}/admin/merge/track" do
protected!
old_track = Track.get(params[:id_old])
new_track = Track.get(params[:id_new])
if(old_track&&new_track)
#album
#move tracks from old album to new album
link = AlbumTrack.all(:track_id => old_track.id)
link.each{ |link_item|
@album_load = Album.get(link_item.album_id)
@moved = @album_load.tracks << new_track
@moved.save
}
#delete old album_track relations
link.destroy!
#artist
#move tracks from old artist to new artist
link = ArtistTrack.all(:track_id => old_track.id)
link.each{ |link_item|
@artist_load = Artist.get(link_item.artist_id)
@moved = @artist_load.tracks << new_track
@moved.save
}
#delete old artist_track relations
link.destroy!
#plays
plays = Play.all(:track_id => old_track.id)
plays.each{ |link_item|
link_item.update(:track_id => params[:id_new])
}
end
#delete old album
old_track.destroy!
end
get '/demo/album-charts' do
from_date = DateTime.now - 7
@from_date_string = from_date.strftime("%b %e")
to_date = DateTime.now
@to_date_string = to_date.strftime("%b %e")
respond_to do |wants|
wants.html{erb :album_chart_all}
end
end
get '/jjj' do
cache_control :public, :max_age => 600
artistmbid = {}
har ='a'
hur = 'b'
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
#hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
all = Hash.new
@artists.each{ |o|
begin
if o.artistmbid
#puts o.artistname
begin
result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
if(result.code==200)
all[o.artistname] = Hash.new
all[o.artistname].store("media",Hash.new())
all[o.artistname].store("info",Hash.new())
all[o.artistname].fetch("info").store("mbid",o.artistmbid)
all[o.artistname].fetch("info").store("count",o.cnt)
xml = Crack::XML.parse(result)
if(xml["rss"]["channel"]["item"].kind_of?(Array))
xml["rss"]["channel"]["item"].each_with_index{|ha,i|
if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
har = ha["title"]
da = ha["media:thumbnail"]
if da.kind_of?(Array)
hur = da.first["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
else
hur = da["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
end
if ha["media:content"].kind_of?(Array)
all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
else
all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
end
end
}
else
if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
har = xml["rss"]["channel"]["item"]["title"]
hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
end
end
#john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
#puts john.inspect
end
rescue => e
end
end
end
}
@hat = all
respond_to do |wants|
wants.html { erb :jjj }
wants.json { all.to_json }
end
end
\ No newline at end of file
|
simonhn/pav-api
|
df5cf42b77f347088b41560eff50f268041442df
|
adding merge functionality
|
diff --git a/pavapi.rb b/pavapi.rb
index ee19d63..cab1b91 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -73,616 +73,698 @@ before '/*' do
end
before '/demo/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
before '*/chart/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
from_date = played_to - 7
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
def get_channel(cha)
if isNumeric(cha)
channel = cha
elsif cha.nil?
channel = false
end
end
def get_artist_query(q)
if (!q.nil?)
return "AND artists.artistname LIKE '%#{q}%' "
end
end
def get_track_query(q)
if (!q.nil?)
return "AND tracks.title LIKE '%#{q}%' "
end
end
def get_album_query(q)
if (!q.nil?)
return "AND albums.albumname LIKE '%#{q}%' "
end
end
def get_all_query(q)
if (!q.nil?)
return "AND (albums.albumname LIKE '%#{q}%' OR albums.albumname LIKE '%#{q}%' OR artists.artistname LIKE '%#{q}%') "
end
end
def get_order_by(order)
if (order=='artist')
return "artists.artistname ASC, plays.playedtime DESC"
elsif (order=='track')
return "tracks.title ASC, plays.playedtime DESC"
else
return "plays.playedtime DESC"
end
end
def get_channel(channel)
if(!channel.nil?)
return "plays.channel_id=#{channel} AND"
end
end
end
#ROUTES
# Front page
get '/' do
erb :front
end
#show all artists, defaults to 10, ordered by created date
get "/#{@version}/artists" do
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
if channel
@artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist }
wants.xml { builder :artist }
wants.json { @artist.to_json }
end
end
# show tracks from artist
get "/#{@version}/artist/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@tracks = @artist.tracks
respond_to do |wants|
wants.html { erb :artist_tracks }
wants.xml { builder :artist_tracks }
wants.json { @tracks.to_json }
end
end
# show plays from artist
get "/#{@version}/artist/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@plays = @artist.tracks.plays
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
wants.json { @plays.to_json }
end
end
#add new track item (an item in the playout xml)
post "/#{@version}/track" do
protected!
begin
data = JSON.parse params[:payload].to_json
if !data['item']['artist']['artistname'].nil? && Play.count(:playedtime => data['item']['playedtime'], :channel_id => data['channel'])==0
Stalker.enqueue('track.store', :item => data['item'],:channel => data['channel'])
#Delayed::Job.enqueue StoreTrackJob.new(data['item'], data['channel'])
#store_hash(data['item'], data['channel'])
end
rescue StandardError => e
$LOG.info("Post method end: Issue while processing #{data['item']['artist']['artistname']} - #{data['channel']}, #{e.backtrace}")
end
end
#show tracks
get "/#{@version}/tracks" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@tracks = Track.all(Track.plays.channel_id => channel, :limit=>limit.to_i, :order => [:created_at.desc])
else
@tracks = Track.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :tracks }
wants.xml { builder :tracks }
wants.json {@tracks.to_json}
end
end
# show track
get "/#{@version}/track/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
respond_to do |wants|
wants.html { erb :track }
wants.xml { builder :track }
wants.json {@track.to_json}
end
end
#show artists for a track
get "/#{@version}/track/:id/artists" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@artists = @track.artists
respond_to do |wants|
wants.html { erb :track_artists }
wants.xml { builder :track_artists }
wants.json {@artists.to_json}
end
end
#show albums for a track
get "/#{@version}/track/:id/albums" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@albums = @track.albums
respond_to do |wants|
wants.html { erb :track_albums }
wants.xml { builder :track_albums }
wants.json {@albums.to_json}
end
end
# show plays for a track
get "/#{@version}/track/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@plays = @track.plays
respond_to do |wants|
wants.html { erb :track_plays }
wants.xml { builder :track_plays }
wants.json {@plays.to_json}
end
end
#show all albums
get "/#{@version}/albums" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = Album.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@albums = Album.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :albums }
wants.xml { builder :albums }
wants.json { @albums.to_json }
end
end
# show album from id
get "/#{@version}/album/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
respond_to do |wants|
wants.html { erb :album }
wants.xml { builder :album }
wants.json {@album.to_json}
end
end
# show tracks for an album
get "/#{@version}/album/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
@tracks = @album.tracks
respond_to do |wants|
wants.html { erb :album_tracks }
wants.xml { builder :album_tracks }
wants.json {@tracks.to_json }
end
end
#PLAY
get "/#{@version}/plays" do
#DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
artist_query = get_artist_query(params[:artist_query])
track_query = get_track_query(params[:track_query])
album_query = get_album_query(params[:album_query])
query_all = get_all_query(params[:q])
order_by = get_order_by(params[:order_by])
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
if channel
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
else
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
end
hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :plays }
wants.xml { builder :plays }
wants.json { hat.to_json }
end
end
get "/#{@version}/play/:id" do
@play = Play.get(params[:id])
respond_to do |wants|
wants.json { @play.to_json }
end
end
# show all channels
get "/#{@version}/channels" do
@channels = Channel.all
respond_to do |wants|
wants.xml { @channels.to_xml }
wants.json { @channels.to_json }
end
end
#create new channel
post "/#{@version}/channel" do
protected!
data = JSON.parse params[:payload].to_json
channel = Channel.first_or_create({ :channelname => data['channelname'] }, { :channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'] })
end
#update a channel
put "/#{@version}/channel/:id" do
protected!
channel = Channel.get(params[:id])
data = JSON.parse params[:payload].to_json
channel = channel.update(:channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'])
end
# show channel from id
get "/#{@version}/channel/:id" do
@channel = Channel.get(params[:id])
respond_to do |wants|
wants.xml { @channel.to_xml }
wants.json { @channel.to_json }
end
end
# chart of top tracks
get "/#{@version}/chart/track" do
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = get_channel(params[:channel])
#SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
respond_to do |wants|
wants.html { erb :track_chart }
wants.xml { builder :track_chart }
wants.json { hat.to_json }
end
end
# chart of top artist by name
get "/#{@version}/chart/artist" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
#@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
respond_to do |wants|
wants.html { erb :artist_chart }
wants.xml { builder :artist_chart }
wants.json {hat.to_json}
end
end
get "/#{@version}/chart/album" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
@albums = repository(:default).adapter.select("select artists.artistname, artists.artistmbid, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where #{channel} tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :artistmbid => o.artistmbid, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :album_chart }
wants.xml { builder :album_chart }
wants.json {hat.to_json}
end
end
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
#Count all artists
get "/#{@version}/stats" do
@artistcount = Artist.count
@artistmbid = (Artist.count(:artistmbid).to_f/@artistcount.to_f)*100
@trackcount = Track.count
@trackmbid = (Track.count(:trackmbid).to_f/@trackcount.to_f)*100
@playcount = Play.count
@albumcount = Album.count
@albummbid = (Album.count(:albummbid).to_f/@albumcount.to_f)*100
@dig_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_play = Play.all('channel_id'=>1).count
@jazz_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_play = Play.all('channel_id'=>2).count
@country_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_play = Play.all('channel_id'=>3).count
@jjj_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_play = Play.all('channel_id'=>4).count
respond_to do |wants|
wants.html { erb :stats }
end
end
-get "/#{@version}/admin/merge-artists" do
+get "/#{@version}/admin/duplicate/artist" do
protected!
+ @list = repository(:default).adapter.select("SELECT distinct d2.id, d2.artistname, d2.artistmbid FROM artists d1 JOIN artists d2 ON d2.artistname = d1.artistname AND d2.id <> d1.id order by artistname, id")
respond_to do |wants|
- wants.html { erb :merge_artists }
+ wants.html { erb :duplicate_artists }
end
end
-post "/#{@version}/admin/merge-artists" do
+post "/#{@version}/admin/merge/artist" do
protected!
old_artist = Artist.get(params[:id_old])
new_artist = Artist.get(params[:id_new])
if(old_artist&&new_artist)
#move tracks from old artist to new artist
link = ArtistTrack.all(:artist_id => old_artist.id)
link.each{ |link_item|
@track_load = Track.get(link_item.track_id)
@moved = new_artist.tracks << @track_load
@moved.save
}
#delete old artist_track relations
link.destroy!
#delete old artist
old_artist.destroy!
end
end
+get "/#{@version}/admin/duplicate/album" do
+ protected!
+ @list = repository(:default).adapter.select("SELECT distinct d2.id, d2.albumname, d2.albummbid FROM albums d1 JOIN albums d2 ON d2.albumname = d1.albumname AND d2.id <> d1.id order by albumname, id")
+ respond_to do |wants|
+ wants.html { erb :duplicate_albums }
+ end
+end
+
+post "/#{@version}/admin/merge/album" do
+ protected!
+ old_album = Album.get(params[:id_old])
+ new_album = Album.get(params[:id_new])
+
+ if(old_album&&new_album)
+ #move tracks from old album to new album
+ link = AlbumTrack.all(:album_id => old_album.id)
+ link.each{ |link_item|
+ @track_load = Track.get(link_item.track_id)
+ @moved = new_album.tracks << @track_load
+ @moved.save
+ }
+
+ #delete old album_track relations
+ link.destroy!
+
+ #delete old album
+ old_album.destroy!
+ end
+end
+
+get "/#{@version}/admin/duplicate/track" do
+ protected!
+ @list = repository(:default).adapter.select("SELECT distinct d2.id, d2.title, d2.trackmbid FROM tracks d1 JOIN tracks d2 ON d2.title = d1.title AND d2.id <> d1.id order by title, id")
+ respond_to do |wants|
+ wants.html { erb :duplicate_tracks }
+ end
+end
+
+post "/#{@version}/admin/merge/track" do
+ protected!
+ old_track = Track.get(params[:id_old])
+ new_track = Track.get(params[:id_new])
+
+ if(old_track&&new_track)
+
+ #album
+ #move tracks from old album to new album
+ link = AlbumTrack.all(:track_id => old_track.id)
+ link.each{ |link_item|
+ @album_load = Album.get(link_item.album_id)
+ @moved = @album_load.tracks << new_track
+ @moved.save
+ }
+ #delete old album_track relations
+ link.destroy!
+
+ #artist
+ #move tracks from old artist to new artist
+ link = ArtistTrack.all(:track_id => old_track.id)
+ link.each{ |link_item|
+ @artist_load = Artist.get(link_item.artist_id)
+ @moved = @artist_load.tracks << new_track
+ @moved.save
+ }
+ #delete old artist_track relations
+ link.destroy!
+
+ #plays
+ plays = Play.all(:track_id => old_track.id)
+ plays.each{ |link_item|
+ link_item.update(:track_id => params[:id_new])
+ }
+
+ end
+
+ #delete old album
+ old_track.destroy!
+end
+
+
+
get '/demo/album-charts' do
from_date = DateTime.now - 7
@from_date_string = from_date.strftime("%b %e")
to_date = DateTime.now
@to_date_string = to_date.strftime("%b %e")
respond_to do |wants|
wants.html{erb :album_chart_all}
end
end
get '/jjj' do
cache_control :public, :max_age => 600
artistmbid = {}
har ='a'
hur = 'b'
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
#hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
all = Hash.new
@artists.each{ |o|
begin
if o.artistmbid
#puts o.artistname
begin
result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
if(result.code==200)
all[o.artistname] = Hash.new
all[o.artistname].store("media",Hash.new())
all[o.artistname].store("info",Hash.new())
all[o.artistname].fetch("info").store("mbid",o.artistmbid)
all[o.artistname].fetch("info").store("count",o.cnt)
xml = Crack::XML.parse(result)
if(xml["rss"]["channel"]["item"].kind_of?(Array))
xml["rss"]["channel"]["item"].each_with_index{|ha,i|
if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
har = ha["title"]
da = ha["media:thumbnail"]
if da.kind_of?(Array)
hur = da.first["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
else
hur = da["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
end
if ha["media:content"].kind_of?(Array)
all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
else
all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
end
end
}
else
if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
har = xml["rss"]["channel"]["item"]["title"]
hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
end
end
#john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
#puts john.inspect
end
rescue => e
end
end
end
}
@hat = all
respond_to do |wants|
wants.html { erb :jjj }
wants.json { all.to_json }
end
end
\ No newline at end of file
diff --git a/views/artist.html.erb b/views/artist.html.erb
index 14bf785..6af971b 100644
--- a/views/artist.html.erb
+++ b/views/artist.html.erb
@@ -1,2 +1,8 @@
<h1>Artist</h1>
<p><%= @artist.artistname %></p>
+<p><% if [email protected]? %><%[email protected] %><% end %></p>
+<p><% if [email protected]? %><%[email protected] %><% end %></p>
+<p><% if [email protected]? %><%[email protected] %><% end %></p>
+<p><% if [email protected]? %><%[email protected] %><% end %></p>
+
+
diff --git a/views/duplicate_albums.html.erb b/views/duplicate_albums.html.erb
new file mode 100644
index 0000000..07e3c4a
--- /dev/null
+++ b/views/duplicate_albums.html.erb
@@ -0,0 +1,287 @@
+
+<style type="text/css">
+
+body{font-size: 0.75em;}
+#just_played #song_list {
+ float: left;
+ margin: 2px 0 10px;
+ }
+
+ #just_played .sort_order {
+ text-align: center;
+ color: #808080;
+ padding: 8px 0;
+ }
+
+ #just_played .sort_order .title {
+ font-weight: 700;
+ margin-right: 4px;
+ color: #000000;
+ }
+
+ #just_played .sort_order a {
+ text-decoration: underline;
+ margin: 0 4px;
+ }
+
+ #just_played .sort_order a.current {
+ text-decoration: none;
+ color: #000000;
+ }
+
+ #just_played .pagination,
+ #song_list .search-criteria {
+ text-align: center;
+ margin: 4px 0;
+ float: left;
+ padding: 8px 0;
+ }
+
+ #just_played #song_list .pagination {
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ }
+
+ #song_list .search-criteria {
+ border-bottom-width: 4px;
+ border-bottom-style: solid;
+ }
+
+ #just_played .pagination .title {
+ font-weight: 700;
+ margin-right: 8px;
+ }
+
+ #just_played .pagination .pages {
+ word-spacing: 0.5em;
+ margin-right: 8px;
+ color: #808080;
+ }
+
+ #just_played .pagination a {
+ color: #204ba1;
+ text-decoration: underline;
+ }
+
+ #just_played .pagination .pages a.current {
+ color: #000000;
+ text-decoration: none;
+ }
+
+ #just_played .pagination a.next {
+ color: #204ba1;
+ text-decoration: none;
+ font-weight: 700;
+ }
+
+ #clear-search {
+ display: inline-block;
+ font-size: 0.8em;
+ margin-left: 10px;
+ }
+
+ #just_played .list_quantity {
+ color: #204ba1;
+ }
+
+ #just_played .list_quantity img {
+ margin-right: 4px;
+ }
+
+ #just_played .song {
+ float: left;
+ border-top: 1px dashed #C9C9C9;
+ padding-top: 4px;
+ }
+
+ #just_played .song .date {
+ font-size: 1.0em;
+ padding: 3px 8px;
+ margin: -4px 0 5px 60px;
+ color: #fff;
+ background-color: #1F2933;
+ float: left;
+ }
+
+ #just_played .song .time {
+ font-size: 0.8em;
+ color: #999999;
+ margin-bottom: 2px;
+ }
+
+ #just_played .song .album_image_container {
+ float: left;
+ width: 110px;
+ height: 100px;
+ background-image: url('http://abcdigmusic.net.au/sites/all/themes/dig2/images/background/no-cover.png');
+ background-repeat: no-repeat;
+ }
+
+ #just_played .song .album_image_container img {
+ border: 1px solid #FFFFFF;
+ }
+
+ #just_played .song .album_image_container img:hover {
+ border: 1px solid #CAD4DD;
+ }
+
+ #just_played .song .australian_artist_container {
+ z-index:2;
+ position:absolute;
+ left:75px;
+ }
+
+ #just_played .song .details {
+ float: left;
+ margin-left: 10px;
+ width: 200px;
+ }
+
+ #just_played .song .details td {
+ padding-bottom: 9px;
+ }
+
+ #just_played .song .details td.label {
+ width: 80px;
+ font-size: 0.9em;
+ color: #4d4d4d;
+ }
+
+ #just_played .song .details td.info {
+ width: 145px;
+ font-size: 0.9em;
+ font-weight: bold;
+ }
+
+ #just_played .song .details td a{
+ color: #204ba1;
+ }
+
+ #just_played .song .social_data {
+ float: left;
+ margin: 0;
+ color: #4d4d4d;
+ font-size: 0.9em;
+ padding-left: 10px;
+ }
+
+ #just_played .song .feature_album {
+ position: relative;
+ top: -4px;
+ border: 0;
+ }
+
+ #just_played .song .social_data a {
+ color: #2f57a7;
+ }
+
+ #just_played .song .social_data .community {
+ float: left;
+ border-bottom: 1px dotted #CAD4DD;
+ margin-bottom: 2px;
+ padding: 2px 1px;
+ }
+
+ #just_played .song .social_data .user {
+ float: left;
+ width: 110px;
+ border-bottom: 1px dotted #CAD4DD;
+ margin-bottom: 2px;
+ padding: 2px 1px;
+ margin-left: 15px;
+ }
+
+ #just_played .song .social_data .last {
+ border-bottom: 0;
+ }
+
+ #just_played .song .social_data .icon {
+ float: left;
+ margin-right: 2px;
+ }
+
+ #just_played .song .social_data .community .text {
+ float: left;
+ line-height: 1.2em;
+ }
+
+ #just_played .song .social_data .user .text {
+ float: left;
+ width: 84px;
+ line-height: 1.2em;
+ }
+
+ #just_played .song .social_data .note {
+ float: left;
+ clear: both;
+ width: 310px;
+ border-top: 1px dotted #CAD4DD;
+ padding-top: 4px;
+ padding-left: 21px;
+ }
+
+ #just_played .song .social_data .note .text {
+ float: left;
+ width: 320px;
+ }
+
+ #just_played .song .social_data .note .text p {
+ color: #4d4d4d;
+ }
+
+ #just_played .song .social_data .note a {
+ background-image: url(../images/icon_external.png);
+ padding-right: 19px;
+ background-repeat: no-repeat;
+ background-position: right;
+ }
+
+ #just_played .disclaimer {
+ text-align: right;
+ padding-top: 8px;
+ float: left;
+ }
+.clear { clear: right; }
+
+</style>
+<p>
+
+<form action='/v1/admin/merge/album' method="POST">
+ Album to delete<input type="text" name="id_old" />
+
+Album to keep
+<input type="text" name="id_new" />
+
+ <input type="submit" value="Merge!" />
+</form>
+</p>
+
+<p>
+ <div id="just_played">
+ <% @list.each do |track| %>
+ <div class="song">
+ <br style="clear: both">
+
+ <div class="details">
+ <table><tbody>
+
+ <tr>
+ <td class="label">Album</td>
+ <td class="label"><a href="/v1/album/<%= track.id %>"><%= track.id %></td>
+
+ <td class="info">
+
+ <span><% if !track.albummbid.nil? %><a href="http://musicbrainz.org/release-group/<%= track.albummbid %>.html"><%= track.albumname %></a>
+ <% else %> <%= track.albumname %><% end %></span>
+ </td>
+ </tr>
+
+ </tbody></table>
+ </div>
+
+ </div>
+ <% end %>
+ </div>
+</p>
+
+
diff --git a/views/duplicate_artists.html.erb b/views/duplicate_artists.html.erb
new file mode 100644
index 0000000..737f381
--- /dev/null
+++ b/views/duplicate_artists.html.erb
@@ -0,0 +1,287 @@
+
+<style type="text/css">
+
+body{font-size: 0.75em;}
+#just_played #song_list {
+ float: left;
+ margin: 2px 0 10px;
+ }
+
+ #just_played .sort_order {
+ text-align: center;
+ color: #808080;
+ padding: 8px 0;
+ }
+
+ #just_played .sort_order .title {
+ font-weight: 700;
+ margin-right: 4px;
+ color: #000000;
+ }
+
+ #just_played .sort_order a {
+ text-decoration: underline;
+ margin: 0 4px;
+ }
+
+ #just_played .sort_order a.current {
+ text-decoration: none;
+ color: #000000;
+ }
+
+ #just_played .pagination,
+ #song_list .search-criteria {
+ text-align: center;
+ margin: 4px 0;
+ float: left;
+ padding: 8px 0;
+ }
+
+ #just_played #song_list .pagination {
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ }
+
+ #song_list .search-criteria {
+ border-bottom-width: 4px;
+ border-bottom-style: solid;
+ }
+
+ #just_played .pagination .title {
+ font-weight: 700;
+ margin-right: 8px;
+ }
+
+ #just_played .pagination .pages {
+ word-spacing: 0.5em;
+ margin-right: 8px;
+ color: #808080;
+ }
+
+ #just_played .pagination a {
+ color: #204ba1;
+ text-decoration: underline;
+ }
+
+ #just_played .pagination .pages a.current {
+ color: #000000;
+ text-decoration: none;
+ }
+
+ #just_played .pagination a.next {
+ color: #204ba1;
+ text-decoration: none;
+ font-weight: 700;
+ }
+
+ #clear-search {
+ display: inline-block;
+ font-size: 0.8em;
+ margin-left: 10px;
+ }
+
+ #just_played .list_quantity {
+ color: #204ba1;
+ }
+
+ #just_played .list_quantity img {
+ margin-right: 4px;
+ }
+
+ #just_played .song {
+ float: left;
+ border-top: 1px dashed #C9C9C9;
+ padding-top: 4px;
+ }
+
+ #just_played .song .date {
+ font-size: 1.0em;
+ padding: 3px 8px;
+ margin: -4px 0 5px 60px;
+ color: #fff;
+ background-color: #1F2933;
+ float: left;
+ }
+
+ #just_played .song .time {
+ font-size: 0.8em;
+ color: #999999;
+ margin-bottom: 2px;
+ }
+
+ #just_played .song .album_image_container {
+ float: left;
+ width: 110px;
+ height: 100px;
+ background-image: url('http://abcdigmusic.net.au/sites/all/themes/dig2/images/background/no-cover.png');
+ background-repeat: no-repeat;
+ }
+
+ #just_played .song .album_image_container img {
+ border: 1px solid #FFFFFF;
+ }
+
+ #just_played .song .album_image_container img:hover {
+ border: 1px solid #CAD4DD;
+ }
+
+ #just_played .song .australian_artist_container {
+ z-index:2;
+ position:absolute;
+ left:75px;
+ }
+
+ #just_played .song .details {
+ float: left;
+ margin-left: 10px;
+ width: 200px;
+ }
+
+ #just_played .song .details td {
+ padding-bottom: 9px;
+ }
+
+ #just_played .song .details td.label {
+ width: 80px;
+ font-size: 0.9em;
+ color: #4d4d4d;
+ }
+
+ #just_played .song .details td.info {
+ width: 145px;
+ font-size: 0.9em;
+ font-weight: bold;
+ }
+
+ #just_played .song .details td a{
+ color: #204ba1;
+ }
+
+ #just_played .song .social_data {
+ float: left;
+ margin: 0;
+ color: #4d4d4d;
+ font-size: 0.9em;
+ padding-left: 10px;
+ }
+
+ #just_played .song .feature_album {
+ position: relative;
+ top: -4px;
+ border: 0;
+ }
+
+ #just_played .song .social_data a {
+ color: #2f57a7;
+ }
+
+ #just_played .song .social_data .community {
+ float: left;
+ border-bottom: 1px dotted #CAD4DD;
+ margin-bottom: 2px;
+ padding: 2px 1px;
+ }
+
+ #just_played .song .social_data .user {
+ float: left;
+ width: 110px;
+ border-bottom: 1px dotted #CAD4DD;
+ margin-bottom: 2px;
+ padding: 2px 1px;
+ margin-left: 15px;
+ }
+
+ #just_played .song .social_data .last {
+ border-bottom: 0;
+ }
+
+ #just_played .song .social_data .icon {
+ float: left;
+ margin-right: 2px;
+ }
+
+ #just_played .song .social_data .community .text {
+ float: left;
+ line-height: 1.2em;
+ }
+
+ #just_played .song .social_data .user .text {
+ float: left;
+ width: 84px;
+ line-height: 1.2em;
+ }
+
+ #just_played .song .social_data .note {
+ float: left;
+ clear: both;
+ width: 310px;
+ border-top: 1px dotted #CAD4DD;
+ padding-top: 4px;
+ padding-left: 21px;
+ }
+
+ #just_played .song .social_data .note .text {
+ float: left;
+ width: 320px;
+ }
+
+ #just_played .song .social_data .note .text p {
+ color: #4d4d4d;
+ }
+
+ #just_played .song .social_data .note a {
+ background-image: url(../images/icon_external.png);
+ padding-right: 19px;
+ background-repeat: no-repeat;
+ background-position: right;
+ }
+
+ #just_played .disclaimer {
+ text-align: right;
+ padding-top: 8px;
+ float: left;
+ }
+.clear { clear: right; }
+
+</style>
+<p>
+
+<form action='/v1/admin/merge/artist' method="POST">
+ Artist to delete<input type="text" name="id_old" />
+
+Artist to keep
+<input type="text" name="id_new" />
+
+ <input type="submit" value="Merge!" />
+</form>
+</p>
+
+<p>
+ <div id="just_played">
+ <% @list.each do |track| %>
+ <div class="song">
+ <br style="clear: both">
+
+ <div class="details">
+ <table><tbody>
+
+ <tr>
+ <td class="label">Artist</td>
+ <td class="label"><a href="/v1/artist/<%= track.id %>"><%= track.id %></td>
+
+ <td class="info">
+
+ <span><% if !track.artistmbid.nil? %><a href="http://musicbrainz.org/artist/<%= track.artistmbid %>.html"><%= track.artistname %></a>
+ <% else %> <%= track.artistname %><% end %></span>
+ </td>
+ </tr>
+
+ </tbody></table>
+ </div>
+
+ </div>
+ <% end %>
+ </div>
+</p>
+
+
diff --git a/views/duplicate_tracks.html.erb b/views/duplicate_tracks.html.erb
new file mode 100644
index 0000000..d5fce4b
--- /dev/null
+++ b/views/duplicate_tracks.html.erb
@@ -0,0 +1,287 @@
+
+<style type="text/css">
+
+body{font-size: 0.75em;}
+#just_played #song_list {
+ float: left;
+ margin: 2px 0 10px;
+ }
+
+ #just_played .sort_order {
+ text-align: center;
+ color: #808080;
+ padding: 8px 0;
+ }
+
+ #just_played .sort_order .title {
+ font-weight: 700;
+ margin-right: 4px;
+ color: #000000;
+ }
+
+ #just_played .sort_order a {
+ text-decoration: underline;
+ margin: 0 4px;
+ }
+
+ #just_played .sort_order a.current {
+ text-decoration: none;
+ color: #000000;
+ }
+
+ #just_played .pagination,
+ #song_list .search-criteria {
+ text-align: center;
+ margin: 4px 0;
+ float: left;
+ padding: 8px 0;
+ }
+
+ #just_played #song_list .pagination {
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ }
+
+ #song_list .search-criteria {
+ border-bottom-width: 4px;
+ border-bottom-style: solid;
+ }
+
+ #just_played .pagination .title {
+ font-weight: 700;
+ margin-right: 8px;
+ }
+
+ #just_played .pagination .pages {
+ word-spacing: 0.5em;
+ margin-right: 8px;
+ color: #808080;
+ }
+
+ #just_played .pagination a {
+ color: #204ba1;
+ text-decoration: underline;
+ }
+
+ #just_played .pagination .pages a.current {
+ color: #000000;
+ text-decoration: none;
+ }
+
+ #just_played .pagination a.next {
+ color: #204ba1;
+ text-decoration: none;
+ font-weight: 700;
+ }
+
+ #clear-search {
+ display: inline-block;
+ font-size: 0.8em;
+ margin-left: 10px;
+ }
+
+ #just_played .list_quantity {
+ color: #204ba1;
+ }
+
+ #just_played .list_quantity img {
+ margin-right: 4px;
+ }
+
+ #just_played .song {
+ float: left;
+ border-top: 1px dashed #C9C9C9;
+ padding-top: 4px;
+ }
+
+ #just_played .song .date {
+ font-size: 1.0em;
+ padding: 3px 8px;
+ margin: -4px 0 5px 60px;
+ color: #fff;
+ background-color: #1F2933;
+ float: left;
+ }
+
+ #just_played .song .time {
+ font-size: 0.8em;
+ color: #999999;
+ margin-bottom: 2px;
+ }
+
+ #just_played .song .album_image_container {
+ float: left;
+ width: 110px;
+ height: 100px;
+ background-image: url('http://abcdigmusic.net.au/sites/all/themes/dig2/images/background/no-cover.png');
+ background-repeat: no-repeat;
+ }
+
+ #just_played .song .album_image_container img {
+ border: 1px solid #FFFFFF;
+ }
+
+ #just_played .song .album_image_container img:hover {
+ border: 1px solid #CAD4DD;
+ }
+
+ #just_played .song .australian_artist_container {
+ z-index:2;
+ position:absolute;
+ left:75px;
+ }
+
+ #just_played .song .details {
+ float: left;
+ margin-left: 10px;
+ width: 200px;
+ }
+
+ #just_played .song .details td {
+ padding-bottom: 9px;
+ }
+
+ #just_played .song .details td.label {
+ width: 80px;
+ font-size: 0.9em;
+ color: #4d4d4d;
+ }
+
+ #just_played .song .details td.info {
+ width: 145px;
+ font-size: 0.9em;
+ font-weight: bold;
+ }
+
+ #just_played .song .details td a{
+ color: #204ba1;
+ }
+
+ #just_played .song .social_data {
+ float: left;
+ margin: 0;
+ color: #4d4d4d;
+ font-size: 0.9em;
+ padding-left: 10px;
+ }
+
+ #just_played .song .feature_album {
+ position: relative;
+ top: -4px;
+ border: 0;
+ }
+
+ #just_played .song .social_data a {
+ color: #2f57a7;
+ }
+
+ #just_played .song .social_data .community {
+ float: left;
+ border-bottom: 1px dotted #CAD4DD;
+ margin-bottom: 2px;
+ padding: 2px 1px;
+ }
+
+ #just_played .song .social_data .user {
+ float: left;
+ width: 110px;
+ border-bottom: 1px dotted #CAD4DD;
+ margin-bottom: 2px;
+ padding: 2px 1px;
+ margin-left: 15px;
+ }
+
+ #just_played .song .social_data .last {
+ border-bottom: 0;
+ }
+
+ #just_played .song .social_data .icon {
+ float: left;
+ margin-right: 2px;
+ }
+
+ #just_played .song .social_data .community .text {
+ float: left;
+ line-height: 1.2em;
+ }
+
+ #just_played .song .social_data .user .text {
+ float: left;
+ width: 84px;
+ line-height: 1.2em;
+ }
+
+ #just_played .song .social_data .note {
+ float: left;
+ clear: both;
+ width: 310px;
+ border-top: 1px dotted #CAD4DD;
+ padding-top: 4px;
+ padding-left: 21px;
+ }
+
+ #just_played .song .social_data .note .text {
+ float: left;
+ width: 320px;
+ }
+
+ #just_played .song .social_data .note .text p {
+ color: #4d4d4d;
+ }
+
+ #just_played .song .social_data .note a {
+ background-image: url(../images/icon_external.png);
+ padding-right: 19px;
+ background-repeat: no-repeat;
+ background-position: right;
+ }
+
+ #just_played .disclaimer {
+ text-align: right;
+ padding-top: 8px;
+ float: left;
+ }
+.clear { clear: right; }
+
+</style>
+<p>
+
+<form action='/v1/admin/merge/track' method="POST">
+ Track to delete<input type="text" name="id_old" />
+
+Track to keep
+<input type="text" name="id_new" />
+
+ <input type="submit" value="Merge!" />
+</form>
+</p>
+
+<p>
+ <div id="just_played">
+ <% @list.each do |track| %>
+ <div class="song">
+ <br style="clear: both">
+
+ <div class="details">
+ <table><tbody>
+
+ <tr>
+ <td class="label">Track</td>
+ <td class="label"><a href="/v1/track/<%= track.id %>"><%= track.id %></td>
+
+ <td class="info">
+
+ <span><% if !track.trackmbid.nil? %><a href="http://musicbrainz.org/track/<%= track.trackmbid %>.html"><%= track.title %></a>
+ <% else %> <%= track.title %><% end %></span>
+ </td>
+ </tr>
+
+ </tbody></table>
+ </div>
+
+ </div>
+ <% end %>
+ </div>
+</p>
+
+
|
simonhn/pav-api
|
77119c65768472f61a736af0c4a89d3967f25ff8
|
refarcoring of charts and adding artist merge-functionality
|
diff --git a/pavapi.rb b/pavapi.rb
index 39cadf4..ee19d63 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -1,669 +1,688 @@
#core stuff
require 'rubygems'
require 'sinatra'
require './models'
require './store_methods'
#Queueing with delayed job
#require 'delayed_job'
#require 'delayed_job_data_mapper'
#require './storetrackjob'
require 'stalker'
#template systems
require 'yajl/json_gem'
require 'rack/contrib/jsonp'
require 'builder'
use Rack::JSONP
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
# Enable New Relic
#configure :production do
#require 'newrelic_rpm'
#end
#throttling
#require 'rack/throttle'
#require 'memcached'
#require './throttler'
#for serving different content types
require 'sinatra/respond_to'
Sinatra::Application.register Sinatra::RespondTo
#versioning
@version = "v1"
configure do
#use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
#use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
#logging
DataMapper::Logger.new('log/datamapper.log', :warn)
DataMapper::Model.raise_on_save_failure = true
$LOG = Logger.new('log/pavstore.log', 'monthly')
# MySQL connection:
@config = YAML::load( File.open( 'config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#DataMapper.auto_upgrade!
#DataMapper::auto_migrate!
set :default_content, :html
end
#Caching 1 minute - must adjust
before '/*' do
cache_control :public, :must_revalidate, :max_age => 60 unless development?
end
before '/demo/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
before '*/chart/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
from_date = played_to - 7
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
def get_channel(cha)
if isNumeric(cha)
channel = cha
elsif cha.nil?
channel = false
end
end
def get_artist_query(q)
if (!q.nil?)
return "AND artists.artistname LIKE '%#{q}%' "
end
end
def get_track_query(q)
if (!q.nil?)
return "AND tracks.title LIKE '%#{q}%' "
end
end
def get_album_query(q)
if (!q.nil?)
return "AND albums.albumname LIKE '%#{q}%' "
end
end
def get_all_query(q)
if (!q.nil?)
return "AND (albums.albumname LIKE '%#{q}%' OR albums.albumname LIKE '%#{q}%' OR artists.artistname LIKE '%#{q}%') "
end
end
def get_order_by(order)
if (order=='artist')
return "artists.artistname ASC, plays.playedtime DESC"
elsif (order=='track')
return "tracks.title ASC, plays.playedtime DESC"
else
return "plays.playedtime DESC"
end
end
+
+ def get_channel(channel)
+ if(!channel.nil?)
+ return "plays.channel_id=#{channel} AND"
+ end
+ end
end
#ROUTES
# Front page
get '/' do
erb :front
end
#show all artists, defaults to 10, ordered by created date
get "/#{@version}/artists" do
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
if channel
@artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist }
wants.xml { builder :artist }
wants.json { @artist.to_json }
end
end
# show tracks from artist
get "/#{@version}/artist/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@tracks = @artist.tracks
respond_to do |wants|
wants.html { erb :artist_tracks }
wants.xml { builder :artist_tracks }
wants.json { @tracks.to_json }
end
end
# show plays from artist
get "/#{@version}/artist/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@plays = @artist.tracks.plays
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
wants.json { @plays.to_json }
end
end
#add new track item (an item in the playout xml)
post "/#{@version}/track" do
protected!
begin
data = JSON.parse params[:payload].to_json
if !data['item']['artist']['artistname'].nil? && Play.count(:playedtime => data['item']['playedtime'], :channel_id => data['channel'])==0
Stalker.enqueue('track.store', :item => data['item'],:channel => data['channel'])
#Delayed::Job.enqueue StoreTrackJob.new(data['item'], data['channel'])
#store_hash(data['item'], data['channel'])
end
rescue StandardError => e
$LOG.info("Post method end: Issue while processing #{data['item']['artist']['artistname']} - #{data['channel']}, #{e.backtrace}")
end
end
#show tracks
get "/#{@version}/tracks" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@tracks = Track.all(Track.plays.channel_id => channel, :limit=>limit.to_i, :order => [:created_at.desc])
else
@tracks = Track.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :tracks }
wants.xml { builder :tracks }
wants.json {@tracks.to_json}
end
end
# show track
get "/#{@version}/track/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
respond_to do |wants|
wants.html { erb :track }
wants.xml { builder :track }
wants.json {@track.to_json}
end
end
#show artists for a track
get "/#{@version}/track/:id/artists" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@artists = @track.artists
respond_to do |wants|
wants.html { erb :track_artists }
wants.xml { builder :track_artists }
wants.json {@artists.to_json}
end
end
#show albums for a track
get "/#{@version}/track/:id/albums" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@albums = @track.albums
respond_to do |wants|
wants.html { erb :track_albums }
wants.xml { builder :track_albums }
wants.json {@albums.to_json}
end
end
# show plays for a track
get "/#{@version}/track/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@plays = @track.plays
respond_to do |wants|
wants.html { erb :track_plays }
wants.xml { builder :track_plays }
wants.json {@plays.to_json}
end
end
#show all albums
get "/#{@version}/albums" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = Album.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@albums = Album.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :albums }
wants.xml { builder :albums }
wants.json { @albums.to_json }
end
end
# show album from id
get "/#{@version}/album/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
respond_to do |wants|
wants.html { erb :album }
wants.xml { builder :album }
wants.json {@album.to_json}
end
end
# show tracks for an album
get "/#{@version}/album/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
@tracks = @album.tracks
respond_to do |wants|
wants.html { erb :album_tracks }
wants.xml { builder :album_tracks }
wants.json {@tracks.to_json }
end
end
#PLAY
get "/#{@version}/plays" do
#DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
artist_query = get_artist_query(params[:artist_query])
track_query = get_track_query(params[:track_query])
album_query = get_album_query(params[:album_query])
query_all = get_all_query(params[:q])
order_by = get_order_by(params[:order_by])
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
if channel
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
else
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
end
hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :plays }
wants.xml { builder :plays }
wants.json { hat.to_json }
end
end
get "/#{@version}/play/:id" do
@play = Play.get(params[:id])
respond_to do |wants|
wants.json { @play.to_json }
end
end
# show all channels
get "/#{@version}/channels" do
@channels = Channel.all
respond_to do |wants|
wants.xml { @channels.to_xml }
wants.json { @channels.to_json }
end
end
#create new channel
post "/#{@version}/channel" do
protected!
data = JSON.parse params[:payload].to_json
channel = Channel.first_or_create({ :channelname => data['channelname'] }, { :channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'] })
end
#update a channel
put "/#{@version}/channel/:id" do
protected!
channel = Channel.get(params[:id])
data = JSON.parse params[:payload].to_json
channel = channel.update(:channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'])
end
# show channel from id
get "/#{@version}/channel/:id" do
@channel = Channel.get(params[:id])
respond_to do |wants|
wants.xml { @channel.to_xml }
wants.json { @channel.to_json }
end
end
# chart of top tracks
get "/#{@version}/chart/track" do
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
- channel = params[:channel]
+ channel = get_channel(params[:channel])
#SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
-
- if channel
- @tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
- else
- @tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
- end
+ @tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
respond_to do |wants|
wants.html { erb :track_chart }
wants.xml { builder :track_chart }
wants.json { hat.to_json }
end
end
# chart of top artist by name
get "/#{@version}/chart/artist" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
- channel = params[:channel]
- if channel
- @artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
- else
- @artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
- end
+ channel = get_channel(params[:channel])
+ @artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where #{channel} tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
+
#@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
respond_to do |wants|
wants.html { erb :artist_chart }
wants.xml { builder :artist_chart }
wants.json {hat.to_json}
end
end
get "/#{@version}/chart/album" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
- channel = params[:channel]
- if channel
- @albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
- else
- @albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
- end
- hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
+ channel = get_channel(params[:channel])
+ @albums = repository(:default).adapter.select("select artists.artistname, artists.artistmbid, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where #{channel} tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
+ hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :artistmbid => o.artistmbid, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :album_chart }
wants.xml { builder :album_chart }
wants.json {hat.to_json}
end
end
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
-#Sinatra version info
-get "/#{@version}/about" do
- "I'm running version " + Sinatra::VERSION
-end
-
#Count all artists
get "/#{@version}/stats" do
@artistcount = Artist.count
@artistmbid = (Artist.count(:artistmbid).to_f/@artistcount.to_f)*100
@trackcount = Track.count
@trackmbid = (Track.count(:trackmbid).to_f/@trackcount.to_f)*100
@playcount = Play.count
@albumcount = Album.count
@albummbid = (Album.count(:albummbid).to_f/@albumcount.to_f)*100
@dig_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_play = Play.all('channel_id'=>1).count
@jazz_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_play = Play.all('channel_id'=>2).count
@country_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_play = Play.all('channel_id'=>3).count
@jjj_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_play = Play.all('channel_id'=>4).count
respond_to do |wants|
wants.html { erb :stats }
end
end
+get "/#{@version}/admin/merge-artists" do
+ protected!
+ respond_to do |wants|
+ wants.html { erb :merge_artists }
+ end
+end
+
+post "/#{@version}/admin/merge-artists" do
+ protected!
+ old_artist = Artist.get(params[:id_old])
+ new_artist = Artist.get(params[:id_new])
+
+ if(old_artist&&new_artist)
+ #move tracks from old artist to new artist
+ link = ArtistTrack.all(:artist_id => old_artist.id)
+ link.each{ |link_item|
+ @track_load = Track.get(link_item.track_id)
+ @moved = new_artist.tracks << @track_load
+ @moved.save
+ }
+
+ #delete old artist_track relations
+ link.destroy!
+
+ #delete old artist
+ old_artist.destroy!
+ end
+end
+
+
get '/demo/album-charts' do
from_date = DateTime.now - 7
@from_date_string = from_date.strftime("%b %e")
to_date = DateTime.now
@to_date_string = to_date.strftime("%b %e")
respond_to do |wants|
wants.html{erb :album_chart_all}
end
end
get '/jjj' do
cache_control :public, :max_age => 600
artistmbid = {}
har ='a'
hur = 'b'
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
#hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
all = Hash.new
@artists.each{ |o|
begin
if o.artistmbid
#puts o.artistname
begin
result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
if(result.code==200)
all[o.artistname] = Hash.new
all[o.artistname].store("media",Hash.new())
all[o.artistname].store("info",Hash.new())
all[o.artistname].fetch("info").store("mbid",o.artistmbid)
all[o.artistname].fetch("info").store("count",o.cnt)
xml = Crack::XML.parse(result)
if(xml["rss"]["channel"]["item"].kind_of?(Array))
xml["rss"]["channel"]["item"].each_with_index{|ha,i|
if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
har = ha["title"]
da = ha["media:thumbnail"]
if da.kind_of?(Array)
hur = da.first["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
else
hur = da["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
end
if ha["media:content"].kind_of?(Array)
all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
else
all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
end
end
}
else
if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
har = xml["rss"]["channel"]["item"]["title"]
hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
end
end
#john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
#puts john.inspect
end
rescue => e
end
end
end
}
@hat = all
respond_to do |wants|
wants.html { erb :jjj }
wants.json { all.to_json }
end
end
\ No newline at end of file
diff --git a/views/merge_artists.html.erb b/views/merge_artists.html.erb
new file mode 100644
index 0000000..671058a
--- /dev/null
+++ b/views/merge_artists.html.erb
@@ -0,0 +1,8 @@
+<form action='/v1/admin/merge-artists' method="POST">
+ Artist to delete<input type="text" name="id_old" />
+
+Artist to keep
+<input type="text" name="id_new" />
+
+ <input type="submit" value="Merge!" />
+</form>
\ No newline at end of file
|
simonhn/pav-api
|
165e9305ea23db428cfac86f92db909aa39edfe1
|
fixing some template inconcistence
|
diff --git a/pavapi.rb b/pavapi.rb
index 882d324..39cadf4 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -20,649 +20,650 @@ use Rack::JSONP
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
# Enable New Relic
#configure :production do
#require 'newrelic_rpm'
#end
#throttling
#require 'rack/throttle'
#require 'memcached'
#require './throttler'
#for serving different content types
require 'sinatra/respond_to'
Sinatra::Application.register Sinatra::RespondTo
#versioning
@version = "v1"
configure do
#use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
#use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
#logging
DataMapper::Logger.new('log/datamapper.log', :warn)
DataMapper::Model.raise_on_save_failure = true
$LOG = Logger.new('log/pavstore.log', 'monthly')
# MySQL connection:
@config = YAML::load( File.open( 'config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#DataMapper.auto_upgrade!
#DataMapper::auto_migrate!
set :default_content, :html
end
#Caching 1 minute - must adjust
before '/*' do
cache_control :public, :must_revalidate, :max_age => 60 unless development?
end
before '/demo/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
before '*/chart/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
from_date = played_to - 7
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
def get_channel(cha)
if isNumeric(cha)
channel = cha
elsif cha.nil?
channel = false
end
end
def get_artist_query(q)
if (!q.nil?)
return "AND artists.artistname LIKE '%#{q}%' "
end
end
def get_track_query(q)
if (!q.nil?)
return "AND tracks.title LIKE '%#{q}%' "
end
end
def get_album_query(q)
if (!q.nil?)
return "AND albums.albumname LIKE '%#{q}%' "
end
end
def get_all_query(q)
if (!q.nil?)
return "AND (albums.albumname LIKE '%#{q}%' OR albums.albumname LIKE '%#{q}%' OR artists.artistname LIKE '%#{q}%') "
end
end
def get_order_by(order)
if (order=='artist')
return "artists.artistname ASC, plays.playedtime DESC"
elsif (order=='track')
return "tracks.title ASC, plays.playedtime DESC"
else
return "plays.playedtime DESC"
end
end
end
#ROUTES
# Front page
get '/' do
erb :front
end
#show all artists, defaults to 10, ordered by created date
get "/#{@version}/artists" do
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
if channel
@artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist }
wants.xml { builder :artist }
wants.json { @artist.to_json }
end
end
# show tracks from artist
get "/#{@version}/artist/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@tracks = @artist.tracks
respond_to do |wants|
wants.html { erb :artist_tracks }
wants.xml { builder :artist_tracks }
wants.json { @tracks.to_json }
end
end
# show plays from artist
get "/#{@version}/artist/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@plays = @artist.tracks.plays
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
wants.json { @plays.to_json }
end
end
#add new track item (an item in the playout xml)
post "/#{@version}/track" do
protected!
begin
data = JSON.parse params[:payload].to_json
if !data['item']['artist']['artistname'].nil? && Play.count(:playedtime => data['item']['playedtime'], :channel_id => data['channel'])==0
Stalker.enqueue('track.store', :item => data['item'],:channel => data['channel'])
#Delayed::Job.enqueue StoreTrackJob.new(data['item'], data['channel'])
#store_hash(data['item'], data['channel'])
end
rescue StandardError => e
$LOG.info("Post method end: Issue while processing #{data['item']['artist']['artistname']} - #{data['channel']}, #{e.backtrace}")
end
end
#show tracks
get "/#{@version}/tracks" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@tracks = Track.all(Track.plays.channel_id => channel, :limit=>limit.to_i, :order => [:created_at.desc])
else
@tracks = Track.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :tracks }
wants.xml { builder :tracks }
wants.json {@tracks.to_json}
end
end
# show track
get "/#{@version}/track/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
respond_to do |wants|
wants.html { erb :track }
wants.xml { builder :track }
wants.json {@track.to_json}
end
end
#show artists for a track
get "/#{@version}/track/:id/artists" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@artists = @track.artists
respond_to do |wants|
wants.html { erb :track_artists }
wants.xml { builder :track_artists }
wants.json {@artists.to_json}
end
end
#show albums for a track
get "/#{@version}/track/:id/albums" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@albums = @track.albums
respond_to do |wants|
wants.html { erb :track_albums }
wants.xml { builder :track_albums }
wants.json {@albums.to_json}
end
end
# show plays for a track
get "/#{@version}/track/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@plays = @track.plays
respond_to do |wants|
wants.html { erb :track_plays }
wants.xml { builder :track_plays }
wants.json {@plays.to_json}
end
end
#show all albums
get "/#{@version}/albums" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = Album.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@albums = Album.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :albums }
wants.xml { builder :albums }
wants.json { @albums.to_json }
end
end
# show album from id
get "/#{@version}/album/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
respond_to do |wants|
wants.html { erb :album }
wants.xml { builder :album }
wants.json {@album.to_json}
end
end
# show tracks for an album
get "/#{@version}/album/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
@tracks = @album.tracks
respond_to do |wants|
wants.html { erb :album_tracks }
wants.xml { builder :album_tracks }
wants.json {@tracks.to_json }
end
end
#PLAY
get "/#{@version}/plays" do
#DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
artist_query = get_artist_query(params[:artist_query])
track_query = get_track_query(params[:track_query])
album_query = get_album_query(params[:album_query])
query_all = get_all_query(params[:q])
order_by = get_order_by(params[:order_by])
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
if channel
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
else
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
end
hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :plays }
wants.xml { builder :plays }
wants.json { hat.to_json }
end
end
get "/#{@version}/play/:id" do
@play = Play.get(params[:id])
respond_to do |wants|
wants.json { @play.to_json }
end
end
# show all channels
get "/#{@version}/channels" do
@channels = Channel.all
respond_to do |wants|
wants.xml { @channels.to_xml }
wants.json { @channels.to_json }
end
end
#create new channel
post "/#{@version}/channel" do
protected!
data = JSON.parse params[:payload].to_json
channel = Channel.first_or_create({ :channelname => data['channelname'] }, { :channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'] })
end
#update a channel
put "/#{@version}/channel/:id" do
protected!
channel = Channel.get(params[:id])
data = JSON.parse params[:payload].to_json
channel = channel.update(:channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'])
end
# show channel from id
get "/#{@version}/channel/:id" do
@channel = Channel.get(params[:id])
respond_to do |wants|
wants.xml { @channel.to_xml }
wants.json { @channel.to_json }
end
end
# chart of top tracks
get "/#{@version}/chart/track" do
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
#SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
if channel
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
else
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
end
hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
respond_to do |wants|
wants.html { erb :track_chart }
wants.xml { builder :track_chart }
wants.json { hat.to_json }
end
end
# chart of top artist by name
get "/#{@version}/chart/artist" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
else
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
end
#@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
respond_to do |wants|
wants.html { erb :artist_chart }
wants.xml { builder :artist_chart }
wants.json {hat.to_json}
end
end
get "/#{@version}/chart/album" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
else
@albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
end
hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
respond_to do |wants|
+ wants.html { erb :album_chart }
wants.xml { builder :album_chart }
wants.json {hat.to_json}
end
end
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
#Sinatra version info
get "/#{@version}/about" do
"I'm running version " + Sinatra::VERSION
end
#Count all artists
get "/#{@version}/stats" do
@artistcount = Artist.count
@artistmbid = (Artist.count(:artistmbid).to_f/@artistcount.to_f)*100
@trackcount = Track.count
@trackmbid = (Track.count(:trackmbid).to_f/@trackcount.to_f)*100
@playcount = Play.count
@albumcount = Album.count
@albummbid = (Album.count(:albummbid).to_f/@albumcount.to_f)*100
@dig_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_play = Play.all('channel_id'=>1).count
@jazz_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_play = Play.all('channel_id'=>2).count
@country_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_play = Play.all('channel_id'=>3).count
@jjj_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_play = Play.all('channel_id'=>4).count
respond_to do |wants|
wants.html { erb :stats }
end
end
get '/demo/album-charts' do
from_date = DateTime.now - 7
@from_date_string = from_date.strftime("%b %e")
to_date = DateTime.now
@to_date_string = to_date.strftime("%b %e")
respond_to do |wants|
wants.html{erb :album_chart_all}
end
end
get '/jjj' do
cache_control :public, :max_age => 600
artistmbid = {}
har ='a'
hur = 'b'
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
#hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
all = Hash.new
@artists.each{ |o|
begin
if o.artistmbid
#puts o.artistname
begin
result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
if(result.code==200)
all[o.artistname] = Hash.new
all[o.artistname].store("media",Hash.new())
all[o.artistname].store("info",Hash.new())
all[o.artistname].fetch("info").store("mbid",o.artistmbid)
all[o.artistname].fetch("info").store("count",o.cnt)
xml = Crack::XML.parse(result)
if(xml["rss"]["channel"]["item"].kind_of?(Array))
xml["rss"]["channel"]["item"].each_with_index{|ha,i|
if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
har = ha["title"]
da = ha["media:thumbnail"]
if da.kind_of?(Array)
hur = da.first["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
else
hur = da["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
end
if ha["media:content"].kind_of?(Array)
all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
else
all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
end
end
}
else
if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
har = xml["rss"]["channel"]["item"]["title"]
hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
end
end
#john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
#puts john.inspect
end
rescue => e
end
end
end
}
@hat = all
respond_to do |wants|
wants.html { erb :jjj }
wants.json { all.to_json }
end
end
\ No newline at end of file
diff --git a/views/album_chart.html.erb b/views/album_chart.html.erb
new file mode 100644
index 0000000..8002b7e
--- /dev/null
+++ b/views/album_chart.html.erb
@@ -0,0 +1,9 @@
+
+
+
+<h1>Albums</h1>
+<% for album in @albums %>
+ <p><%= album.albumname %> - <%=album.cnt.to_i%></p>
+ <% if !album.albumimage.nil? %><img src="<%= album.albumimage %>" /><% end %>
+
+<% end %>
diff --git a/views/album_chart.xml.builder b/views/album_chart.xml.builder
index faebd5c..4f42a0b 100644
--- a/views/album_chart.xml.builder
+++ b/views/album_chart.xml.builder
@@ -1,6 +1,6 @@
xml.instruct! :xml, :version => '1.0'
xml.chart do
@albums.each do |album|
- xml.album :count => album.cnt.to_i, :artistname => album.artistname, :albumname => album.albumname, :albumid => album.album_id, :trackid => album.track_id
+ xml.album :count => album.cnt, :artistname => album.artistname, :albumname => album.albumname, :albumid => album.album_id, :albumimage => album.albumimage, :albummbid => album.albummbid
end
end
\ No newline at end of file
diff --git a/views/plays.html.erb b/views/plays.html.erb
index 4c592e1..a35654f 100644
--- a/views/plays.html.erb
+++ b/views/plays.html.erb
@@ -1,290 +1,290 @@
<style type="text/css">
body{font-size: 0.75em;}
#just_played #song_list {
float: left;
margin: 2px 0 10px;
}
#just_played .sort_order {
text-align: center;
color: #808080;
padding: 8px 0;
}
#just_played .sort_order .title {
font-weight: 700;
margin-right: 4px;
color: #000000;
}
#just_played .sort_order a {
text-decoration: underline;
margin: 0 4px;
}
#just_played .sort_order a.current {
text-decoration: none;
color: #000000;
}
#just_played .pagination,
#song_list .search-criteria {
text-align: center;
margin: 4px 0;
float: left;
padding: 8px 0;
}
#just_played #song_list .pagination {
border-bottom-width: 1px;
border-bottom-style: dotted;
}
#song_list .search-criteria {
border-bottom-width: 4px;
border-bottom-style: solid;
}
#just_played .pagination .title {
font-weight: 700;
margin-right: 8px;
}
#just_played .pagination .pages {
word-spacing: 0.5em;
margin-right: 8px;
color: #808080;
}
#just_played .pagination a {
color: #204ba1;
text-decoration: underline;
}
#just_played .pagination .pages a.current {
color: #000000;
text-decoration: none;
}
#just_played .pagination a.next {
color: #204ba1;
text-decoration: none;
font-weight: 700;
}
#clear-search {
display: inline-block;
font-size: 0.8em;
margin-left: 10px;
}
#just_played .list_quantity {
color: #204ba1;
}
#just_played .list_quantity img {
margin-right: 4px;
}
#just_played .song {
float: left;
border-top: 1px dashed #C9C9C9;
padding-top: 4px;
}
#just_played .song .date {
font-size: 1.0em;
padding: 3px 8px;
margin: -4px 0 5px 60px;
color: #fff;
background-color: #1F2933;
float: left;
}
#just_played .song .time {
font-size: 0.8em;
color: #999999;
margin-bottom: 2px;
}
#just_played .song .album_image_container {
float: left;
width: 110px;
height: 100px;
background-image: url('http://abcdigmusic.net.au/sites/all/themes/dig2/images/background/no-cover.png');
background-repeat: no-repeat;
}
#just_played .song .album_image_container img {
border: 1px solid #FFFFFF;
}
#just_played .song .album_image_container img:hover {
border: 1px solid #CAD4DD;
}
#just_played .song .australian_artist_container {
z-index:2;
position:absolute;
left:75px;
}
#just_played .song .details {
float: left;
margin-left: 10px;
width: 200px;
}
#just_played .song .details td {
padding-bottom: 9px;
}
#just_played .song .details td.label {
width: 80px;
font-size: 0.9em;
color: #4d4d4d;
}
#just_played .song .details td.info {
width: 145px;
font-size: 0.9em;
font-weight: bold;
}
#just_played .song .details td a{
color: #204ba1;
}
#just_played .song .social_data {
float: left;
margin: 0;
color: #4d4d4d;
font-size: 0.9em;
padding-left: 10px;
}
#just_played .song .feature_album {
position: relative;
top: -4px;
border: 0;
}
#just_played .song .social_data a {
color: #2f57a7;
}
#just_played .song .social_data .community {
float: left;
border-bottom: 1px dotted #CAD4DD;
margin-bottom: 2px;
padding: 2px 1px;
}
#just_played .song .social_data .user {
float: left;
width: 110px;
border-bottom: 1px dotted #CAD4DD;
margin-bottom: 2px;
padding: 2px 1px;
margin-left: 15px;
}
#just_played .song .social_data .last {
border-bottom: 0;
}
#just_played .song .social_data .icon {
float: left;
margin-right: 2px;
}
#just_played .song .social_data .community .text {
float: left;
line-height: 1.2em;
}
#just_played .song .social_data .user .text {
float: left;
width: 84px;
line-height: 1.2em;
}
#just_played .song .social_data .note {
float: left;
clear: both;
width: 310px;
border-top: 1px dotted #CAD4DD;
padding-top: 4px;
padding-left: 21px;
}
#just_played .song .social_data .note .text {
float: left;
width: 320px;
}
#just_played .song .social_data .note .text p {
color: #4d4d4d;
}
#just_played .song .social_data .note a {
background-image: url(../images/icon_external.png);
padding-right: 19px;
background-repeat: no-repeat;
background-position: right;
}
#just_played .disclaimer {
text-align: right;
padding-top: 8px;
float: left;
}
.clear { clear: right; }
</style>
<p>
<div id="just_played">
<% @plays.each do |track| %>
<div class="song">
<br style="clear: both">
<div class="time"><%= track.playedtime.strftime "%R on %B %d, %Y" %></div>
<div class="album_image_container">
<img alt="album cover" src="<%= track.albumimage %>" width="100" height="100">
</div>
<div class="details">
<table><tbody>
<tr><td class="label">Song</td><td class="info"><% if !track.trackmbid.nil? %><a href="http://musicbrainz.org/track/<%= track.trackmbid %>.html"><%= track.title %></a>
<% else %> <%= track.title %><% end %></td></tr>
<tr>
<td class="label">Artist</td>
<td class="info">
<span><% if !track.artistmbid.nil? %><a href="http://musicbrainz.org/artist/<%= track.artistmbid %>.html"><%= track.artistname %></a>
<% else %> <%= track.artistname %><% end %></span>
</td>
</tr>
<tr>
<td class="label">Album</td>
- <td class="info"><% if !track.albummbid.nil? %><a href="http://musicbrainz.org/album/<%= track.albummbid %>.html"><%= track.albumname %></a><% else %> <%= track.albumname %><% end %></td>
+ <td class="info"><% if !track.albummbid.nil? %><a href="http://musicbrainz.org/release-group/<%= track.albummbid %>.html"><%= track.albumname %></a><% else %> <%= track.albumname %><% end %></td>
</tr>
<tr>
<td class="label">Label</td>
<td class="info"></td>
</tr>
<tr>
<td class="label">Year</td>
<td class="info"></td>
</tr>
</tbody></table>
</div>
</div>
<% end %>
</div>
</p>
|
simonhn/pav-api
|
9c7d41a57cf8037908fedc051bfc1b4db6f79a5b
|
fixing typo
|
diff --git a/pavapi.rb b/pavapi.rb
index 01cc30e..882d324 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -9,660 +9,660 @@ require './store_methods'
#require 'delayed_job_data_mapper'
#require './storetrackjob'
require 'stalker'
#template systems
require 'yajl/json_gem'
require 'rack/contrib/jsonp'
require 'builder'
use Rack::JSONP
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
# Enable New Relic
#configure :production do
#require 'newrelic_rpm'
#end
#throttling
#require 'rack/throttle'
#require 'memcached'
#require './throttler'
#for serving different content types
require 'sinatra/respond_to'
Sinatra::Application.register Sinatra::RespondTo
#versioning
@version = "v1"
configure do
#use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
#use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
#logging
DataMapper::Logger.new('log/datamapper.log', :warn)
DataMapper::Model.raise_on_save_failure = true
$LOG = Logger.new('log/pavstore.log', 'monthly')
# MySQL connection:
@config = YAML::load( File.open( 'config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#DataMapper.auto_upgrade!
#DataMapper::auto_migrate!
set :default_content, :html
end
#Caching 1 minute - must adjust
before '/*' do
cache_control :public, :must_revalidate, :max_age => 60 unless development?
end
before '/demo/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
before '*/chart/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
from_date = played_to - 7
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
def get_channel(cha)
if isNumeric(cha)
channel = cha
elsif cha.nil?
channel = false
end
end
def get_artist_query(q)
if (!q.nil?)
return "AND artists.artistname LIKE '%#{q}%' "
end
end
def get_track_query(q)
if (!q.nil?)
return "AND tracks.title LIKE '%#{q}%' "
end
end
def get_album_query(q)
if (!q.nil?)
return "AND albums.albumname LIKE '%#{q}%' "
end
end
def get_all_query(q)
if (!q.nil?)
return "AND (albums.albumname LIKE '%#{q}%' OR albums.albumname LIKE '%#{q}%' OR artists.artistname LIKE '%#{q}%') "
end
end
def get_order_by(order)
if (order=='artist')
return "artists.artistname ASC, plays.playedtime DESC"
elsif (order=='track')
return "tracks.title ASC, plays.playedtime DESC"
else
return "plays.playedtime DESC"
end
end
end
#ROUTES
# Front page
get '/' do
erb :front
end
#show all artists, defaults to 10, ordered by created date
get "/#{@version}/artists" do
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
if channel
@artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist }
wants.xml { builder :artist }
wants.json { @artist.to_json }
end
end
# show tracks from artist
get "/#{@version}/artist/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@tracks = @artist.tracks
respond_to do |wants|
wants.html { erb :artist_tracks }
wants.xml { builder :artist_tracks }
wants.json { @tracks.to_json }
end
end
# show plays from artist
get "/#{@version}/artist/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@plays = @artist.tracks.plays
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
wants.json { @plays.to_json }
end
end
#add new track item (an item in the playout xml)
post "/#{@version}/track" do
protected!
begin
data = JSON.parse params[:payload].to_json
if !data['item']['artist']['artistname'].nil? && Play.count(:playedtime => data['item']['playedtime'], :channel_id => data['channel'])==0
Stalker.enqueue('track.store', :item => data['item'],:channel => data['channel'])
#Delayed::Job.enqueue StoreTrackJob.new(data['item'], data['channel'])
#store_hash(data['item'], data['channel'])
end
rescue StandardError => e
$LOG.info("Post method end: Issue while processing #{data['item']['artist']['artistname']} - #{data['channel']}, #{e.backtrace}")
end
end
#show tracks
get "/#{@version}/tracks" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@tracks = Track.all(Track.plays.channel_id => channel, :limit=>limit.to_i, :order => [:created_at.desc])
else
@tracks = Track.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :tracks }
wants.xml { builder :tracks }
wants.json {@tracks.to_json}
end
end
# show track
get "/#{@version}/track/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
respond_to do |wants|
wants.html { erb :track }
wants.xml { builder :track }
wants.json {@track.to_json}
end
end
#show artists for a track
get "/#{@version}/track/:id/artists" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@artists = @track.artists
respond_to do |wants|
wants.html { erb :track_artists }
wants.xml { builder :track_artists }
wants.json {@artists.to_json}
end
end
#show albums for a track
get "/#{@version}/track/:id/albums" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@albums = @track.albums
respond_to do |wants|
wants.html { erb :track_albums }
wants.xml { builder :track_albums }
wants.json {@albums.to_json}
end
end
# show plays for a track
get "/#{@version}/track/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@plays = @track.plays
respond_to do |wants|
wants.html { erb :track_plays }
wants.xml { builder :track_plays }
wants.json {@plays.to_json}
end
end
#show all albums
get "/#{@version}/albums" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = Album.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@albums = Album.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :albums }
wants.xml { builder :albums }
wants.json { @albums.to_json }
end
end
# show album from id
get "/#{@version}/album/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
respond_to do |wants|
wants.html { erb :album }
wants.xml { builder :album }
wants.json {@album.to_json}
end
end
# show tracks for an album
get "/#{@version}/album/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
@tracks = @album.tracks
respond_to do |wants|
wants.html { erb :album_tracks }
wants.xml { builder :album_tracks }
wants.json {@tracks.to_json }
end
end
#PLAY
get "/#{@version}/plays" do
#DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
artist_query = get_artist_query(params[:artist_query])
track_query = get_track_query(params[:track_query])
album_query = get_album_query(params[:album_query])
query_all = get_all_query(params[:q])
order_by = get_order_by(params[:order_by])
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
if channel
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
else
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
end
hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :plays }
wants.xml { builder :plays }
wants.json { hat.to_json }
end
end
get "/#{@version}/play/:id" do
@play = Play.get(params[:id])
respond_to do |wants|
wants.json { @play.to_json }
end
end
# show all channels
get "/#{@version}/channels" do
@channels = Channel.all
respond_to do |wants|
wants.xml { @channels.to_xml }
wants.json { @channels.to_json }
end
end
#create new channel
post "/#{@version}/channel" do
protected!
data = JSON.parse params[:payload].to_json
channel = Channel.first_or_create({ :channelname => data['channelname'] }, { :channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'] })
end
#update a channel
put "/#{@version}/channel/:id" do
protected!
channel = Channel.get(params[:id])
data = JSON.parse params[:payload].to_json
channel = channel.update(:channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'])
end
# show channel from id
get "/#{@version}/channel/:id" do
@channel = Channel.get(params[:id])
respond_to do |wants|
wants.xml { @channel.to_xml }
wants.json { @channel.to_json }
end
end
# chart of top tracks
get "/#{@version}/chart/track" do
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
#SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
if channel
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
else
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
end
hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
respond_to do |wants|
wants.html { erb :track_chart }
wants.xml { builder :track_chart }
wants.json { hat.to_json }
end
end
# chart of top artist by name
get "/#{@version}/chart/artist" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
else
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
end
#@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
respond_to do |wants|
wants.html { erb :artist_chart }
wants.xml { builder :artist_chart }
wants.json {hat.to_json}
end
end
get "/#{@version}/chart/album" do
- to_from = make_to_from(params[:played_from], params[:played_to])
+ to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
else
@albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
end
hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
respond_to do |wants|
wants.xml { builder :album_chart }
wants.json {hat.to_json}
end
end
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
#Sinatra version info
get "/#{@version}/about" do
"I'm running version " + Sinatra::VERSION
end
#Count all artists
get "/#{@version}/stats" do
@artistcount = Artist.count
@artistmbid = (Artist.count(:artistmbid).to_f/@artistcount.to_f)*100
@trackcount = Track.count
@trackmbid = (Track.count(:trackmbid).to_f/@trackcount.to_f)*100
@playcount = Play.count
@albumcount = Album.count
@albummbid = (Album.count(:albummbid).to_f/@albumcount.to_f)*100
@dig_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_play = Play.all('channel_id'=>1).count
@jazz_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_play = Play.all('channel_id'=>2).count
@country_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_play = Play.all('channel_id'=>3).count
@jjj_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_play = Play.all('channel_id'=>4).count
respond_to do |wants|
wants.html { erb :stats }
end
end
get '/demo/album-charts' do
from_date = DateTime.now - 7
@from_date_string = from_date.strftime("%b %e")
to_date = DateTime.now
@to_date_string = to_date.strftime("%b %e")
respond_to do |wants|
wants.html{erb :album_chart_all}
end
end
get '/jjj' do
cache_control :public, :max_age => 600
artistmbid = {}
har ='a'
hur = 'b'
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
#hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
all = Hash.new
@artists.each{ |o|
begin
if o.artistmbid
#puts o.artistname
begin
result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
if(result.code==200)
all[o.artistname] = Hash.new
all[o.artistname].store("media",Hash.new())
all[o.artistname].store("info",Hash.new())
all[o.artistname].fetch("info").store("mbid",o.artistmbid)
all[o.artistname].fetch("info").store("count",o.cnt)
xml = Crack::XML.parse(result)
if(xml["rss"]["channel"]["item"].kind_of?(Array))
xml["rss"]["channel"]["item"].each_with_index{|ha,i|
if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
har = ha["title"]
da = ha["media:thumbnail"]
if da.kind_of?(Array)
hur = da.first["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
else
hur = da["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
end
if ha["media:content"].kind_of?(Array)
all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
else
all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
end
end
}
else
if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
har = xml["rss"]["channel"]["item"]["title"]
hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
end
end
#john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
#puts john.inspect
end
rescue => e
end
end
end
}
@hat = all
respond_to do |wants|
wants.html { erb :jjj }
wants.json { all.to_json }
end
end
\ No newline at end of file
|
simonhn/pav-api
|
527348266488785991f2c97f992214b2d05f9be3
|
adding order by and search to play resource path
|
diff --git a/pavapi.rb b/pavapi.rb
index a2a45f1..01cc30e 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -1,632 +1,668 @@
#core stuff
require 'rubygems'
require 'sinatra'
require './models'
require './store_methods'
#Queueing with delayed job
#require 'delayed_job'
#require 'delayed_job_data_mapper'
#require './storetrackjob'
require 'stalker'
#template systems
require 'yajl/json_gem'
require 'rack/contrib/jsonp'
require 'builder'
use Rack::JSONP
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
# Enable New Relic
#configure :production do
#require 'newrelic_rpm'
#end
#throttling
#require 'rack/throttle'
#require 'memcached'
#require './throttler'
#for serving different content types
require 'sinatra/respond_to'
Sinatra::Application.register Sinatra::RespondTo
#versioning
@version = "v1"
configure do
#use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
#use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
#logging
DataMapper::Logger.new('log/datamapper.log', :warn)
DataMapper::Model.raise_on_save_failure = true
$LOG = Logger.new('log/pavstore.log', 'monthly')
# MySQL connection:
@config = YAML::load( File.open( 'config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#DataMapper.auto_upgrade!
#DataMapper::auto_migrate!
set :default_content, :html
end
#Caching 1 minute - must adjust
before '/*' do
cache_control :public, :must_revalidate, :max_age => 60 unless development?
end
before '/demo/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
before '*/chart/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
from_date = played_to - 7
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
def get_channel(cha)
if isNumeric(cha)
channel = cha
elsif cha.nil?
channel = false
end
end
-
+
+ def get_artist_query(q)
+ if (!q.nil?)
+ return "AND artists.artistname LIKE '%#{q}%' "
+ end
+ end
+
+ def get_track_query(q)
+ if (!q.nil?)
+ return "AND tracks.title LIKE '%#{q}%' "
+ end
+ end
+
+ def get_album_query(q)
+ if (!q.nil?)
+ return "AND albums.albumname LIKE '%#{q}%' "
+ end
+ end
+ def get_all_query(q)
+ if (!q.nil?)
+ return "AND (albums.albumname LIKE '%#{q}%' OR albums.albumname LIKE '%#{q}%' OR artists.artistname LIKE '%#{q}%') "
+ end
+ end
+ def get_order_by(order)
+ if (order=='artist')
+ return "artists.artistname ASC, plays.playedtime DESC"
+ elsif (order=='track')
+ return "tracks.title ASC, plays.playedtime DESC"
+ else
+ return "plays.playedtime DESC"
+ end
+ end
end
#ROUTES
# Front page
get '/' do
erb :front
end
#show all artists, defaults to 10, ordered by created date
get "/#{@version}/artists" do
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
if channel
@artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist }
wants.xml { builder :artist }
wants.json { @artist.to_json }
end
end
# show tracks from artist
get "/#{@version}/artist/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@tracks = @artist.tracks
respond_to do |wants|
wants.html { erb :artist_tracks }
wants.xml { builder :artist_tracks }
wants.json { @tracks.to_json }
end
end
# show plays from artist
get "/#{@version}/artist/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@plays = @artist.tracks.plays
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
wants.json { @plays.to_json }
end
end
#add new track item (an item in the playout xml)
post "/#{@version}/track" do
protected!
begin
data = JSON.parse params[:payload].to_json
if !data['item']['artist']['artistname'].nil? && Play.count(:playedtime => data['item']['playedtime'], :channel_id => data['channel'])==0
Stalker.enqueue('track.store', :item => data['item'],:channel => data['channel'])
#Delayed::Job.enqueue StoreTrackJob.new(data['item'], data['channel'])
#store_hash(data['item'], data['channel'])
end
rescue StandardError => e
$LOG.info("Post method end: Issue while processing #{data['item']['artist']['artistname']} - #{data['channel']}, #{e.backtrace}")
end
end
#show tracks
get "/#{@version}/tracks" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@tracks = Track.all(Track.plays.channel_id => channel, :limit=>limit.to_i, :order => [:created_at.desc])
else
@tracks = Track.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :tracks }
wants.xml { builder :tracks }
wants.json {@tracks.to_json}
end
end
# show track
get "/#{@version}/track/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
respond_to do |wants|
wants.html { erb :track }
wants.xml { builder :track }
wants.json {@track.to_json}
end
end
#show artists for a track
get "/#{@version}/track/:id/artists" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@artists = @track.artists
respond_to do |wants|
wants.html { erb :track_artists }
wants.xml { builder :track_artists }
wants.json {@artists.to_json}
end
end
#show albums for a track
get "/#{@version}/track/:id/albums" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@albums = @track.albums
respond_to do |wants|
wants.html { erb :track_albums }
wants.xml { builder :track_albums }
wants.json {@albums.to_json}
end
end
# show plays for a track
get "/#{@version}/track/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@plays = @track.plays
respond_to do |wants|
wants.html { erb :track_plays }
wants.xml { builder :track_plays }
wants.json {@plays.to_json}
end
end
#show all albums
get "/#{@version}/albums" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = Album.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@albums = Album.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :albums }
wants.xml { builder :albums }
wants.json { @albums.to_json }
end
end
# show album from id
get "/#{@version}/album/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
respond_to do |wants|
wants.html { erb :album }
wants.xml { builder :album }
wants.json {@album.to_json}
end
end
# show tracks for an album
get "/#{@version}/album/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
@tracks = @album.tracks
respond_to do |wants|
wants.html { erb :album_tracks }
wants.xml { builder :album_tracks }
wants.json {@tracks.to_json }
end
end
#PLAY
get "/#{@version}/plays" do
#DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
+ artist_query = get_artist_query(params[:artist_query])
+ track_query = get_track_query(params[:track_query])
+ album_query = get_album_query(params[:album_query])
+ query_all = get_all_query(params[:q])
+ order_by = get_order_by(params[:order_by])
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
if channel
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
- @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
+ @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
else
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
- @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
+ @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} #{artist_query} #{album_query} #{track_query} #{query_all} group by tracks.id, plays.playedtime order by #{order_by} limit #{limit}")
end
hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :plays }
wants.xml { builder :plays }
wants.json { hat.to_json }
end
end
get "/#{@version}/play/:id" do
@play = Play.get(params[:id])
respond_to do |wants|
wants.json { @play.to_json }
end
end
# show all channels
get "/#{@version}/channels" do
@channels = Channel.all
respond_to do |wants|
wants.xml { @channels.to_xml }
wants.json { @channels.to_json }
end
end
#create new channel
post "/#{@version}/channel" do
protected!
data = JSON.parse params[:payload].to_json
channel = Channel.first_or_create({ :channelname => data['channelname'] }, { :channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'] })
end
#update a channel
put "/#{@version}/channel/:id" do
protected!
channel = Channel.get(params[:id])
data = JSON.parse params[:payload].to_json
channel = channel.update(:channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'])
end
# show channel from id
get "/#{@version}/channel/:id" do
@channel = Channel.get(params[:id])
respond_to do |wants|
wants.xml { @channel.to_xml }
wants.json { @channel.to_json }
end
end
# chart of top tracks
get "/#{@version}/chart/track" do
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
#SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
if channel
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
else
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
end
hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
respond_to do |wants|
wants.html { erb :track_chart }
wants.xml { builder :track_chart }
wants.json { hat.to_json }
end
end
# chart of top artist by name
get "/#{@version}/chart/artist" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
else
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
end
#@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
respond_to do |wants|
wants.html { erb :artist_chart }
wants.xml { builder :artist_chart }
wants.json {hat.to_json}
end
end
get "/#{@version}/chart/album" do
to_from = make_to_from(params[:played_from], params[:played_to])
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
else
@albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
end
hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
respond_to do |wants|
wants.xml { builder :album_chart }
wants.json {hat.to_json}
end
end
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
#Sinatra version info
get "/#{@version}/about" do
"I'm running version " + Sinatra::VERSION
end
#Count all artists
get "/#{@version}/stats" do
@artistcount = Artist.count
@artistmbid = (Artist.count(:artistmbid).to_f/@artistcount.to_f)*100
@trackcount = Track.count
@trackmbid = (Track.count(:trackmbid).to_f/@trackcount.to_f)*100
@playcount = Play.count
@albumcount = Album.count
@albummbid = (Album.count(:albummbid).to_f/@albumcount.to_f)*100
@dig_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_play = Play.all('channel_id'=>1).count
@jazz_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_play = Play.all('channel_id'=>2).count
@country_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_play = Play.all('channel_id'=>3).count
@jjj_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_play = Play.all('channel_id'=>4).count
respond_to do |wants|
wants.html { erb :stats }
end
end
get '/demo/album-charts' do
from_date = DateTime.now - 7
@from_date_string = from_date.strftime("%b %e")
to_date = DateTime.now
@to_date_string = to_date.strftime("%b %e")
respond_to do |wants|
wants.html{erb :album_chart_all}
end
end
get '/jjj' do
cache_control :public, :max_age => 600
artistmbid = {}
har ='a'
hur = 'b'
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
#hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
all = Hash.new
@artists.each{ |o|
begin
if o.artistmbid
#puts o.artistname
begin
result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
if(result.code==200)
all[o.artistname] = Hash.new
all[o.artistname].store("media",Hash.new())
all[o.artistname].store("info",Hash.new())
all[o.artistname].fetch("info").store("mbid",o.artistmbid)
all[o.artistname].fetch("info").store("count",o.cnt)
xml = Crack::XML.parse(result)
if(xml["rss"]["channel"]["item"].kind_of?(Array))
xml["rss"]["channel"]["item"].each_with_index{|ha,i|
if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
har = ha["title"]
da = ha["media:thumbnail"]
if da.kind_of?(Array)
hur = da.first["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
else
hur = da["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
end
if ha["media:content"].kind_of?(Array)
all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
else
all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
end
end
}
else
if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
har = xml["rss"]["channel"]["item"]["title"]
hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
end
end
#john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
#puts john.inspect
end
rescue => e
end
end
end
}
@hat = all
respond_to do |wants|
wants.html { erb :jjj }
wants.json { all.to_json }
end
end
\ No newline at end of file
diff --git a/views/front.html.erb b/views/front.html.erb
index 2da070b..8bced63 100644
--- a/views/front.html.erb
+++ b/views/front.html.erb
@@ -1,445 +1,445 @@
<div>
<p>
The pav:api exposes playlist data and is currently under development.
</p>
<ul>
<li><a href="#general">general information</a></li>
<ul>
<li><a href="#general-query-parameters">query parameters</a></li>
<li><a href="#general-identifiers">identifiers</a></li>
<li><a href="#general-authentication">authentication</a></li>
<li><a href="#general-versioning">versioning</a></li>
<li><a href="#general-return-types">return types</a></li>
<li><a href="#general-response-codes">reponse codes</a></li>
<li><a href="#general-terms">terms</a></li>
</ul>
<li><a href="#resources">resources</a></li>
<ul>
<li><a href="#resources-artists">artists</a></li>
<li><a href="#resources-tracks">tracks</a></li>
<li><a href="#resources-albums">albums</a></li>
<li><a href="#resources-channels">channels</a></li>
<li><a href="#resources-plays">plays</a></li>
<li><a href="#resources-chart">charts</a></li>
<li><a href="#resources-search">search</a></li>
<li><a href="#resources-stats">stats</a></li>
</ul>
</ul>
<p>
<h2 id="general">general information</h2>
<h3 id="general-query-parameters">query parameters</h3>
<span>Some paths accepts the following query parameters. See each <a href="#resources">resource</a> type for more specifics.
<ul>
<li>channel, default is all channels, available on paths that return a list</li>
<li>limit, default is 10, available on paths that return a list</li>
- <li>callback, for cross-domain access jsonp is delivered to requests with 'callback' query parameter and json as return type.</li>
+ <li>callback, for cross-domain access jsonp is delivered to requests with 'callback' query parameter and json as return type</li>
<li>format, return type format (html, json, xml)</li>
<li>type, to specify lookup type, mbid</li>
<li>to (to date) in yyyy-mm-dd format</li>
<li>from (from date) in yyyy-mm-dd format</li>
- <li class="missing">fields, for partial responses</li>
- <li class="missing">sort, for ordering results</li>
- <li class="missing">key, is required for all calls to the api</li>
-
+ <li>order_by, for ordering results. Default is playedtime. Allowed values are artist and track</li>
+ <li>q, a query for searching for track title, album name and artist name</li>
+ <li>artist_query, searching for an artist name</li>
+ <li>track_query, searching for a track title</li>
+ <li>album_query, searching for an album name</li>
</ul>
</p>
<p>
<h3 id="general-identifiers">identifiers</h3>
To lookup a specific artist/track/album you can use pav IDs or Musicbrainz IDs where available.
</p>
<p>
<h3 id="general-authentication">authentication</h3>
All put and post requests require authentication
</p>
<p>
<h3 id="general-versioning">versioning</h3>
The version of the api you wish to use is specified at the root path of resources. The current version is v1.
</p>
<p>
<h3 id="general-return-types">return types</h3>
Return type can selected by appending the desired content type to the url (.html, .xml, .json) or by adding ?format=(html, xml, json) to the query parameter. Use only one of these methods when doing a request.
<br />
Default return type is currently html but will change to json when the API is put in production.
</p>
<p>
<h3 id="general-response-codes">response codes</h3>
The API attempts to return appropriate HTTP status codes for every request.
<ul>
<li>200 OK: Request succeeded</li>
<li>400 Bad Request: Your request was invalid and we'll return an error message telling you why</li>
<li>401 Not Authorized: You did not provide the right credentials</li>
<li>404 Not Found: The URI requested is invalid or the resource requested, such as a user, does not exists</li>
<li>500 Internal Server Error: Something is broken.</li>
<li>503 Service Unavailable: You cannot make this request at this time. Servers are up, but overloaded with requests</li>
</ul>
</p>
<p>
<h3 id="general-terms">terms</h3>
Please be nice when using the api. If you plan to make massive amounts of calls please advise us.
</p>
<h2 id="resources">resources</h2>
The resources that can be accessed through the api follows the model below:
<img id="resources-model" width="400px" src="images/models.png"/>
<br />
Some useful observation about the model:
<ul>
<li>An artist can have multiple tracks</li>
<li>A track can have multiple artists</li>
<li>A track can have multiple albums (a track appearing on different albums)</li>
<li>An album can have multiple tracks</li>
<li>A track can have multiple plays</li>
<li>A play belongs to one track</li>
<li>A play belongs to one channel</li>
<li>A channel can have multiple plays</li>
</ul>
<h3 id="resources-artists">artists</h3>
<h4>/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of artists</p>
<h5>Parameters</h5>
<p>Supports the following parameters: channel, limit.</p>
<h5>Example query</h5>
<code><div class="inner-code"><div class="inner-code"><a href="/v1/artists.json?channel=4">/v1/artists.json?channel=4</a></div></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967986.js"></script>
</div>
<h4>/artist/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/artist/1234.json">/v1/artist/1234.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/967997.js"></script>
</div>
<h4>/artist/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single artist</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/artist/1234/tracks.json">/v1/artist/1234/tracks.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968001.js"></script>
</div>
<h3 id="resources-tracks">tracks</h3>
<h4>/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of tracks</p>
<h5>Parameters</h5>
<p>Supports the following parameters: channel, limit.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/tracks.json?channel=4&limit=3">/v1/tracks.json?channel=4&limit=3</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968008.js"></script>
</div>
<h4>/track/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single track specified by an id.</p>
<h5>Parameters</h5>
Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/track/324.json">/v1/track/324.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968013.js?file=gistfile1.json"></script>
</div>
<h4>post /track</h4>
<div class='resource'>
<h5>Description</h5>
<p>Post a track to pav. Requires authentication.</p>
<h5>Parameters</h5>
<p>A json payload
<script src="https://gist.github.com/968015.js?file=gistfile1.json"></script>
<h5>Example response</h5>
<p>200</p>
</div>
<h4>/track/:id/artists</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the artists related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/track/324/artists.json">/v1/track/324/artists.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968022.js?file=gistfile1.json"></script>
</div>
<h4>/track/:id/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the albums related to a single track</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/track/324/albums.json">/v1/track/324/albums.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968023.js?file=gistfile1.json"></script>
</div>
<h4>/track/:id/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the plays related to a single track.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/track/324/plays.json">/v1/track/324/plays.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968025.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-albums">albums</h3>
<h4>/albums</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of albums.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: channel, limit.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/albums.json">/v1/albums.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968027.js?file=gistfile1.json"></script>
</div>
<h4>/album/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/album/15.json">/v1/album/15.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968029.js?file=gistfile1.json"></script>
</div>
<h4>/album/:id/tracks</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns the tracks related to a single album.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: type.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/album/15/tracks.json">/v1/album/15/tracks.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968035.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-channels">channels</h3>
<h4>/channels</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a list of channels.</p>
<h5>Parameters</h5>
Supports the following parameters: limit.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/channels.json">/v1/channels.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968054.js?file=gistfile1.json"></script>
</div>
<h4>/channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single channel.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/channel/1.json">/v1/channel/1.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968058.js?file=gistfile1.json"></script>
</div>
<h4>post channel</h4>
<div class='resource'>
<h5>Description</h5>
<p>Create a new channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
<h4>put channel/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Update a channel.</p>
<h5>Parameters</h5>
<script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-plays">plays</h3>
<h4>/plays</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a playlist.</p>
<h5>Parameters</h5>
- <p>Supports the following parameters: to, from, limit, channel.</p>
-
+ <p>Supports the following parameters: to, from, limit, channel, artist_query, track_query, album_query, q (query artist, channel and track name), order_by.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/plays.json?channel=1&limit=3">/v1/plays.json?channel=1&limit=3</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/956363.js"> </script>
</div>
<h4>/play/:id</h4>
<div class='resource'>
<h5>Description</h5>
<p>Returns a single play.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/play/4356.json">/v1/play/4356.json</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/968064.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-chart">charts</h3>
<h4>/chart/artist</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played artists for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: channel, limit, to, from. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/chart/artist.json?channel=1">/v1/chart/artist.json?channel=1</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973721.js?file=gistfile1.json"></script>
</div>
<h4>/chart/track</h4>
<div class='resource'>
<h5>Description</h5>
A chart of most played tracks for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: channel, limit, to, from. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/chart/track.json?from=2011-04-20">/v1/chart/track.json?from=2011-04-20</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973726.js?file=gistfile1.json"></script>
</div>
<h4>/chart/album</h4>
<div class='resource'>
<h5>Description</h5>
<p>A chart of most played albums for a given period.</p>
<h5>Parameters</h5>
<p>Supports the following parameters: channel, limit, to, from. If no to/from parameter is provided we return a chart from the last 7 days.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/chart/album.json?limit=5&channel=4">/v1/chart/album.json?limit=5&channel=4</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973730.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-search">search</h3>
<div class='resource'>
<h5>Description</h5>
<p>Search for artists (tracks and albums to come).</p>
<h5>Parameters</h5>
<p>Supports the following parameters: limit.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/search/dylan.json?limit=5">/v1/search/dylan.json?limit=5</a></div></code>
<h5>Example response</h5>
<script src="https://gist.github.com/973733.js?file=gistfile1.json"></script>
</div>
<h3 id="resources-stats">stats</h3>
<div class='resource'>
<h5>Description</h5>
<p>Statistics for the pav datastore.</p>
<h5>Example query</h5>
<code><div class="inner-code"><a href="/v1/stats">/v1/stats</a></div></code>
</div>
</div>
<style type="text/css" media="screen">
.gist-syntax .s2 {
color: black;
}
.gist .gist-file .gist-data{
font-size:75%;
}
.gist .gist-file .gist-meta{
display:none;
}
</style>
|
simonhn/pav-api
|
21652f8e71cbc1c282c14570199fbd807157bb7a
|
fixing line break
|
diff --git a/views/album_chart_all.html.erb b/views/album_chart_all.html.erb
index f2666eb..45053a5 100644
--- a/views/album_chart_all.html.erb
+++ b/views/album_chart_all.html.erb
@@ -1,292 +1,292 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<script src="http://jmar777.googlecode.com/svn/trunk/js/jquery.easing.1.3.js" type="text/javascript"></script>
<script src="http://kwicks.googlecode.com/svn/branches/v1.5.1/Kwicks/jquery.kwicks-1.5.1.pack.js" type="text/javascript"></script>
<div>
<h2>Demo of Most Played Albums <%=@from_date_string%> to <%=@to_date_string%></h2>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/triplejlogo.gif'>
<ul class="kwicks-jjj">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcdigmusiclogo.gif'>
<ul class="kwicks-dig">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcjazzlogo.gif'>
<ul class="kwicks-jazz">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abccountrylogo.gif'>
<ul class="kwicks-country">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcradiologo.gif'>
<h5>Combined view of triple j, ABC Dig Music, ABC Jazz and ABC Country</h5>
<ul class="kwicks-combined">
</ul>
</div>
</div>
</div>
<script type="text/javascript">
$().ready(function() {
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-jjj");
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
cache:true,
jsonpCallback:'c1',
dataType: "jsonp",
data: {
format:"json",
- channel: 4,
+ channel: 4
},
success: function(data){
$(".kwicks-jjj #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-jjj");
});
$('.kwicks-jjj').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
- },
+ }
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-dig");
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
cache:true,
jsonpCallback:'c2',
dataType: "jsonp",
data: {
format:"json",
- channel: 1,
+ channel: 1
},
success: function(data){
$(".kwicks-dig #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-dig");
});
$('.kwicks-dig').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
- },
+ }
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-jazz");
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
jsonpCallback:'c3',
cache:true,
dataType: "jsonp",
data: {
format:"json",
- channel: 2,
+ channel: 2
},
success: function(data){
$(".kwicks-jazz #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-jazz");
});
$('.kwicks-jazz').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
- },
+ }
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-country");
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
cache:true,
jsonpCallback:'c4',
dataType: "jsonp",
data: {
format:"json",
- channel: 3,
+ channel: 3
},
success: function(data){
$(".kwicks-country #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-country");
});
$('.kwicks-country').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
- },
+ }
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-combined");
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
cache:true,
jsonpCallback:'c5',
dataType: "jsonp",
data: {
format:"json"
},
success: function(data){
$(".kwicks-combined #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-combined");
});
$('.kwicks-combined').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
- },
+ }
});
});
</script>
<style type="text/css" media="screen">
header#main,div#wrapper{
width:700px;
}
#number_overlay{
display: block;
position: absolute;
width: 100%;
top: 7%;
left: -5;
z-index: 2;
text-align: right;
font-size: 70px;
letter-spacing: -13px;
font-weight: bold;
font-family:arial,helvetica,sans-serif;
}
#front_page_playlist_section
{height:145px;}
#front_page_playlist_section .top_wrapper{
border-top: 0px dotted #C9C9C9;
padding-top: 20px;
}
/* defaults for all examples */
.kwicks-combined, .kwicks-jjj, .kwicks-dig, .kwicks-jazz, .kwicks-country {
list-style: none;
position: relative;
margin: 0;
padding: 0;
padding-top:10px;
}
.kwicks-combined li, .kwicks-jjj li, .kwicks-dig li,.kwicks-jazz li,.kwicks-country li{
display: block;
overflow: hidden;
padding: 0;
width: 69px
}
.kwicks_inner {
width: 180px;
}
.bigLetter {
float: left;
margin-right:8px;
position:relative;
z-index:1;
color:white;
}
.bigLetter img{
width: 69px;
height:69px;
}
.smallLetters {
display: none;
font-size: 12px;
width:100px;
float:right;
word-wrap: break-word;
}
#kwick_albumname{
color: #204BA1;
}
li.active .smallLetters {
display: block;
}
</style>
|
simonhn/pav-api
|
a1a0e8d8808fdc3c9e5a6a9179459ae2ff22094f
|
fixing line break
|
diff --git a/views/album_chart_all.html.erb b/views/album_chart_all.html.erb
index 89c8894..f2666eb 100644
--- a/views/album_chart_all.html.erb
+++ b/views/album_chart_all.html.erb
@@ -1,290 +1,292 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<script src="http://jmar777.googlecode.com/svn/trunk/js/jquery.easing.1.3.js" type="text/javascript"></script>
<script src="http://kwicks.googlecode.com/svn/branches/v1.5.1/Kwicks/jquery.kwicks-1.5.1.pack.js" type="text/javascript"></script>
<div>
<h2>Demo of Most Played Albums <%=@from_date_string%> to <%=@to_date_string%></h2>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/triplejlogo.gif'>
<ul class="kwicks-jjj">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcdigmusiclogo.gif'>
<ul class="kwicks-dig">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcjazzlogo.gif'>
<ul class="kwicks-jazz">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abccountrylogo.gif'>
<ul class="kwicks-country">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcradiologo.gif'>
<h5>Combined view of triple j, ABC Dig Music, ABC Jazz and ABC Country</h5>
<ul class="kwicks-combined">
</ul>
</div>
</div>
</div>
<script type="text/javascript">
$().ready(function() {
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-jjj");
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
cache:true,
jsonpCallback:'c1',
dataType: "jsonp",
data: {
format:"json",
channel: 4,
},
success: function(data){
$(".kwicks-jjj #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-jjj");
});
$('.kwicks-jjj').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-dig");
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
cache:true,
jsonpCallback:'c2',
dataType: "jsonp",
data: {
format:"json",
channel: 1,
},
success: function(data){
$(".kwicks-dig #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-dig");
});
$('.kwicks-dig').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-jazz");
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
jsonpCallback:'c3',
cache:true,
dataType: "jsonp",
data: {
format:"json",
channel: 2,
},
success: function(data){
$(".kwicks-jazz #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-jazz");
});
$('.kwicks-jazz').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-country");
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
cache:true,
jsonpCallback:'c4',
dataType: "jsonp",
data: {
format:"json",
channel: 3,
},
success: function(data){
$(".kwicks-country #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-country");
});
$('.kwicks-country').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-combined");
$.ajax({
url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
cache:true,
jsonpCallback:'c5',
dataType: "jsonp",
data: {
format:"json"
},
success: function(data){
$(".kwicks-combined #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-combined");
});
$('.kwicks-combined').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
});
</script>
<style type="text/css" media="screen">
header#main,div#wrapper{
width:700px;
}
#number_overlay{
display: block;
position: absolute;
width: 100%;
top: 7%;
left: -5;
z-index: 2;
text-align: right;
font-size: 70px;
letter-spacing: -13px;
font-weight: bold;
font-family:arial,helvetica,sans-serif;
}
#front_page_playlist_section
{height:145px;}
#front_page_playlist_section .top_wrapper{
border-top: 0px dotted #C9C9C9;
padding-top: 20px;
}
/* defaults for all examples */
.kwicks-combined, .kwicks-jjj, .kwicks-dig, .kwicks-jazz, .kwicks-country {
list-style: none;
position: relative;
margin: 0;
padding: 0;
padding-top:10px;
}
.kwicks-combined li, .kwicks-jjj li, .kwicks-dig li,.kwicks-jazz li,.kwicks-country li{
display: block;
overflow: hidden;
padding: 0;
width: 69px
}
.kwicks_inner {
width: 180px;
}
.bigLetter {
float: left;
margin-right:8px;
position:relative;
z-index:1;
color:white;
}
.bigLetter img{
width: 69px;
height:69px;
}
.smallLetters {
display: none;
font-size: 12px;
+ width:100px;
+ float:right;
word-wrap: break-word;
}
#kwick_albumname{
color: #204BA1;
}
li.active .smallLetters {
display: block;
}
</style>
|
simonhn/pav-api
|
ae29bb8ee14cd24fbfe244d9118f8b6ce7d3afd1
|
more expire tweaks
|
diff --git a/pavapi.rb b/pavapi.rb
index b267dd6..a2a45f1 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -1,592 +1,595 @@
#core stuff
require 'rubygems'
require 'sinatra'
require './models'
require './store_methods'
#Queueing with delayed job
#require 'delayed_job'
#require 'delayed_job_data_mapper'
#require './storetrackjob'
require 'stalker'
#template systems
require 'yajl/json_gem'
require 'rack/contrib/jsonp'
require 'builder'
use Rack::JSONP
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
# Enable New Relic
#configure :production do
#require 'newrelic_rpm'
#end
#throttling
#require 'rack/throttle'
#require 'memcached'
#require './throttler'
#for serving different content types
require 'sinatra/respond_to'
Sinatra::Application.register Sinatra::RespondTo
#versioning
@version = "v1"
configure do
#use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
#use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
#logging
DataMapper::Logger.new('log/datamapper.log', :warn)
DataMapper::Model.raise_on_save_failure = true
$LOG = Logger.new('log/pavstore.log', 'monthly')
# MySQL connection:
@config = YAML::load( File.open( 'config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#DataMapper.auto_upgrade!
#DataMapper::auto_migrate!
set :default_content, :html
end
#Caching 1 minute - must adjust
-
+before '/*' do
+ cache_control :public, :must_revalidate, :max_age => 60 unless development?
+end
before '/demo/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
before '*/chart/*' do
cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
+
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
from_date = played_to - 7
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
def get_channel(cha)
if isNumeric(cha)
channel = cha
elsif cha.nil?
channel = false
end
end
end
#ROUTES
# Front page
get '/' do
erb :front
end
#show all artists, defaults to 10, ordered by created date
get "/#{@version}/artists" do
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
if channel
@artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist }
wants.xml { builder :artist }
wants.json { @artist.to_json }
end
end
# show tracks from artist
get "/#{@version}/artist/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@tracks = @artist.tracks
respond_to do |wants|
wants.html { erb :artist_tracks }
wants.xml { builder :artist_tracks }
wants.json { @tracks.to_json }
end
end
# show plays from artist
get "/#{@version}/artist/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@plays = @artist.tracks.plays
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
wants.json { @plays.to_json }
end
end
#add new track item (an item in the playout xml)
post "/#{@version}/track" do
protected!
begin
data = JSON.parse params[:payload].to_json
if !data['item']['artist']['artistname'].nil? && Play.count(:playedtime => data['item']['playedtime'], :channel_id => data['channel'])==0
Stalker.enqueue('track.store', :item => data['item'],:channel => data['channel'])
#Delayed::Job.enqueue StoreTrackJob.new(data['item'], data['channel'])
#store_hash(data['item'], data['channel'])
end
rescue StandardError => e
$LOG.info("Post method end: Issue while processing #{data['item']['artist']['artistname']} - #{data['channel']}, #{e.backtrace}")
end
end
#show tracks
get "/#{@version}/tracks" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@tracks = Track.all(Track.plays.channel_id => channel, :limit=>limit.to_i, :order => [:created_at.desc])
else
@tracks = Track.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :tracks }
wants.xml { builder :tracks }
wants.json {@tracks.to_json}
end
end
# show track
get "/#{@version}/track/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
respond_to do |wants|
wants.html { erb :track }
wants.xml { builder :track }
wants.json {@track.to_json}
end
end
#show artists for a track
get "/#{@version}/track/:id/artists" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@artists = @track.artists
respond_to do |wants|
wants.html { erb :track_artists }
wants.xml { builder :track_artists }
wants.json {@artists.to_json}
end
end
#show albums for a track
get "/#{@version}/track/:id/albums" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@albums = @track.albums
respond_to do |wants|
wants.html { erb :track_albums }
wants.xml { builder :track_albums }
wants.json {@albums.to_json}
end
end
# show plays for a track
get "/#{@version}/track/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@plays = @track.plays
respond_to do |wants|
wants.html { erb :track_plays }
wants.xml { builder :track_plays }
wants.json {@plays.to_json}
end
end
#show all albums
get "/#{@version}/albums" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = Album.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@albums = Album.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :albums }
wants.xml { builder :albums }
wants.json { @albums.to_json }
end
end
# show album from id
get "/#{@version}/album/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
respond_to do |wants|
wants.html { erb :album }
wants.xml { builder :album }
wants.json {@album.to_json}
end
end
# show tracks for an album
get "/#{@version}/album/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
@tracks = @album.tracks
respond_to do |wants|
wants.html { erb :album_tracks }
wants.xml { builder :album_tracks }
wants.json {@tracks.to_json }
end
end
#PLAY
get "/#{@version}/plays" do
#DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
if channel
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
else
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
end
hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :plays }
wants.xml { builder :plays }
wants.json { hat.to_json }
end
end
get "/#{@version}/play/:id" do
@play = Play.get(params[:id])
respond_to do |wants|
wants.json { @play.to_json }
end
end
# show all channels
get "/#{@version}/channels" do
@channels = Channel.all
respond_to do |wants|
wants.xml { @channels.to_xml }
wants.json { @channels.to_json }
end
end
#create new channel
post "/#{@version}/channel" do
protected!
data = JSON.parse params[:payload].to_json
channel = Channel.first_or_create({ :channelname => data['channelname'] }, { :channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'] })
end
#update a channel
put "/#{@version}/channel/:id" do
protected!
channel = Channel.get(params[:id])
data = JSON.parse params[:payload].to_json
channel = channel.update(:channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'])
end
# show channel from id
get "/#{@version}/channel/:id" do
@channel = Channel.get(params[:id])
respond_to do |wants|
wants.xml { @channel.to_xml }
wants.json { @channel.to_json }
end
end
# chart of top tracks
get "/#{@version}/chart/track" do
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
#SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
if channel
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
else
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
end
hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
respond_to do |wants|
wants.html { erb :track_chart }
wants.xml { builder :track_chart }
wants.json { hat.to_json }
end
end
# chart of top artist by name
get "/#{@version}/chart/artist" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
else
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
end
#@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
respond_to do |wants|
wants.html { erb :artist_chart }
wants.xml { builder :artist_chart }
wants.json {hat.to_json}
end
end
get "/#{@version}/chart/album" do
to_from = make_to_from(params[:played_from], params[:played_to])
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
else
@albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
end
hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
respond_to do |wants|
wants.xml { builder :album_chart }
wants.json {hat.to_json}
end
end
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
#Sinatra version info
get "/#{@version}/about" do
"I'm running version " + Sinatra::VERSION
end
#Count all artists
get "/#{@version}/stats" do
@artistcount = Artist.count
@artistmbid = (Artist.count(:artistmbid).to_f/@artistcount.to_f)*100
@trackcount = Track.count
@trackmbid = (Track.count(:trackmbid).to_f/@trackcount.to_f)*100
@playcount = Play.count
@albumcount = Album.count
@albummbid = (Album.count(:albummbid).to_f/@albumcount.to_f)*100
@dig_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_play = Play.all('channel_id'=>1).count
@jazz_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_play = Play.all('channel_id'=>2).count
@country_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_play = Play.all('channel_id'=>3).count
@jjj_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_play = Play.all('channel_id'=>4).count
respond_to do |wants|
wants.html { erb :stats }
end
end
get '/demo/album-charts' do
from_date = DateTime.now - 7
@from_date_string = from_date.strftime("%b %e")
to_date = DateTime.now
@to_date_string = to_date.strftime("%b %e")
respond_to do |wants|
wants.html{erb :album_chart_all}
end
end
get '/jjj' do
cache_control :public, :max_age => 600
artistmbid = {}
har ='a'
hur = 'b'
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
#hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
all = Hash.new
@artists.each{ |o|
begin
if o.artistmbid
#puts o.artistname
begin
result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
if(result.code==200)
all[o.artistname] = Hash.new
all[o.artistname].store("media",Hash.new())
all[o.artistname].store("info",Hash.new())
all[o.artistname].fetch("info").store("mbid",o.artistmbid)
all[o.artistname].fetch("info").store("count",o.cnt)
xml = Crack::XML.parse(result)
if(xml["rss"]["channel"]["item"].kind_of?(Array))
xml["rss"]["channel"]["item"].each_with_index{|ha,i|
if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
diff --git a/views/album_chart_all.html.erb b/views/album_chart_all.html.erb
index e37ba77..89c8894 100644
--- a/views/album_chart_all.html.erb
+++ b/views/album_chart_all.html.erb
@@ -1,281 +1,290 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<script src="http://jmar777.googlecode.com/svn/trunk/js/jquery.easing.1.3.js" type="text/javascript"></script>
<script src="http://kwicks.googlecode.com/svn/branches/v1.5.1/Kwicks/jquery.kwicks-1.5.1.pack.js" type="text/javascript"></script>
<div>
<h2>Demo of Most Played Albums <%=@from_date_string%> to <%=@to_date_string%></h2>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/triplejlogo.gif'>
<ul class="kwicks-jjj">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcdigmusiclogo.gif'>
<ul class="kwicks-dig">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcjazzlogo.gif'>
<ul class="kwicks-jazz">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abccountrylogo.gif'>
<ul class="kwicks-country">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcradiologo.gif'>
<h5>Combined view of triple j, ABC Dig Music, ABC Jazz and ABC Country</h5>
<ul class="kwicks-combined">
</ul>
</div>
</div>
</div>
<script type="text/javascript">
$().ready(function() {
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-jjj");
$.ajax({
- url: "/v1/chart/album",
- jsonpCallback:"pavCallBack",
+ url: "http://96.126.96.51/v1/chart/album",
+ cache:true,
+ jsonpCallback:'c1',
dataType: "jsonp",
data: {
format:"json",
channel: 4,
},
success: function(data){
$(".kwicks-jjj #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-jjj");
});
$('.kwicks-jjj').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-dig");
$.ajax({
- url: "/v1/chart/album",
+ url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
- jsonpCallback:"pavCallBack",
+ cache:true,
+ jsonpCallback:'c2',
+
dataType: "jsonp",
data: {
format:"json",
channel: 1,
},
success: function(data){
$(".kwicks-dig #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-dig");
});
$('.kwicks-dig').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-jazz");
$.ajax({
- url: "/v1/chart/album",
+ url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
- jsonpCallback:"pavCallBack",
+ jsonpCallback:'c3',
+
+ cache:true,
dataType: "jsonp",
data: {
format:"json",
channel: 2,
},
success: function(data){
$(".kwicks-jazz #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-jazz");
});
$('.kwicks-jazz').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-country");
$.ajax({
- url: "/v1/chart/album",
+ url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
- jsonpCallback:"pavCallBack",
+ cache:true,
+ jsonpCallback:'c4',
+
dataType: "jsonp",
data: {
format:"json",
channel: 3,
},
success: function(data){
$(".kwicks-country #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-country");
});
$('.kwicks-country').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-combined");
$.ajax({
- url: "/v1/chart/album",
+ url: "http://96.126.96.51/v1/chart/album",
timeout : 40000,
- jsonpCallback:"pavCallBack",
+ cache:true,
+ jsonpCallback:'c5',
+
dataType: "jsonp",
data: {
format:"json"
},
success: function(data){
$(".kwicks-combined #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-combined");
});
$('.kwicks-combined').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
});
</script>
<style type="text/css" media="screen">
header#main,div#wrapper{
width:700px;
}
#number_overlay{
display: block;
position: absolute;
width: 100%;
top: 7%;
left: -5;
z-index: 2;
text-align: right;
font-size: 70px;
letter-spacing: -13px;
font-weight: bold;
font-family:arial,helvetica,sans-serif;
}
#front_page_playlist_section
{height:145px;}
#front_page_playlist_section .top_wrapper{
border-top: 0px dotted #C9C9C9;
padding-top: 20px;
}
/* defaults for all examples */
.kwicks-combined, .kwicks-jjj, .kwicks-dig, .kwicks-jazz, .kwicks-country {
list-style: none;
position: relative;
margin: 0;
padding: 0;
padding-top:10px;
}
.kwicks-combined li, .kwicks-jjj li, .kwicks-dig li,.kwicks-jazz li,.kwicks-country li{
display: block;
overflow: hidden;
padding: 0;
width: 69px
}
.kwicks_inner {
width: 180px;
}
.bigLetter {
float: left;
margin-right:8px;
position:relative;
z-index:1;
color:white;
}
.bigLetter img{
width: 69px;
height:69px;
}
.smallLetters {
display: none;
font-size: 12px;
word-wrap: break-word;
}
#kwick_albumname{
color: #204BA1;
}
li.active .smallLetters {
display: block;
}
</style>
|
simonhn/pav-api
|
11c1b1d5c94d632cd146fb6de758d45c6a14b3f0
|
adjusting expire values for better caching
|
diff --git a/pavapi.rb b/pavapi.rb
index fa307a6..b267dd6 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -1,584 +1,590 @@
#core stuff
require 'rubygems'
require 'sinatra'
require './models'
require './store_methods'
#Queueing with delayed job
#require 'delayed_job'
#require 'delayed_job_data_mapper'
#require './storetrackjob'
require 'stalker'
#template systems
require 'yajl/json_gem'
require 'rack/contrib/jsonp'
require 'builder'
use Rack::JSONP
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
# Enable New Relic
#configure :production do
#require 'newrelic_rpm'
#end
#throttling
#require 'rack/throttle'
#require 'memcached'
#require './throttler'
#for serving different content types
require 'sinatra/respond_to'
Sinatra::Application.register Sinatra::RespondTo
#versioning
@version = "v1"
configure do
#use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
#use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
#logging
DataMapper::Logger.new('log/datamapper.log', :warn)
DataMapper::Model.raise_on_save_failure = true
$LOG = Logger.new('log/pavstore.log', 'monthly')
# MySQL connection:
@config = YAML::load( File.open( 'config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#DataMapper.auto_upgrade!
#DataMapper::auto_migrate!
set :default_content, :html
end
#Caching 1 minute - must adjust
-before do
- cache_control :public, :must_revalidate, :max_age => 60 unless development?
+
+
+before '/demo/*' do
+ cache_control :public, :must_revalidate, :max_age => 3600 unless development?
+end
+
+before '*/chart/*' do
+ cache_control :public, :must_revalidate, :max_age => 3600 unless development?
end
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
from_date = played_to - 7
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
def get_channel(cha)
if isNumeric(cha)
channel = cha
elsif cha.nil?
channel = false
end
end
end
#ROUTES
# Front page
get '/' do
erb :front
end
#show all artists, defaults to 10, ordered by created date
get "/#{@version}/artists" do
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
if channel
@artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist }
wants.xml { builder :artist }
wants.json { @artist.to_json }
end
end
# show tracks from artist
get "/#{@version}/artist/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@tracks = @artist.tracks
respond_to do |wants|
wants.html { erb :artist_tracks }
wants.xml { builder :artist_tracks }
wants.json { @tracks.to_json }
end
end
# show plays from artist
get "/#{@version}/artist/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@plays = @artist.tracks.plays
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
wants.json { @plays.to_json }
end
end
#add new track item (an item in the playout xml)
post "/#{@version}/track" do
protected!
begin
data = JSON.parse params[:payload].to_json
if !data['item']['artist']['artistname'].nil? && Play.count(:playedtime => data['item']['playedtime'], :channel_id => data['channel'])==0
Stalker.enqueue('track.store', :item => data['item'],:channel => data['channel'])
#Delayed::Job.enqueue StoreTrackJob.new(data['item'], data['channel'])
#store_hash(data['item'], data['channel'])
end
rescue StandardError => e
$LOG.info("Post method end: Issue while processing #{data['item']['artist']['artistname']} - #{data['channel']}, #{e.backtrace}")
end
end
#show tracks
get "/#{@version}/tracks" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@tracks = Track.all(Track.plays.channel_id => channel, :limit=>limit.to_i, :order => [:created_at.desc])
else
@tracks = Track.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :tracks }
wants.xml { builder :tracks }
wants.json {@tracks.to_json}
end
end
# show track
get "/#{@version}/track/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
respond_to do |wants|
wants.html { erb :track }
wants.xml { builder :track }
wants.json {@track.to_json}
end
end
#show artists for a track
get "/#{@version}/track/:id/artists" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@artists = @track.artists
respond_to do |wants|
wants.html { erb :track_artists }
wants.xml { builder :track_artists }
wants.json {@artists.to_json}
end
end
#show albums for a track
get "/#{@version}/track/:id/albums" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@albums = @track.albums
respond_to do |wants|
wants.html { erb :track_albums }
wants.xml { builder :track_albums }
wants.json {@albums.to_json}
end
end
# show plays for a track
get "/#{@version}/track/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@plays = @track.plays
respond_to do |wants|
wants.html { erb :track_plays }
wants.xml { builder :track_plays }
wants.json {@plays.to_json}
end
end
#show all albums
get "/#{@version}/albums" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = Album.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@albums = Album.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :albums }
wants.xml { builder :albums }
wants.json { @albums.to_json }
end
end
# show album from id
get "/#{@version}/album/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
respond_to do |wants|
wants.html { erb :album }
wants.xml { builder :album }
wants.json {@album.to_json}
end
end
# show tracks for an album
get "/#{@version}/album/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
@tracks = @album.tracks
respond_to do |wants|
wants.html { erb :album_tracks }
wants.xml { builder :album_tracks }
wants.json {@tracks.to_json }
end
end
#PLAY
get "/#{@version}/plays" do
#DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
if channel
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
else
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
end
hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :plays }
wants.xml { builder :plays }
wants.json { hat.to_json }
end
end
get "/#{@version}/play/:id" do
@play = Play.get(params[:id])
respond_to do |wants|
wants.json { @play.to_json }
end
end
# show all channels
get "/#{@version}/channels" do
@channels = Channel.all
respond_to do |wants|
wants.xml { @channels.to_xml }
wants.json { @channels.to_json }
end
end
#create new channel
post "/#{@version}/channel" do
protected!
data = JSON.parse params[:payload].to_json
channel = Channel.first_or_create({ :channelname => data['channelname'] }, { :channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'] })
end
#update a channel
put "/#{@version}/channel/:id" do
protected!
channel = Channel.get(params[:id])
data = JSON.parse params[:payload].to_json
channel = channel.update(:channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'])
end
# show channel from id
get "/#{@version}/channel/:id" do
@channel = Channel.get(params[:id])
respond_to do |wants|
wants.xml { @channel.to_xml }
wants.json { @channel.to_json }
end
end
# chart of top tracks
get "/#{@version}/chart/track" do
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
#SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
if channel
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
else
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
end
hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
respond_to do |wants|
wants.html { erb :track_chart }
wants.xml { builder :track_chart }
wants.json { hat.to_json }
end
end
# chart of top artist by name
get "/#{@version}/chart/artist" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
else
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
end
#@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
respond_to do |wants|
wants.html { erb :artist_chart }
wants.xml { builder :artist_chart }
wants.json {hat.to_json}
end
end
get "/#{@version}/chart/album" do
to_from = make_to_from(params[:played_from], params[:played_to])
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
else
@albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
end
hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
respond_to do |wants|
wants.xml { builder :album_chart }
wants.json {hat.to_json}
end
end
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
#Sinatra version info
get "/#{@version}/about" do
"I'm running version " + Sinatra::VERSION
end
#Count all artists
get "/#{@version}/stats" do
@artistcount = Artist.count
@artistmbid = (Artist.count(:artistmbid).to_f/@artistcount.to_f)*100
@trackcount = Track.count
@trackmbid = (Track.count(:trackmbid).to_f/@trackcount.to_f)*100
@playcount = Play.count
@albumcount = Album.count
@albummbid = (Album.count(:albummbid).to_f/@albumcount.to_f)*100
@dig_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_play = Play.all('channel_id'=>1).count
@jazz_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_play = Play.all('channel_id'=>2).count
@country_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_play = Play.all('channel_id'=>3).count
@jjj_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_play = Play.all('channel_id'=>4).count
respond_to do |wants|
wants.html { erb :stats }
end
end
get '/demo/album-charts' do
from_date = DateTime.now - 7
@from_date_string = from_date.strftime("%b %e")
to_date = DateTime.now
@to_date_string = to_date.strftime("%b %e")
respond_to do |wants|
wants.html{erb :album_chart_all}
end
end
get '/jjj' do
cache_control :public, :max_age => 600
artistmbid = {}
har ='a'
hur = 'b'
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
#hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
all = Hash.new
@artists.each{ |o|
begin
if o.artistmbid
#puts o.artistname
begin
result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
if(result.code==200)
all[o.artistname] = Hash.new
all[o.artistname].store("media",Hash.new())
all[o.artistname].store("info",Hash.new())
all[o.artistname].fetch("info").store("mbid",o.artistmbid)
all[o.artistname].fetch("info").store("count",o.cnt)
xml = Crack::XML.parse(result)
if(xml["rss"]["channel"]["item"].kind_of?(Array))
diff --git a/views/album_chart_all.html.erb b/views/album_chart_all.html.erb
index b6f83c6..e37ba77 100644
--- a/views/album_chart_all.html.erb
+++ b/views/album_chart_all.html.erb
@@ -1,280 +1,281 @@
-<script src="http://jmar777.googlecode.com/svn/trunk/js/jquery-1.2.6.js" type="text/javascript"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
<script src="http://jmar777.googlecode.com/svn/trunk/js/jquery.easing.1.3.js" type="text/javascript"></script>
<script src="http://kwicks.googlecode.com/svn/branches/v1.5.1/Kwicks/jquery.kwicks-1.5.1.pack.js" type="text/javascript"></script>
<div>
<h2>Demo of Most Played Albums <%=@from_date_string%> to <%=@to_date_string%></h2>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/triplejlogo.gif'>
<ul class="kwicks-jjj">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcdigmusiclogo.gif'>
<ul class="kwicks-dig">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcjazzlogo.gif'>
<ul class="kwicks-jazz">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abccountrylogo.gif'>
<ul class="kwicks-country">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcradiologo.gif'>
<h5>Combined view of triple j, ABC Dig Music, ABC Jazz and ABC Country</h5>
<ul class="kwicks-combined">
</ul>
</div>
</div>
</div>
<script type="text/javascript">
$().ready(function() {
- $("<img id='loader'></img>")
- .attr('src', "/images/ajax_loader.gif")
- .appendTo(".kwicks-jjj");
- $.ajax({
- url: "/v1/chart/album",
- timeout : 40000,
-
- dataType: "jsonp",
- data: {
- format:"json",
- channel: 4,
- },
- success: function(data){
- $(".kwicks-jjj #loader").remove();
- $.each( data, function(i,item) {
- var count = i+1;
- var artist = item.artistname;
- content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
- $(content).appendTo(".kwicks-jjj");
- });
- $('.kwicks-jjj').kwicks({
- max: 189,
- duration: 400,
- spacing: 1,
- sticky: false
- });
- },
- });
+
+
+ $("<img id='loader'></img>")
+ .attr('src', "/images/ajax_loader.gif")
+ .appendTo(".kwicks-jjj");
+ $.ajax({
+ url: "/v1/chart/album",
+ jsonpCallback:"pavCallBack",
+ dataType: "jsonp",
+ data: {
+ format:"json",
+ channel: 4,
+ },
+ success: function(data){
+ $(".kwicks-jjj #loader").remove();
+ $.each( data, function(i,item) {
+ var count = i+1;
+ var artist = item.artistname;
+ content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
+ $(content).appendTo(".kwicks-jjj");
+ });
+ $('.kwicks-jjj').kwicks({
+ max: 189,
+ duration: 400,
+ spacing: 1,
+ sticky: false
+ });
+ },
+ });
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-dig");
$.ajax({
url: "/v1/chart/album",
timeout : 40000,
-
+ jsonpCallback:"pavCallBack",
dataType: "jsonp",
data: {
format:"json",
channel: 1,
},
success: function(data){
$(".kwicks-dig #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-dig");
});
$('.kwicks-dig').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-jazz");
$.ajax({
url: "/v1/chart/album",
timeout : 40000,
-
+ jsonpCallback:"pavCallBack",
dataType: "jsonp",
data: {
format:"json",
channel: 2,
},
success: function(data){
$(".kwicks-jazz #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-jazz");
});
$('.kwicks-jazz').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-country");
$.ajax({
url: "/v1/chart/album",
timeout : 40000,
-
+ jsonpCallback:"pavCallBack",
dataType: "jsonp",
data: {
format:"json",
channel: 3,
},
success: function(data){
$(".kwicks-country #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-country");
});
$('.kwicks-country').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-combined");
$.ajax({
url: "/v1/chart/album",
timeout : 40000,
-
+ jsonpCallback:"pavCallBack",
dataType: "jsonp",
data: {
format:"json"
},
success: function(data){
$(".kwicks-combined #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-combined");
});
$('.kwicks-combined').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
});
</script>
<style type="text/css" media="screen">
header#main,div#wrapper{
width:700px;
}
#number_overlay{
display: block;
position: absolute;
width: 100%;
top: 7%;
left: -5;
z-index: 2;
text-align: right;
font-size: 70px;
letter-spacing: -13px;
font-weight: bold;
font-family:arial,helvetica,sans-serif;
}
#front_page_playlist_section
{height:145px;}
#front_page_playlist_section .top_wrapper{
border-top: 0px dotted #C9C9C9;
padding-top: 20px;
}
/* defaults for all examples */
.kwicks-combined, .kwicks-jjj, .kwicks-dig, .kwicks-jazz, .kwicks-country {
list-style: none;
position: relative;
margin: 0;
padding: 0;
padding-top:10px;
}
.kwicks-combined li, .kwicks-jjj li, .kwicks-dig li,.kwicks-jazz li,.kwicks-country li{
display: block;
overflow: hidden;
padding: 0;
width: 69px
}
.kwicks_inner {
width: 180px;
}
.bigLetter {
float: left;
margin-right:8px;
position:relative;
z-index:1;
color:white;
}
.bigLetter img{
width: 69px;
height:69px;
}
.smallLetters {
display: none;
font-size: 12px;
word-wrap: break-word;
}
#kwick_albumname{
color: #204BA1;
}
li.active .smallLetters {
display: block;
}
</style>
|
simonhn/pav-api
|
7cd6ff6309ee33b35896988785ee45120e7e5f18
|
updating gems to latest versions
|
diff --git a/Gemfile.lock b/Gemfile.lock
index d12ba4f..98d3732 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,114 +1,114 @@
GEM
remote: http://rubygems.org/
specs:
- activesupport (3.0.7)
+ activesupport (3.0.9)
addressable (2.2.6)
beanstalk-client (1.1.0)
builder (3.0.0)
- chronic (0.3.0)
- chronic_duration (0.9.5)
+ chronic (0.5.0)
+ chronic_duration (0.9.6)
numerizer (~> 0.1.1)
crack (0.1.8)
- daemons (1.1.3)
+ daemons (1.1.4)
data_objects (0.10.6)
addressable (~> 2.1)
delayed_job (2.1.4)
activesupport (~> 3.0)
daemons
delayed_job_data_mapper (1.0.0.rc)
delayed_job (~> 2.1)
dm-aggregates
dm-core
dm-observer
dm-aggregates (1.1.0)
dm-core (~> 1.1.0)
dm-core (1.1.0)
addressable (~> 2.2.4)
dm-do-adapter (1.1.0)
data_objects (~> 0.10.2)
dm-core (~> 1.1.0)
dm-migrations (1.1.0)
dm-core (~> 1.1.0)
dm-mysql-adapter (1.1.0)
dm-do-adapter (~> 1.1.0)
do_mysql (~> 0.10.2)
dm-observer (1.1.0)
dm-core (~> 1.1.0)
dm-serializer (1.1.0)
dm-core (~> 1.1.0)
fastercsv (~> 1.5.4)
json (~> 1.4.6)
dm-timestamps (1.1.0)
dm-core (~> 1.1.0)
do_mysql (0.10.6)
data_objects (= 0.10.6)
fastercsv (1.5.4)
- foreman (0.18.0)
+ foreman (0.19.0)
term-ansicolor (~> 1.0.5)
thor (>= 0.13.6)
- httparty (0.7.7)
+ httparty (0.7.8)
crack (= 0.1.8)
i18n (0.6.0)
json (1.4.6)
- json_pure (1.5.1)
- memcached (1.2.7)
+ json_pure (1.5.3)
+ memcached (1.2.7.1)
meta-spotify (0.1.5)
crack (>= 0.1.4)
httparty (>= 0.4.5)
mime-types (1.16)
- newrelic_rpm (3.0.1)
+ newrelic_rpm (3.1.0)
numerizer (0.1.1)
- rack (1.3.0)
+ rack (1.3.1)
rack-contrib (1.1.0)
rack (>= 0.9.1)
rack-throttle (0.3.0)
rack (>= 1.0.0)
rbrainz (0.5.2)
rchardet19 (1.3.5)
- rest-client (1.6.1)
+ rest-client (1.6.3)
mime-types (>= 1.16)
sinatra (1.2.6)
rack (~> 1.1)
tilt (< 2.0, >= 1.2.2)
sinatra-respond_to (0.7.0)
sinatra (~> 1.2)
stalker (0.9.0)
beanstalk-client
json_pure
term-ansicolor (1.0.5)
thor (0.14.6)
- tilt (1.3.1)
+ tilt (1.3.2)
yajl-ruby (0.8.2)
PLATFORMS
ruby
DEPENDENCIES
builder
chronic
chronic_duration
crack
delayed_job
delayed_job_data_mapper
dm-aggregates
dm-core
dm-migrations
dm-mysql-adapter
dm-serializer
dm-timestamps
foreman
i18n
json
memcached
meta-spotify
newrelic_rpm
rack
rack-contrib
rack-throttle
rbrainz
rchardet19
rest-client
sinatra
sinatra-respond_to
stalker
yajl-ruby
|
simonhn/pav-api
|
a957f6677c46280731fcebc1ecba09dd7e8806e1
|
setting fixed height for ie
|
diff --git a/views/album_chart_all.html.erb b/views/album_chart_all.html.erb
index 123c623..b6f83c6 100644
--- a/views/album_chart_all.html.erb
+++ b/views/album_chart_all.html.erb
@@ -1,279 +1,280 @@
<script src="http://jmar777.googlecode.com/svn/trunk/js/jquery-1.2.6.js" type="text/javascript"></script>
<script src="http://jmar777.googlecode.com/svn/trunk/js/jquery.easing.1.3.js" type="text/javascript"></script>
<script src="http://kwicks.googlecode.com/svn/branches/v1.5.1/Kwicks/jquery.kwicks-1.5.1.pack.js" type="text/javascript"></script>
<div>
+ <h2>Demo of Most Played Albums <%=@from_date_string%> to <%=@to_date_string%></h2>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
- <h2>Demo of Most Played Albums <%=@from_date_string%> to <%=@to_date_string%></h2>
</div>
<div class="top_wrapper">
<img src='/images/triplejlogo.gif'>
<ul class="kwicks-jjj">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcdigmusiclogo.gif'>
<ul class="kwicks-dig">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcjazzlogo.gif'>
<ul class="kwicks-jazz">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abccountrylogo.gif'>
<ul class="kwicks-country">
</ul>
</div>
</div>
<div id="front_page_playlist_section">
<div class="heading_wrapper">
<div class="image_text_replacement"></div>
</div>
<div class="top_wrapper">
<img src='/images/abcradiologo.gif'>
<h5>Combined view of triple j, ABC Dig Music, ABC Jazz and ABC Country</h5>
<ul class="kwicks-combined">
</ul>
</div>
</div>
</div>
<script type="text/javascript">
$().ready(function() {
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-jjj");
$.ajax({
url: "/v1/chart/album",
timeout : 40000,
dataType: "jsonp",
data: {
format:"json",
channel: 4,
},
success: function(data){
$(".kwicks-jjj #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-jjj");
});
$('.kwicks-jjj').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-dig");
$.ajax({
url: "/v1/chart/album",
timeout : 40000,
dataType: "jsonp",
data: {
format:"json",
channel: 1,
},
success: function(data){
$(".kwicks-dig #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-dig");
});
$('.kwicks-dig').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-jazz");
$.ajax({
url: "/v1/chart/album",
timeout : 40000,
dataType: "jsonp",
data: {
format:"json",
channel: 2,
},
success: function(data){
$(".kwicks-jazz #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-jazz");
});
$('.kwicks-jazz').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-country");
$.ajax({
url: "/v1/chart/album",
timeout : 40000,
dataType: "jsonp",
data: {
format:"json",
channel: 3,
},
success: function(data){
$(".kwicks-country #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-country");
});
$('.kwicks-country').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
$("<img id='loader'></img>")
.attr('src', "/images/ajax_loader.gif")
.appendTo(".kwicks-combined");
$.ajax({
url: "/v1/chart/album",
timeout : 40000,
dataType: "jsonp",
data: {
format:"json"
},
success: function(data){
$(".kwicks-combined #loader").remove();
$.each( data, function(i,item) {
var count = i+1;
var artist = item.artistname;
content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
$(content).appendTo(".kwicks-combined");
});
$('.kwicks-combined').kwicks({
max: 189,
duration: 400,
spacing: 1,
sticky: false
});
},
});
});
</script>
<style type="text/css" media="screen">
header#main,div#wrapper{
width:700px;
}
#number_overlay{
display: block;
position: absolute;
width: 100%;
top: 7%;
left: -5;
z-index: 2;
text-align: right;
font-size: 70px;
letter-spacing: -13px;
font-weight: bold;
font-family:arial,helvetica,sans-serif;
}
-
+#front_page_playlist_section
+{height:145px;}
#front_page_playlist_section .top_wrapper{
border-top: 0px dotted #C9C9C9;
padding-top: 20px;
}
/* defaults for all examples */
.kwicks-combined, .kwicks-jjj, .kwicks-dig, .kwicks-jazz, .kwicks-country {
list-style: none;
position: relative;
margin: 0;
padding: 0;
padding-top:10px;
}
.kwicks-combined li, .kwicks-jjj li, .kwicks-dig li,.kwicks-jazz li,.kwicks-country li{
display: block;
overflow: hidden;
padding: 0;
width: 69px
}
.kwicks_inner {
width: 180px;
}
.bigLetter {
float: left;
margin-right:8px;
position:relative;
z-index:1;
color:white;
}
.bigLetter img{
width: 69px;
height:69px;
}
.smallLetters {
display: none;
font-size: 12px;
word-wrap: break-word;
}
#kwick_albumname{
color: #204BA1;
}
li.active .smallLetters {
display: block;
}
</style>
|
simonhn/pav-api
|
740a7e6602e14983d8be74104453e9829644c897
|
adding album chart demo
|
diff --git a/pavapi.rb b/pavapi.rb
index 90bcc4d..fa307a6 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -1,611 +1,623 @@
#core stuff
require 'rubygems'
require 'sinatra'
require './models'
require './store_methods'
#Queueing with delayed job
#require 'delayed_job'
#require 'delayed_job_data_mapper'
#require './storetrackjob'
require 'stalker'
#template systems
require 'yajl/json_gem'
require 'rack/contrib/jsonp'
require 'builder'
use Rack::JSONP
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
# Enable New Relic
#configure :production do
#require 'newrelic_rpm'
#end
#throttling
#require 'rack/throttle'
#require 'memcached'
#require './throttler'
#for serving different content types
require 'sinatra/respond_to'
Sinatra::Application.register Sinatra::RespondTo
#versioning
@version = "v1"
configure do
#use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
#use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
#logging
DataMapper::Logger.new('log/datamapper.log', :warn)
DataMapper::Model.raise_on_save_failure = true
$LOG = Logger.new('log/pavstore.log', 'monthly')
# MySQL connection:
@config = YAML::load( File.open( 'config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#DataMapper.auto_upgrade!
#DataMapper::auto_migrate!
set :default_content, :html
end
#Caching 1 minute - must adjust
before do
cache_control :public, :must_revalidate, :max_age => 60 unless development?
end
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
from_date = played_to - 7
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
def get_channel(cha)
if isNumeric(cha)
channel = cha
elsif cha.nil?
channel = false
end
end
end
#ROUTES
# Front page
get '/' do
erb :front
end
#show all artists, defaults to 10, ordered by created date
get "/#{@version}/artists" do
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
if channel
@artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist }
wants.xml { builder :artist }
wants.json { @artist.to_json }
end
end
# show tracks from artist
get "/#{@version}/artist/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@tracks = @artist.tracks
respond_to do |wants|
wants.html { erb :artist_tracks }
wants.xml { builder :artist_tracks }
wants.json { @tracks.to_json }
end
end
# show plays from artist
get "/#{@version}/artist/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@plays = @artist.tracks.plays
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
wants.json { @plays.to_json }
end
end
#add new track item (an item in the playout xml)
post "/#{@version}/track" do
protected!
begin
data = JSON.parse params[:payload].to_json
if !data['item']['artist']['artistname'].nil? && Play.count(:playedtime => data['item']['playedtime'], :channel_id => data['channel'])==0
Stalker.enqueue('track.store', :item => data['item'],:channel => data['channel'])
#Delayed::Job.enqueue StoreTrackJob.new(data['item'], data['channel'])
#store_hash(data['item'], data['channel'])
end
rescue StandardError => e
$LOG.info("Post method end: Issue while processing #{data['item']['artist']['artistname']} - #{data['channel']}, #{e.backtrace}")
end
end
#show tracks
get "/#{@version}/tracks" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@tracks = Track.all(Track.plays.channel_id => channel, :limit=>limit.to_i, :order => [:created_at.desc])
else
@tracks = Track.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :tracks }
wants.xml { builder :tracks }
wants.json {@tracks.to_json}
end
end
# show track
get "/#{@version}/track/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
respond_to do |wants|
wants.html { erb :track }
wants.xml { builder :track }
wants.json {@track.to_json}
end
end
#show artists for a track
get "/#{@version}/track/:id/artists" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@artists = @track.artists
respond_to do |wants|
wants.html { erb :track_artists }
wants.xml { builder :track_artists }
wants.json {@artists.to_json}
end
end
#show albums for a track
get "/#{@version}/track/:id/albums" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@albums = @track.albums
respond_to do |wants|
wants.html { erb :track_albums }
wants.xml { builder :track_albums }
wants.json {@albums.to_json}
end
end
# show plays for a track
get "/#{@version}/track/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@plays = @track.plays
respond_to do |wants|
wants.html { erb :track_plays }
wants.xml { builder :track_plays }
wants.json {@plays.to_json}
end
end
#show all albums
get "/#{@version}/albums" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = Album.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@albums = Album.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :albums }
wants.xml { builder :albums }
wants.json { @albums.to_json }
end
end
# show album from id
get "/#{@version}/album/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
respond_to do |wants|
wants.html { erb :album }
wants.xml { builder :album }
wants.json {@album.to_json}
end
end
# show tracks for an album
get "/#{@version}/album/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
@tracks = @album.tracks
respond_to do |wants|
wants.html { erb :album_tracks }
wants.xml { builder :album_tracks }
wants.json {@tracks.to_json }
end
end
#PLAY
get "/#{@version}/plays" do
#DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
if channel
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
else
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
end
hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :plays }
wants.xml { builder :plays }
wants.json { hat.to_json }
end
end
get "/#{@version}/play/:id" do
@play = Play.get(params[:id])
respond_to do |wants|
wants.json { @play.to_json }
end
end
# show all channels
get "/#{@version}/channels" do
@channels = Channel.all
respond_to do |wants|
wants.xml { @channels.to_xml }
wants.json { @channels.to_json }
end
end
#create new channel
post "/#{@version}/channel" do
protected!
data = JSON.parse params[:payload].to_json
channel = Channel.first_or_create({ :channelname => data['channelname'] }, { :channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'] })
end
#update a channel
put "/#{@version}/channel/:id" do
protected!
channel = Channel.get(params[:id])
data = JSON.parse params[:payload].to_json
channel = channel.update(:channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'])
end
# show channel from id
get "/#{@version}/channel/:id" do
@channel = Channel.get(params[:id])
respond_to do |wants|
wants.xml { @channel.to_xml }
wants.json { @channel.to_json }
end
end
# chart of top tracks
get "/#{@version}/chart/track" do
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
#SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
if channel
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
else
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
end
hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
respond_to do |wants|
wants.html { erb :track_chart }
wants.xml { builder :track_chart }
wants.json { hat.to_json }
end
end
# chart of top artist by name
get "/#{@version}/chart/artist" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
else
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
end
#@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
respond_to do |wants|
wants.html { erb :artist_chart }
wants.xml { builder :artist_chart }
wants.json {hat.to_json}
end
end
get "/#{@version}/chart/album" do
to_from = make_to_from(params[:played_from], params[:played_to])
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
else
- @albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where AND tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
+ @albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
end
hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
respond_to do |wants|
wants.xml { builder :album_chart }
wants.json {hat.to_json}
end
end
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
#Sinatra version info
get "/#{@version}/about" do
"I'm running version " + Sinatra::VERSION
end
#Count all artists
get "/#{@version}/stats" do
@artistcount = Artist.count
@artistmbid = (Artist.count(:artistmbid).to_f/@artistcount.to_f)*100
@trackcount = Track.count
@trackmbid = (Track.count(:trackmbid).to_f/@trackcount.to_f)*100
@playcount = Play.count
@albumcount = Album.count
@albummbid = (Album.count(:albummbid).to_f/@albumcount.to_f)*100
@dig_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_play = Play.all('channel_id'=>1).count
@jazz_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_play = Play.all('channel_id'=>2).count
@country_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_play = Play.all('channel_id'=>3).count
@jjj_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_play = Play.all('channel_id'=>4).count
respond_to do |wants|
wants.html { erb :stats }
end
end
+get '/demo/album-charts' do
+ from_date = DateTime.now - 7
+ @from_date_string = from_date.strftime("%b %e")
+
+ to_date = DateTime.now
+ @to_date_string = to_date.strftime("%b %e")
+
+ respond_to do |wants|
+ wants.html{erb :album_chart_all}
+ end
+end
+
get '/jjj' do
cache_control :public, :max_age => 600
artistmbid = {}
har ='a'
hur = 'b'
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
#hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
all = Hash.new
@artists.each{ |o|
begin
if o.artistmbid
#puts o.artistname
begin
result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
if(result.code==200)
all[o.artistname] = Hash.new
all[o.artistname].store("media",Hash.new())
all[o.artistname].store("info",Hash.new())
all[o.artistname].fetch("info").store("mbid",o.artistmbid)
all[o.artistname].fetch("info").store("count",o.cnt)
xml = Crack::XML.parse(result)
if(xml["rss"]["channel"]["item"].kind_of?(Array))
xml["rss"]["channel"]["item"].each_with_index{|ha,i|
if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
har = ha["title"]
da = ha["media:thumbnail"]
if da.kind_of?(Array)
hur = da.first["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
else
hur = da["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
end
if ha["media:content"].kind_of?(Array)
all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
else
all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
end
end
}
else
if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
har = xml["rss"]["channel"]["item"]["title"]
hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
end
end
#john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
#puts john.inspect
end
rescue => e
end
end
end
}
@hat = all
respond_to do |wants|
wants.html { erb :jjj }
wants.json { all.to_json }
end
end
\ No newline at end of file
diff --git a/public/images/abccountrylogo.gif b/public/images/abccountrylogo.gif
new file mode 100755
index 0000000..fe7aff7
Binary files /dev/null and b/public/images/abccountrylogo.gif differ
diff --git a/public/images/abcdigmusiclogo.gif b/public/images/abcdigmusiclogo.gif
new file mode 100755
index 0000000..cd8226d
Binary files /dev/null and b/public/images/abcdigmusiclogo.gif differ
diff --git a/public/images/abcjazzlogo.gif b/public/images/abcjazzlogo.gif
new file mode 100755
index 0000000..884db61
Binary files /dev/null and b/public/images/abcjazzlogo.gif differ
diff --git a/public/images/abcradiologo.gif b/public/images/abcradiologo.gif
new file mode 100644
index 0000000..e3aa956
Binary files /dev/null and b/public/images/abcradiologo.gif differ
diff --git a/public/images/ajax_loader.gif b/public/images/ajax_loader.gif
new file mode 100644
index 0000000..3288d10
Binary files /dev/null and b/public/images/ajax_loader.gif differ
diff --git a/public/images/triplejlogo.gif b/public/images/triplejlogo.gif
new file mode 100755
index 0000000..e820cf2
Binary files /dev/null and b/public/images/triplejlogo.gif differ
diff --git a/views/album_chart_all.html.erb b/views/album_chart_all.html.erb
new file mode 100644
index 0000000..123c623
--- /dev/null
+++ b/views/album_chart_all.html.erb
@@ -0,0 +1,279 @@
+<script src="http://jmar777.googlecode.com/svn/trunk/js/jquery-1.2.6.js" type="text/javascript"></script>
+<script src="http://jmar777.googlecode.com/svn/trunk/js/jquery.easing.1.3.js" type="text/javascript"></script>
+<script src="http://kwicks.googlecode.com/svn/branches/v1.5.1/Kwicks/jquery.kwicks-1.5.1.pack.js" type="text/javascript"></script>
+
+<div>
+
+
+ <div id="front_page_playlist_section">
+ <div class="heading_wrapper">
+ <div class="image_text_replacement"></div>
+ <h2>Demo of Most Played Albums <%=@from_date_string%> to <%=@to_date_string%></h2>
+ </div>
+ <div class="top_wrapper">
+ <img src='/images/triplejlogo.gif'>
+ <ul class="kwicks-jjj">
+ </ul>
+ </div>
+ </div>
+
+ <div id="front_page_playlist_section">
+ <div class="heading_wrapper">
+ <div class="image_text_replacement"></div>
+ </div>
+ <div class="top_wrapper">
+ <img src='/images/abcdigmusiclogo.gif'>
+ <ul class="kwicks-dig">
+ </ul>
+ </div>
+ </div>
+
+ <div id="front_page_playlist_section">
+ <div class="heading_wrapper">
+ <div class="image_text_replacement"></div>
+ </div>
+ <div class="top_wrapper">
+ <img src='/images/abcjazzlogo.gif'>
+ <ul class="kwicks-jazz">
+ </ul>
+ </div>
+ </div>
+
+ <div id="front_page_playlist_section">
+ <div class="heading_wrapper">
+ <div class="image_text_replacement"></div>
+ </div>
+ <div class="top_wrapper">
+ <img src='/images/abccountrylogo.gif'>
+ <ul class="kwicks-country">
+ </ul>
+ </div>
+ </div>
+
+ <div id="front_page_playlist_section">
+ <div class="heading_wrapper">
+ <div class="image_text_replacement"></div>
+ </div>
+ <div class="top_wrapper">
+ <img src='/images/abcradiologo.gif'>
+ <h5>Combined view of triple j, ABC Dig Music, ABC Jazz and ABC Country</h5>
+ <ul class="kwicks-combined">
+ </ul>
+ </div>
+ </div>
+
+</div>
+<script type="text/javascript">
+$().ready(function() {
+
+ $("<img id='loader'></img>")
+ .attr('src', "/images/ajax_loader.gif")
+ .appendTo(".kwicks-jjj");
+ $.ajax({
+ url: "/v1/chart/album",
+ timeout : 40000,
+
+ dataType: "jsonp",
+ data: {
+ format:"json",
+ channel: 4,
+ },
+ success: function(data){
+ $(".kwicks-jjj #loader").remove();
+ $.each( data, function(i,item) {
+ var count = i+1;
+ var artist = item.artistname;
+ content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
+ $(content).appendTo(".kwicks-jjj");
+ });
+ $('.kwicks-jjj').kwicks({
+ max: 189,
+ duration: 400,
+ spacing: 1,
+ sticky: false
+ });
+ },
+ });
+ $("<img id='loader'></img>")
+ .attr('src', "/images/ajax_loader.gif")
+ .appendTo(".kwicks-dig");
+ $.ajax({
+ url: "/v1/chart/album",
+ timeout : 40000,
+
+ dataType: "jsonp",
+ data: {
+ format:"json",
+ channel: 1,
+ },
+ success: function(data){
+ $(".kwicks-dig #loader").remove();
+ $.each( data, function(i,item) {
+ var count = i+1;
+ var artist = item.artistname;
+ content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
+ $(content).appendTo(".kwicks-dig");
+ });
+ $('.kwicks-dig').kwicks({
+ max: 189,
+ duration: 400,
+ spacing: 1,
+ sticky: false
+ });
+ },
+ });
+
+ $("<img id='loader'></img>")
+ .attr('src', "/images/ajax_loader.gif")
+ .appendTo(".kwicks-jazz");
+ $.ajax({
+ url: "/v1/chart/album",
+ timeout : 40000,
+
+ dataType: "jsonp",
+ data: {
+ format:"json",
+ channel: 2,
+ },
+ success: function(data){
+ $(".kwicks-jazz #loader").remove();
+ $.each( data, function(i,item) {
+ var count = i+1;
+ var artist = item.artistname;
+ content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
+ $(content).appendTo(".kwicks-jazz");
+ });
+ $('.kwicks-jazz').kwicks({
+ max: 189,
+ duration: 400,
+ spacing: 1,
+ sticky: false
+ });
+ },
+ });
+
+ $("<img id='loader'></img>")
+ .attr('src', "/images/ajax_loader.gif")
+ .appendTo(".kwicks-country");
+ $.ajax({
+ url: "/v1/chart/album",
+ timeout : 40000,
+
+ dataType: "jsonp",
+ data: {
+ format:"json",
+ channel: 3,
+ },
+ success: function(data){
+ $(".kwicks-country #loader").remove();
+ $.each( data, function(i,item) {
+ var count = i+1;
+ var artist = item.artistname;
+ content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
+ $(content).appendTo(".kwicks-country");
+ });
+ $('.kwicks-country').kwicks({
+ max: 189,
+ duration: 400,
+ spacing: 1,
+ sticky: false
+ });
+ },
+ });
+
+ $("<img id='loader'></img>")
+ .attr('src', "/images/ajax_loader.gif")
+ .appendTo(".kwicks-combined");
+ $.ajax({
+ url: "/v1/chart/album",
+ timeout : 40000,
+
+ dataType: "jsonp",
+ data: {
+ format:"json"
+ },
+ success: function(data){
+ $(".kwicks-combined #loader").remove();
+ $.each( data, function(i,item) {
+ var count = i+1;
+ var artist = item.artistname;
+ content = '<li><div class="kwicks_inner"><div class="bigLetter"><img src="'+ item.albumimage +'"/><div id="number_overlay">'+count+'</div></div><div class="smallLetters"><i>'+ item.albumname+'</i><div id"kwick_artistname">'+artist + '</div></div></li>';
+ $(content).appendTo(".kwicks-combined");
+ });
+ $('.kwicks-combined').kwicks({
+ max: 189,
+ duration: 400,
+ spacing: 1,
+ sticky: false
+ });
+ },
+ });
+});
+</script>
+<style type="text/css" media="screen">
+header#main,div#wrapper{
+ width:700px;
+}
+ #number_overlay{
+ display: block;
+ position: absolute;
+ width: 100%;
+ top: 7%;
+ left: -5;
+ z-index: 2;
+ text-align: right;
+ font-size: 70px;
+ letter-spacing: -13px;
+ font-weight: bold;
+ font-family:arial,helvetica,sans-serif;
+ }
+
+ #front_page_playlist_section .top_wrapper{
+ border-top: 0px dotted #C9C9C9;
+ padding-top: 20px;
+ }
+ /* defaults for all examples */
+ .kwicks-combined, .kwicks-jjj, .kwicks-dig, .kwicks-jazz, .kwicks-country {
+ list-style: none;
+ position: relative;
+ margin: 0;
+ padding: 0;
+ padding-top:10px;
+
+ }
+ .kwicks-combined li, .kwicks-jjj li, .kwicks-dig li,.kwicks-jazz li,.kwicks-country li{
+ display: block;
+ overflow: hidden;
+ padding: 0;
+ width: 69px
+ }
+
+ .kwicks_inner {
+ width: 180px;
+ }
+ .bigLetter {
+ float: left;
+ margin-right:8px;
+ position:relative;
+ z-index:1;
+ color:white;
+ }
+ .bigLetter img{
+ width: 69px;
+ height:69px;
+ }
+ .smallLetters {
+ display: none;
+ font-size: 12px;
+ word-wrap: break-word;
+ }
+
+ #kwick_albumname{
+ color: #204BA1;
+ }
+
+ li.active .smallLetters {
+ display: block;
+ }
+
+</style>
|
simonhn/pav-api
|
9c0fd6130d1b7bb80b9c5e27c4918a5d7ad9ee1e
|
fixing slight mistakes
|
diff --git a/jobs.rb b/jobs.rb
index 5472c44..2b4af26 100644
--- a/jobs.rb
+++ b/jobs.rb
@@ -1,250 +1,250 @@
#datamapper stuff
require 'dm-core'
require 'dm-timestamps'
require 'dm-aggregates'
require 'dm-migrations'
#require
#Models - to be moved to individual files
class Artist
include DataMapper::Resource
property :id, Serial
property :artistmbid, String, :length => 36
property :artistname, String, :length => 512
property :artistnote, Text
property :artistlink, Text
property :created_at, DateTime
has n, :tracks, :through => Resource
has n, :channels, :through => Resource
end
class Album
include DataMapper::Resource
property :id, Serial
property :albummbid, String, :length => 36
property :albumname, String, :length => 512
property :albumimage, Text
property :created_at, DateTime
has n, :tracks, :through => Resource
end
class Track
include DataMapper::Resource
property :id, Serial
property :trackmbid, String, :length => 36
property :title, String, :length => 512
property :tracknote, Text
property :tracklink, Text
property :show, Text
property :talent, Text
property :aust, String, :length => 512
property :duration, Integer
property :publisher, Text
property :datecopyrighted, Integer
property :created_at, DateTime
has n, :artists, :through => Resource
has n, :albums, :through => Resource
has n, :plays
def date
created_at.strftime "%R on %B %d, %Y"
end
def playcount
Play.count(:track_id => self.id);
end
end
class Play
include DataMapper::Resource
property :id, Serial
property :playedtime, DateTime
belongs_to :track
belongs_to :channel
def date
#converting from utc to aussie time
#playedtime.new_offset(Rational(+20,24)).strftime "%R on %B %d, %Y"
playedtime.strftime "%Y-%m-%d %H:%M:%S"
end
end
class Channel
include DataMapper::Resource
property :id, Serial
property :channelname, String, :length => 512
property :channelxml, String, :length => 512
property :logo, String, :length => 512
property :channellink, String, :length => 512
has n, :plays
has n, :artists, :through => Resource
end
#template systems
require 'yajl/json_gem'
require 'builder'
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
pwd = File.dirname(File.expand_path(__FILE__))
$LOG = Logger.new(pwd+'/log/queue.log', 'monthly')
#setup MySQL connection:
@config = YAML::load( File.open(pwd +'/config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#Method that stores each playitem to database. Index is the id of the channel to associate the play with
def store_hash(item, index)
@albums = nil
mbid_hash = nil
duration = ChronicDuration.parse(item["duration"].to_s)
#there can be multiple artist seperated by '+' so we split them
artist_array = item['artist']['artistname'].split("+")
artist_array.each{ |artist_item|
begin
#for each item, lookup in musicbrainz. Returns hash with mbids for track, album and artist if found
mbid_hash = mbid_lookup(artist_item.strip, item['title'], item['album']['albumname'])
rescue StandardError => e
$LOG.info("Issue while processing #{artist_item.strip} - #{item['title']} - #{e.backtrace}")
end
#ARTIST
if !mbid_hash.nil? && !mbid_hash["artistmbid"].nil?
@artist = Artist.first_or_create({:artistmbid => mbid_hash["artistmbid"]},{:artistmbid => mbid_hash["artistmbid"],:artistname => artist_item.strip, :artistnote => item['artist']['artistnote'], :artistlink => item['artist']['artistlink']})
else
@artist = Artist.first_or_create({:artistname => artist_item.strip},{:artistname => artist_item.strip, :artistnote => item['artist']['artistnote'], :artistlink => item['artist']['artistlink']})
end
#store artist_id / channel_id to a lookup table, for faster selects
@artist_channels = @artist.channels << Channel.get(index)
@artist_channels.save
#ALBUM
#creating and saving album if not exists
if !item['album']['albumname'].empty?
if !mbid_hash.nil? && !mbid_hash["albummbid"].nil?
#puts "album mbid found for: " + mbid_hash["albummbid"]
@albums = Album.first_or_create({:albummbid => mbid_hash["albummbid"]},{:albummbid => mbid_hash["albummbid"], :albumname => item['album']['albumname'], :albumimage=>item['album']['albumimage']})
else
@albums = Album.first_or_create({:albumname => item['album']['albumname']},{:albumname => item['album']['albumname'], :albumimage=>item['album']['albumimage']})
end
end
#Track
#creating and saving track
if mbid_hash && !mbid_hash["trackmbid"].nil?
@tracks = Track.first_or_create({:trackmbid => mbid_hash["trackmbid"]},{:trackmbid => mbid_hash["trackmbid"],:title => item['title'],:show => item['show'],:talent => item['talent'],:aust => item['aust'],:tracklink => item['tracklink'],:tracknote => item['tracknote'],:publisher => item['publisher'], :datecopyrighted => item['datecopyrighted'].to_i})
else
@tracks = Track.first_or_create({:title => item['title'],:duration => duration},{:title => item['title'],:show => item['show'],:talent => item['talent'],:aust => item['aust'],:tracklink => item['tracklink'],:tracknote => item['tracknote'],:duration => duration,:publisher => item['publisher'],:datecopyrighted => item['datecopyrighted'].to_i})
end
#add the track to album - if album exists
if [email protected]?
@album_tracks = @albums.tracks << @tracks
@album_tracks.save
end
#add the track to the artist
@artist_tracks = @artist.tracks << @tracks
@artist_tracks.save
#adding play: only add if playedtime does not exsist in the database already
play_items = Play.count(:playedtime=>item['playedtime'], :channel_id=>index)
if play_items < 1
@play = Play.create(:track_id =>@tracks.id, :channel_id => index, :playedtime=>item['playedtime'])
@plays = @tracks.plays << @play
@plays.save
end
}
end
def mbid_lookup(artist, track, album)
result_hash = {}
#we can only hit mbrainz once a second so we take a nap
sleep 1
service = MusicBrainz::Webservice::Webservice.new(:user_agent => 'pavapi/1.0')
q = MusicBrainz::Webservice::Query.new(service)
#TRACK
if !album.empty?
t_filter = MusicBrainz::Webservice::TrackFilter.new(:artist=>artist, :title=>track, :release=>album, :limit => 5)
else
t_filter = MusicBrainz::Webservice::TrackFilter.new(:artist=>artist, :title=>track, :limit => 5)
end
t_results = q.get_tracks(t_filter)
#No results from the 'advanced' query, so trying artist and album individualy
if t_results.count == 0
#ARTIST
sleep 1
t_filter = MusicBrainz::Webservice::ArtistFilter.new(:name=>artist)
t_results = q.get_artists(t_filter)
if t_results.count > 0
x = t_results.first
if x.score == 100 && is_ascii(String(x.entity.name)) && String(x.entity.name).casecmp(artist)==0
#puts 'ARTIST score: ' + String(x.score) + '- artist: ' + String(x.entity.name) + ' - artist mbid '+ String(x.entity.id.uuid)
result_hash["artistmbid"] = String(x.entity.id.uuid)
end
end
#ALBUM
if !album.empty?
sleep 1
t_filter = MusicBrainz::Webservice::ReleaseGroupFilter.new(:artist=>artist, :title=>album)
t_results = q.get_release_groups(t_filter)
#puts "album results count "+t_results.count.to_s
- if t_results.count>1
+ if t_results.count>0
x = t_results.first
#puts 'ALBUM score: ' + String(x.score) + '- artist: ' + String(x.entity.artist) + ' - artist mbid '+ String(x.entity.id.uuid) +' - release title '+ String(x.entity.title) + ' - orginal album title: '+album
if x.score == 100 && is_ascii(String(x.entity.title)) #&& String(x.entity.title).casecmp(album)==0
#puts 'abekat'+x.entity.id.uuid.inspect
result_hash["albummbid"] = String(x.entity.id.uuid)
end
end
end
elsif t_results.count > 0
t_results.each{ |x|
#puts 'score: ' + String(x.score) + '- artist: ' + String(x.entity.artist) + ' - artist mbid '+ String(x.entity.artist.id.uuid) + ' - track mbid: ' + String(x.entity.id.uuid) + ' - track: ' + String(x.entity.title) +' - album: ' + String(x.entity.releases[0]) +' - album mbid: '+ String(x.entity.releases[0].id.uuid)
if x.score == 100 && is_ascii(String(x.entity.artist))
sleep 1
t_include = MusicBrainz::Webservice::ReleaseIncludes.new(:release_groups=>true)
release = q.get_release_by_id(x.entity.releases[0].id.uuid, t_include)
result_hash["trackmbid"] = String(x.entity.id.uuid)
result_hash["artistmbid"] = String(x.entity.artist.id.uuid)
result_hash["albummbid"] = String(release.release_group.id.uuid)
end
}
end
return result_hash
end
def is_ascii(item)
cd = CharDet.detect(item)
encoding = cd['encoding']
return encoding == 'ascii'
end
job 'track.store' do |args|
store_hash(args['item'], args['channel'].to_i)
error do |e, job, args|
$LOG.info("error e #{e}")
$LOG.info("error job #{job.inspect}")
$LOG.info("error args #{args.inspect}")
end
end
|
simonhn/pav-api
|
12e358304991bb72c04e0be07d3f3cb11244f511
|
using release group instead of release
|
diff --git a/jobs.rb b/jobs.rb
index 79390f9..5472c44 100644
--- a/jobs.rb
+++ b/jobs.rb
@@ -1,243 +1,250 @@
#datamapper stuff
require 'dm-core'
require 'dm-timestamps'
require 'dm-aggregates'
require 'dm-migrations'
#require
#Models - to be moved to individual files
class Artist
include DataMapper::Resource
property :id, Serial
property :artistmbid, String, :length => 36
property :artistname, String, :length => 512
property :artistnote, Text
property :artistlink, Text
property :created_at, DateTime
has n, :tracks, :through => Resource
has n, :channels, :through => Resource
end
class Album
include DataMapper::Resource
property :id, Serial
property :albummbid, String, :length => 36
property :albumname, String, :length => 512
property :albumimage, Text
property :created_at, DateTime
has n, :tracks, :through => Resource
end
class Track
include DataMapper::Resource
property :id, Serial
property :trackmbid, String, :length => 36
property :title, String, :length => 512
property :tracknote, Text
property :tracklink, Text
property :show, Text
property :talent, Text
property :aust, String, :length => 512
property :duration, Integer
property :publisher, Text
property :datecopyrighted, Integer
property :created_at, DateTime
has n, :artists, :through => Resource
has n, :albums, :through => Resource
has n, :plays
def date
created_at.strftime "%R on %B %d, %Y"
end
def playcount
Play.count(:track_id => self.id);
end
end
class Play
include DataMapper::Resource
property :id, Serial
property :playedtime, DateTime
belongs_to :track
belongs_to :channel
def date
#converting from utc to aussie time
#playedtime.new_offset(Rational(+20,24)).strftime "%R on %B %d, %Y"
playedtime.strftime "%Y-%m-%d %H:%M:%S"
end
end
class Channel
include DataMapper::Resource
property :id, Serial
property :channelname, String, :length => 512
property :channelxml, String, :length => 512
property :logo, String, :length => 512
property :channellink, String, :length => 512
has n, :plays
has n, :artists, :through => Resource
end
#template systems
require 'yajl/json_gem'
require 'builder'
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
pwd = File.dirname(File.expand_path(__FILE__))
$LOG = Logger.new(pwd+'/log/queue.log', 'monthly')
#setup MySQL connection:
@config = YAML::load( File.open(pwd +'/config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#Method that stores each playitem to database. Index is the id of the channel to associate the play with
def store_hash(item, index)
@albums = nil
mbid_hash = nil
duration = ChronicDuration.parse(item["duration"].to_s)
#there can be multiple artist seperated by '+' so we split them
artist_array = item['artist']['artistname'].split("+")
artist_array.each{ |artist_item|
begin
#for each item, lookup in musicbrainz. Returns hash with mbids for track, album and artist if found
mbid_hash = mbid_lookup(artist_item.strip, item['title'], item['album']['albumname'])
rescue StandardError => e
$LOG.info("Issue while processing #{artist_item.strip} - #{item['title']} - #{e.backtrace}")
end
#ARTIST
if !mbid_hash.nil? && !mbid_hash["artistmbid"].nil?
@artist = Artist.first_or_create({:artistmbid => mbid_hash["artistmbid"]},{:artistmbid => mbid_hash["artistmbid"],:artistname => artist_item.strip, :artistnote => item['artist']['artistnote'], :artistlink => item['artist']['artistlink']})
else
@artist = Artist.first_or_create({:artistname => artist_item.strip},{:artistname => artist_item.strip, :artistnote => item['artist']['artistnote'], :artistlink => item['artist']['artistlink']})
end
#store artist_id / channel_id to a lookup table, for faster selects
@artist_channels = @artist.channels << Channel.get(index)
@artist_channels.save
#ALBUM
#creating and saving album if not exists
if !item['album']['albumname'].empty?
if !mbid_hash.nil? && !mbid_hash["albummbid"].nil?
#puts "album mbid found for: " + mbid_hash["albummbid"]
@albums = Album.first_or_create({:albummbid => mbid_hash["albummbid"]},{:albummbid => mbid_hash["albummbid"], :albumname => item['album']['albumname'], :albumimage=>item['album']['albumimage']})
else
@albums = Album.first_or_create({:albumname => item['album']['albumname']},{:albumname => item['album']['albumname'], :albumimage=>item['album']['albumimage']})
end
end
#Track
#creating and saving track
if mbid_hash && !mbid_hash["trackmbid"].nil?
@tracks = Track.first_or_create({:trackmbid => mbid_hash["trackmbid"]},{:trackmbid => mbid_hash["trackmbid"],:title => item['title'],:show => item['show'],:talent => item['talent'],:aust => item['aust'],:tracklink => item['tracklink'],:tracknote => item['tracknote'],:publisher => item['publisher'], :datecopyrighted => item['datecopyrighted'].to_i})
else
@tracks = Track.first_or_create({:title => item['title'],:duration => duration},{:title => item['title'],:show => item['show'],:talent => item['talent'],:aust => item['aust'],:tracklink => item['tracklink'],:tracknote => item['tracknote'],:duration => duration,:publisher => item['publisher'],:datecopyrighted => item['datecopyrighted'].to_i})
end
#add the track to album - if album exists
if [email protected]?
@album_tracks = @albums.tracks << @tracks
@album_tracks.save
end
#add the track to the artist
@artist_tracks = @artist.tracks << @tracks
@artist_tracks.save
#adding play: only add if playedtime does not exsist in the database already
play_items = Play.count(:playedtime=>item['playedtime'], :channel_id=>index)
if play_items < 1
@play = Play.create(:track_id =>@tracks.id, :channel_id => index, :playedtime=>item['playedtime'])
@plays = @tracks.plays << @play
@plays.save
end
}
end
def mbid_lookup(artist, track, album)
result_hash = {}
#we can only hit mbrainz once a second so we take a nap
sleep 1
service = MusicBrainz::Webservice::Webservice.new(:user_agent => 'pavapi/1.0')
q = MusicBrainz::Webservice::Query.new(service)
#TRACK
if !album.empty?
t_filter = MusicBrainz::Webservice::TrackFilter.new(:artist=>artist, :title=>track, :release=>album, :limit => 5)
else
t_filter = MusicBrainz::Webservice::TrackFilter.new(:artist=>artist, :title=>track, :limit => 5)
end
t_results = q.get_tracks(t_filter)
#No results from the 'advanced' query, so trying artist and album individualy
if t_results.count == 0
#ARTIST
+ sleep 1
t_filter = MusicBrainz::Webservice::ArtistFilter.new(:name=>artist)
t_results = q.get_artists(t_filter)
if t_results.count > 0
x = t_results.first
if x.score == 100 && is_ascii(String(x.entity.name)) && String(x.entity.name).casecmp(artist)==0
#puts 'ARTIST score: ' + String(x.score) + '- artist: ' + String(x.entity.name) + ' - artist mbid '+ String(x.entity.id.uuid)
result_hash["artistmbid"] = String(x.entity.id.uuid)
end
end
#ALBUM
if !album.empty?
- t_filter = MusicBrainz::Webservice::ReleaseFilter.new(:artist=>artist, :title=>album)
- t_results = q.get_releases(t_filter)
+ sleep 1
+
+ t_filter = MusicBrainz::Webservice::ReleaseGroupFilter.new(:artist=>artist, :title=>album)
+ t_results = q.get_release_groups(t_filter)
#puts "album results count "+t_results.count.to_s
if t_results.count>1
x = t_results.first
#puts 'ALBUM score: ' + String(x.score) + '- artist: ' + String(x.entity.artist) + ' - artist mbid '+ String(x.entity.id.uuid) +' - release title '+ String(x.entity.title) + ' - orginal album title: '+album
if x.score == 100 && is_ascii(String(x.entity.title)) #&& String(x.entity.title).casecmp(album)==0
+ #puts 'abekat'+x.entity.id.uuid.inspect
result_hash["albummbid"] = String(x.entity.id.uuid)
end
end
end
elsif t_results.count > 0
t_results.each{ |x|
#puts 'score: ' + String(x.score) + '- artist: ' + String(x.entity.artist) + ' - artist mbid '+ String(x.entity.artist.id.uuid) + ' - track mbid: ' + String(x.entity.id.uuid) + ' - track: ' + String(x.entity.title) +' - album: ' + String(x.entity.releases[0]) +' - album mbid: '+ String(x.entity.releases[0].id.uuid)
if x.score == 100 && is_ascii(String(x.entity.artist))
+ sleep 1
+ t_include = MusicBrainz::Webservice::ReleaseIncludes.new(:release_groups=>true)
+ release = q.get_release_by_id(x.entity.releases[0].id.uuid, t_include)
result_hash["trackmbid"] = String(x.entity.id.uuid)
result_hash["artistmbid"] = String(x.entity.artist.id.uuid)
- result_hash["albummbid"] = String(x.entity.releases[0].id.uuid)
+ result_hash["albummbid"] = String(release.release_group.id.uuid)
end
}
end
return result_hash
end
def is_ascii(item)
cd = CharDet.detect(item)
encoding = cd['encoding']
return encoding == 'ascii'
end
job 'track.store' do |args|
store_hash(args['item'], args['channel'].to_i)
error do |e, job, args|
$LOG.info("error e #{e}")
$LOG.info("error job #{job.inspect}")
$LOG.info("error args #{args.inspect}")
end
end
|
simonhn/pav-api
|
53bd4f6dfcc6768f8820bb87fc0457bc5437a1c4
|
adding artistname to album chart
|
diff --git a/views/album_chart.xml.builder b/views/album_chart.xml.builder
index 3b182dc..faebd5c 100644
--- a/views/album_chart.xml.builder
+++ b/views/album_chart.xml.builder
@@ -1,6 +1,6 @@
xml.instruct! :xml, :version => '1.0'
xml.chart do
@albums.each do |album|
- xml.album :count => album.cnt.to_i, :albumname => album.albumname, :albumid => album.album_id, :trackid => album.track_id
+ xml.album :count => album.cnt.to_i, :artistname => album.artistname, :albumname => album.albumname, :albumid => album.album_id, :trackid => album.track_id
end
end
\ No newline at end of file
|
simonhn/pav-api
|
a565243b300a19da706d08adba54f97ec092419e
|
adding artistname to album chart
|
diff --git a/pavapi.rb b/pavapi.rb
index 7fba480..90bcc4d 100644
--- a/pavapi.rb
+++ b/pavapi.rb
@@ -1,611 +1,611 @@
#core stuff
require 'rubygems'
require 'sinatra'
require './models'
require './store_methods'
#Queueing with delayed job
#require 'delayed_job'
#require 'delayed_job_data_mapper'
#require './storetrackjob'
require 'stalker'
#template systems
require 'yajl/json_gem'
require 'rack/contrib/jsonp'
require 'builder'
use Rack::JSONP
#for xml fetch and parse
require 'rest_client'
require 'crack'
#musicbrainz stuff
require 'rbrainz'
include MusicBrainz
require 'rchardet19'
require 'logger'
#time parsing
require 'chronic_duration'
require 'chronic'
# Enable New Relic
#configure :production do
#require 'newrelic_rpm'
#end
#throttling
#require 'rack/throttle'
#require 'memcached'
#require './throttler'
#for serving different content types
require 'sinatra/respond_to'
Sinatra::Application.register Sinatra::RespondTo
#versioning
@version = "v1"
configure do
#use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
#use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
#logging
DataMapper::Logger.new('log/datamapper.log', :warn)
DataMapper::Model.raise_on_save_failure = true
$LOG = Logger.new('log/pavstore.log', 'monthly')
# MySQL connection:
@config = YAML::load( File.open( 'config/settings.yml' ) )
@connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
DataMapper.setup(:default, @connection)
DataMapper.finalize
#DataMapper.auto_upgrade!
#DataMapper::auto_migrate!
set :default_content, :html
end
#Caching 1 minute - must adjust
before do
cache_control :public, :must_revalidate, :max_age => 60 unless development?
end
# Error 404 Page Not Found
not_found do
json_status 404, "Not found"
end
error do
json_status 500, env['sinatra.error'].message
end
helpers do
def protected!
unless authorized?
response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
throw(:halt, [401, "Not authorized\n"])
end
end
def authorized?
@auth ||= Rack::Auth::Basic::Request.new(request.env)
@config = YAML::load( File.open( 'config/settings.yml' ) )
@user = @config['authuser']
@pass = @config['authpass']
@auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
end
def json_status(code, reason)
status code
{
:status => code,
:reason => reason
}.to_json
end
def make_to_from(played_from, played_to)
#both to and from parameters provided
played_from = Chronic.parse(played_from)
played_to = Chronic.parse(played_to)
if (!played_from.nil? && !played_to.nil?)
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#no parameters, sets from a week ago
if (played_from.nil? && played_to.nil?)
now_date = DateTime.now - 7
return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only to parameter, setting from a week before that
if (played_from.nil? && !played_to.nil?)
from_date = played_to - 7
return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
end
#only from parameter
if (!played_from.nil? && played_to.nil?)
return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
end
end
def isNumeric(s)
Float(s) != nil rescue false
end
def get_limit(lim)
#if no limit is set, we default to 10
#a max at 5000 on limit to protect the server
if isNumeric(lim)
if lim.to_i < 5000
return lim
else
return 5000
end
else
return 10
end
end
def get_channel(cha)
if isNumeric(cha)
channel = cha
elsif cha.nil?
channel = false
end
end
end
#ROUTES
# Front page
get '/' do
erb :front
end
#show all artists, defaults to 10, ordered by created date
get "/#{@version}/artists" do
limit = get_limit(params[:limit])
channel = get_channel(params[:channel])
if channel
@artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
get "/#{@version}/artist/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
respond_to do |wants|
wants.html { erb :artist }
wants.xml { builder :artist }
wants.json { @artist.to_json }
end
end
# show tracks from artist
get "/#{@version}/artist/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@tracks = @artist.tracks
respond_to do |wants|
wants.html { erb :artist_tracks }
wants.xml { builder :artist_tracks }
wants.json { @tracks.to_json }
end
end
# show plays from artist
get "/#{@version}/artist/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@artist = Artist.first(:artistmbid => params[:id])
else
@artist = Artist.get(params[:id])
end
@plays = @artist.tracks.plays
respond_to do |wants|
wants.html { erb :artist_plays }
wants.xml { builder :artist_plays }
wants.json { @plays.to_json }
end
end
#add new track item (an item in the playout xml)
post "/#{@version}/track" do
protected!
begin
data = JSON.parse params[:payload].to_json
if !data['item']['artist']['artistname'].nil? && Play.count(:playedtime => data['item']['playedtime'], :channel_id => data['channel'])==0
Stalker.enqueue('track.store', :item => data['item'],:channel => data['channel'])
#Delayed::Job.enqueue StoreTrackJob.new(data['item'], data['channel'])
#store_hash(data['item'], data['channel'])
end
rescue StandardError => e
$LOG.info("Post method end: Issue while processing #{data['item']['artist']['artistname']} - #{data['channel']}, #{e.backtrace}")
end
end
#show tracks
get "/#{@version}/tracks" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@tracks = Track.all(Track.plays.channel_id => channel, :limit=>limit.to_i, :order => [:created_at.desc])
else
@tracks = Track.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :tracks }
wants.xml { builder :tracks }
wants.json {@tracks.to_json}
end
end
# show track
get "/#{@version}/track/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
respond_to do |wants|
wants.html { erb :track }
wants.xml { builder :track }
wants.json {@track.to_json}
end
end
#show artists for a track
get "/#{@version}/track/:id/artists" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@artists = @track.artists
respond_to do |wants|
wants.html { erb :track_artists }
wants.xml { builder :track_artists }
wants.json {@artists.to_json}
end
end
#show albums for a track
get "/#{@version}/track/:id/albums" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@albums = @track.albums
respond_to do |wants|
wants.html { erb :track_albums }
wants.xml { builder :track_albums }
wants.json {@albums.to_json}
end
end
# show plays for a track
get "/#{@version}/track/:id/plays" do
if params[:type] == 'mbid' || params[:id].length == 36
@track = Track.first(:trackmbid => params[:id])
else
@track = Track.get(params[:id])
end
@plays = @track.plays
respond_to do |wants|
wants.html { erb :track_plays }
wants.xml { builder :track_plays }
wants.json {@plays.to_json}
end
end
#show all albums
get "/#{@version}/albums" do
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@albums = Album.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
else
@albums = Album.all(:limit => limit.to_i, :order => [:created_at.desc ])
end
respond_to do |wants|
wants.html { erb :albums }
wants.xml { builder :albums }
wants.json { @albums.to_json }
end
end
# show album from id
get "/#{@version}/album/:id" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
respond_to do |wants|
wants.html { erb :album }
wants.xml { builder :album }
wants.json {@album.to_json}
end
end
# show tracks for an album
get "/#{@version}/album/:id/tracks" do
if params[:type] == 'mbid' || params[:id].length == 36
@album = Album.first(:albummbid => params[:id])
else
@album = Album.get(params[:id])
end
@tracks = @album.tracks
respond_to do |wants|
wants.html { erb :album_tracks }
wants.xml { builder :album_tracks }
wants.json {@tracks.to_json }
end
end
#PLAY
get "/#{@version}/plays" do
#DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
if channel
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
else
#@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
@plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
end
hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
respond_to do |wants|
wants.html { erb :plays }
wants.xml { builder :plays }
wants.json { hat.to_json }
end
end
get "/#{@version}/play/:id" do
@play = Play.get(params[:id])
respond_to do |wants|
wants.json { @play.to_json }
end
end
# show all channels
get "/#{@version}/channels" do
@channels = Channel.all
respond_to do |wants|
wants.xml { @channels.to_xml }
wants.json { @channels.to_json }
end
end
#create new channel
post "/#{@version}/channel" do
protected!
data = JSON.parse params[:payload].to_json
channel = Channel.first_or_create({ :channelname => data['channelname'] }, { :channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'] })
end
#update a channel
put "/#{@version}/channel/:id" do
protected!
channel = Channel.get(params[:id])
data = JSON.parse params[:payload].to_json
channel = channel.update(:channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'])
end
# show channel from id
get "/#{@version}/channel/:id" do
@channel = Channel.get(params[:id])
respond_to do |wants|
wants.xml { @channel.to_xml }
wants.json { @channel.to_json }
end
end
# chart of top tracks
get "/#{@version}/chart/track" do
limit = get_limit(params[:limit])
to_from = make_to_from(params[:from], params[:to])
channel = params[:channel]
#SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
if channel
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
else
@tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
end
hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
respond_to do |wants|
wants.html { erb :track_chart }
wants.xml { builder :track_chart }
wants.json { hat.to_json }
end
end
# chart of top artist by name
get "/#{@version}/chart/artist" do
to_from = make_to_from(params[:from], params[:to])
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
else
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
end
#@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
respond_to do |wants|
wants.html { erb :artist_chart }
wants.xml { builder :artist_chart }
wants.json {hat.to_json}
end
end
get "/#{@version}/chart/album" do
to_from = make_to_from(params[:played_from], params[:played_to])
limit = get_limit(params[:limit])
channel = params[:channel]
if channel
- @albums = repository(:default).adapter.select("select albums.albumname, albums.albumimage, albums.id as album_id, tracks.id as track_id, albums.albummbid, count(*) as cnt from tracks, plays, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
+ @albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
else
- @albums = repository(:default).adapter.select("select albums.albumname, albums.albumimage, albums.id as album_id, tracks.id as track_id, albums.albummbid, count(*) as cnt from tracks, plays, albums, album_tracks where tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
+ @albums = repository(:default).adapter.select("select artists.artistname, albums.albumname, albums.albumimage, albums.id as album_id, albums.albummbid, count(distinct plays.id) as cnt from tracks, artists, plays, albums, album_tracks, artist_tracks where AND tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id AND tracks.id=artist_tracks.track_id AND artists.id=artist_tracks.artist_id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
end
- hat = @albums.collect {|o| {:count => o.cnt, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
+ hat = @albums.collect {|o| {:count => o.cnt, :artistname => o.artistname, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
respond_to do |wants|
wants.xml { builder :album_chart }
wants.json {hat.to_json}
end
end
# search artist by name
get "/#{@version}/search/:q" do
limit = get_limit(params[:limit])
@artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
respond_to do |wants|
wants.html { erb :artists }
wants.xml { builder :artists }
wants.json { @artists.to_json }
end
end
#Sinatra version info
get "/#{@version}/about" do
"I'm running version " + Sinatra::VERSION
end
#Count all artists
get "/#{@version}/stats" do
@artistcount = Artist.count
@artistmbid = (Artist.count(:artistmbid).to_f/@artistcount.to_f)*100
@trackcount = Track.count
@trackmbid = (Track.count(:trackmbid).to_f/@trackcount.to_f)*100
@playcount = Play.count
@albumcount = Album.count
@albummbid = (Album.count(:albummbid).to_f/@albumcount.to_f)*100
@dig_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
@dig_play = Play.all('channel_id'=>1).count
@jazz_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
@jazz_play = Play.all('channel_id'=>2).count
@country_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
@country_play = Play.all('channel_id'=>3).count
@jjj_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
@jjj_play = Play.all('channel_id'=>4).count
respond_to do |wants|
wants.html { erb :stats }
end
end
get '/jjj' do
cache_control :public, :max_age => 600
artistmbid = {}
har ='a'
hur = 'b'
@artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
#hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
all = Hash.new
@artists.each{ |o|
begin
if o.artistmbid
#puts o.artistname
begin
result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
if(result.code==200)
all[o.artistname] = Hash.new
all[o.artistname].store("media",Hash.new())
all[o.artistname].store("info",Hash.new())
all[o.artistname].fetch("info").store("mbid",o.artistmbid)
all[o.artistname].fetch("info").store("count",o.cnt)
xml = Crack::XML.parse(result)
if(xml["rss"]["channel"]["item"].kind_of?(Array))
xml["rss"]["channel"]["item"].each_with_index{|ha,i|
if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
har = ha["title"]
da = ha["media:thumbnail"]
if da.kind_of?(Array)
hur = da.first["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
else
hur = da["url"]
all[o.artistname].fetch("media").store(ha["title"],hur)
end
if ha["media:content"].kind_of?(Array)
all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
else
all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
end
end
}
else
if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
har = xml["rss"]["channel"]["item"]["title"]
hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
end
end
#john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
#puts john.inspect
end
rescue => e
end
end
end
}
@hat = all
respond_to do |wants|
wants.html { erb :jjj }
wants.json { all.to_json }
end
end
\ No newline at end of file
|
simonhn/pav-api
|
4ae3eb539b64ce39064407ea7c7e89b3920481c0
|
use foreman to daemonize
|
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ab90ad8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+log/*.log
+config/settings.yml
+config/deploy.rb
+config/deploy/*
+.bundle\n
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..962ed9a
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,36 @@
+source :rubygems
+gem 'sinatra'
+gem 'json'
+gem 'rack'
+gem 'rack-contrib', :require => 'rack/contrib'
+gem 'builder'
+
+gem 'rbrainz'
+gem 'rchardet19'
+
+gem 'rest-client', :require=>'rest_client'
+gem 'crack'
+
+gem 'meta-spotify'
+
+gem 'chronic_duration'
+gem 'chronic'
+
+gem 'sinatra-respond_to'
+
+gem 'dm-core'
+gem 'dm-mysql-adapter'
+gem 'dm-serializer'
+gem 'dm-timestamps'
+gem 'dm-aggregates'
+gem 'dm-migrations'
+gem 'rack-throttle', :require => 'rack/throttle'
+gem 'memcached'
+gem 'yajl-ruby', :require=> 'yajl/json_gem'
+gem 'newrelic_rpm'
+
+gem 'delayed_job'
+gem 'delayed_job_data_mapper'
+gem 'stalker'
+gem 'i18n'
+gem 'foreman'
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..d12ba4f
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,114 @@
+GEM
+ remote: http://rubygems.org/
+ specs:
+ activesupport (3.0.7)
+ addressable (2.2.6)
+ beanstalk-client (1.1.0)
+ builder (3.0.0)
+ chronic (0.3.0)
+ chronic_duration (0.9.5)
+ numerizer (~> 0.1.1)
+ crack (0.1.8)
+ daemons (1.1.3)
+ data_objects (0.10.6)
+ addressable (~> 2.1)
+ delayed_job (2.1.4)
+ activesupport (~> 3.0)
+ daemons
+ delayed_job_data_mapper (1.0.0.rc)
+ delayed_job (~> 2.1)
+ dm-aggregates
+ dm-core
+ dm-observer
+ dm-aggregates (1.1.0)
+ dm-core (~> 1.1.0)
+ dm-core (1.1.0)
+ addressable (~> 2.2.4)
+ dm-do-adapter (1.1.0)
+ data_objects (~> 0.10.2)
+ dm-core (~> 1.1.0)
+ dm-migrations (1.1.0)
+ dm-core (~> 1.1.0)
+ dm-mysql-adapter (1.1.0)
+ dm-do-adapter (~> 1.1.0)
+ do_mysql (~> 0.10.2)
+ dm-observer (1.1.0)
+ dm-core (~> 1.1.0)
+ dm-serializer (1.1.0)
+ dm-core (~> 1.1.0)
+ fastercsv (~> 1.5.4)
+ json (~> 1.4.6)
+ dm-timestamps (1.1.0)
+ dm-core (~> 1.1.0)
+ do_mysql (0.10.6)
+ data_objects (= 0.10.6)
+ fastercsv (1.5.4)
+ foreman (0.18.0)
+ term-ansicolor (~> 1.0.5)
+ thor (>= 0.13.6)
+ httparty (0.7.7)
+ crack (= 0.1.8)
+ i18n (0.6.0)
+ json (1.4.6)
+ json_pure (1.5.1)
+ memcached (1.2.7)
+ meta-spotify (0.1.5)
+ crack (>= 0.1.4)
+ httparty (>= 0.4.5)
+ mime-types (1.16)
+ newrelic_rpm (3.0.1)
+ numerizer (0.1.1)
+ rack (1.3.0)
+ rack-contrib (1.1.0)
+ rack (>= 0.9.1)
+ rack-throttle (0.3.0)
+ rack (>= 1.0.0)
+ rbrainz (0.5.2)
+ rchardet19 (1.3.5)
+ rest-client (1.6.1)
+ mime-types (>= 1.16)
+ sinatra (1.2.6)
+ rack (~> 1.1)
+ tilt (< 2.0, >= 1.2.2)
+ sinatra-respond_to (0.7.0)
+ sinatra (~> 1.2)
+ stalker (0.9.0)
+ beanstalk-client
+ json_pure
+ term-ansicolor (1.0.5)
+ thor (0.14.6)
+ tilt (1.3.1)
+ yajl-ruby (0.8.2)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ builder
+ chronic
+ chronic_duration
+ crack
+ delayed_job
+ delayed_job_data_mapper
+ dm-aggregates
+ dm-core
+ dm-migrations
+ dm-mysql-adapter
+ dm-serializer
+ dm-timestamps
+ foreman
+ i18n
+ json
+ memcached
+ meta-spotify
+ newrelic_rpm
+ rack
+ rack-contrib
+ rack-throttle
+ rbrainz
+ rchardet19
+ rest-client
+ sinatra
+ sinatra-respond_to
+ stalker
+ yajl-ruby
diff --git a/Procfile b/Procfile
new file mode 100644
index 0000000..0348c11
--- /dev/null
+++ b/Procfile
@@ -0,0 +1 @@
+worker: bundle exec stalk jobs.rb
diff --git a/config.ru b/config.ru
new file mode 100644
index 0000000..911a1ed
--- /dev/null
+++ b/config.ru
@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'bundler'
+Bundler.require
+require './pavapi'
+
+#set :environment, :production
+disable :run
+enable :logging, :dump_errors, :raise_errors, :show_exceptions
+
+run Sinatra::Application
\ No newline at end of file
diff --git a/config/newrelic.yml b/config/newrelic.yml
new file mode 100644
index 0000000..9763a74
--- /dev/null
+++ b/config/newrelic.yml
@@ -0,0 +1,265 @@
+#
+# This file configures the NewRelic RPM Agent, NewRelic RPM monitors
+# Rails applications with deep visibility and low overhead. For more
+# information, visit www.newrelic.com.
+#
+# Generated <%= Time.now.strftime('%B %d, %Y') %>, for version <%= NewRelic::VERSION::STRING %>
+#
+# <%= generated_for_user %>
+
+
+# Here are the settings that are common to all environments
+common: &default_settings
+ # ============================== LICENSE KEY ===============================
+
+ # You must specify the license key associated with your New Relic
+ # account. This key binds your Agent's data to your account in the
+ # New Relic RPM service.
+ license_key: '210487aabe063bb848621a762f71bf24fa5d5d51'
+
+ # Agent Enabled (Rails Only)
+ # Use this setting to force the agent to run or not run.
+ # Default is 'auto' which means the agent will install and run only
+ # if a valid dispatcher such as Mongrel is running. This prevents
+ # it from running with Rake or the console. Set to false to
+ # completely turn the agent off regardless of the other settings.
+ # Valid values are true, false and auto.
+ #
+ # agent_enabled: auto
+
+ # Application Name
+ # Set this to be the name of your application as you'd like it show
+ # up in RPM. RPM will then auto-map instances of your application
+ # into a RPM "application" on your home dashboard page. If you want
+ # to map this instance into multiple apps, like "AJAX Requests" and
+ # "All UI" then specify a semicolon separated list of up to three
+ # distinct names, or a yaml list. Defaults to the
+ # capitalized RAILS_ENV or RACK_ENV (i.e., Production, Staging, etc)
+ #
+ # Example:
+ #
+ # app_name:
+ # - Ajax Service
+ # - All Services
+ #
+ app_name: Pav
+
+ # When "true", the agent collects performance data about your
+ # application and reports this data to the NewRelic RPM service at
+ # newrelic.com. This global switch is normally overridden for each
+ # environment below. (formerly called 'enabled')
+ monitor_mode: true
+
+ # Developer mode should be off in every environment but
+ # development as it has very high overhead in memory.
+ developer_mode: false
+
+ # The newrelic agent generates its own log file to keep its logging
+ # information separate from that of your application. Specify its
+ # log level here.
+ log_level: info
+
+ # Optionally set the path to the log file This is expanded from the
+ # root directory (may be relative or absolute, e.g. 'log/' or
+ # '/var/log/') The agent will attempt to create this directory if it
+ # does not exist.
+ # log_file_path: 'log/'
+
+ # Optionally set the name of the log file, defaults to 'newrelic_agent.log'
+ # log_file_name: 'newrelic_agent.log'
+
+ # The newrelic agent communicates with the RPM service via http by
+ # default. If you want to communicate via https to increase
+ # security, then turn on SSL by setting this value to true. Note,
+ # this will result in increased CPU overhead to perform the
+ # encryption involved in SSL communication, but this work is done
+ # asynchronously to the threads that process your application code,
+ # so it should not impact response times.
+ ssl: false
+
+ # EXPERIMENTAL: enable verification of the SSL certificate sent by
+ # the server. This setting has no effect unless SSL is enabled
+ # above. This may block your application. Only enable it if the data
+ # you send us needs end-to-end verified certificates.
+ #
+ # This means we cannot cache the DNS lookup, so each request to the
+ # RPM service will perform a lookup. It also means that we cannot
+ # use a non-blocking lookup, so in a worst case, if you have DNS
+ # problems, your app may block indefinitely.
+ # verify_certificate: true
+
+ # Set your application's Apdex threshold value with the 'apdex_t'
+ # setting, in seconds. The apdex_t value determines the buckets used
+ # to compute your overall Apdex score.
+ # Requests that take less than apdex_t seconds to process will be
+ # classified as Satisfying transactions; more than apdex_t seconds
+ # as Tolerating transactions; and more than four times the apdex_t
+ # value as Frustrating transactions.
+ # For more about the Apdex standard, see
+ # http://support.newrelic.com/faqs/general/apdex
+
+ apdex_t: 0.5
+
+ #============================== Browser Monitoring ===============================
+ # New Relic Real User Monitoring gives you insight into the performance real users are
+ # experiencing with your website. This is accomplished by measuring the time it takes for
+ # your users' browsers to download and render your web pages by injecting a small amount
+ # of JavaScript code into the header and footer of each page.
+ browser_monitoring:
+ # By default the agent automatically injects the monitoring JavaScript
+ # into web pages. Set this attribute to false to turn off this behavior.
+ auto_instrument: true
+
+ # Proxy settings for connecting to the RPM server.
+ #
+ # If a proxy is used, the host setting is required. Other settings
+ # are optional. Default port is 8080.
+ #
+ # proxy_host: hostname
+ # proxy_port: 8080
+ # proxy_user:
+ # proxy_pass:
+
+
+ # Tells transaction tracer and error collector (when enabled)
+ # whether or not to capture HTTP params. When true, frameworks can
+ # exclude HTTP parameters from being captured.
+ # Rails: the RoR filter_parameter_logging excludes parameters
+ # Java: create a config setting called "ignored_params" and set it to
+ # a comma separated list of HTTP parameter names.
+ # ex: ignored_params: credit_card, ssn, password
+ capture_params: false
+
+
+ # Transaction tracer captures deep information about slow
+ # transactions and sends this to the RPM service once a
+ # minute. Included in the transaction is the exact call sequence of
+ # the transactions including any SQL statements issued.
+ transaction_tracer:
+
+ # Transaction tracer is enabled by default. Set this to false to
+ # turn it off. This feature is only available at the Silver and
+ # above product levels.
+ enabled: true
+
+ # Threshold in seconds for when to collect a transaction
+ # trace. When the response time of a controller action exceeds
+ # this threshold, a transaction trace will be recorded and sent to
+ # RPM. Valid values are any float value, or (default) "apdex_f",
+ # which will use the threshold for an dissatisfying Apdex
+ # controller action - four times the Apdex T value.
+ transaction_threshold: apdex_f
+
+ # When transaction tracer is on, SQL statements can optionally be
+ # recorded. The recorder has three modes, "off" which sends no
+ # SQL, "raw" which sends the SQL statement in its original form,
+ # and "obfuscated", which strips out numeric and string literals
+ record_sql: obfuscated
+
+ # Threshold in seconds for when to collect stack trace for a SQL
+ # call. In other words, when SQL statements exceed this threshold,
+ # then capture and send to RPM the current stack trace. This is
+ # helpful for pinpointing where long SQL calls originate from
+ stack_trace_threshold: 0.500
+
+ # Determines whether the agent will capture query plans for slow
+ # SQL queries. Only supported in mysql and postgres. Should be
+ # set to false when using other adapters.
+ # explain_enabled: true
+
+ # Threshold for query execution time below which query plans will not
+ # not be captured. Relevant only when `explain_enabled` is true.
+ # explain_threshold: 0.5
+
+ # Error collector captures information about uncaught exceptions and
+ # sends them to RPM for viewing
+ error_collector:
+
+ # Error collector is enabled by default. Set this to false to turn
+ # it off. This feature is only available at the Silver and above
+ # product levels
+ enabled: true
+
+ # Rails Only - tells error collector whether or not to capture a
+ # source snippet around the place of the error when errors are View
+ # related.
+ capture_source: true
+
+ # To stop specific errors from reporting to RPM, set this property
+ # to comma separated values. Default is to ignore routing errors
+ # which are how 404's get triggered.
+ #
+ ignore_errors: ActionController::RoutingError
+
+ # (Advanced) Uncomment this to ensure the cpu and memory samplers
+ # won't run. Useful when you are using the agent to monitor an
+ # external resource
+ # disable_samplers: true
+
+ # If you aren't interested in visibility in these areas, you can
+ # disable the instrumentation to reduce overhead.
+ #
+ # disable_view_instrumentation: true
+ # disable_activerecord_instrumentation: true
+ # disable_memcache_instrumentation: true
+ # disable_dj: true
+
+ # If you're interested in capturing memcache keys as though they
+ # were SQL uncomment this flag. Note that this does increase
+ # overhead slightly on every memcached call, and can have security
+ # implications if your memcached keys are sensitive
+ # capture_memcache_keys: true
+
+ # Certain types of instrumentation such as GC stats will not work if
+ # you are running multi-threaded. Please let us know.
+ # multi_threaded = false
+
+# Application Environments
+# ------------------------------------------
+# Environment specific settings are in this section.
+# For Rails applications, RAILS_ENV is used to determine the environment
+# For Java applications, pass -Dnewrelic.environment <environment> to set
+# the environment
+
+# NOTE if your application has other named environments, you should
+# provide newrelic configuration settings for these environments here.
+
+development:
+ <<: *default_settings
+ # Turn off communication to RPM service in development mode (also
+ # 'enabled').
+ # NOTE: for initial evaluation purposes, you may want to temporarily
+ # turn the agent on in development mode.
+ monitor_mode: true
+
+ # Rails Only - when running in Developer Mode, the New Relic Agent will
+ # present performance information on the last 100 transactions you have
+ # executed since starting the mongrel.
+ # NOTE: There is substantial overhead when running in developer mode.
+ # Do not use for production or load testing.
+ developer_mode: false
+
+ # Enable textmate links
+ # textmate: true
+
+test:
+ <<: *default_settings
+ # It almost never makes sense to turn on the agent when running
+ # unit, functional or integration tests or the like.
+ monitor_mode: false
+
+# Turn on the agent in production for 24x7 monitoring. NewRelic
+# testing shows an average performance impact of < 5 ms per
+# transaction, you you can leave this on all the time without
+# incurring any user-visible performance degradation.
+production:
+ <<: *default_settings
+ monitor_mode: true
+
+# Many applications have a staging environment which behaves
+# identically to production. Support for that environment is provided
+# here. By default, the staging environment has the agent turned on.
+staging:
+ <<: *default_settings
+ monitor_mode: true
+ app_name: My Application> (Staging)
diff --git a/config/settings.yml.erb b/config/settings.yml.erb
new file mode 100644
index 0000000..a10e835
--- /dev/null
+++ b/config/settings.yml.erb
@@ -0,0 +1,15 @@
+# store your custom template at foo/bar/database.yml.erb
+#set :template_dir, "config"
+#
+# example of database template
+
+adapter: mysql
+host: localhost
+username: simonhn
+database: <%= Capistrano::CLI.ui.ask("Enter MySQL database to connect to: ") %>
+password: <%= Capistrano::CLI.ui.ask("Enter MySQL database password: ") %>
+encoding: utf8
+timeout: 5000
+
+authuser: admin
+authpass: <%= Capistrano::CLI.ui.ask("Enter http auth password: ") %>
\ No newline at end of file
diff --git a/jobs.rb b/jobs.rb
new file mode 100644
index 0000000..79390f9
--- /dev/null
+++ b/jobs.rb
@@ -0,0 +1,243 @@
+
+#datamapper stuff
+require 'dm-core'
+require 'dm-timestamps'
+require 'dm-aggregates'
+require 'dm-migrations'
+
+#require
+#Models - to be moved to individual files
+class Artist
+ include DataMapper::Resource
+ property :id, Serial
+ property :artistmbid, String, :length => 36
+ property :artistname, String, :length => 512
+ property :artistnote, Text
+ property :artistlink, Text
+ property :created_at, DateTime
+ has n, :tracks, :through => Resource
+ has n, :channels, :through => Resource
+end
+
+class Album
+ include DataMapper::Resource
+ property :id, Serial
+ property :albummbid, String, :length => 36
+ property :albumname, String, :length => 512
+ property :albumimage, Text
+ property :created_at, DateTime
+ has n, :tracks, :through => Resource
+end
+
+class Track
+ include DataMapper::Resource
+ property :id, Serial
+ property :trackmbid, String, :length => 36
+ property :title, String, :length => 512
+ property :tracknote, Text
+ property :tracklink, Text
+ property :show, Text
+ property :talent, Text
+ property :aust, String, :length => 512
+ property :duration, Integer
+ property :publisher, Text
+ property :datecopyrighted, Integer
+ property :created_at, DateTime
+ has n, :artists, :through => Resource
+ has n, :albums, :through => Resource
+ has n, :plays
+ def date
+ created_at.strftime "%R on %B %d, %Y"
+ end
+ def playcount
+ Play.count(:track_id => self.id);
+ end
+end
+
+class Play
+ include DataMapper::Resource
+ property :id, Serial
+ property :playedtime, DateTime
+ belongs_to :track
+ belongs_to :channel
+ def date
+ #converting from utc to aussie time
+ #playedtime.new_offset(Rational(+20,24)).strftime "%R on %B %d, %Y"
+ playedtime.strftime "%Y-%m-%d %H:%M:%S"
+ end
+end
+
+class Channel
+ include DataMapper::Resource
+ property :id, Serial
+ property :channelname, String, :length => 512
+ property :channelxml, String, :length => 512
+ property :logo, String, :length => 512
+ property :channellink, String, :length => 512
+ has n, :plays
+ has n, :artists, :through => Resource
+end
+
+#template systems
+require 'yajl/json_gem'
+require 'builder'
+
+#for xml fetch and parse
+require 'rest_client'
+require 'crack'
+
+#musicbrainz stuff
+require 'rbrainz'
+include MusicBrainz
+require 'rchardet19'
+require 'logger'
+
+#time parsing
+require 'chronic_duration'
+require 'chronic'
+pwd = File.dirname(File.expand_path(__FILE__))
+
+$LOG = Logger.new(pwd+'/log/queue.log', 'monthly')
+
+ #setup MySQL connection:
+ @config = YAML::load( File.open(pwd +'/config/settings.yml' ) )
+ @connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
+ DataMapper.setup(:default, @connection)
+ DataMapper.finalize
+ #Method that stores each playitem to database. Index is the id of the channel to associate the play with
+ def store_hash(item, index)
+ @albums = nil
+
+ mbid_hash = nil
+ duration = ChronicDuration.parse(item["duration"].to_s)
+
+ #there can be multiple artist seperated by '+' so we split them
+ artist_array = item['artist']['artistname'].split("+")
+ artist_array.each{ |artist_item|
+ begin
+ #for each item, lookup in musicbrainz. Returns hash with mbids for track, album and artist if found
+ mbid_hash = mbid_lookup(artist_item.strip, item['title'], item['album']['albumname'])
+ rescue StandardError => e
+ $LOG.info("Issue while processing #{artist_item.strip} - #{item['title']} - #{e.backtrace}")
+ end
+ #ARTIST
+ if !mbid_hash.nil? && !mbid_hash["artistmbid"].nil?
+ @artist = Artist.first_or_create({:artistmbid => mbid_hash["artistmbid"]},{:artistmbid => mbid_hash["artistmbid"],:artistname => artist_item.strip, :artistnote => item['artist']['artistnote'], :artistlink => item['artist']['artistlink']})
+ else
+ @artist = Artist.first_or_create({:artistname => artist_item.strip},{:artistname => artist_item.strip, :artistnote => item['artist']['artistnote'], :artistlink => item['artist']['artistlink']})
+ end
+
+ #store artist_id / channel_id to a lookup table, for faster selects
+ @artist_channels = @artist.channels << Channel.get(index)
+ @artist_channels.save
+
+ #ALBUM
+ #creating and saving album if not exists
+ if !item['album']['albumname'].empty?
+ if !mbid_hash.nil? && !mbid_hash["albummbid"].nil?
+ #puts "album mbid found for: " + mbid_hash["albummbid"]
+ @albums = Album.first_or_create({:albummbid => mbid_hash["albummbid"]},{:albummbid => mbid_hash["albummbid"], :albumname => item['album']['albumname'], :albumimage=>item['album']['albumimage']})
+ else
+ @albums = Album.first_or_create({:albumname => item['album']['albumname']},{:albumname => item['album']['albumname'], :albumimage=>item['album']['albumimage']})
+ end
+ end
+
+
+ #Track
+ #creating and saving track
+ if mbid_hash && !mbid_hash["trackmbid"].nil?
+ @tracks = Track.first_or_create({:trackmbid => mbid_hash["trackmbid"]},{:trackmbid => mbid_hash["trackmbid"],:title => item['title'],:show => item['show'],:talent => item['talent'],:aust => item['aust'],:tracklink => item['tracklink'],:tracknote => item['tracknote'],:publisher => item['publisher'], :datecopyrighted => item['datecopyrighted'].to_i})
+ else
+ @tracks = Track.first_or_create({:title => item['title'],:duration => duration},{:title => item['title'],:show => item['show'],:talent => item['talent'],:aust => item['aust'],:tracklink => item['tracklink'],:tracknote => item['tracknote'],:duration => duration,:publisher => item['publisher'],:datecopyrighted => item['datecopyrighted'].to_i})
+ end
+
+ #add the track to album - if album exists
+ if [email protected]?
+ @album_tracks = @albums.tracks << @tracks
+ @album_tracks.save
+ end
+
+ #add the track to the artist
+ @artist_tracks = @artist.tracks << @tracks
+ @artist_tracks.save
+
+ #adding play: only add if playedtime does not exsist in the database already
+ play_items = Play.count(:playedtime=>item['playedtime'], :channel_id=>index)
+ if play_items < 1
+ @play = Play.create(:track_id =>@tracks.id, :channel_id => index, :playedtime=>item['playedtime'])
+ @plays = @tracks.plays << @play
+ @plays.save
+ end
+
+ }
+ end
+
+ def mbid_lookup(artist, track, album)
+ result_hash = {}
+
+ #we can only hit mbrainz once a second so we take a nap
+ sleep 1
+ service = MusicBrainz::Webservice::Webservice.new(:user_agent => 'pavapi/1.0')
+ q = MusicBrainz::Webservice::Query.new(service)
+ #TRACK
+ if !album.empty?
+ t_filter = MusicBrainz::Webservice::TrackFilter.new(:artist=>artist, :title=>track, :release=>album, :limit => 5)
+ else
+ t_filter = MusicBrainz::Webservice::TrackFilter.new(:artist=>artist, :title=>track, :limit => 5)
+ end
+ t_results = q.get_tracks(t_filter)
+
+ #No results from the 'advanced' query, so trying artist and album individualy
+ if t_results.count == 0
+ #ARTIST
+ t_filter = MusicBrainz::Webservice::ArtistFilter.new(:name=>artist)
+ t_results = q.get_artists(t_filter)
+ if t_results.count > 0
+ x = t_results.first
+ if x.score == 100 && is_ascii(String(x.entity.name)) && String(x.entity.name).casecmp(artist)==0
+ #puts 'ARTIST score: ' + String(x.score) + '- artist: ' + String(x.entity.name) + ' - artist mbid '+ String(x.entity.id.uuid)
+ result_hash["artistmbid"] = String(x.entity.id.uuid)
+ end
+ end
+
+ #ALBUM
+ if !album.empty?
+ t_filter = MusicBrainz::Webservice::ReleaseFilter.new(:artist=>artist, :title=>album)
+ t_results = q.get_releases(t_filter)
+ #puts "album results count "+t_results.count.to_s
+ if t_results.count>1
+ x = t_results.first
+ #puts 'ALBUM score: ' + String(x.score) + '- artist: ' + String(x.entity.artist) + ' - artist mbid '+ String(x.entity.id.uuid) +' - release title '+ String(x.entity.title) + ' - orginal album title: '+album
+ if x.score == 100 && is_ascii(String(x.entity.title)) #&& String(x.entity.title).casecmp(album)==0
+ result_hash["albummbid"] = String(x.entity.id.uuid)
+ end
+ end
+ end
+
+ elsif t_results.count > 0
+ t_results.each{ |x|
+ #puts 'score: ' + String(x.score) + '- artist: ' + String(x.entity.artist) + ' - artist mbid '+ String(x.entity.artist.id.uuid) + ' - track mbid: ' + String(x.entity.id.uuid) + ' - track: ' + String(x.entity.title) +' - album: ' + String(x.entity.releases[0]) +' - album mbid: '+ String(x.entity.releases[0].id.uuid)
+ if x.score == 100 && is_ascii(String(x.entity.artist))
+ result_hash["trackmbid"] = String(x.entity.id.uuid)
+ result_hash["artistmbid"] = String(x.entity.artist.id.uuid)
+ result_hash["albummbid"] = String(x.entity.releases[0].id.uuid)
+ end
+ }
+ end
+ return result_hash
+ end
+
+ def is_ascii(item)
+ cd = CharDet.detect(item)
+ encoding = cd['encoding']
+ return encoding == 'ascii'
+ end
+
+job 'track.store' do |args|
+ store_hash(args['item'], args['channel'].to_i)
+ error do |e, job, args|
+ $LOG.info("error e #{e}")
+ $LOG.info("error job #{job.inspect}")
+ $LOG.info("error args #{args.inspect}")
+ end
+end
diff --git a/models.rb b/models.rb
new file mode 100644
index 0000000..6c63f57
--- /dev/null
+++ b/models.rb
@@ -0,0 +1,79 @@
+#datamapper stuff
+require 'dm-core'
+require 'dm-serializer'
+require 'dm-timestamps'
+require 'dm-aggregates'
+require 'dm-migrations'
+
+#require
+#Models - to be moved to individual files
+class Artist
+ include DataMapper::Resource
+ property :id, Serial
+ property :artistmbid, String, :length => 36
+ property :artistname, String, :length => 512
+ property :artistnote, Text
+ property :artistlink, Text
+ property :created_at, DateTime
+ has n, :tracks, :through => Resource
+ has n, :channels, :through => Resource
+end
+
+class Album
+ include DataMapper::Resource
+ property :id, Serial
+ property :albummbid, String, :length => 36
+ property :albumname, String, :length => 512
+ property :albumimage, Text
+ property :created_at, DateTime
+ has n, :tracks, :through => Resource
+end
+
+class Track
+ include DataMapper::Resource
+ property :id, Serial
+ property :trackmbid, String, :length => 36
+ property :title, String, :length => 512
+ property :tracknote, Text
+ property :tracklink, Text
+ property :show, Text
+ property :talent, Text
+ property :aust, String, :length => 512
+ property :duration, Integer
+ property :publisher, Text
+ property :datecopyrighted, Integer
+ property :created_at, DateTime
+ has n, :artists, :through => Resource
+ has n, :albums, :through => Resource
+ has n, :plays
+ def date
+ created_at.strftime "%R on %B %d, %Y"
+ end
+ def playcount
+ Play.count(:track_id => self.id);
+ end
+end
+
+class Play
+ include DataMapper::Resource
+ property :id, Serial
+ property :playedtime, DateTime
+ belongs_to :track
+ belongs_to :channel
+ def date
+ #converting from utc to aussie time
+ #playedtime.new_offset(Rational(+20,24)).strftime "%R on %B %d, %Y"
+ playedtime.strftime "%Y-%m-%d %H:%M:%S"
+ end
+end
+
+class Channel
+ include DataMapper::Resource
+ property :id, Serial
+ property :channelname, String, :length => 512
+ property :channelxml, String, :length => 512
+ property :logo, String, :length => 512
+ property :channellink, String, :length => 512
+ has n, :plays
+ has n, :artists, :through => Resource
+end
diff --git a/pavapi.rb b/pavapi.rb
new file mode 100644
index 0000000..7fba480
--- /dev/null
+++ b/pavapi.rb
@@ -0,0 +1,611 @@
+#core stuff
+require 'rubygems'
+require 'sinatra'
+require './models'
+require './store_methods'
+
+#Queueing with delayed job
+#require 'delayed_job'
+#require 'delayed_job_data_mapper'
+#require './storetrackjob'
+require 'stalker'
+
+#template systems
+require 'yajl/json_gem'
+require 'rack/contrib/jsonp'
+require 'builder'
+use Rack::JSONP
+
+#for xml fetch and parse
+require 'rest_client'
+require 'crack'
+
+#musicbrainz stuff
+require 'rbrainz'
+include MusicBrainz
+require 'rchardet19'
+require 'logger'
+
+#time parsing
+require 'chronic_duration'
+require 'chronic'
+
+# Enable New Relic
+#configure :production do
+ #require 'newrelic_rpm'
+#end
+
+#throttling
+#require 'rack/throttle'
+#require 'memcached'
+#require './throttler'
+
+#for serving different content types
+require 'sinatra/respond_to'
+Sinatra::Application.register Sinatra::RespondTo
+
+#versioning
+@version = "v1"
+
+configure do
+ #use Throttler, :min => 300.0, :cache => Memcached.new, :key_prefix => :throttle
+ #use Rack::Throttle::Throttler, :min => 1.0, :cache => Memcached.new, :key_prefix => :throttle
+
+ #logging
+ DataMapper::Logger.new('log/datamapper.log', :warn)
+ DataMapper::Model.raise_on_save_failure = true
+ $LOG = Logger.new('log/pavstore.log', 'monthly')
+
+ # MySQL connection:
+ @config = YAML::load( File.open( 'config/settings.yml' ) )
+ @connection = "#{@config['adapter']}://#{@config['username']}:#{@config['password']}@#{@config['host']}/#{@config['database']}";
+ DataMapper.setup(:default, @connection)
+ DataMapper.finalize
+
+ #DataMapper.auto_upgrade!
+ #DataMapper::auto_migrate!
+ set :default_content, :html
+end
+
+#Caching 1 minute - must adjust
+before do
+ cache_control :public, :must_revalidate, :max_age => 60 unless development?
+end
+
+# Error 404 Page Not Found
+not_found do
+ json_status 404, "Not found"
+end
+
+error do
+ json_status 500, env['sinatra.error'].message
+end
+
+helpers do
+
+ def protected!
+ unless authorized?
+ response['WWW-Authenticate'] = %(Basic realm="Auth needed for post requests")
+ throw(:halt, [401, "Not authorized\n"])
+ end
+ end
+
+ def authorized?
+ @auth ||= Rack::Auth::Basic::Request.new(request.env)
+ @config = YAML::load( File.open( 'config/settings.yml' ) )
+ @user = @config['authuser']
+ @pass = @config['authpass']
+ @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [@user.to_s, @pass.to_s]
+ end
+
+ def json_status(code, reason)
+ status code
+ {
+ :status => code,
+ :reason => reason
+ }.to_json
+ end
+
+ def make_to_from(played_from, played_to)
+ #both to and from parameters provided
+ played_from = Chronic.parse(played_from)
+ played_to = Chronic.parse(played_to)
+
+ if (!played_from.nil? && !played_to.nil?)
+ return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
+ end
+ #no parameters, sets from a week ago
+ if (played_from.nil? && played_to.nil?)
+ now_date = DateTime.now - 7
+ return "AND playedtime > '#{now_date.strftime("%Y-%m-%d %H:%M:%S")}'"
+ end
+ #only to parameter, setting from a week before that
+ if (played_from.nil? && !played_to.nil?)
+ from_date = played_to - 7
+
+ return "AND playedtime < '#{played_to.strftime("%Y-%m-%d %H:%M:%S")}' AND playedtime > '#{from_date.strftime("%Y-%m-%d %H:%M:%S")}'"
+ end
+ #only from parameter
+ if (!played_from.nil? && played_to.nil?)
+ return "AND playedtime > '#{played_from.strftime("%Y-%m-%d %H:%M:%S")}'"
+ end
+ end
+
+ def isNumeric(s)
+ Float(s) != nil rescue false
+ end
+
+ def get_limit(lim)
+ #if no limit is set, we default to 10
+ #a max at 5000 on limit to protect the server
+ if isNumeric(lim)
+ if lim.to_i < 5000
+ return lim
+ else
+ return 5000
+ end
+ else
+ return 10
+ end
+ end
+
+ def get_channel(cha)
+ if isNumeric(cha)
+ channel = cha
+ elsif cha.nil?
+ channel = false
+ end
+ end
+
+end
+
+#ROUTES
+
+# Front page
+get '/' do
+ erb :front
+end
+
+#show all artists, defaults to 10, ordered by created date
+get "/#{@version}/artists" do
+ limit = get_limit(params[:limit])
+ channel = get_channel(params[:channel])
+ if channel
+ @artists = Artist.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
+ else
+ @artists = Artist.all(:limit => limit.to_i, :order => [:created_at.desc ])
+ end
+ respond_to do |wants|
+ wants.html { erb :artists }
+ wants.xml { builder :artists }
+ wants.json { @artists.to_json }
+ end
+end
+
+# show artist from id. if ?type=mbid is added, it will perform a mbid lookup
+get "/#{@version}/artist/:id" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @artist = Artist.first(:artistmbid => params[:id])
+ else
+ @artist = Artist.get(params[:id])
+ end
+ respond_to do |wants|
+ wants.html { erb :artist }
+ wants.xml { builder :artist }
+ wants.json { @artist.to_json }
+ end
+end
+
+# show tracks from artist
+get "/#{@version}/artist/:id/tracks" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @artist = Artist.first(:artistmbid => params[:id])
+ else
+ @artist = Artist.get(params[:id])
+ end
+ @tracks = @artist.tracks
+
+ respond_to do |wants|
+ wants.html { erb :artist_tracks }
+ wants.xml { builder :artist_tracks }
+ wants.json { @tracks.to_json }
+ end
+end
+
+
+# show plays from artist
+get "/#{@version}/artist/:id/plays" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @artist = Artist.first(:artistmbid => params[:id])
+ else
+ @artist = Artist.get(params[:id])
+ end
+ @plays = @artist.tracks.plays
+ respond_to do |wants|
+ wants.html { erb :artist_plays }
+ wants.xml { builder :artist_plays }
+ wants.json { @plays.to_json }
+ end
+end
+
+#add new track item (an item in the playout xml)
+post "/#{@version}/track" do
+ protected!
+ begin
+
+ data = JSON.parse params[:payload].to_json
+ if !data['item']['artist']['artistname'].nil? && Play.count(:playedtime => data['item']['playedtime'], :channel_id => data['channel'])==0
+ Stalker.enqueue('track.store', :item => data['item'],:channel => data['channel'])
+
+ #Delayed::Job.enqueue StoreTrackJob.new(data['item'], data['channel'])
+ #store_hash(data['item'], data['channel'])
+ end
+
+ rescue StandardError => e
+ $LOG.info("Post method end: Issue while processing #{data['item']['artist']['artistname']} - #{data['channel']}, #{e.backtrace}")
+ end
+end
+
+#show tracks
+get "/#{@version}/tracks" do
+ limit = get_limit(params[:limit])
+ channel = params[:channel]
+ if channel
+ @tracks = Track.all(Track.plays.channel_id => channel, :limit=>limit.to_i, :order => [:created_at.desc])
+ else
+ @tracks = Track.all(:limit => limit.to_i, :order => [:created_at.desc ])
+ end
+ respond_to do |wants|
+ wants.html { erb :tracks }
+ wants.xml { builder :tracks }
+ wants.json {@tracks.to_json}
+ end
+end
+
+# show track
+get "/#{@version}/track/:id" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @track = Track.first(:trackmbid => params[:id])
+ else
+ @track = Track.get(params[:id])
+ end
+ respond_to do |wants|
+ wants.html { erb :track }
+ wants.xml { builder :track }
+ wants.json {@track.to_json}
+ end
+end
+
+#show artists for a track
+get "/#{@version}/track/:id/artists" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @track = Track.first(:trackmbid => params[:id])
+ else
+ @track = Track.get(params[:id])
+ end
+ @artists = @track.artists
+
+ respond_to do |wants|
+ wants.html { erb :track_artists }
+ wants.xml { builder :track_artists }
+ wants.json {@artists.to_json}
+ end
+end
+
+#show albums for a track
+get "/#{@version}/track/:id/albums" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @track = Track.first(:trackmbid => params[:id])
+ else
+ @track = Track.get(params[:id])
+ end
+
+ @albums = @track.albums
+ respond_to do |wants|
+ wants.html { erb :track_albums }
+ wants.xml { builder :track_albums }
+ wants.json {@albums.to_json}
+ end
+end
+
+# show plays for a track
+get "/#{@version}/track/:id/plays" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @track = Track.first(:trackmbid => params[:id])
+ else
+ @track = Track.get(params[:id])
+ end
+ @plays = @track.plays
+ respond_to do |wants|
+ wants.html { erb :track_plays }
+ wants.xml { builder :track_plays }
+ wants.json {@plays.to_json}
+ end
+end
+
+#show all albums
+get "/#{@version}/albums" do
+ limit = get_limit(params[:limit])
+ channel = params[:channel]
+ if channel
+ @albums = Album.all('tracks.plays.channel_id' => channel, :limit=>limit.to_i, :order => [:created_at.desc ])
+ else
+ @albums = Album.all(:limit => limit.to_i, :order => [:created_at.desc ])
+ end
+ respond_to do |wants|
+ wants.html { erb :albums }
+ wants.xml { builder :albums }
+ wants.json { @albums.to_json }
+ end
+end
+
+# show album from id
+get "/#{@version}/album/:id" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @album = Album.first(:albummbid => params[:id])
+ else
+ @album = Album.get(params[:id])
+ end
+ respond_to do |wants|
+ wants.html { erb :album }
+ wants.xml { builder :album }
+ wants.json {@album.to_json}
+ end
+end
+
+# show tracks for an album
+get "/#{@version}/album/:id/tracks" do
+ if params[:type] == 'mbid' || params[:id].length == 36
+ @album = Album.first(:albummbid => params[:id])
+ else
+ @album = Album.get(params[:id])
+ end
+ @tracks = @album.tracks
+ respond_to do |wants|
+ wants.html { erb :album_tracks }
+ wants.xml { builder :album_tracks }
+ wants.json {@tracks.to_json }
+ end
+end
+
+#PLAY
+get "/#{@version}/plays" do
+ #DATE_FORMAT(playedtime, '%d %m %Y %H %i %S')
+ limit = get_limit(params[:limit])
+ to_from = make_to_from(params[:from], params[:to])
+ channel = params[:channel]
+ if channel
+ #@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
+ @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE `plays`.`channel_id` = #{channel} #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
+ else
+ #@plays = repository(:default).adapter.select("select * from tracks, plays, artists, artist_tracks, albums, album_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id AND albums.id = album_tracks.album_id AND tracks.id = album_tracks.track_id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
+ @plays = repository(:default).adapter.select("select * from tracks Left Outer Join album_tracks ON album_tracks.track_id = tracks.id Left Outer Join albums ON album_tracks.album_id = albums.id Inner Join artist_tracks ON artist_tracks.track_id = tracks.id Inner Join artists ON artists.id = artist_tracks.artist_id Inner Join plays ON tracks.id = plays.track_id WHERE tracks.id #{to_from} group by tracks.id, plays.playedtime order by plays.playedtime DESC limit #{limit}")
+ end
+ hat = @plays.collect {|o| {:title => o.title, :artistname => o.artistname, :playedtime => o.playedtime, :albumname => o.albumname, :albumimage => o.albumimage} }
+
+ respond_to do |wants|
+ wants.html { erb :plays }
+ wants.xml { builder :plays }
+ wants.json { hat.to_json }
+ end
+end
+
+get "/#{@version}/play/:id" do
+@play = Play.get(params[:id])
+ respond_to do |wants|
+ wants.json { @play.to_json }
+ end
+end
+
+# show all channels
+get "/#{@version}/channels" do
+ @channels = Channel.all
+ respond_to do |wants|
+ wants.xml { @channels.to_xml }
+ wants.json { @channels.to_json }
+ end
+end
+
+#create new channel
+post "/#{@version}/channel" do
+ protected!
+ data = JSON.parse params[:payload].to_json
+ channel = Channel.first_or_create({ :channelname => data['channelname'] }, { :channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'] })
+end
+
+#update a channel
+put "/#{@version}/channel/:id" do
+ protected!
+ channel = Channel.get(params[:id])
+ data = JSON.parse params[:payload].to_json
+ channel = channel.update(:channelname => data['channelname'],:channelxml => data['channelxml'], :logo => data['logo'], :channellink => data['channellink'])
+end
+
+# show channel from id
+get "/#{@version}/channel/:id" do
+ @channel = Channel.get(params[:id])
+ respond_to do |wants|
+ wants.xml { @channel.to_xml }
+ wants.json { @channel.to_json }
+ end
+end
+
+
+
+# chart of top tracks
+get "/#{@version}/chart/track" do
+ limit = get_limit(params[:limit])
+ to_from = make_to_from(params[:from], params[:to])
+ channel = params[:channel]
+ #SELECT tracks.title, artists.artistname, count(*) as cnt FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` INNER JOIN artist_tracks ON tracks.id=artist_tracks.track_id INNER JOIN artists ON artists.id=artist_tracks.artist_id WHERE `plays`.`channel_id` = 1 group by tracks.id order by cnt DESC limit 10;
+
+ if channel
+ @tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
+ else
+ @tracks = repository(:default).adapter.select("select *, count(distinct plays.id) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND artists.id=artist_tracks.artist_id AND artist_tracks.track_id=tracks.id #{to_from} group by tracks.id order by cnt DESC limit #{limit}")
+ end
+ hat = @tracks.collect {|o| {:count => o.cnt, :title => o.title, :artistname => o.artistname,:artistmbid => o.artistmbid, :trackmbid => o.trackmbid} }
+ respond_to do |wants|
+ wants.html { erb :track_chart }
+ wants.xml { builder :track_chart }
+ wants.json { hat.to_json }
+ end
+end
+
+
+# chart of top artist by name
+get "/#{@version}/chart/artist" do
+ to_from = make_to_from(params[:from], params[:to])
+ limit = get_limit(params[:limit])
+ channel = params[:channel]
+ if channel
+ @artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
+ else
+ @artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id #{to_from} group by artists.id order by cnt desc limit #{limit}")
+ end
+ #@artists = repository(:default).adapter.select("select sum(cnt) as count, har.artistname, har.id from (select artists.artistname, artists.id, artist_tracks.artist_id, count(*) as cnt from tracks, plays, artists, artist_tracks where tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id= artists.id #{to_from} group by tracks.id, plays.playedtime) as har group by har.artistname order by count desc limit #{limit}")
+ hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
+ respond_to do |wants|
+ wants.html { erb :artist_chart }
+ wants.xml { builder :artist_chart }
+ wants.json {hat.to_json}
+ end
+end
+
+get "/#{@version}/chart/album" do
+ to_from = make_to_from(params[:played_from], params[:played_to])
+ limit = get_limit(params[:limit])
+ channel = params[:channel]
+ if channel
+ @albums = repository(:default).adapter.select("select albums.albumname, albums.albumimage, albums.id as album_id, tracks.id as track_id, albums.albummbid, count(*) as cnt from tracks, plays, albums, album_tracks where plays.channel_id=#{channel} AND tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
+ else
+ @albums = repository(:default).adapter.select("select albums.albumname, albums.albumimage, albums.id as album_id, tracks.id as track_id, albums.albummbid, count(*) as cnt from tracks, plays, albums, album_tracks where tracks.id=plays.track_id AND albums.id=album_tracks.album_id AND album_tracks.track_id=tracks.id #{to_from} group by albums.id order by cnt DESC limit #{limit}")
+ end
+ hat = @albums.collect {|o| {:count => o.cnt, :albumname => o.albumname, :album_id => o.album_id, :albummbid => o.albummbid,:albumimage => o.albumimage} }
+
+ respond_to do |wants|
+ wants.xml { builder :album_chart }
+ wants.json {hat.to_json}
+ end
+end
+
+# search artist by name
+get "/#{@version}/search/:q" do
+ limit = get_limit(params[:limit])
+ @artists = Artist.all(:artistname.like =>'%'+params[:q]+'%', :limit => limit.to_i)
+ respond_to do |wants|
+ wants.html { erb :artists }
+ wants.xml { builder :artists }
+ wants.json { @artists.to_json }
+ end
+end
+
+#Sinatra version info
+get "/#{@version}/about" do
+ "I'm running version " + Sinatra::VERSION
+end
+
+#Count all artists
+get "/#{@version}/stats" do
+ @artistcount = Artist.count
+ @artistmbid = (Artist.count(:artistmbid).to_f/@artistcount.to_f)*100
+
+ @trackcount = Track.count
+ @trackmbid = (Track.count(:trackmbid).to_f/@trackcount.to_f)*100
+
+ @playcount = Play.count
+
+ @albumcount = Album.count
+ @albummbid = (Album.count(:albummbid).to_f/@albumcount.to_f)*100
+
+ @dig_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
+ @dig_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
+ @dig_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 1")
+ @dig_play = Play.all('channel_id'=>1).count
+
+
+ @jazz_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
+ @jazz_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
+ @jazz_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 2")
+ @jazz_play = Play.all('channel_id'=>2).count
+
+
+ @country_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
+ @country_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
+ @country_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 3")
+ @country_play = Play.all('channel_id'=>3).count
+
+
+ @jjj_track = repository(:default).adapter.select("SELECT COUNT(distinct tracks.id) FROM `tracks` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
+ @jjj_artist = repository(:default).adapter.select("SELECT COUNT(distinct artists.id) FROM `artists` INNER JOIN `artist_tracks` ON `artists`.`id` = `artist_tracks`.`artist_id` INNER JOIN `tracks` ON `artist_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
+ @jjj_album = repository(:default).adapter.select("SELECT COUNT(distinct albums.id) FROM `albums` INNER JOIN `album_tracks` ON `albums`.`id` = `album_tracks`.`album_id` INNER JOIN `tracks` ON `album_tracks`.`track_id` = `tracks`.`id` INNER JOIN `plays` ON `tracks`.`id` = `plays`.`track_id` WHERE `plays`.`channel_id` = 4")
+ @jjj_play = Play.all('channel_id'=>4).count
+
+ respond_to do |wants|
+ wants.html { erb :stats }
+ end
+
+end
+
+get '/jjj' do
+ cache_control :public, :max_age => 600
+ artistmbid = {}
+ har ='a'
+ hur = 'b'
+ @artists = repository(:default).adapter.select("select artists.artistname, artists.id, artist_tracks.artist_id, artists.artistmbid, count(*) as cnt from tracks, plays, artists, artist_tracks where plays.channel_id=4 AND tracks.id=plays.track_id AND tracks.id=artist_tracks.track_id AND artist_tracks.artist_id=artists.id group by artists.id order by cnt desc limit 10")
+ #hat = @artists.collect {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid} }
+all = Hash.new
+ @artists.each{ |o|
+ begin
+ if o.artistmbid
+ #puts o.artistname
+ begin
+ result = RestClient.get 'http://www.abc.net.au/triplej/media/artists/'+o.artistmbid+'/all-media.xml'
+
+ if(result.code==200)
+ all[o.artistname] = Hash.new
+ all[o.artistname].store("media",Hash.new())
+ all[o.artistname].store("info",Hash.new())
+ all[o.artistname].fetch("info").store("mbid",o.artistmbid)
+ all[o.artistname].fetch("info").store("count",o.cnt)
+ xml = Crack::XML.parse(result)
+ if(xml["rss"]["channel"]["item"].kind_of?(Array))
+ xml["rss"]["channel"]["item"].each_with_index{|ha,i|
+ if !ha["title"].empty? && !ha["media:thumbnail"].first.nil?
+ har = ha["title"]
+ da = ha["media:thumbnail"]
+ if da.kind_of?(Array)
+ hur = da.first["url"]
+ all[o.artistname].fetch("media").store(ha["title"],hur)
+ else
+ hur = da["url"]
+ all[o.artistname].fetch("media").store(ha["title"],hur)
+ end
+ if ha["media:content"].kind_of?(Array)
+ all[o.artistname].fetch("media").store(ha["media:content"].first["medium"],ha["media:content"].first["url"])
+ else
+ all[o.artistname].fetch("media").store(ha["media:content"]["medium"],ha["media:content"]["url"])
+
+ end
+ end
+ }
+ else
+ if(!xml["rss"]["channel"]["item"]["title"].nil? && !xml["rss"]["channel"]["item"]["media:thumbnail"]["url"].nil?)
+ har = xml["rss"]["channel"]["item"]["title"]
+ hur = xml["rss"]["channel"]["item"]["media:thumbnail"]["url"]
+ end
+ end
+ #john = @artists.map {|o| {:count => o.cnt, :artistname => o.artistname, :id => o.id, :artistmbid => o.artistmbid, :media=> {:title => har.to_s, :thumb=>hur.to_s}} }
+ #puts john.inspect
+ end
+ rescue => e
+ end
+ end
+ end
+ }
+ @hat = all
+ respond_to do |wants|
+ wants.html { erb :jjj }
+ wants.json { all.to_json }
+ end
+end
\ No newline at end of file
diff --git a/public/css/master.css b/public/css/master.css
new file mode 100644
index 0000000..2284b6b
--- /dev/null
+++ b/public/css/master.css
@@ -0,0 +1,63 @@
+body { font-family: " Georgia, serif"; margin: 0; padding: 0; }
+header, article, section, aside, footer { display: block; }
+h1, h2, h3, h4, h5, h6, p { margin: 0; padding: 0; font-weight: normal; }
+a { color: inherit; text-decoration: none; }
+ul a, code a{text-decoration: underline;}
+a:hover {
+ border-bottom: 1px solid #555;
+ background-color:#FFF461;
+ color:#222222;
+}
+div#wrapper { margin: 2em auto 0; width: 600px; padding: 0 0 1em 0; }
+header#main { width: 600px; margin: 0 auto; border-bottom: 3px double rgba(0, 0, 0, 0.5); }
+
+header#main h1{font-family: 'Helvetica Neue', Helvetica, sans-serif;
+text-shadow: 0 1px 0 white;
+color: black;
+font-size: 58px;
+line-height: 1.0em;
+letter-spacing: -1px;
+margin-top: 60px;
+margin-bottom: 10px;
+font-weight: bold;
+}
+
+h2,h3,h4{
+ font-family: 'Helvetica Neue', Helvetica, sans-serif;
+ text-shadow: 0 1px 0 white;
+ color: black;
+ letter-spacing: -1px;
+ font-weight: bold;
+}
+h4{
+ font-family: 'Helvetica Neue', Helvetica, sans-serif;
+ color: black;
+ letter-spacing: 0px;
+}
+h5{
+ font-family: 'Helvetica Neue', Helvetica, sans-serif;
+ color:#A30000;
+}
+
+
+p, code {
+ padding-bottom: 5px;
+}
+
+.missing{text-decoration:line-through;}
+
+code{
+ background-color: ghostWhite;
+ border: 1px solid #DEDEDE;
+ font-family: Monaco, "Courier New", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace;
+ font-size:75%;
+ width:100%;
+ display:block;
+}
+code .inner-code{
+ padding: 5px;
+}
+code a{
+ font-family: Monaco, "Courier New", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace;
+
+}
\ No newline at end of file
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000..f82b508
Binary files /dev/null and b/public/favicon.ico differ
diff --git a/public/images/favicon.ico b/public/images/favicon.ico
new file mode 100644
index 0000000..f82b508
Binary files /dev/null and b/public/images/favicon.ico differ
diff --git a/public/images/models.png b/public/images/models.png
new file mode 100644
index 0000000..17c92e1
Binary files /dev/null and b/public/images/models.png differ
diff --git a/store_methods.rb b/store_methods.rb
new file mode 100644
index 0000000..6c22bf2
--- /dev/null
+++ b/store_methods.rb
@@ -0,0 +1,123 @@
+ #Method that stores each playitem to database. Index is the id of the channel to associate the play with
+ def store_hash(item, index)
+ mbid_hash = nil
+ duration = ChronicDuration.parse(item["duration"].to_s)
+
+ #there can be multiple artist seperated by '+' so we split them
+ artist_array = item['artist']['artistname'].split("+")
+ artist_array.each{ |artist_item|
+ begin
+ #for each item, lookup in musicbrainz. Returns hash with mbids for track, album and artist if found
+ mbid_hash = mbid_lookup(artist_item.strip, item['title'], item['album']['albumname'])
+
+ rescue StandardError => e
+ $LOG.info("Issue while processing #{artist_item.strip} - #{item['title']} - #{item['album']['albumname']} - #{e.backtrace}")
+ end
+ #ARTIST
+ if !mbid_hash["artistmbid"].nil?
+ @artist = Artist.first_or_create({:artistmbid => mbid_hash["artistmbid"]},{:artistmbid => mbid_hash["artistmbid"],:artistname => artist_item.strip, :artistnote => item['artist']['artistnote'], :artistlink => item['artist']['artistlink']})
+ else
+ @artist = Artist.first_or_create({:artistname => artist_item.strip},{:artistname => artist_item.strip, :artistnote => item['artist']['artistnote'], :artistlink => item['artist']['artistlink']})
+ end
+
+ #store artist_id / channel_id to a lookup table, for faster selects
+ @artist_channels = @artist.channels << Channel.get(index)
+ @artist_channels.save
+
+ #ALBUM
+ #creating and saving album if not exists
+ if !item['album']['albumname'].empty?
+ if !mbid_hash["albummbid"].nil?
+ #puts "album mbid found for: " + mbid_hash["albummbid"]
+ @albums = Album.first_or_create({:albummbid => mbid_hash["albummbid"]},{:albummbid => mbid_hash["albummbid"], :albumname => item['album']['albumname'], :albumimage=>item['album']['albumimage']})
+ else
+ @albums = Album.first_or_create({:albumname => item['album']['albumname']},{:albumname => item['album']['albumname'], :albumimage=>item['album']['albumimage']})
+ end
+ end
+
+
+ #Track
+ #creating and saving track
+ if !mbid_hash["trackmbid"].nil?
+ @tracks = Track.first_or_create({:trackmbid => mbid_hash["trackmbid"]},{:trackmbid => mbid_hash["trackmbid"],:title => item['title'],:show => item['show'],:talent => item['talent'],:aust => item['aust'],:tracklink => item['tracklink'],:tracknote => item['tracknote'],:publisher => item['publisher'], :datecopyrighted => item['datecopyrighted'].to_i})
+ else
+ @tracks = Track.first_or_create({:title => item['title'],:duration => duration},{:title => item['title'],:show => item['show'],:talent => item['talent'],:aust => item['aust'],:tracklink => item['tracklink'],:tracknote => item['tracknote'],:duration => duration,:publisher => item['publisher'],:datecopyrighted => item['datecopyrighted'].to_i})
+ end
+
+ #add the track to album - if album exists
+ if [email protected]?
+ @album_tracks = @albums.tracks << @tracks
+ @album_tracks.save
+ end
+
+ #add the track to the artist
+ @artist_tracks = @artist.tracks << @tracks
+ @artist_tracks.save
+
+ #adding play: only add if playedtime does not exsist in the database already
+ play_items = Play.count(:playedtime=>item['playedtime'], :channel_id=>index)
+ if play_items < 1
+ @play = Play.create(:track_id =>@tracks.id, :channel_id => index, :playedtime=>item['playedtime'])
+ @plays = @tracks.plays << @play
+ @plays.save
+ end
+
+ }
+ end
+
+def mbid_lookup(artist, track, album)
+ result_hash = {}
+
+ #we can only hit mbrainz once a second so we take a nap
+ sleep 1
+ service = MusicBrainz::Webservice::Webservice.new(:user_agent => 'pavapi/1.0')
+ q = MusicBrainz::Webservice::Query.new(service)
+
+ #TRACK
+ t_filter = MusicBrainz::Webservice::TrackFilter.new(:artist=>artist, :title=>track, :release=>album, :limit => 5)
+ #t_filter = MusicBrainz::Webservice::TrackFilter.new(:artist=>artist, :title=>track, :limit => 5)
+ t_results = q.get_tracks(t_filter)
+
+ #No results from the 'advanced' query, so trying artist and album individualy
+ if t_results.count == 0
+ #ARTIST
+ t_filter = MusicBrainz::Webservice::ArtistFilter.new(:name=>artist)
+ t_results = q.get_artists(t_filter)
+ if t_results.count > 0
+ x = t_results.first
+ if x.score == 100 && is_ascii(String(x.entity.name)) && String(x.entity.name).casecmp(artist)==0
+ #puts 'ARTIST score: ' + String(x.score) + '- artist: ' + String(x.entity.name) + ' - artist mbid '+ String(x.entity.id.uuid)
+ result_hash["artistmbid"] = String(x.entity.id.uuid)
+ end
+ end
+
+ #ALBUM
+ t_filter = MusicBrainz::Webservice::ReleaseFilter.new(:artist=>artist, :title=>album)
+ t_results = q.get_releases(t_filter)
+ #puts "album results count "+t_results.count.to_s
+ if t_results.count==1
+ x = t_results.first
+ #puts 'ALBUM score: ' + String(x.score) + '- artist: ' + String(x.entity.artist) + ' - artist mbid '+ String(x.entity.id.uuid) +' - release title '+ String(x.entity.title) + ' - orginal album title: '+album
+ if x.score == 100 && is_ascii(String(x.entity.title)) #&& String(x.entity.title).casecmp(album)==0
+ result_hash["albummbid"] = String(x.entity.id.uuid)
+ end
+ end
+
+ elsif t_results.count > 0
+ t_results.each{ |x|
+ #puts 'score: ' + String(x.score) + '- artist: ' + String(x.entity.artist) + ' - artist mbid '+ String(x.entity.artist.id.uuid) + ' - track mbid: ' + String(x.entity.id.uuid) + ' - track: ' + String(x.entity.title) +' - album: ' + String(x.entity.releases[0]) +' - album mbid: '+ String(x.entity.releases[0].id.uuid)
+ if x.score == 100 && is_ascii(String(x.entity.artist))
+ result_hash["trackmbid"] = String(x.entity.id.uuid)
+ result_hash["artistmbid"] = String(x.entity.artist.id.uuid)
+ result_hash["albummbid"] = String(x.entity.releases[0].id.uuid)
+ end
+ }
+ end
+ return result_hash
+end
+
+def is_ascii(item)
+ cd = CharDet.detect(item)
+ encoding = cd['encoding']
+ return encoding == 'ascii'
+end
\ No newline at end of file
diff --git a/throttler.rb b/throttler.rb
new file mode 100644
index 0000000..c037a10
--- /dev/null
+++ b/throttler.rb
@@ -0,0 +1,18 @@
+#MAX_REQUESTS_PER_HOUR = 10
+ABC_IP = '174.143.182.132'
+module Rack;
+ module Throttle
+ class Throttler < Rack::Throttle::Interval
+ def initialize(app, options = {})
+ super
+ end
+ def allowed?(request)
+ if request.ip.to_s == ABC_IP
+ true
+ else
+ super(request)
+ end
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/views/album.html.erb b/views/album.html.erb
new file mode 100644
index 0000000..b61bc79
--- /dev/null
+++ b/views/album.html.erb
@@ -0,0 +1,5 @@
+<h1>Album</h1>
+<%= @album.id %>
+<%= @album.albumname %>
+<%= @album.albumimage %>
+<%= @album.created_at %>
\ No newline at end of file
diff --git a/views/album.xml.builder b/views/album.xml.builder
new file mode 100644
index 0000000..dcc96f0
--- /dev/null
+++ b/views/album.xml.builder
@@ -0,0 +1,6 @@
+xml.instruct! :xml, :version => '1.0'
+xml.album :id => @album.id do
+ xml.albumname @album.albumname
+ xml.albumimage @album.albumimage
+ xml.created_at @album.created_at
+end
diff --git a/views/album_chart.xml.builder b/views/album_chart.xml.builder
new file mode 100644
index 0000000..3b182dc
--- /dev/null
+++ b/views/album_chart.xml.builder
@@ -0,0 +1,6 @@
+xml.instruct! :xml, :version => '1.0'
+xml.chart do
[email protected] do |album|
+ xml.album :count => album.cnt.to_i, :albumname => album.albumname, :albumid => album.album_id, :trackid => album.track_id
+end
+end
\ No newline at end of file
diff --git a/views/album_tracks.html.erb b/views/album_tracks.html.erb
new file mode 100644
index 0000000..5b74c3e
--- /dev/null
+++ b/views/album_tracks.html.erb
@@ -0,0 +1,17 @@
+<h1>Tracks for <%= @album.albumname %></h1>
+<% if [email protected]? %><img src="<%= @album.albumimage %>" /><% end %>
+
+<% @tracks.each do |track| %>
+<ul>
+<% if !track.id.nil? %><li>id: <%= track.id %></li><% end %>
+<% if !track.title.nil? %><li>title: <%= track.title %></li><% end %>
+<% if !track.tracknote.nil? %><li><%= track.tracknote %></li><% end %>
+<% if !track.tracklink.nil? %><li><%= track.tracklink %></li><% end %>
+<% if !track.show.nil? %><li><%= track.show %></li><% end %>
+<% if !track.talent.nil? %><li><%= track.talent %></li><% end %>
+<% if !track.duration.nil? %><li><%= track.duration %></li><% end %>
+<% if !track.publisher.nil? %><li><%= track.publisher %></li><% end %>
+<% if !track.datecopyrighted.nil? %><li><%= track.datecopyrighted %></li><% end %>
+<li>date: <%= track.date %></li>
+</ul>
+<% end %>
diff --git a/views/album_tracks.xml.builder b/views/album_tracks.xml.builder
new file mode 100644
index 0000000..064cda8
--- /dev/null
+++ b/views/album_tracks.xml.builder
@@ -0,0 +1,19 @@
+xml.instruct! :xml, :version => '1.0'
+xml.album_tracks :albumname => @album.albumname do
+xml.tracks do
[email protected] do |track|
+xml.track do
+ xml.id track.id
+ xml.title track.title
+ xml.tracknote track.tracknote
+ xml.tracklink track.tracklink
+ xml.show track.show
+ xml.talent track.talent
+ xml.duration track.duration
+ xml.publisher track.publisher
+ xml.datecopyrighted track.datecopyrighted
+ xml.created_at track.created_at
+end
+end
+end
+end
\ No newline at end of file
diff --git a/views/albums.html.erb b/views/albums.html.erb
new file mode 100644
index 0000000..83d51f1
--- /dev/null
+++ b/views/albums.html.erb
@@ -0,0 +1,6 @@
+<h1>Albums</h1>
+<% for album in @albums %>
+ <p><%= album.albumname %></p>
+ <% if !album.albumimage.nil? %><img src="<%= album.albumimage %>" /><% end %>
+
+<% end %>
diff --git a/views/albums.xml.builder b/views/albums.xml.builder
new file mode 100644
index 0000000..34cd0f5
--- /dev/null
+++ b/views/albums.xml.builder
@@ -0,0 +1,9 @@
+xml.instruct! :xml, :version => '1.0'
+xml.albums do
[email protected] do |album|
+xml.album :id => album.id do
+ xml.artistname album.albumname
+ xml.created_at album.created_at
+end
+end
+end
diff --git a/views/artist.html.erb b/views/artist.html.erb
new file mode 100644
index 0000000..14bf785
--- /dev/null
+++ b/views/artist.html.erb
@@ -0,0 +1,2 @@
+<h1>Artist</h1>
+<p><%= @artist.artistname %></p>
diff --git a/views/artist.xml.builder b/views/artist.xml.builder
new file mode 100644
index 0000000..2faa27d
--- /dev/null
+++ b/views/artist.xml.builder
@@ -0,0 +1,7 @@
+xml.instruct! :xml, :version => '1.0'
+xml.artist :id => @artist.id do
+ xml.artistname @artist.artistname
+ xml.artistnote @artist.artistnote
+ xml.artistlink @artist.artistlink
+ xml.created_at @artist.created_at
+end
\ No newline at end of file
diff --git a/views/artist_chart.html.erb b/views/artist_chart.html.erb
new file mode 100644
index 0000000..758424d
--- /dev/null
+++ b/views/artist_chart.html.erb
@@ -0,0 +1,9 @@
+<h1>TOP artists</h1>
+<% for artist in @artists %>
+<ul>
+ <li>Play count: <%= artist.cnt %></li>
+ <% if !artist.id.nil? %><li>id: <%= artist.id %></li><% end %>
+ <% if !artist.artistname.empty? %><li>name: <%= artist.artistname %></li><% end %>
+</ul>
+<% end %>
+</ul>
\ No newline at end of file
diff --git a/views/artist_chart.xml.builder b/views/artist_chart.xml.builder
new file mode 100644
index 0000000..02761c9
--- /dev/null
+++ b/views/artist_chart.xml.builder
@@ -0,0 +1,6 @@
+xml.instruct! :xml, :version => '1.0'
+xml.chart do
[email protected] do |artist|
+ xml.artist :count => artist.count.to_i, :artistname => artist.artistname, :id => artist.id
+end
+end
diff --git a/views/artist_plays.xml.builder b/views/artist_plays.xml.builder
new file mode 100644
index 0000000..82d1369
--- /dev/null
+++ b/views/artist_plays.xml.builder
@@ -0,0 +1,16 @@
+xml.instruct! :xml, :version => '1.0'
+xml.artist_plays do
+xml.artist do
+ xml.artistname @artist.artistname
+ xml.id @artist.id
+end
+xml.plays do
[email protected] do |play|
+xml.play do
+ xml.id play.id
+ xml.channel_id play.channel_id
+ xml.playedtime play.date
+end
+end
+end
+end
\ No newline at end of file
diff --git a/views/artist_tracks.html.erb b/views/artist_tracks.html.erb
new file mode 100644
index 0000000..d39a146
--- /dev/null
+++ b/views/artist_tracks.html.erb
@@ -0,0 +1,17 @@
+<h1>Tracks for <%= @artist.artistname %></h1>
+<p>
+<% @tracks.each do |track| %>
+<ul>
+ <% if !track.id.nil? %><li>id: <%= track.id %></li><% end %>
+ <% if !track.title.empty? %><li>title: <%= track.title %></li><% end %>
+ <% if !track.tracknote.empty? %><li><%= track.tracknote %></li><% end %>
+ <% if !track.tracklink.empty? %><li><%= track.tracklink %></li><% end %>
+ <% if !track.show.empty? %><li><%= track.show %></li><% end %>
+ <% if !track.talent.empty? %><li><%= track.talent %></li><% end %>
+ <% if !track.duration.nil? %><li><%= track.duration %></li><% end %>
+ <% if !track.publisher.empty? %><li><%= track.publisher %></li><% end %>
+ <% if !track.datecopyrighted.nil? %><li><%= track.datecopyrighted %></li><% end %>
+ <li>date: <%= track.date %></li>
+</ul>
+<% end %>
+</p>
\ No newline at end of file
diff --git a/views/artist_tracks.xml.builder b/views/artist_tracks.xml.builder
new file mode 100644
index 0000000..d1bc504
--- /dev/null
+++ b/views/artist_tracks.xml.builder
@@ -0,0 +1,24 @@
+builder do |xml|
+xml.instruct! :xml, :version => '1.0'
+xml.artist_tracks do
+xml.artist do
+ xml.artistname @artist.artistname
+ xml.id @artist.id
+end
+xml.tracks do
[email protected] do |track|
+xml.track do
+ xml.id track.id
+ xml.title track.title
+ xml.tracknote track.tracknote
+ xml.tracklink track.tracklink
+ xml.show track.show
+ xml.talent track.talent
+ xml.duration track.duration
+ xml.publisher track.publisher
+ xml.datecopyrighted track.datecopyrighted
+end
+end
+end
+end
+end
\ No newline at end of file
diff --git a/views/artists.html.erb b/views/artists.html.erb
new file mode 100644
index 0000000..058158e
--- /dev/null
+++ b/views/artists.html.erb
@@ -0,0 +1,4 @@
+<h1>Artists</h1>
+<% for artist in @artists %>
+ <p><%= artist.id %>: <%= artist.artistname %></p>
+<% end %>
diff --git a/views/artists.xml.builder b/views/artists.xml.builder
new file mode 100644
index 0000000..e346957
--- /dev/null
+++ b/views/artists.xml.builder
@@ -0,0 +1,11 @@
+xml.instruct! :xml, :version => '1.0'
+xml.artists do
[email protected] do |artist|
+xml.artist :id => artist.id do
+ xml.artistname artist.artistname
+ xml.artistnote artist.artistnote
+ xml.artistlink artist.artistlink
+ xml.created_at artist.created_at
+end
+end
+end
diff --git a/views/front.html.erb b/views/front.html.erb
new file mode 100644
index 0000000..2da070b
--- /dev/null
+++ b/views/front.html.erb
@@ -0,0 +1,445 @@
+<div>
+
+<p>
+The pav:api exposes playlist data and is currently under development.
+</p>
+<ul>
+ <li><a href="#general">general information</a></li>
+ <ul>
+ <li><a href="#general-query-parameters">query parameters</a></li>
+ <li><a href="#general-identifiers">identifiers</a></li>
+ <li><a href="#general-authentication">authentication</a></li>
+ <li><a href="#general-versioning">versioning</a></li>
+ <li><a href="#general-return-types">return types</a></li>
+ <li><a href="#general-response-codes">reponse codes</a></li>
+ <li><a href="#general-terms">terms</a></li>
+ </ul>
+ <li><a href="#resources">resources</a></li>
+ <ul>
+ <li><a href="#resources-artists">artists</a></li>
+ <li><a href="#resources-tracks">tracks</a></li>
+ <li><a href="#resources-albums">albums</a></li>
+ <li><a href="#resources-channels">channels</a></li>
+ <li><a href="#resources-plays">plays</a></li>
+ <li><a href="#resources-chart">charts</a></li>
+ <li><a href="#resources-search">search</a></li>
+ <li><a href="#resources-stats">stats</a></li>
+ </ul>
+</ul>
+<p>
+ <h2 id="general">general information</h2>
+
+ <h3 id="general-query-parameters">query parameters</h3>
+ <span>Some paths accepts the following query parameters. See each <a href="#resources">resource</a> type for more specifics.
+ <ul>
+ <li>channel, default is all channels, available on paths that return a list</li>
+ <li>limit, default is 10, available on paths that return a list</li>
+ <li>callback, for cross-domain access jsonp is delivered to requests with 'callback' query parameter and json as return type.</li>
+ <li>format, return type format (html, json, xml)</li>
+ <li>type, to specify lookup type, mbid</li>
+ <li>to (to date) in yyyy-mm-dd format</li>
+ <li>from (from date) in yyyy-mm-dd format</li>
+ <li class="missing">fields, for partial responses</li>
+ <li class="missing">sort, for ordering results</li>
+ <li class="missing">key, is required for all calls to the api</li>
+
+ </ul>
+</p>
+
+<p>
+ <h3 id="general-identifiers">identifiers</h3>
+ To lookup a specific artist/track/album you can use pav IDs or Musicbrainz IDs where available.
+</p>
+
+<p>
+ <h3 id="general-authentication">authentication</h3>
+ All put and post requests require authentication
+</p>
+
+<p>
+ <h3 id="general-versioning">versioning</h3>
+ The version of the api you wish to use is specified at the root path of resources. The current version is v1.
+</p>
+
+<p>
+ <h3 id="general-return-types">return types</h3>
+ Return type can selected by appending the desired content type to the url (.html, .xml, .json) or by adding ?format=(html, xml, json) to the query parameter. Use only one of these methods when doing a request.
+<br />
+ Default return type is currently html but will change to json when the API is put in production.
+</p>
+
+<p>
+ <h3 id="general-response-codes">response codes</h3>
+ The API attempts to return appropriate HTTP status codes for every request.
+ <ul>
+ <li>200 OK: Request succeeded</li>
+ <li>400 Bad Request: Your request was invalid and we'll return an error message telling you why</li>
+ <li>401 Not Authorized: You did not provide the right credentials</li>
+ <li>404 Not Found: The URI requested is invalid or the resource requested, such as a user, does not exists</li>
+ <li>500 Internal Server Error: Something is broken.</li>
+ <li>503 Service Unavailable: You cannot make this request at this time. Servers are up, but overloaded with requests</li>
+ </ul>
+</p>
+
+<p>
+ <h3 id="general-terms">terms</h3>
+ Please be nice when using the api. If you plan to make massive amounts of calls please advise us.
+</p>
+
+<h2 id="resources">resources</h2>
+The resources that can be accessed through the api follows the model below:
+<img id="resources-model" width="400px" src="images/models.png"/>
+<br />
+Some useful observation about the model:
+<ul>
+ <li>An artist can have multiple tracks</li>
+ <li>A track can have multiple artists</li>
+ <li>A track can have multiple albums (a track appearing on different albums)</li>
+ <li>An album can have multiple tracks</li>
+ <li>A track can have multiple plays</li>
+ <li>A play belongs to one track</li>
+ <li>A play belongs to one channel</li>
+ <li>A channel can have multiple plays</li>
+</ul>
+
+<h3 id="resources-artists">artists</h3>
+
+<h4>/artists</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns a list of artists</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameters: channel, limit.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><div class="inner-code"><a href="/v1/artists.json?channel=4">/v1/artists.json?channel=4</a></div></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/967986.js"></script>
+</div>
+
+<h4>/artist/:id</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns a single artist</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameters: type.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/artist/1234.json">/v1/artist/1234.json</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/967997.js"></script>
+</div>
+
+<h4>/artist/:id/tracks</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns the tracks related to a single artist</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameters: type</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/artist/1234/tracks.json">/v1/artist/1234/tracks.json</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/968001.js"></script>
+</div>
+
+
+<h3 id="resources-tracks">tracks</h3>
+<h4>/tracks</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns a list of tracks</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameters: channel, limit.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/tracks.json?channel=4&limit=3">/v1/tracks.json?channel=4&limit=3</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/968008.js"></script>
+</div>
+
+<h4>/track/:id</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns a single track specified by an id.</p>
+
+ <h5>Parameters</h5>
+ Supports the following parameters: type.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/track/324.json">/v1/track/324.json</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/968013.js?file=gistfile1.json"></script>
+</div>
+
+<h4>post /track</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Post a track to pav. Requires authentication.</p>
+
+ <h5>Parameters</h5>
+ <p>A json payload
+ <script src="https://gist.github.com/968015.js?file=gistfile1.json"></script>
+
+ <h5>Example response</h5>
+ <p>200</p>
+</div>
+
+<h4>/track/:id/artists</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns the artists related to a single track</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameters: type.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/track/324/artists.json">/v1/track/324/artists.json</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/968022.js?file=gistfile1.json"></script>
+</div>
+
+<h4>/track/:id/albums</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns the albums related to a single track</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameters: type.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/track/324/albums.json">/v1/track/324/albums.json</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/968023.js?file=gistfile1.json"></script>
+</div>
+
+<h4>/track/:id/plays</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns the plays related to a single track.</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameters: type.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/track/324/plays.json">/v1/track/324/plays.json</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/968025.js?file=gistfile1.json"></script>
+</div>
+
+
+<h3 id="resources-albums">albums</h3>
+<h4>/albums</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns a list of albums.</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameters: channel, limit.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/albums.json">/v1/albums.json</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/968027.js?file=gistfile1.json"></script>
+</div>
+
+<h4>/album/:id</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns a single album.</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameters: type.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/album/15.json">/v1/album/15.json</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/968029.js?file=gistfile1.json"></script>
+</div>
+
+<h4>/album/:id/tracks</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns the tracks related to a single album.</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameters: type.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/album/15/tracks.json">/v1/album/15/tracks.json</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/968035.js?file=gistfile1.json"></script>
+</div>
+
+
+<h3 id="resources-channels">channels</h3>
+<h4>/channels</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns a list of channels.</p>
+
+ <h5>Parameters</h5>
+ Supports the following parameters: limit.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/channels.json">/v1/channels.json</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/968054.js?file=gistfile1.json"></script>
+</div>
+
+<h4>/channel/:id</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns a single channel.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/channel/1.json">/v1/channel/1.json</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/968058.js?file=gistfile1.json"></script>
+</div>
+
+<h4>post channel</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Create a new channel.</p>
+
+ <h5>Parameters</h5>
+ <script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
+</div>
+
+<h4>put channel/:id</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Update a channel.</p>
+
+ <h5>Parameters</h5>
+ <script src="https://gist.github.com/968061.js?file=gistfile1.json"></script>
+</div>
+
+<h3 id="resources-plays">plays</h3>
+<h4>/plays</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns a playlist.</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameters: to, from, limit, channel.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/plays.json?channel=1&limit=3">/v1/plays.json?channel=1&limit=3</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/956363.js"> </script>
+</div>
+
+<h4>/play/:id</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Returns a single play.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/play/4356.json">/v1/play/4356.json</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/968064.js?file=gistfile1.json"></script>
+</div>
+
+<h3 id="resources-chart">charts</h3>
+<h4>/chart/artist</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>A chart of most played artists for a given period.</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameters: channel, limit, to, from. If no to/from parameter is provided we return a chart from the last 7 days.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/chart/artist.json?channel=1">/v1/chart/artist.json?channel=1</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/973721.js?file=gistfile1.json"></script>
+</div>
+
+<h4>/chart/track</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ A chart of most played tracks for a given period.</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameters: channel, limit, to, from. If no to/from parameter is provided we return a chart from the last 7 days.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/chart/track.json?from=2011-04-20">/v1/chart/track.json?from=2011-04-20</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/973726.js?file=gistfile1.json"></script>
+</div>
+
+<h4>/chart/album</h4>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>A chart of most played albums for a given period.</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameters: channel, limit, to, from. If no to/from parameter is provided we return a chart from the last 7 days.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/chart/album.json?limit=5&channel=4">/v1/chart/album.json?limit=5&channel=4</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/973730.js?file=gistfile1.json"></script>
+</div>
+
+
+<h3 id="resources-search">search</h3>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Search for artists (tracks and albums to come).</p>
+
+ <h5>Parameters</h5>
+ <p>Supports the following parameters: limit.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/search/dylan.json?limit=5">/v1/search/dylan.json?limit=5</a></div></code>
+
+ <h5>Example response</h5>
+ <script src="https://gist.github.com/973733.js?file=gistfile1.json"></script>
+</div>
+
+<h3 id="resources-stats">stats</h3>
+<div class='resource'>
+ <h5>Description</h5>
+ <p>Statistics for the pav datastore.</p>
+
+ <h5>Example query</h5>
+ <code><div class="inner-code"><a href="/v1/stats">/v1/stats</a></div></code>
+</div>
+</div>
+<style type="text/css" media="screen">
+.gist-syntax .s2 {
+color: black;
+}
+.gist .gist-file .gist-data{
+ font-size:75%;
+}
+.gist .gist-file .gist-meta{
+ display:none;
+}
+</style>
diff --git a/views/jjj.html.erb b/views/jjj.html.erb
new file mode 100644
index 0000000..86402c4
--- /dev/null
+++ b/views/jjj.html.erb
@@ -0,0 +1,35 @@
+<div id="wrapper">
+
+<h2 style=" font-family: 'Helvetica Neue', Helvetica, sans-serif;
+ text-shadow: 0 1px 0 white;
+ color: black;
+ font-size: 30px;
+ line-height: 1.0em;
+ letter-spacing: -1px;
+ margin-bottom: 10px;
+ font-weight: bold;">TOP artists</h2>
+<% @hat.each do |k,v| %>
+ <% artistname = k %>
+ <p><h3 style="color:#A30000"><%=artistname%></h3></p>
+ <% v.each do |ke,va| %>
+ <% va.each do |key,val| %>
+ <%if key=='mbid'%>
+ <%elsif key == 'count' %>
+ <%elsif key == 'audio' %>
+ <p>
+ <audio src="<%=val%>" controls>
+ audio not supported
+ </audio>
+ </p>
+ <%elsif key == 'video' %>
+ <p><h4>Video url: <%=val%></h4></p>
+ <%else%>
+ <p><img src="<%=val%>"><p>
+ <h4><%=key%></h4>
+ <%end%>
+
+ <%end%>
+ <%end%>
+
+<%end%>
+</div>
\ No newline at end of file
diff --git a/views/layout.html.erb b/views/layout.html.erb
new file mode 100644
index 0000000..b7798ef
--- /dev/null
+++ b/views/layout.html.erb
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+<meta charset="utf-8" />
+<title>pav api</title>
+<link rel="stylesheet" href="/css/master.css" type="text/css" />
+
+<!--[if IE]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+
+<link rel="shortcut icon" href="/images/favicon.ico">
+
+</head>
+
+<body>
+ <div id="wrapper">
+<a href="http://github.com/simonhn"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+</a>
+<header id="main">
+ <hgroup>
+ <h1><a href="/">pav:api</a></h1>
+ </hgroup>
+ </header>
+<section>
+ <%= yield %>
+ </section>
+ </div>
+</body>
+</html>
diff --git a/views/plays.html.erb b/views/plays.html.erb
new file mode 100644
index 0000000..4c592e1
--- /dev/null
+++ b/views/plays.html.erb
@@ -0,0 +1,290 @@
+
+<style type="text/css">
+
+body{font-size: 0.75em;}
+#just_played #song_list {
+ float: left;
+ margin: 2px 0 10px;
+ }
+
+ #just_played .sort_order {
+ text-align: center;
+ color: #808080;
+ padding: 8px 0;
+ }
+
+ #just_played .sort_order .title {
+ font-weight: 700;
+ margin-right: 4px;
+ color: #000000;
+ }
+
+ #just_played .sort_order a {
+ text-decoration: underline;
+ margin: 0 4px;
+ }
+
+ #just_played .sort_order a.current {
+ text-decoration: none;
+ color: #000000;
+ }
+
+ #just_played .pagination,
+ #song_list .search-criteria {
+ text-align: center;
+ margin: 4px 0;
+ float: left;
+ padding: 8px 0;
+ }
+
+ #just_played #song_list .pagination {
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ }
+
+ #song_list .search-criteria {
+ border-bottom-width: 4px;
+ border-bottom-style: solid;
+ }
+
+ #just_played .pagination .title {
+ font-weight: 700;
+ margin-right: 8px;
+ }
+
+ #just_played .pagination .pages {
+ word-spacing: 0.5em;
+ margin-right: 8px;
+ color: #808080;
+ }
+
+ #just_played .pagination a {
+ color: #204ba1;
+ text-decoration: underline;
+ }
+
+ #just_played .pagination .pages a.current {
+ color: #000000;
+ text-decoration: none;
+ }
+
+ #just_played .pagination a.next {
+ color: #204ba1;
+ text-decoration: none;
+ font-weight: 700;
+ }
+
+ #clear-search {
+ display: inline-block;
+ font-size: 0.8em;
+ margin-left: 10px;
+ }
+
+ #just_played .list_quantity {
+ color: #204ba1;
+ }
+
+ #just_played .list_quantity img {
+ margin-right: 4px;
+ }
+
+ #just_played .song {
+ float: left;
+ border-top: 1px dashed #C9C9C9;
+ padding-top: 4px;
+ }
+
+ #just_played .song .date {
+ font-size: 1.0em;
+ padding: 3px 8px;
+ margin: -4px 0 5px 60px;
+ color: #fff;
+ background-color: #1F2933;
+ float: left;
+ }
+
+ #just_played .song .time {
+ font-size: 0.8em;
+ color: #999999;
+ margin-bottom: 2px;
+ }
+
+ #just_played .song .album_image_container {
+ float: left;
+ width: 110px;
+ height: 100px;
+ background-image: url('http://abcdigmusic.net.au/sites/all/themes/dig2/images/background/no-cover.png');
+ background-repeat: no-repeat;
+ }
+
+ #just_played .song .album_image_container img {
+ border: 1px solid #FFFFFF;
+ }
+
+ #just_played .song .album_image_container img:hover {
+ border: 1px solid #CAD4DD;
+ }
+
+ #just_played .song .australian_artist_container {
+ z-index:2;
+ position:absolute;
+ left:75px;
+ }
+
+ #just_played .song .details {
+ float: left;
+ margin-left: 10px;
+ width: 200px;
+ }
+
+ #just_played .song .details td {
+ padding-bottom: 9px;
+ }
+
+ #just_played .song .details td.label {
+ width: 80px;
+ font-size: 0.9em;
+ color: #4d4d4d;
+ }
+
+ #just_played .song .details td.info {
+ width: 145px;
+ font-size: 0.9em;
+ font-weight: bold;
+ }
+
+ #just_played .song .details td a{
+ color: #204ba1;
+ }
+
+ #just_played .song .social_data {
+ float: left;
+ margin: 0;
+ color: #4d4d4d;
+ font-size: 0.9em;
+ padding-left: 10px;
+ }
+
+ #just_played .song .feature_album {
+ position: relative;
+ top: -4px;
+ border: 0;
+ }
+
+ #just_played .song .social_data a {
+ color: #2f57a7;
+ }
+
+ #just_played .song .social_data .community {
+ float: left;
+ border-bottom: 1px dotted #CAD4DD;
+ margin-bottom: 2px;
+ padding: 2px 1px;
+ }
+
+ #just_played .song .social_data .user {
+ float: left;
+ width: 110px;
+ border-bottom: 1px dotted #CAD4DD;
+ margin-bottom: 2px;
+ padding: 2px 1px;
+ margin-left: 15px;
+ }
+
+ #just_played .song .social_data .last {
+ border-bottom: 0;
+ }
+
+ #just_played .song .social_data .icon {
+ float: left;
+ margin-right: 2px;
+ }
+
+ #just_played .song .social_data .community .text {
+ float: left;
+ line-height: 1.2em;
+ }
+
+ #just_played .song .social_data .user .text {
+ float: left;
+ width: 84px;
+ line-height: 1.2em;
+ }
+
+ #just_played .song .social_data .note {
+ float: left;
+ clear: both;
+ width: 310px;
+ border-top: 1px dotted #CAD4DD;
+ padding-top: 4px;
+ padding-left: 21px;
+ }
+
+ #just_played .song .social_data .note .text {
+ float: left;
+ width: 320px;
+ }
+
+ #just_played .song .social_data .note .text p {
+ color: #4d4d4d;
+ }
+
+ #just_played .song .social_data .note a {
+ background-image: url(../images/icon_external.png);
+ padding-right: 19px;
+ background-repeat: no-repeat;
+ background-position: right;
+ }
+
+ #just_played .disclaimer {
+ text-align: right;
+ padding-top: 8px;
+ float: left;
+ }
+.clear { clear: right; }
+
+</style>
+
+<p>
+ <div id="just_played">
+ <% @plays.each do |track| %>
+ <div class="song">
+ <br style="clear: both">
+ <div class="time"><%= track.playedtime.strftime "%R on %B %d, %Y" %></div>
+ <div class="album_image_container">
+ <img alt="album cover" src="<%= track.albumimage %>" width="100" height="100">
+ </div>
+ <div class="details">
+ <table><tbody>
+ <tr><td class="label">Song</td><td class="info"><% if !track.trackmbid.nil? %><a href="http://musicbrainz.org/track/<%= track.trackmbid %>.html"><%= track.title %></a>
+ <% else %> <%= track.title %><% end %></td></tr>
+ <tr>
+ <td class="label">Artist</td>
+ <td class="info">
+
+ <span><% if !track.artistmbid.nil? %><a href="http://musicbrainz.org/artist/<%= track.artistmbid %>.html"><%= track.artistname %></a>
+ <% else %> <%= track.artistname %><% end %></span>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">Album</td>
+ <td class="info"><% if !track.albummbid.nil? %><a href="http://musicbrainz.org/album/<%= track.albummbid %>.html"><%= track.albumname %></a><% else %> <%= track.albumname %><% end %></td>
+ </tr>
+ <tr>
+ <td class="label">Label</td>
+ <td class="info"></td>
+ </tr>
+ <tr>
+ <td class="label">Year</td>
+ <td class="info"></td>
+ </tr>
+
+ </tbody></table>
+ </div>
+
+ </div>
+ <% end %>
+ </div>
+</p>
+
+
diff --git a/views/plays.xml.builder b/views/plays.xml.builder
new file mode 100644
index 0000000..6f05475
--- /dev/null
+++ b/views/plays.xml.builder
@@ -0,0 +1,14 @@
+xml.instruct! :xml, :version => '1.0'
+xml.plays do
+ @plays.each do |track|
+ xml.track do
+ xml.trackid track.id
+ xml.tracktitle track.title
+ xml.artistname track.artistname
+ xml.albumname track.albumname
+ xml.albumimage track.albumimage
+ xml.channelid track.channel_id
+ xml.playedtime track.playedtime
+ end
+ end
+end
\ No newline at end of file
diff --git a/views/stats.html.erb b/views/stats.html.erb
new file mode 100644
index 0000000..9e60541
--- /dev/null
+++ b/views/stats.html.erb
@@ -0,0 +1,14 @@
+Currently the database contains:
+<ul>
+<li><%= @artistcount %> artists (<%[email protected]_i %>% has a mbid)</li>
+<li><%= @trackcount %> tracks (<%[email protected]_i %>% has a mbid)</li>
+<li><%= @playcount %> plays</li>
+<li><%= @albumcount %> albums (<%[email protected]_i %>% has a mbid)</li>
+</ul>
+<ul>
+<li>ABC Dig Music has <%= @dig_artist %> artists, <%= @dig_track %> tracks, <%= @dig_play %> plays and <%= @dig_album %> albums </li>
+<li>ABC Jazz has <%= @jazz_artist %> artists, <%= @jazz_track %> tracks, <%= @jazz_play %> plays and <%= @jazz_album %> albums </li>
+<li>ABC Country has <%= @country_artist %> artists, <%= @country_track %> tracks, <%= @country_play %> plays and <%= @country_album %> albums </li>
+<li>Triple J has <%= @jjj_artist %> artists, <%= @jjj_track %> tracks, <%= @jjj_play %> plays and <%= @jjj_album %> albums </li>
+
+</ul>
diff --git a/views/track.html.erb b/views/track.html.erb
new file mode 100644
index 0000000..9e98dc1
--- /dev/null
+++ b/views/track.html.erb
@@ -0,0 +1,13 @@
+<h1>Track</h1>
+<ul>
+<% if [email protected]? %><li>id: <%= @track.id %></li><% end %>
+<% if [email protected]? %><li>title: <%= @track.title %></li><% end %>
+<% if [email protected]? %><li>tracknote: <%= @track.tracknote %></li><% end %>
+<% if [email protected]? %><li>tracklink: <%= @track.tracklink %></li><% end %>
+<% if [email protected]? %><li>show: <%= @track.show %></li><% end %>
+<% if [email protected]? %><li>talent: <%= @track.talent %></li><% end %>
+<% if [email protected]? %><li>duration: <%= @track.duration %></li><% end %>
+<% if [email protected]? %><li>publisher: <%= @track.publisher %></li><% end %>
+<% if [email protected]? %><li>datecopyrighted: <%= @track.datecopyrighted %></li><% end %>
+<li>date: <%= @track.date %></li>
+</ul>
\ No newline at end of file
diff --git a/views/track.xml.builder b/views/track.xml.builder
new file mode 100644
index 0000000..3204e12
--- /dev/null
+++ b/views/track.xml.builder
@@ -0,0 +1,13 @@
+xml.instruct! :xml, :version => '1.0'
+xml.track :id => @track.id do
+ xml.title @track.title
+ xml.tracknote @track.tracknote
+ xml.tracklink @track.tracklink
+ xml.show @track.show
+ xml.talent @track.talent
+ xml.aust @track.aust
+ xml.duration @track.duration
+ xml.publisher @track.publisher
+ xml.datecopyrighted @track.datecopyrighted
+ xml.created_at @track.created_at
+end
diff --git a/views/track_albums.html.erb b/views/track_albums.html.erb
new file mode 100644
index 0000000..8e03dba
--- /dev/null
+++ b/views/track_albums.html.erb
@@ -0,0 +1,10 @@
+<h1>Albums for <%= @track.title %></h1>
+<p>
+<% for album in @albums %>
+ <ul>
+ <li>id: <%= album.id %></li>
+ <li>album name: <%= album.albumname %></li>
+ <li>album image: <%= album.albumimage %></li>
+ </ul>
+<% end %>
+</p>
\ No newline at end of file
diff --git a/views/track_albums.xml.builder b/views/track_albums.xml.builder
new file mode 100644
index 0000000..3e749a5
--- /dev/null
+++ b/views/track_albums.xml.builder
@@ -0,0 +1,17 @@
+xml.instruct! :xml, :version => '1.0'
+xml.track_albums do
+xml.track do
+ xml.title @track.title
+ xml.id @track.id
+end
+xml.albums do
[email protected] do |album|
+xml.album do
+ xml.id album.id
+ xml.albumname album.albumname
+ xml.albumimage album.albumimage
+ xml.created_at album.created_at
+end
+end
+end
+end
\ No newline at end of file
diff --git a/views/track_artists.html.erb b/views/track_artists.html.erb
new file mode 100644
index 0000000..c542853
--- /dev/null
+++ b/views/track_artists.html.erb
@@ -0,0 +1,9 @@
+<h1>Artists for <%= @track.title %></h1>
+<p>
+<% for artist in @artists %>
+ <ul>
+ <li>id: <%= artist.id %></li>
+ <li>artist name: <%= artist.artistname %></li>
+ </ul>
+<% end %>
+</p>
\ No newline at end of file
diff --git a/views/track_artists.xml.builder b/views/track_artists.xml.builder
new file mode 100644
index 0000000..d0f199e
--- /dev/null
+++ b/views/track_artists.xml.builder
@@ -0,0 +1,16 @@
+xml.instruct! :xml, :version => '1.0'
+xml.track_artists do
+xml.track do
+ xml.title @track.title
+ xml.id @track.id
+end
+xml.artists do
[email protected] do |artist|
+xml.artist do
+ xml.id artist.id
+ xml.artistname artist.artistname
+ xml.created_at artist.created_at
+end
+end
+end
+end
\ No newline at end of file
diff --git a/views/track_chart.html.erb b/views/track_chart.html.erb
new file mode 100644
index 0000000..af6b381
--- /dev/null
+++ b/views/track_chart.html.erb
@@ -0,0 +1,19 @@
+
+<h1>TOP Tracks</h1>
+<% for track in @tracks %>
+<ul>
+ <li>Play count: <%= track.cnt %></li>
+ <% if !track.id.nil? %><li>id: <%= track.id %></li><% end %>
+ <% if !track.title.empty? %><li>title: <%= track.title %></li><% end %>
+ <li>artist name <%= track.artistname %></li>
+ <% if !track.tracknote.empty? %><li><%= track.tracknote %></li><% end %>
+ <% if !track.tracklink.empty? %><li><%= track.tracklink %></li><% end %>
+ <% if !track.show.empty? %><li><%= track.show %></li><% end %>
+ <% if !track.talent.empty? %><li><%= track.talent %></li><% end %>
+ <% if !track.duration.nil? %><li><%= track.duration %></li><% end %>
+ <% if !track.publisher.empty? %><li><%= track.publisher %></li><% end %>
+ <% if !track.datecopyrighted.nil? %><li><%= track.datecopyrighted %></li><% end %>
+ <li>date: <%= track.created_at.strftime "%Y-%m-%d %H:%M:%S" %></li>
+</ul>
+<% end %>
+</ul>
diff --git a/views/track_chart.xml.builder b/views/track_chart.xml.builder
new file mode 100644
index 0000000..6534ef6
--- /dev/null
+++ b/views/track_chart.xml.builder
@@ -0,0 +1,20 @@
+=begin
+builder do |xml|
+xml.instruct! :xml, :version => '1.0'
+xml.tracks do
[email protected] do |track|
+xml.track :id => track.id do
+ xml.plays track.cnt
+ xml.tracktitle track.title
+ xml.artistname track.artistname
+end
+end
+end
+end
+=end
+xml.instruct! :xml, :version => '1.0'
+xml.chart do
[email protected] do |track|
+ xml.track :count => track.cnt.to_i, :tracktitle => track.title, :artist => track.artistname, :trackid => track.id
+end
+end
\ No newline at end of file
diff --git a/views/track_plays.html.erb b/views/track_plays.html.erb
new file mode 100644
index 0000000..1cf2a3d
--- /dev/null
+++ b/views/track_plays.html.erb
@@ -0,0 +1,10 @@
+<h1>Plays for <%= @track.title %></h1>
+<p>
+<% for play in @plays %>
+ <ul>
+ <li>id: <%= play.id %></li>
+ <li>played time: <%= play.playedtime %></li>
+ <li>channel id: <%= play.channel_id %></li>
+ </ul>
+<% end %>
+</p>
\ No newline at end of file
diff --git a/views/track_plays.xml.builder b/views/track_plays.xml.builder
new file mode 100644
index 0000000..5aada2b
--- /dev/null
+++ b/views/track_plays.xml.builder
@@ -0,0 +1,16 @@
+xml.instruct! :xml, :version => '1.0'
+xml.track_plays do
+xml.track do
+ xml.title @track.title
+ xml.id @track.id
+end
+xml.plays do
[email protected] do |play|
+xml.play do
+ xml.id play.id
+ xml.channel_id play.channel_id
+ xml.playedtime play.date
+end
+end
+end
+end
\ No newline at end of file
diff --git a/views/tracks.html.erb b/views/tracks.html.erb
new file mode 100644
index 0000000..e5f712b
--- /dev/null
+++ b/views/tracks.html.erb
@@ -0,0 +1,16 @@
+<h1>Tracks</h1>
+<% for track in @tracks %>
+<ul>
+ <% if !track.id.nil? %><li>id: <%= track.id %></li><% end %>
+ <% if !track.title.empty? %><li>title: <%= track.title %></li><% end %>
+ <% if !track.tracknote.empty? %><li><%= track.tracknote %></li><% end %>
+ <% if !track.tracklink.empty? %><li><%= track.tracklink %></li><% end %>
+ <% if !track.show.empty? %><li><%= track.show %></li><% end %>
+ <% if !track.talent.empty? %><li><%= track.talent %></li><% end %>
+ <% if !track.duration.nil? %><li><%= track.duration %></li><% end %>
+ <% if !track.publisher.empty? %><li><%= track.publisher %></li><% end %>
+ <% if !track.datecopyrighted.nil? %><li><%= track.datecopyrighted %></li><% end %>
+ <li>date: <%= track.created_at.strftime "%Y-%m-%d %H:%M:%S" %></li>
+</ul>
+<% end %>
+
diff --git a/views/tracks.xml.builder b/views/tracks.xml.builder
new file mode 100644
index 0000000..19c38aa
--- /dev/null
+++ b/views/tracks.xml.builder
@@ -0,0 +1,17 @@
+xml.instruct! :xml, :version => '1.0'
+xml.tracks do
[email protected] do |track|
+xml.track :id => track.id do
+ xml.title track.title
+ xml.tracknote track.tracknote
+ xml.tracklink track.tracklink
+ xml.show track.show
+ xml.talent track.talent
+ xml.aust track.aust
+ xml.duration track.duration
+ xml.publisher track.publisher
+ xml.datecopyrighted track.datecopyrighted
+ xml.created_at track.created_at
+end
+end
+end
\ No newline at end of file
diff --git a/worker-daemon.rb b/worker-daemon.rb
new file mode 100644
index 0000000..1fd49b5
--- /dev/null
+++ b/worker-daemon.rb
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'daemons'
+
+pwd = File.dirname(File.expand_path(__FILE__))
+file = pwd + '/jobs.rb'
+
+Daemons.run_proc(
+ 'track-store-worker', # name of daemon
+ :dir_mode => :normal,
+ :backtrace => true,
+ :monitor => true,
+ :log_output => true
+) do
+ exec "stalk #{file}"
+end
\ No newline at end of file
|
drzazga/wspolbiezne_projekt
|
99f934762d8bbe6966d58e97576cb97a02fafa51
|
sprawdzanie przekroczenia limitu graczy
|
diff --git a/bsd.c b/bsd.c
deleted file mode 100644
index dcb3640..0000000
--- a/bsd.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <stdio.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <signal.h>
-
-int main(int argc, char* argv[])
-{
- int sd,buff=3,clen;
- struct sockaddr_in sad, cad;
-
- buff = atoi(argv[1]);
-
- sd=socket(AF_INET,SOCK_DGRAM,0);
- bzero(&sad, sizeof(sad));
- sad.sin_family=AF_INET;
- sad.sin_addr.s_addr=inet_addr("127.0.0.1");
- sad.sin_port=htons((ushort) 5000);
- bind(sd, (struct sockaddr *) &sad,sizeof(sad));
- clen = sizeof(cad);
-
-
-
- while(1)
- {
- buff=htonl(buff);
- sendto(sd, &buff, sizeof(int), 0, (struct sockaddr *) &sad, clen);
- buff = 0;
-
- recvfrom(sd, &buff, sizeof(int), 0, (struct sockaddr *) &cad, &clen);
- buff=ntohl(buff);
-
- printf("Mamy: %d\n", buff);
- }
- return 0;
-}
-
diff --git a/server.c b/server.c
index a3e509e..03e6a4b 100644
--- a/server.c
+++ b/server.c
@@ -1,177 +1,180 @@
#define _REENTRANT
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <signal.h>
typedef struct
{
int id;
int wspX;
int wspY;
int odebraneWObecnejIteracji;
struct sockaddr_in adres;
} zawodnik;
void *wyslijPozycjeKola();
void wyslijDanePoczatkowe(struct sockaddr *adres);
char *zwrocWspolrzedne();
char *substring(int start, int stop, char *src, char *dst);
void ustawWspolrzedne();
int wspX, wspY;
int sd, clen;
char *zera[3] = { "", "0", "00" };
int idZawodnika;
int idOdebrane;
int xOdebrane;
int yOdebrane;
char id[3];
char x[3];
char y[3];
zawodnik tablicaZawodnikow[999];
int main()
{
char *data = (char*) calloc(10, sizeof(char));
pthread_t tid;
struct sockaddr_in sad,cad;
signal(SIGHUP,SIG_IGN);
sd=socket(AF_INET,SOCK_DGRAM,0);
//bzero((char *) &sad, sizeof(sad));
sad.sin_family=AF_INET;
sad.sin_addr.s_addr=htonl(INADDR_ANY);
sad.sin_port=htons((ushort) 5000);
bind(sd,(struct sockaddr *) &sad,sizeof(sad));
clen=sizeof(cad);
idZawodnika = 0;
wspX = 100-(15/2);
wspY = 200-(15/2);
pthread_create(&tid,NULL,wyslijPozycjeKola,NULL);
while (1)
{
recvfrom(sd, data,10,0,(struct sockaddr *) &cad,&clen);
if(strcmp(data, "init") == 0)
{
tablicaZawodnikow[idZawodnika].adres = cad;
wyslijDanePoczatkowe((struct sockaddr *) &cad);
idZawodnika++;
+
+ if(idZawodnika == 999)
+ idZawodnika = 0;
}
else
{
substring(0, 3, data, id);
substring(3, 6, data, x);
substring(6, 9, data, y);
idOdebrane = atoi(id);
xOdebrane = atoi(x);
yOdebrane = atoi(y);
tablicaZawodnikow[idOdebrane].wspX = xOdebrane;
tablicaZawodnikow[idOdebrane].wspY = yOdebrane;
tablicaZawodnikow[idOdebrane].odebraneWObecnejIteracji = 1;
}
}
return 0;
}
void *wyslijPozycjeKola()
{
int i;
char *wspDoWyslania = (char*) calloc(6, sizeof(char));;
while(1)
{
usleep(200000);
wspDoWyslania = zwrocWspolrzedne();
for(i = 0; i < idZawodnika; i++)
{
sendto(sd, wspDoWyslania, 6, 0, (struct sockaddr *) &tablicaZawodnikow[i].adres, clen);
}
}
return;
}
void wyslijDanePoczatkowe(struct sockaddr *cad)
{
char *danePoczatkowe = (char*) calloc(1, sizeof(char));
if(idZawodnika < 10)
sprintf(danePoczatkowe, "%s%d%s", zera[2], idZawodnika, zwrocWspolrzedne());
else if(idZawodnika < 100 && idZawodnika > 9)
sprintf(danePoczatkowe, "%s%d%s", zera[1], idZawodnika, zwrocWspolrzedne());
else
sprintf(danePoczatkowe, "%s%d%s", zera[0], idZawodnika, zwrocWspolrzedne());
//printf("dane poczatkowe: %s\n", danePoczatkowe);
sendto(sd, danePoczatkowe, 10, 0, cad, clen);
}
char *zwrocWspolrzedne()
{
char *wspolrzedne = (char*) calloc(1, sizeof(char));
char *wspolrzednaX = (char*) calloc(1, sizeof(char));
char *wspolrzednaY = (char*) calloc(1, sizeof(char));
ustawWspolrzedne();
if(wspX < 10)
sprintf(wspolrzednaX, "%s%d", zera[2], wspX);
else if(wspX < 100 && wspX > 9)
sprintf(wspolrzednaX, "%s%d", zera[1], wspX);
else
sprintf(wspolrzednaX, "%s%d", zera[0], wspX);
if(wspY < 10)
sprintf(wspolrzednaY, "%s%d", zera[2], wspY);
else if(wspY < 100 && wspY > 9)
sprintf(wspolrzednaY, "%s%d", zera[1], wspY);
else
sprintf(wspolrzednaY, "%s%d", zera[0], wspY);
sprintf(wspolrzedne, "%s%s", wspolrzednaX, wspolrzednaY);
return wspolrzedne;
}
char *substring(int start, int stop, char *src, char *dst)
{
int count = stop - start;
sprintf(dst, "%.*s", count, src + start);
return dst;
}
void ustawWspolrzedne()
{
int i, iloscOdebranych = 0;
int x, y;
for(i = 0; i < idZawodnika; i++)
{
if(tablicaZawodnikow[i].odebraneWObecnejIteracji == 1)
{
x += tablicaZawodnikow[i].wspX;
y += tablicaZawodnikow[i].wspY;
tablicaZawodnikow[i].odebraneWObecnejIteracji = 0;
iloscOdebranych++;
}
}
if(iloscOdebranych != 0)
{
wspX = x / iloscOdebranych;
wspY = y / iloscOdebranych;
}
}
|
drzazga/wspolbiezne_projekt
|
caf95ce2c29ba5305686a009026803625b37f502
|
ver 0.1 do oddania
|
diff --git a/Makefile b/Makefile
index bb21f14..1efcb91 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-CFLAGS=-L/usr/X11R6/lib -lX11 -lpthread
+CFLAGS=-L/usr/X11R6/lib -lX11 -lpthread -lm
programy= klient server
all: klient server
clean :
rm -f *~ \#* $(programy)
diff --git a/dokumentacja.txt b/dokumentacja.txt
index 3148373..ad7cb7f 100644
--- a/dokumentacja.txt
+++ b/dokumentacja.txt
@@ -1,15 +1,16 @@
ImiÄ i nazwisko: Bartosz Drzazgowski
Zadanie: Przesuwanie koÅa przez wielu użytkowników.
Uzasadnienie: Do komunikacji pomiÄdzy klientem a serwerem wybraÅem gniazda bsd, w wyborze
kierowaÅem siÄ tym, że umożliwiajÄ
komunikacjÄ z procesami na różnych komputerach.
Serwer w oddzielnym wÄ
tku nasÅuchujÄ i zapisuje nadchodzÄ
ce dane. WybraÅem wÄ
tki, ponieważ
-dzielÄ
pamiÄÄ z procesem macierzystym i Åatwiej byÅo to napisaÄ.
+dzielÄ
pamiÄÄ z procesem macierzystym, dziÄki czemu nie trzeba byÅo siÄ trudziÄ z innymi mechanizmami
+dzielenia pamiÄci.
Opis dziaÅania: Użytkownicy przesuwajÄ
koÅo znajdujÄ
ce siÄ na ekranie, odpowiednie
wspóÅrzÄdne przesyÅane sÄ
do serwera, który w konkretnych odstÄpach czasu
wylicza wspóÅrzÄdne do wysÅania wszystkim klientom. Klienci odbierajÄ
wspóÅrzÄdne i
na ich podstawie rysujÄ
koÅo.
Sytuacje bÅÄdne:
- Brak podania IP serwera przy wywoÅywaniu klienta - odpowiednia informacja
diff --git a/klient.c b/klient.c
index e84d5aa..29087a4 100644
--- a/klient.c
+++ b/klient.c
@@ -1,263 +1,250 @@
#include <X11/Xlib.h>
#include <X11/X.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <signal.h>
Display *mydisplay;
Window mywindow;
XSetWindowAttributes mywindowattributes;
XGCValues mygcvalues;
GC mygc;
Visual *myvisual;
int mydepth;
int myscreen;
int xw, yw;
int x,y;
Colormap mycolormap;
XColor mycolor, dummy;
XEvent myevent;
unsigned long i;
int wspX, wspY;
int oldX, oldY;
int roznicaX, roznicaY;
int idZawodnika;
int sd,clen;
struct sockaddr_in sad, cad;
char *zera[3] = { "", "0", "00" };
char *daneJakies;
void *odczytujNadchodzaceDane();
void rysujKolo();
int sprawdzPolozenieKursora(int x, int y);
void ustawWspolrzedne(char *wspolrzedne);
void ustawDanePoczatkowe(char *dane);
char *substring(int start, int stop, char *src, char *dst);
char *zwrocDaneDoWyslania();
char *zwrocIdZawodnika();
char *zwrocWspolrzedne();
int main(int argc, char **argv)
{
char *data = (char*) calloc(10, sizeof(char));
pthread_t tid;
if(argc != 2)
{
printf("Niepoprawne wywolanie programu.\n");
printf("./klient ADRES_IP_SERWERA\n");
return -1;
}
sd=socket(AF_INET,SOCK_DGRAM,0);
- //bzero(&sad, sizeof(sad));
sad.sin_family=AF_INET;
sad.sin_addr.s_addr=inet_addr(argv[1]);
sad.sin_port=htons((ushort) 5000);
bind(sd, (struct sockaddr *) &sad,sizeof(sad));
clen = sizeof(cad);
mydisplay = XOpenDisplay("");
myscreen = DefaultScreen(mydisplay);
myvisual = DefaultVisual(mydisplay,myscreen);
mydepth = DefaultDepth(mydisplay,myscreen);
mywindowattributes.background_pixel = XWhitePixel(mydisplay,myscreen);
mywindowattributes.override_redirect = False;
mywindow = XCreateWindow(mydisplay,XRootWindow(mydisplay,myscreen),
100,100,500,500,0,mydepth,InputOutput,
myvisual,CWBackPixel|CWOverrideRedirect,
&mywindowattributes);
XSelectInput(mydisplay,mywindow,ExposureMask|KeyPressMask|ButtonPressMask|ButtonMotionMask|ButtonReleaseMask);
mycolormap = DefaultColormap(mydisplay,myscreen);
XMapWindow(mydisplay,mywindow);
mygc = DefaultGC(mydisplay,myscreen);
mycolormap = DefaultColormap(mydisplay,myscreen);
XAllocNamedColor(mydisplay,mycolormap,"green",&mycolor,&dummy);
oldX = -1;
oldY = -1;
sprintf(data, "init");
sendto(sd, data, sizeof(data), 0, (struct sockaddr *) &sad, clen);
recvfrom(sd, data, 10, 0, (struct sockaddr *) &cad, &clen);
ustawDanePoczatkowe(data);
pthread_create(&tid,NULL,odczytujNadchodzaceDane,NULL);
- printf("id: %d, x: %d, y: %d\n", idZawodnika, wspX, wspY);
+ //printf("id: %d, x: %d, y: %d\n", idZawodnika, wspX, wspY);
char *wsp = (char*) calloc(6, sizeof(char));
while(1)
{
recvfrom(sd, wsp, 6, 0, (struct sockaddr *) &cad, &clen);
ustawWspolrzedne(wsp);
rysujKolo();
}
}
void rysujKolo()
{
- printf("otrzymalem od serwera nastepujace dane: %d %d\n", wspX, wspY);
+ //printf("otrzymalem od serwera nastepujace dane: %d %d\n", wspX, wspY);
XClearWindow(mydisplay, mywindow);
XSetForeground(mydisplay,mygc,mycolor.pixel);
XFillArc(mydisplay, mywindow, mygc, wspX-(100/2), wspY-(100/2), 100, 100, 0, 360*64);
XFlush(mydisplay);
}
int sprawdzPolozenieKursora(int x, int y)
{
- if(abs(wspX-x) <= 50 && abs(wspY-y) <= 50)
+ if(sqrt(pow(wspX-x, 2.0) + pow(wspY-y, 2.0)) <= 50.0)
return 1;
else
return 0;
}
void ustawWspolrzedne(char *wspolrzedne)
{
char x[3];
char y[3];
substring(0, 3, wspolrzedne, x);
substring(3, 7, wspolrzedne, y);
wspX = atoi(x);
wspY = atoi(y);
}
void ustawDanePoczatkowe(char *dane)
{
- printf("dane: %s\n", dane);
char id[3];
char wspolrzedneXY[6];
substring(0, 3, dane, id);
substring(3, 10, dane, wspolrzedneXY);
idZawodnika = atoi(id);
ustawWspolrzedne(wspolrzedneXY);
}
char *substring(int start, int stop, char *src, char *dst)
{
int count = stop - start;
sprintf(dst, "%.*s", count, src + start);
return dst;
}
void *odczytujNadchodzaceDane()
{
while (1)
{
XNextEvent(mydisplay,&myevent);
- printf("event no. %5d\n",myevent.type);
+ //printf("event no. %5d\n",myevent.type);
switch (myevent.type)
{
- case ButtonPress:
- x = myevent.xmotion.x;
- y = myevent.xmotion.y;
-
- printf("nacisnieto przycisk x: %d y: %d\n", x, y);
-
- break;
-
case ButtonRelease:
oldX = -1;
oldY = -1;
break;
case MotionNotify:
x = myevent.xmotion.x;
y = myevent.xmotion.y;
if(sprawdzPolozenieKursora(x, y) == 1)
{
if(oldX == -1)
{
oldX = x;
oldY = y;
}
roznicaX = x - oldX;
roznicaY = y - oldY;
oldX = x;
oldY = y;
- //printf("roznica x: %d, roznica y: %d\n", roznicaX, roznicaY);
wspX += roznicaX;
wspY += roznicaY;
daneJakies = zwrocDaneDoWyslania();
- printf("WYSYLAM: %s\n", daneJakies);
sendto(sd, daneJakies, 10, 0, (struct sockaddr *) &sad, clen);
- //rysujKolo();
}
else
{
oldX = -1;
oldY = -1;
}
break;
case Expose:
rysujKolo();
break;
case KeyPress:
XCloseDisplay(mydisplay);
exit(0);
}
}
}
char *zwrocWspolrzedne()
{
char *wspolrzedne = (char*) calloc(1, sizeof(char));
char *wspolrzednaX = (char*) calloc(1, sizeof(char));
char *wspolrzednaY = (char*) calloc(1, sizeof(char));
if(wspX < 10)
sprintf(wspolrzednaX, "%s%d", zera[2], wspX);
else if(wspX < 100 && wspX > 9)
sprintf(wspolrzednaX, "%s%d", zera[1], wspX);
else
sprintf(wspolrzednaX, "%s%d", zera[0], wspX);
if(wspY < 10)
sprintf(wspolrzednaY, "%s%d", zera[2], wspY);
else if(wspY < 100 && wspY > 9)
sprintf(wspolrzednaY, "%s%d", zera[1], wspY);
else
sprintf(wspolrzednaY, "%s%d", zera[0], wspY);
sprintf(wspolrzedne, "%s%s", wspolrzednaX, wspolrzednaY);
return wspolrzedne;
}
char *zwrocIdZawodnika()
{
char *mojeId = (char*) calloc(1, sizeof(char));
if(idZawodnika < 10)
sprintf(mojeId, "%s%d", zera[2], idZawodnika);
else if(idZawodnika < 100 && idZawodnika > 9)
sprintf(mojeId, "%s%d", zera[1], idZawodnika);
else
sprintf(mojeId, "%s%d", zera[0], idZawodnika);
return mojeId;
}
char *zwrocDaneDoWyslania()
{
char *daneDoWyslania = (char*) calloc(10, sizeof(char));
sprintf(daneDoWyslania, "%s%s", zwrocIdZawodnika(), zwrocWspolrzedne());
return daneDoWyslania;
}
diff --git a/server.c b/server.c
index 49d5263..a3e509e 100644
--- a/server.c
+++ b/server.c
@@ -1,181 +1,177 @@
#define _REENTRANT
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <signal.h>
typedef struct
{
int id;
int wspX;
int wspY;
- int oldX;
- int oldY;
int odebraneWObecnejIteracji;
struct sockaddr_in adres;
} zawodnik;
void *wyslijPozycjeKola();
void wyslijDanePoczatkowe(struct sockaddr *adres);
char *zwrocWspolrzedne();
char *substring(int start, int stop, char *src, char *dst);
void ustawWspolrzedne();
int wspX, wspY;
int sd, clen;
char *zera[3] = { "", "0", "00" };
int idZawodnika;
int idOdebrane;
int xOdebrane;
int yOdebrane;
char id[3];
char x[3];
char y[3];
zawodnik tablicaZawodnikow[999];
int main()
{
char *data = (char*) calloc(10, sizeof(char));
pthread_t tid;
struct sockaddr_in sad,cad;
signal(SIGHUP,SIG_IGN);
sd=socket(AF_INET,SOCK_DGRAM,0);
//bzero((char *) &sad, sizeof(sad));
sad.sin_family=AF_INET;
sad.sin_addr.s_addr=htonl(INADDR_ANY);
sad.sin_port=htons((ushort) 5000);
bind(sd,(struct sockaddr *) &sad,sizeof(sad));
clen=sizeof(cad);
idZawodnika = 0;
wspX = 100-(15/2);
wspY = 200-(15/2);
pthread_create(&tid,NULL,wyslijPozycjeKola,NULL);
while (1)
{
recvfrom(sd, data,10,0,(struct sockaddr *) &cad,&clen);
if(strcmp(data, "init") == 0)
{
tablicaZawodnikow[idZawodnika].adres = cad;
wyslijDanePoczatkowe((struct sockaddr *) &cad);
idZawodnika++;
}
else
{
- printf("otrzymalem dane: %s\n", data);
substring(0, 3, data, id);
substring(3, 6, data, x);
substring(6, 9, data, y);
idOdebrane = atoi(id);
xOdebrane = atoi(x);
yOdebrane = atoi(y);
tablicaZawodnikow[idOdebrane].wspX = xOdebrane;
tablicaZawodnikow[idOdebrane].wspY = yOdebrane;
tablicaZawodnikow[idOdebrane].odebraneWObecnejIteracji = 1;
- //sendto(sd, data,sizeof(data),0,(struct sockaddr *) &cad,clen);
}
}
return 0;
}
void *wyslijPozycjeKola()
{
int i;
char *wspDoWyslania = (char*) calloc(6, sizeof(char));;
while(1)
{
usleep(200000);
wspDoWyslania = zwrocWspolrzedne();
for(i = 0; i < idZawodnika; i++)
{
sendto(sd, wspDoWyslania, 6, 0, (struct sockaddr *) &tablicaZawodnikow[i].adres, clen);
}
}
return;
}
void wyslijDanePoczatkowe(struct sockaddr *cad)
{
char *danePoczatkowe = (char*) calloc(1, sizeof(char));
if(idZawodnika < 10)
sprintf(danePoczatkowe, "%s%d%s", zera[2], idZawodnika, zwrocWspolrzedne());
else if(idZawodnika < 100 && idZawodnika > 9)
sprintf(danePoczatkowe, "%s%d%s", zera[1], idZawodnika, zwrocWspolrzedne());
else
sprintf(danePoczatkowe, "%s%d%s", zera[0], idZawodnika, zwrocWspolrzedne());
- printf("dane poczatkowe: %s\n", danePoczatkowe);
+ //printf("dane poczatkowe: %s\n", danePoczatkowe);
sendto(sd, danePoczatkowe, 10, 0, cad, clen);
}
char *zwrocWspolrzedne()
{
char *wspolrzedne = (char*) calloc(1, sizeof(char));
char *wspolrzednaX = (char*) calloc(1, sizeof(char));
char *wspolrzednaY = (char*) calloc(1, sizeof(char));
ustawWspolrzedne();
if(wspX < 10)
sprintf(wspolrzednaX, "%s%d", zera[2], wspX);
else if(wspX < 100 && wspX > 9)
sprintf(wspolrzednaX, "%s%d", zera[1], wspX);
else
sprintf(wspolrzednaX, "%s%d", zera[0], wspX);
if(wspY < 10)
sprintf(wspolrzednaY, "%s%d", zera[2], wspY);
else if(wspY < 100 && wspY > 9)
sprintf(wspolrzednaY, "%s%d", zera[1], wspY);
else
sprintf(wspolrzednaY, "%s%d", zera[0], wspY);
sprintf(wspolrzedne, "%s%s", wspolrzednaX, wspolrzednaY);
return wspolrzedne;
}
char *substring(int start, int stop, char *src, char *dst)
{
int count = stop - start;
sprintf(dst, "%.*s", count, src + start);
return dst;
}
void ustawWspolrzedne()
{
int i, iloscOdebranych = 0;
int x, y;
for(i = 0; i < idZawodnika; i++)
{
if(tablicaZawodnikow[i].odebraneWObecnejIteracji == 1)
{
x += tablicaZawodnikow[i].wspX;
y += tablicaZawodnikow[i].wspY;
tablicaZawodnikow[i].odebraneWObecnejIteracji = 0;
iloscOdebranych++;
}
}
if(iloscOdebranych != 0)
{
wspX = x / iloscOdebranych;
wspY = y / iloscOdebranych;
}
}
|
drzazga/wspolbiezne_projekt
|
973f242a4dd131a9b580cf53e59b1ae3e4137162
|
wstepna dokumentacja
|
diff --git a/dokumentacja.txt b/dokumentacja.txt
new file mode 100644
index 0000000..3148373
--- /dev/null
+++ b/dokumentacja.txt
@@ -0,0 +1,15 @@
+ImiÄ i nazwisko: Bartosz Drzazgowski
+Zadanie: Przesuwanie koÅa przez wielu użytkowników.
+
+Uzasadnienie: Do komunikacji pomiÄdzy klientem a serwerem wybraÅem gniazda bsd, w wyborze
+kierowaÅem siÄ tym, że umożliwiajÄ
komunikacjÄ z procesami na różnych komputerach.
+Serwer w oddzielnym wÄ
tku nasÅuchujÄ i zapisuje nadchodzÄ
ce dane. WybraÅem wÄ
tki, ponieważ
+dzielÄ
pamiÄÄ z procesem macierzystym i Åatwiej byÅo to napisaÄ.
+
+Opis dziaÅania: Użytkownicy przesuwajÄ
koÅo znajdujÄ
ce siÄ na ekranie, odpowiednie
+wspóÅrzÄdne przesyÅane sÄ
do serwera, który w konkretnych odstÄpach czasu
+wylicza wspóÅrzÄdne do wysÅania wszystkim klientom. Klienci odbierajÄ
wspóÅrzÄdne i
+na ich podstawie rysujÄ
koÅo.
+Sytuacje bÅÄdne:
+ - Brak podania IP serwera przy wywoÅywaniu klienta - odpowiednia informacja
+
|
drzazga/wspolbiezne_projekt
|
ab37102fcddc3b424ed52ee3242df3426cfad2f1
|
poprawne rysowanie na podstawie danych z serwera, pozostaje algorytm wyliczania wsp
|
diff --git a/server.c b/server.c
index e9391b2..49d5263 100644
--- a/server.c
+++ b/server.c
@@ -1,175 +1,181 @@
#define _REENTRANT
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <signal.h>
typedef struct
{
int id;
int wspX;
int wspY;
int oldX;
int oldY;
+ int odebraneWObecnejIteracji;
struct sockaddr_in adres;
} zawodnik;
void *wyslijPozycjeKola();
void wyslijDanePoczatkowe(struct sockaddr *adres);
char *zwrocWspolrzedne();
char *substring(int start, int stop, char *src, char *dst);
void ustawWspolrzedne();
int wspX, wspY;
int sd, clen;
char *zera[3] = { "", "0", "00" };
int idZawodnika;
int idOdebrane;
int xOdebrane;
int yOdebrane;
char id[3];
char x[3];
char y[3];
zawodnik tablicaZawodnikow[999];
int main()
{
char *data = (char*) calloc(10, sizeof(char));
pthread_t tid;
struct sockaddr_in sad,cad;
signal(SIGHUP,SIG_IGN);
sd=socket(AF_INET,SOCK_DGRAM,0);
//bzero((char *) &sad, sizeof(sad));
sad.sin_family=AF_INET;
sad.sin_addr.s_addr=htonl(INADDR_ANY);
sad.sin_port=htons((ushort) 5000);
bind(sd,(struct sockaddr *) &sad,sizeof(sad));
clen=sizeof(cad);
idZawodnika = 0;
wspX = 100-(15/2);
wspY = 200-(15/2);
pthread_create(&tid,NULL,wyslijPozycjeKola,NULL);
while (1)
{
recvfrom(sd, data,10,0,(struct sockaddr *) &cad,&clen);
if(strcmp(data, "init") == 0)
{
tablicaZawodnikow[idZawodnika].adres = cad;
wyslijDanePoczatkowe((struct sockaddr *) &cad);
idZawodnika++;
}
else
{
printf("otrzymalem dane: %s\n", data);
substring(0, 3, data, id);
substring(3, 6, data, x);
substring(6, 9, data, y);
idOdebrane = atoi(id);
xOdebrane = atoi(x);
yOdebrane = atoi(y);
tablicaZawodnikow[idOdebrane].wspX = xOdebrane;
- tablicaZawodnikow[idOdebrane].wspX = yOdebrane;
+ tablicaZawodnikow[idOdebrane].wspY = yOdebrane;
+ tablicaZawodnikow[idOdebrane].odebraneWObecnejIteracji = 1;
//sendto(sd, data,sizeof(data),0,(struct sockaddr *) &cad,clen);
}
}
return 0;
}
void *wyslijPozycjeKola()
{
int i;
char *wspDoWyslania = (char*) calloc(6, sizeof(char));;
while(1)
{
- usleep(500000);
- printf("wysylam dane %d y %d", wspX, wspY);
+ usleep(200000);
wspDoWyslania = zwrocWspolrzedne();
for(i = 0; i < idZawodnika; i++)
{
sendto(sd, wspDoWyslania, 6, 0, (struct sockaddr *) &tablicaZawodnikow[i].adres, clen);
}
}
return;
}
void wyslijDanePoczatkowe(struct sockaddr *cad)
{
char *danePoczatkowe = (char*) calloc(1, sizeof(char));
if(idZawodnika < 10)
sprintf(danePoczatkowe, "%s%d%s", zera[2], idZawodnika, zwrocWspolrzedne());
else if(idZawodnika < 100 && idZawodnika > 9)
sprintf(danePoczatkowe, "%s%d%s", zera[1], idZawodnika, zwrocWspolrzedne());
else
sprintf(danePoczatkowe, "%s%d%s", zera[0], idZawodnika, zwrocWspolrzedne());
printf("dane poczatkowe: %s\n", danePoczatkowe);
sendto(sd, danePoczatkowe, 10, 0, cad, clen);
}
char *zwrocWspolrzedne()
{
char *wspolrzedne = (char*) calloc(1, sizeof(char));
char *wspolrzednaX = (char*) calloc(1, sizeof(char));
char *wspolrzednaY = (char*) calloc(1, sizeof(char));
ustawWspolrzedne();
if(wspX < 10)
sprintf(wspolrzednaX, "%s%d", zera[2], wspX);
else if(wspX < 100 && wspX > 9)
sprintf(wspolrzednaX, "%s%d", zera[1], wspX);
else
sprintf(wspolrzednaX, "%s%d", zera[0], wspX);
if(wspY < 10)
sprintf(wspolrzednaY, "%s%d", zera[2], wspY);
else if(wspY < 100 && wspY > 9)
sprintf(wspolrzednaY, "%s%d", zera[1], wspY);
else
sprintf(wspolrzednaY, "%s%d", zera[0], wspY);
sprintf(wspolrzedne, "%s%s", wspolrzednaX, wspolrzednaY);
return wspolrzedne;
}
char *substring(int start, int stop, char *src, char *dst)
{
int count = stop - start;
sprintf(dst, "%.*s", count, src + start);
return dst;
}
void ustawWspolrzedne()
{
- int i;
+ int i, iloscOdebranych = 0;
int x, y;
for(i = 0; i < idZawodnika; i++)
{
- x += tablicaZawodnikow[i].wspX;
- y += tablicaZawodnikow[i].wspY;
+ if(tablicaZawodnikow[i].odebraneWObecnejIteracji == 1)
+ {
+ x += tablicaZawodnikow[i].wspX;
+ y += tablicaZawodnikow[i].wspY;
+ tablicaZawodnikow[i].odebraneWObecnejIteracji = 0;
+ iloscOdebranych++;
+ }
}
- if(idZawodnika != 0)
+ if(iloscOdebranych != 0)
{
- wspX = x / (idZawodnika);
- wspY = y / (idZawodnika);
+ wspX = x / iloscOdebranych;
+ wspY = y / iloscOdebranych;
}
}
|
drzazga/wspolbiezne_projekt
|
5dee5f4333bd0a2e10b867cb657bc72c304039fe
|
proba wyslania i pobierania wartosci z serwera
|
diff --git a/server.c b/server.c
index 3b868e6..e9391b2 100644
--- a/server.c
+++ b/server.c
@@ -1,130 +1,175 @@
#define _REENTRANT
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <signal.h>
typedef struct
{
int id;
int wspX;
int wspY;
int oldX;
int oldY;
struct sockaddr_in adres;
} zawodnik;
void *wyslijPozycjeKola();
void wyslijDanePoczatkowe(struct sockaddr *adres);
char *zwrocWspolrzedne();
+char *substring(int start, int stop, char *src, char *dst);
+void ustawWspolrzedne();
+
int wspX, wspY;
int sd, clen;
char *zera[3] = { "", "0", "00" };
int idZawodnika;
+int idOdebrane;
+int xOdebrane;
+int yOdebrane;
+char id[3];
+char x[3];
+char y[3];
+
zawodnik tablicaZawodnikow[999];
int main()
{
char *data = (char*) calloc(10, sizeof(char));
pthread_t tid;
struct sockaddr_in sad,cad;
signal(SIGHUP,SIG_IGN);
sd=socket(AF_INET,SOCK_DGRAM,0);
//bzero((char *) &sad, sizeof(sad));
sad.sin_family=AF_INET;
sad.sin_addr.s_addr=htonl(INADDR_ANY);
sad.sin_port=htons((ushort) 5000);
bind(sd,(struct sockaddr *) &sad,sizeof(sad));
clen=sizeof(cad);
idZawodnika = 0;
wspX = 100-(15/2);
wspY = 200-(15/2);
pthread_create(&tid,NULL,wyslijPozycjeKola,NULL);
while (1)
{
recvfrom(sd, data,10,0,(struct sockaddr *) &cad,&clen);
if(strcmp(data, "init") == 0)
{
tablicaZawodnikow[idZawodnika].adres = cad;
wyslijDanePoczatkowe((struct sockaddr *) &cad);
idZawodnika++;
}
else
{
printf("otrzymalem dane: %s\n", data);
+ substring(0, 3, data, id);
+ substring(3, 6, data, x);
+ substring(6, 9, data, y);
+ idOdebrane = atoi(id);
+ xOdebrane = atoi(x);
+ yOdebrane = atoi(y);
+
+ tablicaZawodnikow[idOdebrane].wspX = xOdebrane;
+ tablicaZawodnikow[idOdebrane].wspX = yOdebrane;
//sendto(sd, data,sizeof(data),0,(struct sockaddr *) &cad,clen);
}
}
return 0;
}
void *wyslijPozycjeKola()
{
int i;
+ char *wspDoWyslania = (char*) calloc(6, sizeof(char));;
while(1)
{
- usleep(200000);
+ usleep(500000);
printf("wysylam dane %d y %d", wspX, wspY);
+ wspDoWyslania = zwrocWspolrzedne();
+
for(i = 0; i < idZawodnika; i++)
{
- sendto(sd, zwrocWspolrzedne(), 6, 0, (struct sockaddr *) &tablicaZawodnikow[i].adres, clen);
+ sendto(sd, wspDoWyslania, 6, 0, (struct sockaddr *) &tablicaZawodnikow[i].adres, clen);
}
-
- wspX += 1;
- wspY += 1;
}
return;
}
void wyslijDanePoczatkowe(struct sockaddr *cad)
{
char *danePoczatkowe = (char*) calloc(1, sizeof(char));
if(idZawodnika < 10)
sprintf(danePoczatkowe, "%s%d%s", zera[2], idZawodnika, zwrocWspolrzedne());
else if(idZawodnika < 100 && idZawodnika > 9)
sprintf(danePoczatkowe, "%s%d%s", zera[1], idZawodnika, zwrocWspolrzedne());
else
sprintf(danePoczatkowe, "%s%d%s", zera[0], idZawodnika, zwrocWspolrzedne());
printf("dane poczatkowe: %s\n", danePoczatkowe);
sendto(sd, danePoczatkowe, 10, 0, cad, clen);
}
char *zwrocWspolrzedne()
{
char *wspolrzedne = (char*) calloc(1, sizeof(char));
char *wspolrzednaX = (char*) calloc(1, sizeof(char));
char *wspolrzednaY = (char*) calloc(1, sizeof(char));
+ ustawWspolrzedne();
+
if(wspX < 10)
sprintf(wspolrzednaX, "%s%d", zera[2], wspX);
else if(wspX < 100 && wspX > 9)
sprintf(wspolrzednaX, "%s%d", zera[1], wspX);
else
sprintf(wspolrzednaX, "%s%d", zera[0], wspX);
if(wspY < 10)
sprintf(wspolrzednaY, "%s%d", zera[2], wspY);
else if(wspY < 100 && wspY > 9)
sprintf(wspolrzednaY, "%s%d", zera[1], wspY);
else
sprintf(wspolrzednaY, "%s%d", zera[0], wspY);
sprintf(wspolrzedne, "%s%s", wspolrzednaX, wspolrzednaY);
return wspolrzedne;
}
+char *substring(int start, int stop, char *src, char *dst)
+{
+ int count = stop - start;
+ sprintf(dst, "%.*s", count, src + start);
+ return dst;
+}
+
+void ustawWspolrzedne()
+{
+ int i;
+ int x, y;
+ for(i = 0; i < idZawodnika; i++)
+ {
+ x += tablicaZawodnikow[i].wspX;
+ y += tablicaZawodnikow[i].wspY;
+ }
+
+ if(idZawodnika != 0)
+ {
+ wspX = x / (idZawodnika);
+ wspY = y / (idZawodnika);
+ }
+}
+
|
drzazga/wspolbiezne_projekt
|
726e3ed1415f7856cfa020518e7733ebedb41d39
|
wysylanie wspolrzednych do serwera, odbior i rysowanie wg odebranych danych
|
diff --git a/klient.c b/klient.c
index ece4e8e..e84d5aa 100644
--- a/klient.c
+++ b/klient.c
@@ -1,191 +1,263 @@
#include <X11/Xlib.h>
#include <X11/X.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <signal.h>
Display *mydisplay;
Window mywindow;
XSetWindowAttributes mywindowattributes;
XGCValues mygcvalues;
GC mygc;
Visual *myvisual;
int mydepth;
int myscreen;
int xw, yw;
int x,y;
Colormap mycolormap;
XColor mycolor, dummy;
XEvent myevent;
unsigned long i;
int wspX, wspY;
int oldX, oldY;
int roznicaX, roznicaY;
int idZawodnika;
+int sd,clen;
+struct sockaddr_in sad, cad;
+char *zera[3] = { "", "0", "00" };
+char *daneJakies;
+void *odczytujNadchodzaceDane();
void rysujKolo();
int sprawdzPolozenieKursora(int x, int y);
void ustawWspolrzedne(char *wspolrzedne);
void ustawDanePoczatkowe(char *dane);
char *substring(int start, int stop, char *src, char *dst);
+char *zwrocDaneDoWyslania();
+char *zwrocIdZawodnika();
+char *zwrocWspolrzedne();
int main(int argc, char **argv)
{
- int sd,clen;
char *data = (char*) calloc(10, sizeof(char));
- struct sockaddr_in sad, cad;
+ pthread_t tid;
if(argc != 2)
{
printf("Niepoprawne wywolanie programu.\n");
printf("./klient ADRES_IP_SERWERA\n");
return -1;
}
sd=socket(AF_INET,SOCK_DGRAM,0);
//bzero(&sad, sizeof(sad));
sad.sin_family=AF_INET;
sad.sin_addr.s_addr=inet_addr(argv[1]);
sad.sin_port=htons((ushort) 5000);
bind(sd, (struct sockaddr *) &sad,sizeof(sad));
clen = sizeof(cad);
mydisplay = XOpenDisplay("");
myscreen = DefaultScreen(mydisplay);
myvisual = DefaultVisual(mydisplay,myscreen);
mydepth = DefaultDepth(mydisplay,myscreen);
mywindowattributes.background_pixel = XWhitePixel(mydisplay,myscreen);
mywindowattributes.override_redirect = False;
mywindow = XCreateWindow(mydisplay,XRootWindow(mydisplay,myscreen),
100,100,500,500,0,mydepth,InputOutput,
myvisual,CWBackPixel|CWOverrideRedirect,
&mywindowattributes);
XSelectInput(mydisplay,mywindow,ExposureMask|KeyPressMask|ButtonPressMask|ButtonMotionMask|ButtonReleaseMask);
mycolormap = DefaultColormap(mydisplay,myscreen);
XMapWindow(mydisplay,mywindow);
mygc = DefaultGC(mydisplay,myscreen);
mycolormap = DefaultColormap(mydisplay,myscreen);
XAllocNamedColor(mydisplay,mycolormap,"green",&mycolor,&dummy);
oldX = -1;
oldY = -1;
sprintf(data, "init");
sendto(sd, data, sizeof(data), 0, (struct sockaddr *) &sad, clen);
recvfrom(sd, data, 10, 0, (struct sockaddr *) &cad, &clen);
ustawDanePoczatkowe(data);
+ pthread_create(&tid,NULL,odczytujNadchodzaceDane,NULL);
+
printf("id: %d, x: %d, y: %d\n", idZawodnika, wspX, wspY);
+ char *wsp = (char*) calloc(6, sizeof(char));
+ while(1)
+ {
+ recvfrom(sd, wsp, 6, 0, (struct sockaddr *) &cad, &clen);
+ ustawWspolrzedne(wsp);
+ rysujKolo();
+ }
+}
+
+void rysujKolo()
+{
+ printf("otrzymalem od serwera nastepujace dane: %d %d\n", wspX, wspY);
+ XClearWindow(mydisplay, mywindow);
+ XSetForeground(mydisplay,mygc,mycolor.pixel);
+ XFillArc(mydisplay, mywindow, mygc, wspX-(100/2), wspY-(100/2), 100, 100, 0, 360*64);
+ XFlush(mydisplay);
+}
+
+int sprawdzPolozenieKursora(int x, int y)
+{
+ if(abs(wspX-x) <= 50 && abs(wspY-y) <= 50)
+ return 1;
+ else
+ return 0;
+}
+
+void ustawWspolrzedne(char *wspolrzedne)
+{
+ char x[3];
+ char y[3];
+
+ substring(0, 3, wspolrzedne, x);
+ substring(3, 7, wspolrzedne, y);
+
+ wspX = atoi(x);
+ wspY = atoi(y);
+}
+
+void ustawDanePoczatkowe(char *dane)
+{
+ printf("dane: %s\n", dane);
+ char id[3];
+ char wspolrzedneXY[6];
+
+ substring(0, 3, dane, id);
+ substring(3, 10, dane, wspolrzedneXY);
+
+ idZawodnika = atoi(id);
+ ustawWspolrzedne(wspolrzedneXY);
+}
+
+char *substring(int start, int stop, char *src, char *dst)
+{
+ int count = stop - start;
+ sprintf(dst, "%.*s", count, src + start);
+ return dst;
+}
+
+void *odczytujNadchodzaceDane()
+{
while (1)
{
XNextEvent(mydisplay,&myevent);
printf("event no. %5d\n",myevent.type);
switch (myevent.type)
{
case ButtonPress:
x = myevent.xmotion.x;
y = myevent.xmotion.y;
printf("nacisnieto przycisk x: %d y: %d\n", x, y);
break;
case ButtonRelease:
oldX = -1;
oldY = -1;
break;
case MotionNotify:
x = myevent.xmotion.x;
y = myevent.xmotion.y;
if(sprawdzPolozenieKursora(x, y) == 1)
{
if(oldX == -1)
{
oldX = x;
oldY = y;
}
roznicaX = x - oldX;
roznicaY = y - oldY;
oldX = x;
oldY = y;
- printf("roznica x: %d, roznica y: %d\n", roznicaX, roznicaY);
+ //printf("roznica x: %d, roznica y: %d\n", roznicaX, roznicaY);
wspX += roznicaX;
wspY += roznicaY;
- rysujKolo();
+
+ daneJakies = zwrocDaneDoWyslania();
+ printf("WYSYLAM: %s\n", daneJakies);
+ sendto(sd, daneJakies, 10, 0, (struct sockaddr *) &sad, clen);
+ //rysujKolo();
}
else
{
oldX = -1;
oldY = -1;
}
break;
case Expose:
rysujKolo();
break;
case KeyPress:
XCloseDisplay(mydisplay);
exit(0);
}
}
}
-void rysujKolo()
-{
- XClearWindow(mydisplay, mywindow);
- XSetForeground(mydisplay,mygc,mycolor.pixel);
- XFillArc(mydisplay, mywindow, mygc, wspX-(100/2), wspY-(100/2), 100, 100, 0, 360*64);
-}
-
-int sprawdzPolozenieKursora(int x, int y)
+char *zwrocWspolrzedne()
{
- if(abs(wspX-x) <= 50 && abs(wspY-y) <= 50)
- return 1;
+ char *wspolrzedne = (char*) calloc(1, sizeof(char));
+ char *wspolrzednaX = (char*) calloc(1, sizeof(char));
+ char *wspolrzednaY = (char*) calloc(1, sizeof(char));
+
+ if(wspX < 10)
+ sprintf(wspolrzednaX, "%s%d", zera[2], wspX);
+ else if(wspX < 100 && wspX > 9)
+ sprintf(wspolrzednaX, "%s%d", zera[1], wspX);
else
- return 0;
-}
+ sprintf(wspolrzednaX, "%s%d", zera[0], wspX);
-void ustawWspolrzedne(char *wspolrzedne)
-{
- char x[3];
- char y[3];
+ if(wspY < 10)
+ sprintf(wspolrzednaY, "%s%d", zera[2], wspY);
+ else if(wspY < 100 && wspY > 9)
+ sprintf(wspolrzednaY, "%s%d", zera[1], wspY);
+ else
+ sprintf(wspolrzednaY, "%s%d", zera[0], wspY);
- substring(0, 3, wspolrzedne, x);
- substring(3, 7, wspolrzedne, y);
+ sprintf(wspolrzedne, "%s%s", wspolrzednaX, wspolrzednaY);
- wspX = atoi(x);
- wspY = atoi(y);
+ return wspolrzedne;
}
-void ustawDanePoczatkowe(char *dane)
+char *zwrocIdZawodnika()
{
- printf("dane: %s", dane);
- char id[3];
- char wspolrzedneXY[6];
+ char *mojeId = (char*) calloc(1, sizeof(char));
- substring(0, 3, dane, id);
- substring(3, 10, dane, wspolrzedneXY);
+ if(idZawodnika < 10)
+ sprintf(mojeId, "%s%d", zera[2], idZawodnika);
+ else if(idZawodnika < 100 && idZawodnika > 9)
+ sprintf(mojeId, "%s%d", zera[1], idZawodnika);
+ else
+ sprintf(mojeId, "%s%d", zera[0], idZawodnika);
- idZawodnika = atoi(id);
- ustawWspolrzedne(wspolrzedneXY);
+ return mojeId;
}
-char *substring(int start, int stop, char *src, char *dst)
+char *zwrocDaneDoWyslania()
{
- int count = stop - start;
- sprintf(dst, "%.*s", count, src + start);
- return dst;
+ char *daneDoWyslania = (char*) calloc(10, sizeof(char));
+ sprintf(daneDoWyslania, "%s%s", zwrocIdZawodnika(), zwrocWspolrzedne());
+ return daneDoWyslania;
}
diff --git a/server.c b/server.c
index 8b5ed7a..3b868e6 100644
--- a/server.c
+++ b/server.c
@@ -1,110 +1,130 @@
#define _REENTRANT
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <signal.h>
typedef struct
{
int id;
- struct sockaddr adres;
+ int wspX;
+ int wspY;
+ int oldX;
+ int oldY;
+ struct sockaddr_in adres;
} zawodnik;
void *wyslijPozycjeKola();
void wyslijDanePoczatkowe(struct sockaddr *adres);
char *zwrocWspolrzedne();
int wspX, wspY;
int sd, clen;
char *zera[3] = { "", "0", "00" };
int idZawodnika;
-//zawodnik tablicaZawodnikow[999];
+zawodnik tablicaZawodnikow[999];
int main()
{
- char *data = (char*) calloc(1, sizeof(char));
+ char *data = (char*) calloc(10, sizeof(char));
pthread_t tid;
struct sockaddr_in sad,cad;
signal(SIGHUP,SIG_IGN);
sd=socket(AF_INET,SOCK_DGRAM,0);
//bzero((char *) &sad, sizeof(sad));
sad.sin_family=AF_INET;
sad.sin_addr.s_addr=htonl(INADDR_ANY);
sad.sin_port=htons((ushort) 5000);
bind(sd,(struct sockaddr *) &sad,sizeof(sad));
clen=sizeof(cad);
idZawodnika = 0;
wspX = 100-(15/2);
wspY = 200-(15/2);
- //pthread_create(&tid,NULL,wyslijPozycjeKola,NULL);
+ pthread_create(&tid,NULL,wyslijPozycjeKola,NULL);
while (1)
{
- recvfrom(sd, data,sizeof(data),0,(struct sockaddr *) &cad,&clen);
+ recvfrom(sd, data,10,0,(struct sockaddr *) &cad,&clen);
if(strcmp(data, "init") == 0)
{
+ tablicaZawodnikow[idZawodnika].adres = cad;
wyslijDanePoczatkowe((struct sockaddr *) &cad);
+ idZawodnika++;
}
else
{
- sendto(sd, data,sizeof(data),0,(struct sockaddr *) &cad,clen);
+ printf("otrzymalem dane: %s\n", data);
+ //sendto(sd, data,sizeof(data),0,(struct sockaddr *) &cad,clen);
}
}
return 0;
}
void *wyslijPozycjeKola()
{
+ int i;
+
+ while(1)
+ {
+ usleep(200000);
+ printf("wysylam dane %d y %d", wspX, wspY);
+
+ for(i = 0; i < idZawodnika; i++)
+ {
+ sendto(sd, zwrocWspolrzedne(), 6, 0, (struct sockaddr *) &tablicaZawodnikow[i].adres, clen);
+ }
+
+ wspX += 1;
+ wspY += 1;
+ }
return;
}
void wyslijDanePoczatkowe(struct sockaddr *cad)
{
char *danePoczatkowe = (char*) calloc(1, sizeof(char));
if(idZawodnika < 10)
sprintf(danePoczatkowe, "%s%d%s", zera[2], idZawodnika, zwrocWspolrzedne());
else if(idZawodnika < 100 && idZawodnika > 9)
sprintf(danePoczatkowe, "%s%d%s", zera[1], idZawodnika, zwrocWspolrzedne());
else
sprintf(danePoczatkowe, "%s%d%s", zera[0], idZawodnika, zwrocWspolrzedne());
printf("dane poczatkowe: %s\n", danePoczatkowe);
sendto(sd, danePoczatkowe, 10, 0, cad, clen);
-
- idZawodnika++;
}
char *zwrocWspolrzedne()
{
char *wspolrzedne = (char*) calloc(1, sizeof(char));
char *wspolrzednaX = (char*) calloc(1, sizeof(char));
char *wspolrzednaY = (char*) calloc(1, sizeof(char));
if(wspX < 10)
sprintf(wspolrzednaX, "%s%d", zera[2], wspX);
else if(wspX < 100 && wspX > 9)
sprintf(wspolrzednaX, "%s%d", zera[1], wspX);
else
sprintf(wspolrzednaX, "%s%d", zera[0], wspX);
if(wspY < 10)
sprintf(wspolrzednaY, "%s%d", zera[2], wspY);
else if(wspY < 100 && wspY > 9)
sprintf(wspolrzednaY, "%s%d", zera[1], wspY);
else
sprintf(wspolrzednaY, "%s%d", zera[0], wspY);
sprintf(wspolrzedne, "%s%s", wspolrzednaX, wspolrzednaY);
return wspolrzedne;
}
|
drzazga/wspolbiezne_projekt
|
0bd410badaa1150a5d8eafcc40f0780089e32981
|
pobieranie poczatkowych wspolrzednych i idZawodnika z serwera
|
diff --git a/klient.c b/klient.c
index 04068ea..ece4e8e 100644
--- a/klient.c
+++ b/klient.c
@@ -1,125 +1,191 @@
#include <X11/Xlib.h>
#include <X11/X.h>
#include <stdio.h>
#include <stdlib.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <signal.h>
Display *mydisplay;
Window mywindow;
XSetWindowAttributes mywindowattributes;
XGCValues mygcvalues;
GC mygc;
Visual *myvisual;
int mydepth;
int myscreen;
int xw, yw;
int x,y;
Colormap mycolormap;
XColor mycolor, dummy;
XEvent myevent;
unsigned long i;
int wspX, wspY;
int oldX, oldY;
int roznicaX, roznicaY;
+int idZawodnika;
void rysujKolo();
int sprawdzPolozenieKursora(int x, int y);
+void ustawWspolrzedne(char *wspolrzedne);
+void ustawDanePoczatkowe(char *dane);
+char *substring(int start, int stop, char *src, char *dst);
-int main()
+int main(int argc, char **argv)
{
+ int sd,clen;
+ char *data = (char*) calloc(10, sizeof(char));
+ struct sockaddr_in sad, cad;
+
+ if(argc != 2)
+ {
+ printf("Niepoprawne wywolanie programu.\n");
+ printf("./klient ADRES_IP_SERWERA\n");
+ return -1;
+ }
+
+ sd=socket(AF_INET,SOCK_DGRAM,0);
+ //bzero(&sad, sizeof(sad));
+ sad.sin_family=AF_INET;
+ sad.sin_addr.s_addr=inet_addr(argv[1]);
+ sad.sin_port=htons((ushort) 5000);
+ bind(sd, (struct sockaddr *) &sad,sizeof(sad));
+ clen = sizeof(cad);
+
mydisplay = XOpenDisplay("");
myscreen = DefaultScreen(mydisplay);
myvisual = DefaultVisual(mydisplay,myscreen);
mydepth = DefaultDepth(mydisplay,myscreen);
mywindowattributes.background_pixel = XWhitePixel(mydisplay,myscreen);
mywindowattributes.override_redirect = False;
mywindow = XCreateWindow(mydisplay,XRootWindow(mydisplay,myscreen),
100,100,500,500,0,mydepth,InputOutput,
myvisual,CWBackPixel|CWOverrideRedirect,
&mywindowattributes);
XSelectInput(mydisplay,mywindow,ExposureMask|KeyPressMask|ButtonPressMask|ButtonMotionMask|ButtonReleaseMask);
mycolormap = DefaultColormap(mydisplay,myscreen);
XMapWindow(mydisplay,mywindow);
mygc = DefaultGC(mydisplay,myscreen);
mycolormap = DefaultColormap(mydisplay,myscreen);
XAllocNamedColor(mydisplay,mycolormap,"green",&mycolor,&dummy);
- wspX = 200-(15/2);
- wspY = 200-(15/2);
oldX = -1;
oldY = -1;
+ sprintf(data, "init");
+ sendto(sd, data, sizeof(data), 0, (struct sockaddr *) &sad, clen);
+ recvfrom(sd, data, 10, 0, (struct sockaddr *) &cad, &clen);
+
+ ustawDanePoczatkowe(data);
+
+ printf("id: %d, x: %d, y: %d\n", idZawodnika, wspX, wspY);
+
while (1)
{
XNextEvent(mydisplay,&myevent);
printf("event no. %5d\n",myevent.type);
switch (myevent.type)
{
case ButtonPress:
x = myevent.xmotion.x;
y = myevent.xmotion.y;
printf("nacisnieto przycisk x: %d y: %d\n", x, y);
break;
case ButtonRelease:
oldX = -1;
oldY = -1;
break;
case MotionNotify:
x = myevent.xmotion.x;
y = myevent.xmotion.y;
if(sprawdzPolozenieKursora(x, y) == 1)
{
if(oldX == -1)
{
oldX = x;
oldY = y;
}
roznicaX = x - oldX;
roznicaY = y - oldY;
oldX = x;
oldY = y;
printf("roznica x: %d, roznica y: %d\n", roznicaX, roznicaY);
wspX += roznicaX;
wspY += roznicaY;
rysujKolo();
}
else
{
oldX = -1;
oldY = -1;
}
break;
case Expose:
- rysujKolo();
+ rysujKolo();
break;
case KeyPress:
XCloseDisplay(mydisplay);
exit(0);
}
}
}
void rysujKolo()
{
XClearWindow(mydisplay, mywindow);
XSetForeground(mydisplay,mygc,mycolor.pixel);
XFillArc(mydisplay, mywindow, mygc, wspX-(100/2), wspY-(100/2), 100, 100, 0, 360*64);
}
int sprawdzPolozenieKursora(int x, int y)
{
if(abs(wspX-x) <= 50 && abs(wspY-y) <= 50)
return 1;
else
- return 0;
+ return 0;
+}
+
+void ustawWspolrzedne(char *wspolrzedne)
+{
+ char x[3];
+ char y[3];
+
+ substring(0, 3, wspolrzedne, x);
+ substring(3, 7, wspolrzedne, y);
+
+ wspX = atoi(x);
+ wspY = atoi(y);
}
+
+void ustawDanePoczatkowe(char *dane)
+{
+ printf("dane: %s", dane);
+ char id[3];
+ char wspolrzedneXY[6];
+
+ substring(0, 3, dane, id);
+ substring(3, 10, dane, wspolrzedneXY);
+
+ idZawodnika = atoi(id);
+ ustawWspolrzedne(wspolrzedneXY);
+}
+
+char *substring(int start, int stop, char *src, char *dst)
+{
+ int count = stop - start;
+ sprintf(dst, "%.*s", count, src + start);
+ return dst;
+}
+
diff --git a/server.c b/server.c
index fbbe0a2..8b5ed7a 100644
--- a/server.c
+++ b/server.c
@@ -1,44 +1,110 @@
#define _REENTRANT
#include <pthread.h>
#include <stdio.h>
+#include <stdlib.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <signal.h>
+typedef struct
+{
+ int id;
+ struct sockaddr adres;
+} zawodnik;
+
void *wyslijPozycjeKola();
+void wyslijDanePoczatkowe(struct sockaddr *adres);
+char *zwrocWspolrzedne();
+int wspX, wspY;
+int sd, clen;
+char *zera[3] = { "", "0", "00" };
+int idZawodnika;
+//zawodnik tablicaZawodnikow[999];
int main()
{
- int sd,buff,clen;
- char *data = (char*) calloc(1, sizeof(char));
- pthread_t tid;
+ char *data = (char*) calloc(1, sizeof(char));
+ pthread_t tid;
struct sockaddr_in sad,cad;
signal(SIGHUP,SIG_IGN);
sd=socket(AF_INET,SOCK_DGRAM,0);
- bzero((char *) &sad, sizeof(sad));
+ //bzero((char *) &sad, sizeof(sad));
sad.sin_family=AF_INET;
sad.sin_addr.s_addr=htonl(INADDR_ANY);
sad.sin_port=htons((ushort) 5000);
bind(sd,(struct sockaddr *) &sad,sizeof(sad));
clen=sizeof(cad);
+ idZawodnika = 0;
+ wspX = 100-(15/2);
+ wspY = 200-(15/2);
+
//pthread_create(&tid,NULL,wyslijPozycjeKola,NULL);
while (1)
{
- recvfrom(sd,(char *) &buff,sizeof(int),0,(struct sockaddr *) &cad,&clen);
- buff=ntohl(buff);
+ recvfrom(sd, data,sizeof(data),0,(struct sockaddr *) &cad,&clen);
- buff=htonl(buff);
- sendto(sd,(char *) &buff,sizeof(int),0,(struct sockaddr *) &cad,clen);
+ if(strcmp(data, "init") == 0)
+ {
+ wyslijDanePoczatkowe((struct sockaddr *) &cad);
+ }
+ else
+ {
+ sendto(sd, data,sizeof(data),0,(struct sockaddr *) &cad,clen);
+ }
}
return 0;
}
void *wyslijPozycjeKola()
{
return;
}
+
+void wyslijDanePoczatkowe(struct sockaddr *cad)
+{
+ char *danePoczatkowe = (char*) calloc(1, sizeof(char));
+
+ if(idZawodnika < 10)
+ sprintf(danePoczatkowe, "%s%d%s", zera[2], idZawodnika, zwrocWspolrzedne());
+ else if(idZawodnika < 100 && idZawodnika > 9)
+ sprintf(danePoczatkowe, "%s%d%s", zera[1], idZawodnika, zwrocWspolrzedne());
+ else
+ sprintf(danePoczatkowe, "%s%d%s", zera[0], idZawodnika, zwrocWspolrzedne());
+
+ printf("dane poczatkowe: %s\n", danePoczatkowe);
+
+ sendto(sd, danePoczatkowe, 10, 0, cad, clen);
+
+ idZawodnika++;
+}
+
+char *zwrocWspolrzedne()
+{
+ char *wspolrzedne = (char*) calloc(1, sizeof(char));
+ char *wspolrzednaX = (char*) calloc(1, sizeof(char));
+ char *wspolrzednaY = (char*) calloc(1, sizeof(char));
+
+ if(wspX < 10)
+ sprintf(wspolrzednaX, "%s%d", zera[2], wspX);
+ else if(wspX < 100 && wspX > 9)
+ sprintf(wspolrzednaX, "%s%d", zera[1], wspX);
+ else
+ sprintf(wspolrzednaX, "%s%d", zera[0], wspX);
+
+ if(wspY < 10)
+ sprintf(wspolrzednaY, "%s%d", zera[2], wspY);
+ else if(wspY < 100 && wspY > 9)
+ sprintf(wspolrzednaY, "%s%d", zera[1], wspY);
+ else
+ sprintf(wspolrzednaY, "%s%d", zera[0], wspY);
+
+ sprintf(wspolrzedne, "%s%s", wspolrzednaX, wspolrzednaY);
+
+ return wspolrzedne;
+}
+
|
drzazga/wspolbiezne_projekt
|
627cbc6dad7175fa5ae0d83810de6b5ac59cde10
|
dodano plik servera, mozna mozna przesuwac kolko
|
diff --git a/.gitignore b/.gitignore
index 8ffea3f..ca59c93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
*~
a.out
-projekt
+server
+klient
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..bb21f14
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+CFLAGS=-L/usr/X11R6/lib -lX11 -lpthread
+
+programy= klient server
+
+all: klient server
+
+clean :
+ rm -f *~ \#* $(programy)
diff --git a/bsd.c b/bsd.c
new file mode 100644
index 0000000..dcb3640
--- /dev/null
+++ b/bsd.c
@@ -0,0 +1,37 @@
+#include <stdio.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <signal.h>
+
+int main(int argc, char* argv[])
+{
+ int sd,buff=3,clen;
+ struct sockaddr_in sad, cad;
+
+ buff = atoi(argv[1]);
+
+ sd=socket(AF_INET,SOCK_DGRAM,0);
+ bzero(&sad, sizeof(sad));
+ sad.sin_family=AF_INET;
+ sad.sin_addr.s_addr=inet_addr("127.0.0.1");
+ sad.sin_port=htons((ushort) 5000);
+ bind(sd, (struct sockaddr *) &sad,sizeof(sad));
+ clen = sizeof(cad);
+
+
+
+ while(1)
+ {
+ buff=htonl(buff);
+ sendto(sd, &buff, sizeof(int), 0, (struct sockaddr *) &sad, clen);
+ buff = 0;
+
+ recvfrom(sd, &buff, sizeof(int), 0, (struct sockaddr *) &cad, &clen);
+ buff=ntohl(buff);
+
+ printf("Mamy: %d\n", buff);
+ }
+ return 0;
+}
+
diff --git a/klient.c b/klient.c
new file mode 100644
index 0000000..04068ea
--- /dev/null
+++ b/klient.c
@@ -0,0 +1,125 @@
+#include <X11/Xlib.h>
+#include <X11/X.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+Display *mydisplay;
+Window mywindow;
+XSetWindowAttributes mywindowattributes;
+XGCValues mygcvalues;
+GC mygc;
+Visual *myvisual;
+int mydepth;
+int myscreen;
+int xw, yw;
+int x,y;
+Colormap mycolormap;
+XColor mycolor, dummy;
+XEvent myevent;
+unsigned long i;
+int wspX, wspY;
+int oldX, oldY;
+int roznicaX, roznicaY;
+
+void rysujKolo();
+int sprawdzPolozenieKursora(int x, int y);
+
+int main()
+{
+ mydisplay = XOpenDisplay("");
+ myscreen = DefaultScreen(mydisplay);
+ myvisual = DefaultVisual(mydisplay,myscreen);
+ mydepth = DefaultDepth(mydisplay,myscreen);
+ mywindowattributes.background_pixel = XWhitePixel(mydisplay,myscreen);
+ mywindowattributes.override_redirect = False;
+
+ mywindow = XCreateWindow(mydisplay,XRootWindow(mydisplay,myscreen),
+ 100,100,500,500,0,mydepth,InputOutput,
+ myvisual,CWBackPixel|CWOverrideRedirect,
+ &mywindowattributes);
+ XSelectInput(mydisplay,mywindow,ExposureMask|KeyPressMask|ButtonPressMask|ButtonMotionMask|ButtonReleaseMask);
+ mycolormap = DefaultColormap(mydisplay,myscreen);
+ XMapWindow(mydisplay,mywindow);
+ mygc = DefaultGC(mydisplay,myscreen);
+
+ mycolormap = DefaultColormap(mydisplay,myscreen);
+ XAllocNamedColor(mydisplay,mycolormap,"green",&mycolor,&dummy);
+
+ wspX = 200-(15/2);
+ wspY = 200-(15/2);
+ oldX = -1;
+ oldY = -1;
+
+ while (1)
+ {
+ XNextEvent(mydisplay,&myevent);
+ printf("event no. %5d\n",myevent.type);
+ switch (myevent.type)
+ {
+ case ButtonPress:
+ x = myevent.xmotion.x;
+ y = myevent.xmotion.y;
+
+ printf("nacisnieto przycisk x: %d y: %d\n", x, y);
+
+ break;
+
+ case ButtonRelease:
+ oldX = -1;
+ oldY = -1;
+ break;
+
+ case MotionNotify:
+ x = myevent.xmotion.x;
+ y = myevent.xmotion.y;
+
+ if(sprawdzPolozenieKursora(x, y) == 1)
+ {
+ if(oldX == -1)
+ {
+ oldX = x;
+ oldY = y;
+ }
+ roznicaX = x - oldX;
+ roznicaY = y - oldY;
+
+ oldX = x;
+ oldY = y;
+ printf("roznica x: %d, roznica y: %d\n", roznicaX, roznicaY);
+
+ wspX += roznicaX;
+ wspY += roznicaY;
+ rysujKolo();
+ }
+ else
+ {
+ oldX = -1;
+ oldY = -1;
+ }
+ break;
+
+ case Expose:
+ rysujKolo();
+ break;
+
+ case KeyPress:
+ XCloseDisplay(mydisplay);
+ exit(0);
+ }
+ }
+}
+
+void rysujKolo()
+{
+ XClearWindow(mydisplay, mywindow);
+ XSetForeground(mydisplay,mygc,mycolor.pixel);
+ XFillArc(mydisplay, mywindow, mygc, wspX-(100/2), wspY-(100/2), 100, 100, 0, 360*64);
+}
+
+int sprawdzPolozenieKursora(int x, int y)
+{
+ if(abs(wspX-x) <= 50 && abs(wspY-y) <= 50)
+ return 1;
+ else
+ return 0;
+}
diff --git a/projekt b/projekt
new file mode 100755
index 0000000..46fdd4d
Binary files /dev/null and b/projekt differ
diff --git a/projekt.c b/projekt.c
deleted file mode 100644
index 6d7296d..0000000
--- a/projekt.c
+++ /dev/null
@@ -1,80 +0,0 @@
-#include <X11/Xlib.h>
-#include <X11/X.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-Display *mydisplay;
-Window mywindow;
-XSetWindowAttributes mywindowattributes;
-XGCValues mygcvalues;
-GC mygc;
-Visual *myvisual;
-int mydepth;
-int myscreen;
-int xw, yw;
-int x,y;
-Colormap mycolormap;
-XColor mycolor, dummy;
-XEvent myevent;
-unsigned long i;
-
-main()
-{
- mydisplay = XOpenDisplay("");
- myscreen = DefaultScreen(mydisplay);
- myvisual = DefaultVisual(mydisplay,myscreen);
- mydepth = DefaultDepth(mydisplay,myscreen);
- mywindowattributes.background_pixel = XWhitePixel(mydisplay,myscreen);
- mywindowattributes.override_redirect = False;
-
- mywindow = XCreateWindow(mydisplay,XRootWindow(mydisplay,myscreen),
- 100,100,500,500,0,mydepth,InputOutput,
- myvisual,CWBackPixel|CWOverrideRedirect,
- &mywindowattributes);
- XSelectInput(mydisplay,mywindow,ExposureMask|KeyPressMask);
- mycolormap = DefaultColormap(mydisplay,myscreen);
- XMapWindow(mydisplay,mywindow);
- mygc = DefaultGC(mydisplay,myscreen);
-
- mycolormap = DefaultColormap(mydisplay,myscreen);
- XAllocNamedColor(mydisplay,mycolormap,"green",&mycolor,&dummy);
-
- while (1)
- {
- XNextEvent(mydisplay,&myevent);
- printf("event no. %5d\n",myevent.type);
- switch (myevent.type)
- {
- case MotionNotify:
- /* store the mouse button coordinates in 'int' variables. */
- /* also store the ID of the window on which the mouse was */
- /* pressed. */
- x = myevent.xmotion.x;
- y = myevent.xmotion.y;
- //the_win = an_event.xbutton.window;
-
- /* if the 1st mouse button was held during this event, draw a pixel */
- /* at the mouse pointer location. */
- if (myevent.xmotion.state & Button1Mask) {
- /* draw a pixel at the mouse position. */
- XDrawPoint(mydisplay, mywindow, mygc, x, y);
- }
- break;
-
- case Expose:
- XSetForeground(mydisplay,mygc,mycolor.pixel);
- //XFillRectangle(mydisplay,mywindow,mygc,100,100,300,300);
- XDrawArc(mydisplay, mywindow, mygc, 50-(15/2), 100-(15/2), 100, 100, 0, 360*64);
- //XDrawArc(mydisplay, mywindow, mygc, 100, 100, 50, 50, 0.0, 1);
- //XDrawLine(mydisplay,mywindow,mygc,100,400,400,100);
- XSetFunction(mydisplay,mygc,GXcopy);
- XFlush(mydisplay);
- break;
-
- case KeyPress:
- XCloseDisplay(mydisplay);
- exit(0);
- }
- }
-}
-
diff --git a/server.c b/server.c
new file mode 100644
index 0000000..fbbe0a2
--- /dev/null
+++ b/server.c
@@ -0,0 +1,44 @@
+#define _REENTRANT
+#include <pthread.h>
+#include <stdio.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <signal.h>
+
+void *wyslijPozycjeKola();
+
+int main()
+{
+ int sd,buff,clen;
+ char *data = (char*) calloc(1, sizeof(char));
+ pthread_t tid;
+ struct sockaddr_in sad,cad;
+
+ signal(SIGHUP,SIG_IGN);
+ sd=socket(AF_INET,SOCK_DGRAM,0);
+ bzero((char *) &sad, sizeof(sad));
+ sad.sin_family=AF_INET;
+ sad.sin_addr.s_addr=htonl(INADDR_ANY);
+ sad.sin_port=htons((ushort) 5000);
+ bind(sd,(struct sockaddr *) &sad,sizeof(sad));
+ clen=sizeof(cad);
+
+ //pthread_create(&tid,NULL,wyslijPozycjeKola,NULL);
+
+ while (1)
+ {
+ recvfrom(sd,(char *) &buff,sizeof(int),0,(struct sockaddr *) &cad,&clen);
+ buff=ntohl(buff);
+
+ buff=htonl(buff);
+ sendto(sd,(char *) &buff,sizeof(int),0,(struct sockaddr *) &cad,clen);
+ }
+
+ return 0;
+}
+
+void *wyslijPozycjeKola()
+{
+ return;
+}
|
drzazga/wspolbiezne_projekt
|
8b5ad7709e319baed2835ae8b42340d7a6400620
|
init commit
|
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8ffea3f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*~
+a.out
+projekt
+
diff --git a/projekt.c b/projekt.c
new file mode 100644
index 0000000..6d7296d
--- /dev/null
+++ b/projekt.c
@@ -0,0 +1,80 @@
+#include <X11/Xlib.h>
+#include <X11/X.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+Display *mydisplay;
+Window mywindow;
+XSetWindowAttributes mywindowattributes;
+XGCValues mygcvalues;
+GC mygc;
+Visual *myvisual;
+int mydepth;
+int myscreen;
+int xw, yw;
+int x,y;
+Colormap mycolormap;
+XColor mycolor, dummy;
+XEvent myevent;
+unsigned long i;
+
+main()
+{
+ mydisplay = XOpenDisplay("");
+ myscreen = DefaultScreen(mydisplay);
+ myvisual = DefaultVisual(mydisplay,myscreen);
+ mydepth = DefaultDepth(mydisplay,myscreen);
+ mywindowattributes.background_pixel = XWhitePixel(mydisplay,myscreen);
+ mywindowattributes.override_redirect = False;
+
+ mywindow = XCreateWindow(mydisplay,XRootWindow(mydisplay,myscreen),
+ 100,100,500,500,0,mydepth,InputOutput,
+ myvisual,CWBackPixel|CWOverrideRedirect,
+ &mywindowattributes);
+ XSelectInput(mydisplay,mywindow,ExposureMask|KeyPressMask);
+ mycolormap = DefaultColormap(mydisplay,myscreen);
+ XMapWindow(mydisplay,mywindow);
+ mygc = DefaultGC(mydisplay,myscreen);
+
+ mycolormap = DefaultColormap(mydisplay,myscreen);
+ XAllocNamedColor(mydisplay,mycolormap,"green",&mycolor,&dummy);
+
+ while (1)
+ {
+ XNextEvent(mydisplay,&myevent);
+ printf("event no. %5d\n",myevent.type);
+ switch (myevent.type)
+ {
+ case MotionNotify:
+ /* store the mouse button coordinates in 'int' variables. */
+ /* also store the ID of the window on which the mouse was */
+ /* pressed. */
+ x = myevent.xmotion.x;
+ y = myevent.xmotion.y;
+ //the_win = an_event.xbutton.window;
+
+ /* if the 1st mouse button was held during this event, draw a pixel */
+ /* at the mouse pointer location. */
+ if (myevent.xmotion.state & Button1Mask) {
+ /* draw a pixel at the mouse position. */
+ XDrawPoint(mydisplay, mywindow, mygc, x, y);
+ }
+ break;
+
+ case Expose:
+ XSetForeground(mydisplay,mygc,mycolor.pixel);
+ //XFillRectangle(mydisplay,mywindow,mygc,100,100,300,300);
+ XDrawArc(mydisplay, mywindow, mygc, 50-(15/2), 100-(15/2), 100, 100, 0, 360*64);
+ //XDrawArc(mydisplay, mywindow, mygc, 100, 100, 50, 50, 0.0, 1);
+ //XDrawLine(mydisplay,mywindow,mygc,100,400,400,100);
+ XSetFunction(mydisplay,mygc,GXcopy);
+ XFlush(mydisplay);
+ break;
+
+ case KeyPress:
+ XCloseDisplay(mydisplay);
+ exit(0);
+ }
+ }
+}
+
|
xenda/raphaelrb
|
1490a4d7c00bf9e216c683c5b4c67c922fcb5236
|
Fixed small typo
|
diff --git a/lib/app/helpers/raphael_helper.rb b/lib/app/helpers/raphael_helper.rb
index 66c4241..a675e6e 100644
--- a/lib/app/helpers/raphael_helper.rb
+++ b/lib/app/helpers/raphael_helper.rb
@@ -1,280 +1,276 @@
# Raphaelrb
module RaphaelHelper
def render_chart(dom_id,chart_title,type="line")
if type == "line"
js =<<CODE
<script type="text/javascript">
function widget_function_#{dom_id} () {
y1 = [], y2 = []
for (var i = 0; i < 7; i++) {
y1[i] = parseInt((Math.random() * 35));
y2[i] = parseInt((Math.random() * 35));
}
var r = Raphael("#{dom_id}");
r.g.txtattr.font = "16px 'Fontin Sans', Fontin-Sans, sans-serif";
r.g.text(300, 10, "#{chart_title}");
// var lines = r.g.linechart(30, 50, 500, 220, [[5, 10, 15, 20, 25, 30, 35],[5, 10, 15, 20, 25, 30,35]],[[12, 32, 23, 15, 17, 27, 22], [5, 7, 20, 24, 25, 30,32]], {nostroke: false, axis: "0 0 1 1", symbol: "o"}).hoverColumn(function () {
var lines = r.g.linechart(30, 50, 500, 220, [[5, 10, 15, 20, 25, 30, 35],[5, 10, 15, 20, 25, 30,35]],[y1, y2], {nostroke: false, axis: "0 0 1 1", symbol: "o"}).hoverColumn(function () {
this.tags = r.set();
for (var i = 0, ii = this.y.length; i < ii; i++) {
this.tags.push(r.g.tag(this.x, this.y[i], this.values[i], 160, 10).insertBefore(this).attr([{fill: "#ff3"}, {fill: this.symbols[i].attr("fill")}]));
}
}, function () {
this.tags && this.tags.remove();
});
lines.lines[0].animate({"stroke-width": 3}, 1000);
lines.lines[1].animate({"stroke-width": 4}, 2000);
// lines.symbols[0][1].animate({fill: "#f00"}, 1000);
// lines.symbols[1][1].animate({fill: "#fF0"}, 1000);
/// RAPHAEL CHARTS
}
</script>
CODE
elsif type == "carrusel"
js =<<CODE
<script type="text/javascript">
function widget_function_#{dom_id} () {
var r = Raphael("#{dom_id}", 620, 250),
e = [],
clr = [],
months = ["Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Setiembre", "Octubre", "Noviembre", "Diciembre"],
values = [],
now = 0,
month = r.text(310, 27, months[now]).attr({stroke: "none", "font": '15px "Fontin Sans", Fontin-Sans, Arial'}),
rightc = r.circle(364, 27, 10).attr({fill: "#fff"}),
right = r.path("M360,22l10,5 -10,5z").attr({fill: "#000"}),
leftc = r.circle(256, 27, 10).attr({fill: "#fff"}),
left = r.path("M260,22l-10,5 10,5z").attr({fill: "#000"}),
c = r.path("M0,0").attr({fill: "none", "stroke-width": 3}),
bg = r.path("M0,0").attr({stroke: "none", opacity: .3}),
dotsy = [];
function randomPath(length, j) {
var path = "",
x = 10,
y = 0;
dotsy[j] = dotsy[j] || [];
for (var i = 0; i < length; i++) {
dotsy[j][i] = Math.round(Math.random() * 200);
if (i) {
path += "C" + [x + 10, y, (x += 20) - 10, (y = 240 - dotsy[j][i]), x, y];
} else {
path += "M" + [10, (y = 240 - dotsy[j][i])];
}
}
return path;
}
for (var i = 0; i < 12; i++) {
values[i] = randomPath(30, i);
clr[i] = Raphael.getColor(1);
}
c.attr({path: values[0], stroke: clr[0]});
bg.attr({path: values[0] + "L590,250 10,250z", fill: clr[0]});
month.attr({fill: clr[0]});
var animation = function () {
var time = 500;
if (now == 12) {
now = 0;
}
if (now == -1) {
now = 11;
}
c.animate({path: values[now], stroke: clr[now]}, time, "<>");
bg.animate({path: values[now] + "L590,250 10,250z", fill: clr[now]}, time, "<>");
month.attr({text: months[now], fill: clr[now]});
};
rightc.node.onclick = right.node.onclick = function () {
now++;
animation();
};
leftc.node.onclick = left.node.onclick = function () {
now--;
animation();
};
document.onclicks = function () {
var path = r.parsePathString(values[now]),
x = path[1][5] - 30,
y = path[1][6];
path = r.pathToRelative(path);
path[1][0] = "m";
path[1].splice(1, 5, 0);
var newvalue = Math.round(Math.random() * 200) - 100;
path = path.join(",") + "c10,0 10," + newvalue + " 20," + newvalue;
c.animate({path: path}, 2000);
r.safari();
};
};
</script>
CODE
else
js =<<CODE
<script type="text/javascript">
-
-
-
-
Raphael.fn.drawGrid = function (x, y, w, h, wv, hv, color) {
color = color || "#000";
var path = ["M", x, y, "L", x + w, y, x + w, y + h, x, y + h, x, y],
rowHeight = h / hv,
columnWidth = w / wv;
for (var i = 1; i < hv; i++) {
path = path.concat(["M", x, y + i * rowHeight, "L", x + w, y + i * rowHeight]);
}
for (var i = 1; i < wv; i++) {
path = path.concat(["M", x + i * columnWidth, y, "L", x + i * columnWidth, y + h]);
}
return this.path(path.join(",")).attr({stroke: color});
};
$(document).ready(function(){
$("#data").css({
position: "absolute",
left: "-9999em",
top: "-9999em"
});
});
function widget_function_#{dom_id} () {
// Grab the data
var labels = [],
data = [];
$("#data tfoot th").each(function () {
labels.push($(this).html());
});
$("#data tbody td").each(function () {
data.push($(this).html());
});
// Draw
var width = 800,
height = 250,
leftgutter = 30,
bottomgutter = 20,
topgutter = 20,
colorhue = .6 || Math.random(),
color = "hsb(" + [colorhue, 1, .75] + ")",
r = Raphael("#{dom_id}", width, height),
txt = {font: '12px Fontin-Sans, Arial', fill: "#fff"},
txt1 = {font: '10px Fontin-Sans, Arial', fill: "#fff"},
txt2 = {font: '12px Fontin-Sans, Arial', fill: "#000"},
X = (width - leftgutter) / labels.length,
max = Math.max.apply(Math, data),
Y = (height - bottomgutter - topgutter) / max;
r.drawGrid(leftgutter + X * .5, topgutter, width - leftgutter - X, height - topgutter - bottomgutter, 10, 10, "#333");
var path = r.path().attr({stroke: color, "stroke-width": 4, "stroke-linejoin": "round"}),
bgp = r.path().attr({stroke: "none", opacity: .3, fill: color}).moveTo(leftgutter + X * .5, height - bottomgutter),
frame = r.rect(10, 10, 100, 40, 5).attr({fill: "#000", stroke: "#474747", "stroke-width": 2}).hide(),
label = [],
is_label_visible = false,
leave_timer,
blanket = r.set();
label[0] = r.text(60, 10, "24 clicks").attr(txt).hide();
label[1] = r.text(60, 40, "22 Octubre 2009").attr(txt1).attr({fill: color}).hide();
for (var i = 0, ii = labels.length; i < ii; i++) {
var y = Math.round(height - bottomgutter - Y * data[i]),
x = Math.round(leftgutter + X * (i + .5)),
t = r.text(x, height - 6, labels[i]).attr(txt).toBack();
bgp[i == 0 ? "lineTo" : "cplineTo"](x, y, 10);
path[i == 0 ? "moveTo" : "cplineTo"](x, y, 10);
var dot = r.circle(x, y, 5).attr({fill: color, stroke: "#000"});
blanket.push(r.rect(leftgutter + X * i, 0, X, height - bottomgutter).attr({stroke: "none", fill: "#fff", opacity: 0}));
var rect = blanket[blanket.length - 1];
(function (x, y, data, lbl, dot) {
var timer, i = 0;
$(rect.node).hover(function () {
clearTimeout(leave_timer);
var newcoord = {x: +x + 7.5, y: y - 19};
if (newcoord.x + 100 > width) {
newcoord.x -= 114;
}
frame.show().animate({x: newcoord.x, y: newcoord.y}, 200 * is_label_visible);
- label[0].attr({text: data + " hit" + ((data % 10 == 1) ? "" : "s")}).show().animateWith(frame, {x: +newcoord.x + 50, y: +newcoord.y + 12}, 200 * is_label_visible);
+ label[0].attr({text: data + " click" + ((data % 10 == 1) ? "" : "s")}).show().animateWith(frame, {x: +newcoord.x + 50, y: +newcoord.y + 12}, 200 * is_label_visible);
label[1].attr({text: lbl + " Octubre 2009"}).show().animateWith(frame, {x: +newcoord.x + 50, y: +newcoord.y + 27}, 200 * is_label_visible);
dot.attr("r", 7);
is_label_visible = true;
}, function () {
dot.attr("r", 5);
leave_timer = setTimeout(function () {
frame.hide();
label[0].hide();
label[1].hide();
is_label_visible = false;
// r.safari();
}, 1);
});
})(x, y, data[i], labels[i], dot);
}
bgp.lineTo(x, height - bottomgutter).andClose();
frame.toFront();
label[0].toFront();
label[1].toFront();
blanket.toFront();
};
</script>
CODE
end
load_code =<<CODE
<script type="text/javascript">
//
// if (window.addEventListener) // W3C standard
// {
// window.addEventListener('load', widget_function, false); // NB **not** 'onload'
// }
// else if (window.attachEvent) // Microsoft
// {
// window.attachEvent('onload', widget_function);
// }
//
$(window).load(widget_function_#{dom_id} );
</script>
CODE
content_for :javascript do
js + load_code
end
end
end
\ No newline at end of file
|
xenda/raphaelrb
|
7ac8123955ef2146442fcb2f71d4ad2a34078483
|
Added initial suppor through helper to Raphael. TODO: Create proper object approach
|
diff --git a/MIT-LICENSE b/MIT-LICENSE
new file mode 100644
index 0000000..9376605
--- /dev/null
+++ b/MIT-LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2009 [name of plugin creator]
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README b/README
new file mode 100644
index 0000000..6316c7a
--- /dev/null
+++ b/README
@@ -0,0 +1,13 @@
+Raphaelrb
+=========
+
+Introduction goes here.
+
+
+Example
+=======
+
+Example goes here.
+
+
+Copyright (c) 2009 [name of plugin creator], released under the MIT license
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..f05b617
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,23 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the raphaelrb plugin.'
+Rake::TestTask.new(:test) do |t|
+ t.libs << 'lib'
+ t.libs << 'test'
+ t.pattern = 'test/**/*_test.rb'
+ t.verbose = true
+end
+
+desc 'Generate documentation for the raphaelrb plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+ rdoc.rdoc_dir = 'rdoc'
+ rdoc.title = 'Raphaelrb'
+ rdoc.options << '--line-numbers' << '--inline-source'
+ rdoc.rdoc_files.include('README')
+ rdoc.rdoc_files.include('lib/**/*.rb')
+end
diff --git a/init.rb b/init.rb
new file mode 100644
index 0000000..6e0912c
--- /dev/null
+++ b/init.rb
@@ -0,0 +1,2 @@
+# Include hook code here
+require 'raphaelrb'
\ No newline at end of file
diff --git a/install.rb b/install.rb
new file mode 100644
index 0000000..f7732d3
--- /dev/null
+++ b/install.rb
@@ -0,0 +1 @@
+# Install hook code here
diff --git a/lib/app/helpers/raphael_helper.rb b/lib/app/helpers/raphael_helper.rb
new file mode 100644
index 0000000..66c4241
--- /dev/null
+++ b/lib/app/helpers/raphael_helper.rb
@@ -0,0 +1,280 @@
+# Raphaelrb
+module RaphaelHelper
+
+ def render_chart(dom_id,chart_title,type="line")
+
+ if type == "line"
+
+ js =<<CODE
+ <script type="text/javascript">
+
+ function widget_function_#{dom_id} () {
+
+ y1 = [], y2 = []
+ for (var i = 0; i < 7; i++) {
+
+ y1[i] = parseInt((Math.random() * 35));
+ y2[i] = parseInt((Math.random() * 35));
+
+ }
+
+ var r = Raphael("#{dom_id}");
+ r.g.txtattr.font = "16px 'Fontin Sans', Fontin-Sans, sans-serif";
+
+ r.g.text(300, 10, "#{chart_title}");
+
+ // var lines = r.g.linechart(30, 50, 500, 220, [[5, 10, 15, 20, 25, 30, 35],[5, 10, 15, 20, 25, 30,35]],[[12, 32, 23, 15, 17, 27, 22], [5, 7, 20, 24, 25, 30,32]], {nostroke: false, axis: "0 0 1 1", symbol: "o"}).hoverColumn(function () {
+
+ var lines = r.g.linechart(30, 50, 500, 220, [[5, 10, 15, 20, 25, 30, 35],[5, 10, 15, 20, 25, 30,35]],[y1, y2], {nostroke: false, axis: "0 0 1 1", symbol: "o"}).hoverColumn(function () {
+
+ this.tags = r.set();
+ for (var i = 0, ii = this.y.length; i < ii; i++) {
+ this.tags.push(r.g.tag(this.x, this.y[i], this.values[i], 160, 10).insertBefore(this).attr([{fill: "#ff3"}, {fill: this.symbols[i].attr("fill")}]));
+ }
+ }, function () {
+ this.tags && this.tags.remove();
+ });
+ lines.lines[0].animate({"stroke-width": 3}, 1000);
+ lines.lines[1].animate({"stroke-width": 4}, 2000);
+ // lines.symbols[0][1].animate({fill: "#f00"}, 1000);
+ // lines.symbols[1][1].animate({fill: "#fF0"}, 1000);
+
+ /// RAPHAEL CHARTS
+ }
+
+ </script>
+
+
+CODE
+
+ elsif type == "carrusel"
+
+ js =<<CODE
+
+ <script type="text/javascript">
+
+ function widget_function_#{dom_id} () {
+
+ var r = Raphael("#{dom_id}", 620, 250),
+ e = [],
+ clr = [],
+ months = ["Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Setiembre", "Octubre", "Noviembre", "Diciembre"],
+ values = [],
+ now = 0,
+ month = r.text(310, 27, months[now]).attr({stroke: "none", "font": '15px "Fontin Sans", Fontin-Sans, Arial'}),
+ rightc = r.circle(364, 27, 10).attr({fill: "#fff"}),
+ right = r.path("M360,22l10,5 -10,5z").attr({fill: "#000"}),
+ leftc = r.circle(256, 27, 10).attr({fill: "#fff"}),
+ left = r.path("M260,22l-10,5 10,5z").attr({fill: "#000"}),
+ c = r.path("M0,0").attr({fill: "none", "stroke-width": 3}),
+ bg = r.path("M0,0").attr({stroke: "none", opacity: .3}),
+ dotsy = [];
+ function randomPath(length, j) {
+ var path = "",
+ x = 10,
+ y = 0;
+ dotsy[j] = dotsy[j] || [];
+ for (var i = 0; i < length; i++) {
+ dotsy[j][i] = Math.round(Math.random() * 200);
+ if (i) {
+ path += "C" + [x + 10, y, (x += 20) - 10, (y = 240 - dotsy[j][i]), x, y];
+ } else {
+ path += "M" + [10, (y = 240 - dotsy[j][i])];
+ }
+ }
+ return path;
+ }
+ for (var i = 0; i < 12; i++) {
+ values[i] = randomPath(30, i);
+ clr[i] = Raphael.getColor(1);
+ }
+ c.attr({path: values[0], stroke: clr[0]});
+ bg.attr({path: values[0] + "L590,250 10,250z", fill: clr[0]});
+ month.attr({fill: clr[0]});
+ var animation = function () {
+ var time = 500;
+ if (now == 12) {
+ now = 0;
+ }
+ if (now == -1) {
+ now = 11;
+ }
+ c.animate({path: values[now], stroke: clr[now]}, time, "<>");
+ bg.animate({path: values[now] + "L590,250 10,250z", fill: clr[now]}, time, "<>");
+ month.attr({text: months[now], fill: clr[now]});
+ };
+ rightc.node.onclick = right.node.onclick = function () {
+ now++;
+ animation();
+ };
+ leftc.node.onclick = left.node.onclick = function () {
+ now--;
+ animation();
+ };
+ document.onclicks = function () {
+ var path = r.parsePathString(values[now]),
+ x = path[1][5] - 30,
+ y = path[1][6];
+ path = r.pathToRelative(path);
+ path[1][0] = "m";
+ path[1].splice(1, 5, 0);
+ var newvalue = Math.round(Math.random() * 200) - 100;
+ path = path.join(",") + "c10,0 10," + newvalue + " 20," + newvalue;
+ c.animate({path: path}, 2000);
+ r.safari();
+ };
+
+ };
+
+ </script>
+
+CODE
+
+ else
+
+ js =<<CODE
+
+ <script type="text/javascript">
+
+
+
+
+
+ Raphael.fn.drawGrid = function (x, y, w, h, wv, hv, color) {
+ color = color || "#000";
+ var path = ["M", x, y, "L", x + w, y, x + w, y + h, x, y + h, x, y],
+ rowHeight = h / hv,
+ columnWidth = w / wv;
+ for (var i = 1; i < hv; i++) {
+ path = path.concat(["M", x, y + i * rowHeight, "L", x + w, y + i * rowHeight]);
+ }
+ for (var i = 1; i < wv; i++) {
+ path = path.concat(["M", x + i * columnWidth, y, "L", x + i * columnWidth, y + h]);
+ }
+ return this.path(path.join(",")).attr({stroke: color});
+ };
+
+ $(document).ready(function(){
+
+ $("#data").css({
+ position: "absolute",
+ left: "-9999em",
+ top: "-9999em"
+ });
+
+ });
+
+ function widget_function_#{dom_id} () {
+ // Grab the data
+ var labels = [],
+ data = [];
+ $("#data tfoot th").each(function () {
+ labels.push($(this).html());
+ });
+ $("#data tbody td").each(function () {
+ data.push($(this).html());
+ });
+
+ // Draw
+ var width = 800,
+ height = 250,
+ leftgutter = 30,
+ bottomgutter = 20,
+ topgutter = 20,
+ colorhue = .6 || Math.random(),
+ color = "hsb(" + [colorhue, 1, .75] + ")",
+ r = Raphael("#{dom_id}", width, height),
+ txt = {font: '12px Fontin-Sans, Arial', fill: "#fff"},
+ txt1 = {font: '10px Fontin-Sans, Arial', fill: "#fff"},
+ txt2 = {font: '12px Fontin-Sans, Arial', fill: "#000"},
+ X = (width - leftgutter) / labels.length,
+ max = Math.max.apply(Math, data),
+ Y = (height - bottomgutter - topgutter) / max;
+ r.drawGrid(leftgutter + X * .5, topgutter, width - leftgutter - X, height - topgutter - bottomgutter, 10, 10, "#333");
+ var path = r.path().attr({stroke: color, "stroke-width": 4, "stroke-linejoin": "round"}),
+ bgp = r.path().attr({stroke: "none", opacity: .3, fill: color}).moveTo(leftgutter + X * .5, height - bottomgutter),
+ frame = r.rect(10, 10, 100, 40, 5).attr({fill: "#000", stroke: "#474747", "stroke-width": 2}).hide(),
+ label = [],
+ is_label_visible = false,
+ leave_timer,
+ blanket = r.set();
+ label[0] = r.text(60, 10, "24 clicks").attr(txt).hide();
+ label[1] = r.text(60, 40, "22 Octubre 2009").attr(txt1).attr({fill: color}).hide();
+
+ for (var i = 0, ii = labels.length; i < ii; i++) {
+ var y = Math.round(height - bottomgutter - Y * data[i]),
+ x = Math.round(leftgutter + X * (i + .5)),
+ t = r.text(x, height - 6, labels[i]).attr(txt).toBack();
+ bgp[i == 0 ? "lineTo" : "cplineTo"](x, y, 10);
+ path[i == 0 ? "moveTo" : "cplineTo"](x, y, 10);
+ var dot = r.circle(x, y, 5).attr({fill: color, stroke: "#000"});
+ blanket.push(r.rect(leftgutter + X * i, 0, X, height - bottomgutter).attr({stroke: "none", fill: "#fff", opacity: 0}));
+ var rect = blanket[blanket.length - 1];
+ (function (x, y, data, lbl, dot) {
+ var timer, i = 0;
+ $(rect.node).hover(function () {
+ clearTimeout(leave_timer);
+ var newcoord = {x: +x + 7.5, y: y - 19};
+ if (newcoord.x + 100 > width) {
+ newcoord.x -= 114;
+ }
+ frame.show().animate({x: newcoord.x, y: newcoord.y}, 200 * is_label_visible);
+ label[0].attr({text: data + " hit" + ((data % 10 == 1) ? "" : "s")}).show().animateWith(frame, {x: +newcoord.x + 50, y: +newcoord.y + 12}, 200 * is_label_visible);
+ label[1].attr({text: lbl + " Octubre 2009"}).show().animateWith(frame, {x: +newcoord.x + 50, y: +newcoord.y + 27}, 200 * is_label_visible);
+ dot.attr("r", 7);
+ is_label_visible = true;
+ }, function () {
+ dot.attr("r", 5);
+ leave_timer = setTimeout(function () {
+ frame.hide();
+ label[0].hide();
+ label[1].hide();
+ is_label_visible = false;
+ // r.safari();
+ }, 1);
+ });
+ })(x, y, data[i], labels[i], dot);
+ }
+ bgp.lineTo(x, height - bottomgutter).andClose();
+ frame.toFront();
+ label[0].toFront();
+ label[1].toFront();
+ blanket.toFront();
+ };
+
+ </script>
+
+
+CODE
+
+ end
+
+ load_code =<<CODE
+
+ <script type="text/javascript">
+ //
+ // if (window.addEventListener) // W3C standard
+ // {
+ // window.addEventListener('load', widget_function, false); // NB **not** 'onload'
+ // }
+ // else if (window.attachEvent) // Microsoft
+ // {
+ // window.attachEvent('onload', widget_function);
+ // }
+ //
+ $(window).load(widget_function_#{dom_id} );
+
+ </script>
+
+
+
+CODE
+
+ content_for :javascript do
+ js + load_code
+ end
+
+ end
+
+
+end
\ No newline at end of file
diff --git a/lib/raphaelrb.rb b/lib/raphaelrb.rb
new file mode 100644
index 0000000..e258022
--- /dev/null
+++ b/lib/raphaelrb.rb
@@ -0,0 +1,6 @@
+%w{ models controllers helpers }.each do |dir|
+ path = File.join(File.dirname(__FILE__), 'app', dir)
+ $LOAD_PATH << path
+ ActiveSupport::Dependencies.load_paths << path
+ ActiveSupport::Dependencies.load_once_paths.delete(path)
+end
\ No newline at end of file
diff --git a/tasks/raphaelrb_tasks.rake b/tasks/raphaelrb_tasks.rake
new file mode 100644
index 0000000..7d48f24
--- /dev/null
+++ b/tasks/raphaelrb_tasks.rake
@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :raphaelrb do
+# # Task goes here
+# end
diff --git a/test/raphaelrb_test.rb b/test/raphaelrb_test.rb
new file mode 100644
index 0000000..059744a
--- /dev/null
+++ b/test/raphaelrb_test.rb
@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+include RaphaelHelper
+
+class RaphaelHelperTest < Test::Unit::TestCase
+ def test_tweet
+ assert_equal true, true #TBI
+ end
+end
\ No newline at end of file
diff --git a/test/test_helper.rb b/test/test_helper.rb
new file mode 100644
index 0000000..cf148b8
--- /dev/null
+++ b/test/test_helper.rb
@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'active_support'
+require 'active_support/test_case'
\ No newline at end of file
diff --git a/uninstall.rb b/uninstall.rb
new file mode 100644
index 0000000..9738333
--- /dev/null
+++ b/uninstall.rb
@@ -0,0 +1 @@
+# Uninstall hook code here
|
cstim/carcomm
|
ecbdc44689ce0ad1bbba9dbe121def667f081c31
|
cleanup
|
diff --git a/webapp/config/database.yml b/webapp/config/database.yml
index 93bbfb6..20595e5 100644
--- a/webapp/config/database.yml
+++ b/webapp/config/database.yml
@@ -1,26 +1,22 @@
# SQLite version 3.x
# gem install sqlite3
development:
adapter: sqlite3
database: db/development.sqlite3
pool: 5
timeout: 5000
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
adapter: sqlite3
database: db/test.sqlite3
pool: 5
timeout: 5000
production:
adapter: mysql
encoding: utf8
- database: db17573_1
- username: db17573_1
- password: E9vUE7STJG
- host: mysql4.cstim.de
pool: 5
timeout: 5000
|
cstim/carcomm
|
b4fa0d356152e7dabf43fe44e88f4fab496364c3
|
Prepare for bundler deployment
|
diff --git a/ftp-command.txt b/ftp-command.txt
index e4f79dd..e43f9d2 100644
--- a/ftp-command.txt
+++ b/ftp-command.txt
@@ -1,49 +1,49 @@
# Local directory is carcomm/
lftp [email protected]
cd webapps/
cd carcomm/
-mirror -R -x .git -x '.*~' -x '.*\.log' -x environment.rb -n .
+mirror -R -x .git -x '.*~' -x '.*\.log' -x development.sqlite3 -n .
# -x REGEX - to exclude REGEX from transfer
# -n - to transfer only newer files
# -R - Reverse mirror to transfer in upload direction
# WATCH OUT: config/environment.rb must have uncommented the line
# RAILS_GEM_VERSION = '2.2.2' on the server, otherwise the server
# won't have the correct gem versions.
ssh [email protected]
# To force rails to reload the files: Put a file "restart.txt" in
# tmp/, i.e. /webapps/carcomm/tmp
# Datenbank von Duplikaten befreien - Alle Zeilen abfragen, die
# duplizierte times haben:
select distinct slices.id, slices.time, slices.instanceid from slices, slices as b where slices.time = b.time and slices.id <> b.id;
# Von Duplikat-Zeilen jeweils nur eine anzeigen - die kann man dann
# alle zum Löschen auswählen, solange bis keine derartigen Zeilen mehr
# übrig sind:
select distinct slices.id, slices.time from slices, slices as b where slices.time = b.time and slices.id <> b.id GROUP BY slices.time HAVING COUNT(*) > 1;
Von Timo:
Delete from slices where id in(
Select min(id) as id, time from slices group by time having count(*) > 1
)
# ############################################################
Android installieren:
# Switch the Vodafone 845 for linux
usb_modeswitch -v 0x12d1 -p 0x1031 -s 20 -M "55534243123456780600000080000601000000000000000000000000000000"
cd $HOME/android-sdk-linux_86/platform-tools
./adb -d uninstall de.cstimming.konphidroid
./adb -d install -r ~/org/carcomm/konphidroid/bin/konphidroid.apk
diff --git a/webapp/.gitignore b/webapp/.gitignore
index 0902f3d..4d2e8c2 100644
--- a/webapp/.gitignore
+++ b/webapp/.gitignore
@@ -1,6 +1,5 @@
*~
-log/development.log
.bundle
db/*.sqlite3
log/*.log
tmp/
diff --git a/webapp/Gemfile b/webapp/Gemfile
index 53c7bad..9c98a2d 100644
--- a/webapp/Gemfile
+++ b/webapp/Gemfile
@@ -1,34 +1,35 @@
source 'http://rubygems.org'
gem 'rails', '3.0.4'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
+gem 'mysql'
gem 'sqlite3'
source 'http://gemcutter.org'
gem 'will_paginate', '3.0.pre2'
# Use unicorn as the web server
# gem 'unicorn'
# Deploy with Capistrano
# gem 'capistrano'
# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
# gem 'ruby-debug'
# gem 'ruby-debug19'
# Bundle the extra gems:
# gem 'bj'
# gem 'nokogiri'
# gem 'sqlite3-ruby', :require => 'sqlite3'
# gem 'aws-s3', :require => 'aws/s3'
# Bundle gems for the local environment. Make sure to
# put test-only gems in this group so their generators
# and rake tasks are available in development mode:
# group :development, :test do
# gem 'webrat'
# end
diff --git a/webapp/Gemfile.lock b/webapp/Gemfile.lock
new file mode 100644
index 0000000..311f87c
--- /dev/null
+++ b/webapp/Gemfile.lock
@@ -0,0 +1,78 @@
+GEM
+ remote: http://rubygems.org/
+ remote: http://gemcutter.org/
+ specs:
+ abstract (1.0.0)
+ actionmailer (3.0.4)
+ actionpack (= 3.0.4)
+ mail (~> 2.2.15)
+ actionpack (3.0.4)
+ activemodel (= 3.0.4)
+ activesupport (= 3.0.4)
+ builder (~> 2.1.2)
+ erubis (~> 2.6.6)
+ i18n (~> 0.4)
+ rack (~> 1.2.1)
+ rack-mount (~> 0.6.13)
+ rack-test (~> 0.5.7)
+ tzinfo (~> 0.3.23)
+ activemodel (3.0.4)
+ activesupport (= 3.0.4)
+ builder (~> 2.1.2)
+ i18n (~> 0.4)
+ activerecord (3.0.4)
+ activemodel (= 3.0.4)
+ activesupport (= 3.0.4)
+ arel (~> 2.0.2)
+ tzinfo (~> 0.3.23)
+ activeresource (3.0.4)
+ activemodel (= 3.0.4)
+ activesupport (= 3.0.4)
+ activesupport (3.0.4)
+ arel (2.0.9)
+ builder (2.1.2)
+ erubis (2.6.6)
+ abstract (>= 1.0.0)
+ i18n (0.5.0)
+ mail (2.2.15)
+ activesupport (>= 2.3.6)
+ i18n (>= 0.4.0)
+ mime-types (~> 1.16)
+ treetop (~> 1.4.8)
+ mime-types (1.16)
+ mysql (2.8.1)
+ polyglot (0.3.1)
+ rack (1.2.2)
+ rack-mount (0.6.13)
+ rack (>= 1.0.0)
+ rack-test (0.5.7)
+ rack (>= 1.0)
+ rails (3.0.4)
+ actionmailer (= 3.0.4)
+ actionpack (= 3.0.4)
+ activerecord (= 3.0.4)
+ activeresource (= 3.0.4)
+ activesupport (= 3.0.4)
+ bundler (~> 1.0)
+ railties (= 3.0.4)
+ railties (3.0.4)
+ actionpack (= 3.0.4)
+ activesupport (= 3.0.4)
+ rake (>= 0.8.7)
+ thor (~> 0.14.4)
+ rake (0.8.7)
+ sqlite3 (1.3.3)
+ thor (0.14.6)
+ treetop (1.4.9)
+ polyglot (>= 0.3.1)
+ tzinfo (0.3.24)
+ will_paginate (3.0.pre2)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ mysql
+ rails (= 3.0.4)
+ sqlite3
+ will_paginate (= 3.0.pre2)
|
cstim/carcomm
|
69dfbf38f0b6fea947a132749ad0afc35917d44c
|
Last fix for pagination: Choose a new enough gem. 3
|
diff --git a/webapp/Gemfile b/webapp/Gemfile
index 5cee876..53c7bad 100644
--- a/webapp/Gemfile
+++ b/webapp/Gemfile
@@ -1,34 +1,34 @@
source 'http://rubygems.org'
gem 'rails', '3.0.4'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'sqlite3'
source 'http://gemcutter.org'
-gem 'will_paginate'
+gem 'will_paginate', '3.0.pre2'
# Use unicorn as the web server
# gem 'unicorn'
# Deploy with Capistrano
# gem 'capistrano'
# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
# gem 'ruby-debug'
# gem 'ruby-debug19'
# Bundle the extra gems:
# gem 'bj'
# gem 'nokogiri'
# gem 'sqlite3-ruby', :require => 'sqlite3'
# gem 'aws-s3', :require => 'aws/s3'
# Bundle gems for the local environment. Make sure to
# put test-only gems in this group so their generators
# and rake tasks are available in development mode:
# group :development, :test do
# gem 'webrat'
# end
|
cstim/carcomm
|
e61f74f8cb089ead59f22b6dae64ba04d36d0cc5
|
Last fixup for rails 3.0.0
|
diff --git a/webapp/config/routes.rb b/webapp/config/routes.rb
index a915f93..14c85f4 100644
--- a/webapp/config/routes.rb
+++ b/webapp/config/routes.rb
@@ -1,66 +1,67 @@
Webapp::Application.routes.draw do
+ resources :slices
# The priority is based upon order of creation:
# first created -> highest priority.
# Sample of regular route:
# match 'products/:id' => 'catalog#view'
# Keep in mind you can assign values other than :controller and :action
# Sample of named route:
# match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
# This route can be invoked with purchase_url(:id => product.id)
# Sample resource route (maps HTTP verbs to controller actions automatically):
# resources :products
# Sample resource route with options:
# resources :products do
# member do
# get 'short'
# post 'toggle'
# end
#
# collection do
# get 'sold'
# end
# end
# Sample resource route with sub-resources:
# resources :products do
# resources :comments, :sales
# resource :seller
# end
# Sample resource route with more complex sub-resources
# resources :products do
# resources :comments
# resources :sales do
# get 'recent', :on => :collection
# end
# end
# Sample resource route within a namespace:
# namespace :admin do
# # Directs /admin/products/* to Admin::ProductsController
# # (app/controllers/admin/products_controller.rb)
# resources :products
# end
# You can have the root of your site routed with "root"
# just remember to delete public/index.html.
# root :to => "welcome#index"
root :to => "home#index"
# See how all your routes lay out with "rake routes"
# This is a legacy wild controller route that's not recommended for RESTful applications.
# Note: This route will make all actions in every controller accessible via GET requests.
match ':controller(/:action(/:id))'
match ':controller(/:action(/:id(.:format)))'
# My previous rails-2.3.5 routes:
# map.root :controller => "home"
# map.connect ':controller/:action/:id'
# map.connect ':controller/:action/:id.:format'
end
|
cstim/carcomm
|
fd7e73ad364ad8761c4e87d614ba0c921c65185f
|
extra mime type
|
diff --git a/webapp/config/application.rb b/webapp/config/application.rb
index 7cd5ec5..42b2869 100644
--- a/webapp/config/application.rb
+++ b/webapp/config/application.rb
@@ -1,42 +1,45 @@
require File.expand_path('../boot', __FILE__)
require 'rails/all'
# If you have a Gemfile, require the gems listed there, including any gems
# you've limited to :test, :development, or :production.
Bundler.require(:default, Rails.env) if defined?(Bundler)
module Webapp
class Application < Rails::Application
# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
# -- all .rb files in that directory are automatically loaded.
# Custom directories with classes and modules you want to be autoloadable.
# config.autoload_paths += %W(#{config.root}/extras)
# Only load the plugins named here, in the order given (default is alphabetical).
# :all can be used as a placeholder for all plugins not explicitly named.
# config.plugins = [ :exception_notification, :ssl_requirement, :all ]
# Activate observers that should always be running.
# config.active_record.observers = :cacher, :garbage_collector, :forum_observer
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
# config.time_zone = 'Central Time (US & Canada)'
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de
# JavaScript files you want as :defaults (application.js is always included).
# config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
# Configure the default encoding used in templates for Ruby 1.9.
config.encoding = "utf-8"
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password]
end
end
+
+# Extra mime type
+Mime::Type.register "application/gpx+xml", :gpx
|
cstim/carcomm
|
4d72824ef077aebc477b73d0ee5434f7339e9be0
|
Add framework where the actual prediction algorithms should be inserted.
|
diff --git a/ftp-command.txt b/ftp-command.txt
index 67b4871..e4f79dd 100644
--- a/ftp-command.txt
+++ b/ftp-command.txt
@@ -1,49 +1,49 @@
# Local directory is carcomm/
lftp [email protected]
cd webapps/
cd carcomm/
-mirror -R -x .git -x '.*~' -n .
+mirror -R -x .git -x '.*~' -x '.*\.log' -x environment.rb -n .
# -x REGEX - to exclude REGEX from transfer
# -n - to transfer only newer files
# -R - Reverse mirror to transfer in upload direction
# WATCH OUT: config/environment.rb must have uncommented the line
# RAILS_GEM_VERSION = '2.2.2' on the server, otherwise the server
# won't have the correct gem versions.
ssh [email protected]
# To force rails to reload the files: Put a file "restart.txt" in
# tmp/, i.e. /webapps/carcomm/tmp
# Datenbank von Duplikaten befreien - Alle Zeilen abfragen, die
# duplizierte times haben:
select distinct slices.id, slices.time, slices.instanceid from slices, slices as b where slices.time = b.time and slices.id <> b.id;
# Von Duplikat-Zeilen jeweils nur eine anzeigen - die kann man dann
# alle zum Löschen auswählen, solange bis keine derartigen Zeilen mehr
# übrig sind:
select distinct slices.id, slices.time from slices, slices as b where slices.time = b.time and slices.id <> b.id GROUP BY slices.time HAVING COUNT(*) > 1;
Von Timo:
Delete from slices where id in(
Select min(id) as id, time from slices group by time having count(*) > 1
)
# ############################################################
Android installieren:
# Switch the Vodafone 845 for linux
usb_modeswitch -v 0x12d1 -p 0x1031 -s 20 -M "55534243123456780600000080000601000000000000000000000000000000"
cd $HOME/android-sdk-linux_86/platform-tools
./adb -d uninstall de.cstimming.konphidroid
./adb -d install -r ~/org/carcomm/konphidroid/bin/konphidroid.apk
diff --git a/webapp/app/controllers/home_controller.rb b/webapp/app/controllers/home_controller.rb
index d37d880..8ad9e5c 100644
--- a/webapp/app/controllers/home_controller.rb
+++ b/webapp/app/controllers/home_controller.rb
@@ -1,33 +1,34 @@
require 'nmea'
require 'gpx'
+require 'congest'
# The controller class
class HomeController < ApplicationController
attr_reader :minSliceDuration
-
def initialize
@minSliceDuration = 0 # formerly: 30
super
end
protect_from_forgery :except => :gpxUpload
def index
end
def gpxUpload
- resulttext = Gpx.storeGpx(params[:upload], minSliceDuration)
- render :text => "#{resulttext} successfully."
+ rvalue = Gpx.storeGpx(params[:upload], minSliceDuration)
- #r = runMyAlgo
+ # Use the instanceid and latest time to select the slices that go into the algorithm
+ instanceid = rvalue[1]
+ algoresult = Congest.callAlgo(instanceid, rvalue[2])
- #render :text => r.to_s
+ # And return the "algoresult" as the very first value of the text. Done!
+ render :text => "#{algoresult} predicted; #{rvalue[0]} successfully; id=#{instanceid}"
end
def nmeaUpload
resulttext = Nmea.storeNMEA(params[:upload], minSliceDuration)
render :text => "File has been uploaded successfully: #{resulttext}, with duration #{minSliceDuration} seconds each."
end
-
-
+
end
diff --git a/webapp/lib/congest.rb b/webapp/lib/congest.rb
new file mode 100644
index 0000000..ffdaa24
--- /dev/null
+++ b/webapp/lib/congest.rb
@@ -0,0 +1,26 @@
+require 'slice'
+
+class Congest
+ def self.callAlgo(instanceid, lasttime)
+ # Build the conditions for the sub-set of slices
+ conds = {}
+ conds[:instanceid] = instanceid
+ conds[:time] = (lasttime - 2.hours)..(lasttime + 1.hours)
+
+ # Query for the slices
+ slices = Slice.all(:conditions => conds)
+
+ if slices.empty?
+ return 0
+ end
+
+ # Pass the list of slices on to the algorithm, then return its return value
+ Congest.predict1(slices)
+ end
+
+ def self.predict1(slices)
+ # Now we must implement our actual algorithm here with the list of slices!
+ #slices[-1].avgvel
+ slices.size
+ end
+end
diff --git a/webapp/lib/gpx.rb b/webapp/lib/gpx.rb
index 197e245..8e0659c 100644
--- a/webapp/lib/gpx.rb
+++ b/webapp/lib/gpx.rb
@@ -1,35 +1,41 @@
require 'rexml/document'
require 'trkpt'
+require 'time'
class Gpx
def self.storeGpx(file, minSliceDuration)
originalname = (defined? file.original_filename) ? file.original_filename : "<anonymous>"
content = file.read
doc = REXML::Document.new content
newslices = 0
+ instanceid = 0
+ lasttimestamp = Time.now
doc.elements.each("gpx/trk/trkseg") do | track |
prev = nil
track.elements.each do | elem_trkpt |
trkpt = Trkpt.new(nil, nil, nil)
trkpt.fromXml elem_trkpt
#logger.info("#{Time.now} Trying trkpt, got #{trkpt} from #{elem_trkpt}")
+ instanceid = trkpt.instanceid
if prev.nil? or trkpt.time.nil?
prev = trkpt
else
duration = prev.time.nil? ? 0 : trkpt.time - prev.time
+ lasttimestamp = trkpt.time
# Skip slices smaller than 30 seconds
if duration > minSliceDuration
# Ignore everything above 95 seconds altogether
if Trkpt.postSlice(trkpt, prev)
newslices = 1 + newslices
end
prev = trkpt
end
end
end # track.points.each
end # gpx.tracks.each
- "#{newslices} new slices are added from #{originalname}"
+ return ["#{newslices} new slices are added from #{originalname}",
+ instanceid, lasttimestamp]
end
end
|
cstim/carcomm
|
08e944e41dad4fd4a4e5eb895d94f99118df30e6
|
Let the returned string start with a number.
|
diff --git a/ftp-command.txt b/ftp-command.txt
index b25481f..67b4871 100644
--- a/ftp-command.txt
+++ b/ftp-command.txt
@@ -1,42 +1,49 @@
# Local directory is carcomm/
lftp [email protected]
cd webapps/
cd carcomm/
-mirror -R -x .git -n .
+mirror -R -x .git -x '.*~' -n .
# -x REGEX - to exclude REGEX from transfer
# -n - to transfer only newer files
# -R - Reverse mirror to transfer in upload direction
+# WATCH OUT: config/environment.rb must have uncommented the line
+# RAILS_GEM_VERSION = '2.2.2' on the server, otherwise the server
+# won't have the correct gem versions.
+
ssh [email protected]
+# To force rails to reload the files: Put a file "restart.txt" in
+# tmp/, i.e. /webapps/carcomm/tmp
+
# Datenbank von Duplikaten befreien - Alle Zeilen abfragen, die
# duplizierte times haben:
select distinct slices.id, slices.time, slices.instanceid from slices, slices as b where slices.time = b.time and slices.id <> b.id;
# Von Duplikat-Zeilen jeweils nur eine anzeigen - die kann man dann
# alle zum Löschen auswählen, solange bis keine derartigen Zeilen mehr
# übrig sind:
select distinct slices.id, slices.time from slices, slices as b where slices.time = b.time and slices.id <> b.id GROUP BY slices.time HAVING COUNT(*) > 1;
Von Timo:
Delete from slices where id in(
Select min(id) as id, time from slices group by time having count(*) > 1
)
# ############################################################
Android installieren:
# Switch the Vodafone 845 for linux
usb_modeswitch -v 0x12d1 -p 0x1031 -s 20 -M "55534243123456780600000080000601000000000000000000000000000000"
-cd $HOME/android-sdk-linux_86/tools
+cd $HOME/android-sdk-linux_86/platform-tools
./adb -d uninstall de.cstimming.konphidroid
./adb -d install -r ~/org/carcomm/konphidroid/bin/konphidroid.apk
diff --git a/webapp/app/controllers/home_controller.rb b/webapp/app/controllers/home_controller.rb
index 94532c1..d37d880 100644
--- a/webapp/app/controllers/home_controller.rb
+++ b/webapp/app/controllers/home_controller.rb
@@ -1,33 +1,33 @@
require 'nmea'
require 'gpx'
# The controller class
class HomeController < ApplicationController
attr_reader :minSliceDuration
def initialize
@minSliceDuration = 0 # formerly: 30
super
end
protect_from_forgery :except => :gpxUpload
def index
end
def gpxUpload
resulttext = Gpx.storeGpx(params[:upload], minSliceDuration)
- render :text => "File has been uploaded successfully: #{resulttext}"
+ render :text => "#{resulttext} successfully."
#r = runMyAlgo
#render :text => r.to_s
end
def nmeaUpload
resulttext = Nmea.storeNMEA(params[:upload], minSliceDuration)
render :text => "File has been uploaded successfully: #{resulttext}, with duration #{minSliceDuration} seconds each."
end
end
diff --git a/webapp/app/views/home/index.html.erb b/webapp/app/views/home/index.html.erb
index e3b98a7..6695128 100644
--- a/webapp/app/views/home/index.html.erb
+++ b/webapp/app/views/home/index.html.erb
@@ -1,247 +1,247 @@
<head>
- <title>Car Comm Server Prototype, 2010-04-12</title>
+ <title>Car Comm Server Prototype, 2011-03-11</title>
<!-- bring in the OpenLayers javascript library
(here we bring it from the remote site, but you could
easily serve up this javascript yourself) -->
<script src="OpenLayers.js"></script>
<!--script src="http://www.openlayers.org/api/OpenLayers.js"></script-->
<!-- bring in the OpenStreetMap OpenLayers layers.
Using this hosted file will make sure we are kept up
to date with any necessary changes -->
<script src="OpenStreetMap.js"></script>
<!--script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script-->
<!-- The personal functions from CS -->
<script src="csfuncs.js"></script>
<script type="text/javascript">
var map; //complex object of type OpenLayers.Map
var layerGpx;
var gpxStyleMap;
var serverUrl;
function zoomTo(lat, lon, zoom) {
var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
map.setCenter (lonLat, zoom);
updateExtent();
}
function zoomToHamburg() {
// Start position for the map (hardcoded here for simplicity)
zoomTo(53.5514, 9.99, 12);
}
function zoomToMuenchen() {
zoomTo(48.1361, 11.5376, 12);
}
//Initialise the 'map' object
function init() {
serverUrl = ""; // "http://carcomm.cstimming.de/";
// Define the map layer
map = csCreateMap();
// Define the styles for the way slices
gpxStyleMap = csCreateGpxStyleMap();
// Set the initial date interval to 2 weeks
var num_minutes = 10080 * 2 + 60; // 2 weeks + 1 hour
var max_time = new Date();
document.forms.extent.max_time.value = dateToString(max_time);
var min_time = new Date(max_time.getTime() - num_minutes * 60 * 1000);
document.forms.extent.min_time.value = dateToString(min_time);
// Choose Hamburg as center
zoomToHamburg();
}
function setServerUrl(value) {
serverUrl = value;
}
function on_osm_loadstart() {
}
function on_osm_tileloaded() {
}
function reloadWays() {
if (layerGpx) {
map.removeLayer(layerGpx);
layerGpx.destroy();
}
var min_lat = document.forms.extent.min_lat.value;
var max_lat = document.forms.extent.max_lat.value;
var min_lon = document.forms.extent.min_lon.value;
var max_lon = document.forms.extent.max_lon.value;
var min_time = document.forms.extent.min_time.value;
var max_time = document.forms.extent.max_time.value;
// Add the Layer with GPX Track
layerGpx = csCreateLayerGpx(serverUrl,
min_lat, max_lat,
min_lon, max_lon,
min_time, max_time);
map.addLayer(layerGpx);
}
function loadWaysGpx() {
var min_lat = document.forms.extent.min_lat.value;
var max_lat = document.forms.extent.max_lat.value;
var min_lon = document.forms.extent.min_lon.value;
var max_lon = document.forms.extent.max_lon.value;
var min_time = document.forms.extent.min_time.value;
var max_time = document.forms.extent.max_time.value;
var fullURL = serverUrl + "slices.gpx?"
+ "min_lat=" + min_lat
+ "&max_lat=" + max_lat
+ "&min_lon=" + min_lon
+ "&max_lon=" + max_lon
+ "&min_time=" + min_time
+ "&max_time=" + max_time;
window.open(fullURL, "Zweitfenster");
}
function loadWaysCsv() {
var min_lat = document.forms.extent.min_lat.value;
var max_lat = document.forms.extent.max_lat.value;
var min_lon = document.forms.extent.min_lon.value;
var max_lon = document.forms.extent.max_lon.value;
var min_time = document.forms.extent.min_time.value;
var max_time = document.forms.extent.max_time.value;
var fullURL = serverUrl + "slices.csv?"
+ "min_lat=" + min_lat
+ "&max_lat=" + max_lat
+ "&min_lon=" + min_lon
+ "&max_lon=" + max_lon
+ "&min_time=" + min_time
+ "&max_time=" + max_time;
window.open(fullURL, "Zweitfenster");
}
function updateExtent() {
var lonLatUR = map.getLonLatFromPixel(new OpenLayers.Pixel(0,0))
.transform(map.getProjectionObject(),
new OpenLayers.Projection("EPSG:4326"));
var mapSize = map.getSize();
var lonLatLL = map.getLonLatFromPixel(new OpenLayers.Pixel(mapSize.w, mapSize.h))
.transform(map.getProjectionObject(),
new OpenLayers.Projection("EPSG:4326"));
document.forms.extent.min_lat.value = lonLatLL.lat;
document.forms.extent.max_lon.value = lonLatLL.lon;
document.forms.extent.max_lat.value = lonLatUR.lat;
document.forms.extent.min_lon.value = lonLatUR.lon;
document.forms.extent.max_time.value = dateToString(new Date());
reloadWays();
}
</script>
</head>
<!-- body.onload is called once the page is loaded (call the 'init' function) -->
<body onload="init();">
-<h1>Car Comm Server Prototype, 2010-05-19</h1>
+<h1>Car Comm Server Prototype, 2011-03-11</h1>
<p>This is our prototype for a traffic information system using a
client-server architecture.</p>
<p>Current Status: We can view and edit the table of travel report
"slices". A "slice" is the smallest section of the travel reports from
the mobile devices, and it can represent 60 seconds of travel (or
maybe 20 or 90 seconds). The slice is represented by its starting and
ending point in WGS84 coordinates (latitude and longitude), and the
average velocity in between.</p>
<p>Go <a href="map.html">here for a Web application implementation</a> of this system.</p>
<p>You can <%=
link_to "view the table of reported slices", slices_path %>.</p>
<% form_tag('home/gpxUpload', :multipart => true ) do %>
<label for="upload">You can upload a GPX file with GPS logs. Select
File: </label>
<%= file_field_tag 'upload' %>
and <%= submit_tag "Upload GPX" %>
<% end %>
<% form_tag('home/nmeaUpload', :multipart => true ) do %>
<label for="upload">You can upload a NMEA file with GPS logs. Select
File: </label>
<%= file_field_tag 'upload' %>
and <%= submit_tag "Upload NMEA" %>
<% end %>
<p>(File upload will store way slices in a 30-second raster, not finer
than that for now.)</p>
<h2>Displaying the ways on a map</h2>
<p>This display uses the <a
href="http://www.openstreetmap.org">openstreetmap.org</a>
map. Additionally, all the way slices from <%= link_to "here",
slices_path %> are shown as well, and the "average velocity" (in [m/s] in the table, but in [km/h] for the colors)
chooses the display color, as shown below.</p>
<table><tr><td>
<!-- define a DIV into which the map will appear. Make it take up 400 pixels -->
<div style="width:400px; height:400px" id="map"></div>
</td><td valign="top">
<form name="extent">
<table>
<tr><td>min_lat</td><td><input type="text" name="min_lat" value=""></td></tr>
<tr><td>max_lat</td><td><input type="text" name="max_lat" value=""></td></tr>
<tr><td>min_lon</td><td><input type="text" name="min_lon" value=""></td></tr>
<tr><td>max_lon</td><td><input type="text" name="max_lon" value=""></td></tr>
<tr><td>min_time</td><td><input type="text" name="min_time" value="2009-05-01T00:00:00Z"></td></tr>
<tr><td>max_time</td><td><input type="text" name="max_time" value=""></td></tr>
<tr><td colspan="2"><input type="button" value="Reload" onClick="updateExtent()"> everything (coordinates from map, and ways from coordinates)</td></tr>
<tr><td colspan="2">File Download: <input type="button" value="As GPX" onClick="loadWaysGpx()"> <input type="button" value="As CSV" onClick="loadWaysCsv()"></td></tr>
</table>
</form>
<br>
<table><tr><td>Average [km/h]</td><td>Color</td></tr>
<tr><td>0 - 18</td><td style="background-color:red">Red</td></tr>
<tr><td>18 - 40</td><td style="background-color:yellow">Yellow</td></tr>
<tr><td>40 - 65</td><td style="background-color:green">Green</td></tr>
<tr><td>65 - 95</td><td style="background-color:cyan">Cyan</td></tr>
<tr><td>95 - 250</td><td style="background-color:blue">Blue</td></tr>
</table>
</td></tr></table>
<p>Zoom to
<input type="button" value="Hamburg" onClick="zoomToHamburg()">
<input type="button" value="München" onClick="zoomToMuenchen()">
</p>
</body>
<!-- Local Variables: -->
<!-- mode: javascript -->
<!-- indent-tabs-mode:nil -->
<!-- c-basic-offset:4 -->
<!-- tab-width:8 -->
<!-- End: -->
diff --git a/webapp/lib/gpx.rb b/webapp/lib/gpx.rb
index 263df33..197e245 100644
--- a/webapp/lib/gpx.rb
+++ b/webapp/lib/gpx.rb
@@ -1,35 +1,35 @@
require 'rexml/document'
require 'trkpt'
class Gpx
def self.storeGpx(file, minSliceDuration)
originalname = (defined? file.original_filename) ? file.original_filename : "<anonymous>"
content = file.read
doc = REXML::Document.new content
newslices = 0
doc.elements.each("gpx/trk/trkseg") do | track |
prev = nil
track.elements.each do | elem_trkpt |
trkpt = Trkpt.new(nil, nil, nil)
trkpt.fromXml elem_trkpt
#logger.info("#{Time.now} Trying trkpt, got #{trkpt} from #{elem_trkpt}")
if prev.nil? or trkpt.time.nil?
prev = trkpt
else
duration = prev.time.nil? ? 0 : trkpt.time - prev.time
# Skip slices smaller than 30 seconds
if duration > minSliceDuration
# Ignore everything above 95 seconds altogether
if Trkpt.postSlice(trkpt, prev)
newslices = 1 + newslices
end
prev = trkpt
end
end
end # track.points.each
end # gpx.tracks.each
- "Added #{newslices} new slices from #{originalname}"
+ "#{newslices} new slices are added from #{originalname}"
end
-end
\ No newline at end of file
+end
|
cstim/carcomm
|
829fdbee8e20b69b1308b9de500875741d81194d
|
Report a parsed floating point number to the App layout.
|
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml
index ad33776..51796c3 100644
--- a/konphidroid/AndroidManifest.xml
+++ b/konphidroid/AndroidManifest.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.cstimming.konphidroid"
- android:versionName="0.7" android:versionCode="7">
+ android:versionName="0.8" android:versionCode="8">
<application android:icon="@drawable/stautimer_icon" android:label="@string/app_name">
<activity android:name=".KonPhiActivity"
android:label="@string/app_name" android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4"></uses-sdk>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
</manifest>
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml
index 2cea2f1..8d70886 100644
--- a/konphidroid/res/layout/main.xml
+++ b/konphidroid/res/layout/main.xml
@@ -1,100 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="fill_parent"
- android:id="@+id/MainLayout" android:layout_height="fill_parent">
+ android:layout_width="fill_parent"
+ android:id="@+id/MainLayout" android:layout_height="fill_parent" android:orientation="vertical">
<LinearLayout android:layout_width="wrap_content"
android:layout_height="wrap_content" android:orientation="horizontal">
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="@string/hello" />
<TextView android:id="@+id/TextViewVersion"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:text="" />
</LinearLayout>
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content" android:orientation="horizontal">
<ToggleButton android:id="@+id/togglebuttonGps"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:textOn="@string/gpsbutton" android:textOff="@string/gpsbutton" />
<Button android:text="@string/recording_on" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/togglebuttonRecord" />
<Button android:id="@+id/togglebuttonSender"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:text="@string/transmission_on" />
</LinearLayout>
<TableLayout android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="@string/gps_timestamp"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewGPSAge"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Latitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLat"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Longitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLon"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Accuracy [m]:" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewAcc"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Dist to previous [m]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewDist"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Time to previous [s]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewSecs"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="@string/labelsender_on" android:id="@+id/TextLabelSender"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewSender"
android:scrollHorizontally="true" android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="@string/labelspeed"
android:textSize="40sp" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView android:id="@+id/TextViewSpeed" android:textSize="40sp"
android:layout_width="fill_parent" android:layout_height="fill_parent" />
</TableRow>
+ <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
+ <TextView android:text="Calculated:" android:layout_height="wrap_content" android:id="@+id/labelNumber" android:layout_width="wrap_content"></TextView>
+ <TextView android:text="..." android:layout_height="wrap_content" android:id="@+id/TextViewNumber" android:layout_width="wrap_content"></TextView>
+ </TableRow>
</TableLayout>
- <TextView android:text="@string/bottom_url_text" android:id="@+id/TextViewBottom"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
- android:autoLink="web" />
-
- <LinearLayout android:id="@+id/LayoutWebview"
- android:layout_width="fill_parent" android:layout_height="fill_parent" />
-
</LinearLayout>
diff --git a/konphidroid/res/values-de/strings.xml b/konphidroid/res/values-de/strings.xml
index 77aacb5..8bfb53c 100644
--- a/konphidroid/res/values-de/strings.xml
+++ b/konphidroid/res/values-de/strings.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="app_name">KonPhiDroid</string>
- <string name="hello">KonPhiDense Test-App, Version</string>
+ <string name="app_name">Stautimer</string>
+ <string name="hello">Stautimer KonPhi, Version</string>
<string name="transmission_on">Ãbertragung</string>
<string name="transmission_off">Keine Ãbertragung</string>
<string name="recording_on">Logging</string>
<string name="recording_off">Kein Logging</string>
<string name="gpsbutton">GPS</string>
<string name="gps_timestamp">GPS Zeitstempel:</string>
<string name="transmission_on_toast">Bewegung wird zum Server übertragen</string>
<string name="transmission_off_toast">Es wird keine Bewegung mehr übertragen</string>
<string name="labelsender_on">Ãbertragungsergebnis:</string>
<string name="labelsender_off">Pause; Letzte:</string>
<string name="ask_activate_gps_settings">Das GPS ist ausgeschaltet. Wollen Sie die Einstellungen für Standort & Sicherheit bearbeiten, um GPS einzuschalten?</string>
<string name="yes">Ja</string>
<string name="no">Nein</string>
<string name="labelspeed">Speed:</string>
<string name="choose_sending_interval">Sende-Intervall wählen [Min]:</string>
<string name="choose_record_interval">Aufzeichnungs-Intervall wählen [Sek]:</string>
</resources>
diff --git a/konphidroid/res/values/strings.xml b/konphidroid/res/values/strings.xml
index ab9ba9c..2d41f1f 100644
--- a/konphidroid/res/values/strings.xml
+++ b/konphidroid/res/values/strings.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="app_name">KonPhiDroid</string>
- <string name="hello">KonPhiDense Test App, Version</string>
+ <string name="app_name">Stautimer</string>
+ <string name="hello">Stautimer KonPhi, Version</string>
<string name="transmission_on">Transmission</string>
<string name="transmission_off">No Transmission</string>
<string name="recording_on">Recording</string>
<string name="recording_off">No Recording</string>
<string name="gpsbutton">GPS</string>
<string name="gps_timestamp">GPS Timestamp:</string>
<string name="transmission_on_toast">Sending movement to server</string>
<string name="transmission_off_toast">No movement is sent to server</string>
<string name="labelsender_on">Sending Result:</string>
<string name="labelsender_off">Paused; Last:</string>
<string name="ask_activate_gps_settings">The GPS receiver is not active. Do you want to edit your location settings in order to activate GPS now?</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="bottom_url_text">http://carcomm.cstimming.de/view.html</string>
<string name="labelspeed">Speed:</string>
<string name="choose_sending_interval">Choose a sending time interval (minutes):</string>
<string name="choose_record_interval">Choose a recording time interval (seconds):</string>
</resources>
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index 35951bb..075012f 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,331 +1,343 @@
package de.cstimming.konphidroid;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
import android.widget.ToggleButton;
-public class KonPhiActivity extends Activity implements LocationListener, SliceSenderResult {
+public class KonPhiActivity extends Activity implements LocationListener, SliceSenderResult, SenderFloatResult {
private ToggleButton m_togglebuttonGps;
private Button m_togglebuttonSender;
private Button m_togglebuttonRecord;
private SimpleDateFormat m_dateFormatter;
private SimpleDateFormat m_dateFormatSender;
private NumberFormat m_speedFormatter;
private Location m_lastLocation;
private boolean m_lastLocationValid;
private long m_recordIntervalSecs;
private String m_server = "http://carcomm.cstimming.de/";
//private WebView m_webview;
private TextView m_labelSender;
private int m_instanceId;
private int m_categoryId;
private LocationCollector m_locationCollector;
private static final int DIALOG_GPSWARNING = 1;
private static final int DIALOG_RECORDINTERVAL_MULTICHOICE = 2;
private static final int DIALOG_SENDERINTERVAL_MULTICHOICE = 3;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
m_dateFormatSender = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
m_dateFormatSender.setTimeZone(TimeZone.getTimeZone("GMT00"));
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
m_speedFormatter = NumberFormat.getInstance();
m_speedFormatter.setMaximumFractionDigits(1);
m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebuttonGps);
m_togglebuttonSender = (Button) findViewById(R.id.togglebuttonSender);
m_togglebuttonRecord = (Button) findViewById(R.id.togglebuttonRecord);
m_labelSender = (TextView) findViewById(R.id.TextLabelSender);
java.util.Random rg = new java.util.Random();
m_instanceId = rg.nextInt();
m_categoryId = 1;
m_recordIntervalSecs = 0;
- m_locationCollector = new LocationCollector(m_server, this, m_instanceId, m_categoryId, this);
+ m_locationCollector = new LocationCollector(m_server, this, m_instanceId, m_categoryId, this, this);
setRecordIntervalSecs(10);
setSenderIntervalSecs(60);
// Print the version number into the UI
TextView versionView = (TextView) findViewById(R.id.TextViewVersion);
String versionString;
try {
versionString = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
} catch (NameNotFoundException e) {
versionString = "Not found";
e.printStackTrace();
}
versionView.setText(" " + versionString);
//final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
//m_webview = new WebView(this);
//ell.addView(m_webview);
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
m_togglebuttonSender.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
showDialog(DIALOG_SENDERINTERVAL_MULTICHOICE);
}});
m_togglebuttonRecord.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
showDialog(DIALOG_RECORDINTERVAL_MULTICHOICE);
}});
registerAtLocationManager(getRecordIntervalSecs());
}
private void registerAtLocationManager(long intervalSecs) {
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
LocationListener listener = m_locationCollector;//this;
if (intervalSecs == 0) {
locationManager.removeUpdates(listener);
} else {
if (!locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
long minTime = 1000 * intervalSecs; // [milliseconds]
float minDistance = 0; // 10; // [meters]
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
minTime, minDistance, listener);
}
}
public long getRecordIntervalSecs() {
return m_recordIntervalSecs;
}
public void setSenderIntervalSecs(long v) {
if (v == m_locationCollector.getSendingIntervalSecs())
return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (v == 0) {
m_togglebuttonSender.setText(R.string.transmission_off);
m_labelSender.setText(R.string.labelsender_off);
m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
} else {
m_togglebuttonSender.setText(getString(R.string.transmission_on) + " " + String.valueOf(v / 60) + "min");
m_labelSender.setText(R.string.labelsender_on);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
m_labelSender.setTextColor(viewSecs.getTextColors());
}
m_locationCollector.setSendingIntervalSecs(v);
}
public void setRecordIntervalSecs(long v) {
//if (v == m_recordIntervalSecs)
//return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (v == 0) {
m_togglebuttonRecord.setText(R.string.recording_off);
m_labelSender.setText(R.string.labelsender_off);
m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
} else {
m_togglebuttonRecord.setText(getString(R.string.recording_on) + " " + String.valueOf(v) + "s");
m_labelSender.setText(R.string.labelsender_on);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
m_labelSender.setTextColor(viewSecs.getTextColors());
}
registerAtLocationManager(v);
m_recordIntervalSecs = v;
}
protected Dialog onCreateDialog(int d) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
switch (d) {
case DIALOG_GPSWARNING:
builder.setMessage(R.string.ask_activate_gps_settings)
.setCancelable(false)
.setPositiveButton(R.string.yes,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
}
})
.setNegativeButton(R.string.no,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
dialog.cancel();
}
});
break;
case DIALOG_RECORDINTERVAL_MULTICHOICE:
builder.setTitle(R.string.choose_record_interval);
final CharSequence[] items = {"60", "30", "20", "10", "2", "1", "off"};
builder.setSingleChoiceItems(items, 3, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
String item = items[which].toString();
final int secs = (item == "off" ? 0 : Integer.parseInt(item));
setRecordIntervalSecs(secs);
dismissDialog(DIALOG_RECORDINTERVAL_MULTICHOICE);
}
});
break;
case DIALOG_SENDERINTERVAL_MULTICHOICE:
builder.setTitle(R.string.choose_sending_interval);
final CharSequence[] items1 = {"10", "5", "2", "1", "off"};
builder.setSingleChoiceItems(items1, 3, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
String item = items1[which].toString();
final int mins = (item == "off" ? 0 : Integer.parseInt(item));
setSenderIntervalSecs(60 * mins);
dismissDialog(DIALOG_SENDERINTERVAL_MULTICHOICE);
}
});
break;
default:
return null;
}
Dialog result = builder.create();
return result;
}
@Override
public void onLocationChanged(Location loc) {
// Toast.makeText(KonPhiActivity.this, "Received location from " +
// loc.getProvider(), Toast.LENGTH_SHORT).show();
printLocInfo(loc);
m_lastLocationValid = true;
m_lastLocation = loc;
}
private void printLocInfo(Location loc) {
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
final TextView viewSpeed = (TextView) findViewById(R.id.TextViewSpeed);
viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy())
: "...");
float speed = loc.getSpeed();
viewSpeed.setText(m_speedFormatter.format(3.6 * speed) + " km/h");
if (m_lastLocationValid) {
long msecdiff = loc.getTime() - m_lastLocation.getTime();
float distance = m_lastLocation.distanceTo(loc);
String secs = String.valueOf(msecdiff / 1000);
String dist = String.valueOf(distance);
viewDist.setText(dist);
viewSecs.setText(secs);
} else {
viewDist.setText("...");
viewSecs.setText("...");
}
}
@Override
public void onProviderDisabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " disabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider +
// " enabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " out of service", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " tmp. unavailable", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider
// + " available", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
break;
}
}
@Override
public void sliceSenderResult(String text, boolean good, int color) {
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
resultview.setText(text);
resultview.setTextColor(ColorStateList.valueOf(color));
}
-}
\ No newline at end of file
+
+ @Override
+ public void resultFloat(float value, boolean good) {
+ final TextView numberview = (TextView) findViewById(R.id.TextViewNumber);
+ numberview.setText(Float.toString(value));
+ int color = Color.RED;
+ if (good)
+ {
+ color = value > 0 ? Color.GREEN : Color.YELLOW;
+ }
+ numberview.setTextColor(ColorStateList.valueOf(color));
+ }
+}
diff --git a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
index 36db1e8..05986ec 100644
--- a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
+++ b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
@@ -1,182 +1,186 @@
package de.cstimming.konphidroid;
import java.io.CharArrayWriter;
import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import org.apache.http.HttpEntity;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import android.location.Location;
import android.location.LocationListener;
import android.os.Bundle;
public class LocationCollector implements LocationListener, SenderInterface {
private ArrayList<Location> m_collectingLocations;
private ArrayList<Location> m_sendingLocations;
private boolean m_currentlySending;
private String m_server;
private SliceSenderResult m_result_cb;
+ private SenderFloatResult m_floatResult_cb;
private SimpleDateFormat m_dateFormatter;
private int m_instanceid;
private int m_categoryId;
private LocationListener m_location_cb;
private long m_sendingIntervalSecs;
private HttpParams m_httpParameters;
- public LocationCollector(String serveraddress, SliceSenderResult result_cb, int instanceid, int mCategoryId, LocationListener another_location_cb) {
+ public LocationCollector(String serveraddress, SliceSenderResult result_cb,
+ int instanceid, int mCategoryId, LocationListener another_location_cb,
+ SenderFloatResult c3) {
m_currentlySending = false;
m_server = serveraddress;
m_result_cb = result_cb;
+ m_floatResult_cb = c3;
m_instanceid = instanceid;
m_categoryId = mCategoryId;
m_location_cb = another_location_cb;
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
resetCollecting();
m_httpParameters = new BasicHttpParams();
// Set the timeout in milliseconds until a connection is established.
int timeoutConnection = 5000;
HttpConnectionParams.setConnectionTimeout(m_httpParameters, timeoutConnection);
// Set the default socket timeout (SO_TIMEOUT)
// in milliseconds which is the timeout for waiting for data.
int timeoutSocket = 5000;
HttpConnectionParams.setSoTimeout(m_httpParameters, timeoutSocket);
}
private void resetCollecting() {
m_collectingLocations = new ArrayList<Location>();
}
@Override
public void onLocationChanged(Location loc) {
if (m_location_cb != null) {
m_location_cb.onLocationChanged(loc);
}
m_collectingLocations.add(loc);
checkForSending();
}
public void setSendingIntervalSecs(long secs) {
m_sendingIntervalSecs = secs;
}
public long getSendingIntervalSecs() {
return m_sendingIntervalSecs;
}
private void checkForSending() {
if (m_currentlySending
|| m_collectingLocations.size() <= 1
|| m_sendingIntervalSecs == 0) {
return;
}
Location first = m_collectingLocations.get(0);
Location last = m_collectingLocations.get(m_collectingLocations.size() - 1);
long secdiff = (last.getTime() - first.getTime()) / 1000;
if (m_sendingIntervalSecs > 0 && secdiff >= m_sendingIntervalSecs) {
sendNow();
}
}
private void sendNow() {
m_sendingLocations = m_collectingLocations;
m_currentlySending = true;
scheduleSending();
resetCollecting();
}
private static String listToString(ArrayList<Location> ul, int instanceid, int categoryid) {
CharArrayWriter gpxoutput = new GpxCharArrayWriter(ul, instanceid, categoryid);
String gpxstring = gpxoutput.toString();
return gpxstring;
}
private void scheduleSending() {
HttpClient httpclient = new DefaultHttpClient(m_httpParameters);
HttpPost httppost = new HttpPost(m_server + "home/gpxUpload"); // FIXME: Different URL for GPX upload!
final String displaytime = m_dateFormatter.format(new Date(m_sendingLocations.get(m_sendingLocations.size() - 1).getTime())) + ": ";
// Copied from http://www.anddev.org/upload_files_to_web_server-t443-s30.html
final String lineEnd = "\r\n";
final String twoHyphens = "--";
final String boundary = "*****";
httppost.setHeader("Content-Type", "multipart/form-data; boundary="+boundary);
String gpxstring = listToString(m_sendingLocations, m_instanceid, m_categoryId);
String output = twoHyphens + boundary + lineEnd;
output += "Content-Disposition: form-data; name=\"upload\"; filename=\"anonym\"" + lineEnd;
output += "Content-Type: text/plain; charset=UTF-8" + lineEnd;
output += lineEnd;
// send file data
output += gpxstring;
// send multipart form data necesssary after file data.
output += lineEnd;
output += twoHyphens + boundary + twoHyphens + lineEnd;
// Put the string into the http entity
try {
HttpEntity entity = new StringEntity(output);
httppost.setEntity(entity);
} catch (UnsupportedEncodingException e) {
// Auto-generated catch block
e.printStackTrace();
return;
}
//HttpEntity entity = listToStreamEntity(m_sendingLocations, m_instanceid);
// The network connection is moved into a separate task
- SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, m_result_cb, this);
+ SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, m_result_cb, this, m_floatResult_cb);
// Execute HTTP Post Request
task.execute(httppost);
}
@Override
public void startedSending() {
// TODO Auto-generated method stub
}
@Override
public void stoppedSending(boolean successful) {
if (successful) {
m_currentlySending = false;
m_sendingLocations = null;
} else {
scheduleSending(); // TODO: what now?
}
}
@Override
public void onProviderDisabled(String arg0) {
// TODO Auto-generated method stub
if (m_location_cb != null) {
m_location_cb.onProviderDisabled(arg0);
}
}
@Override
public void onProviderEnabled(String arg0) {
// TODO Auto-generated method stub
if (m_location_cb != null) {
m_location_cb.onProviderEnabled(arg0);
}
}
@Override
public void onStatusChanged(String arg0, int arg1, Bundle arg2) {
// TODO Auto-generated method stub
}
}
diff --git a/konphidroid/src/de/cstimming/konphidroid/SenderFloatResult.java b/konphidroid/src/de/cstimming/konphidroid/SenderFloatResult.java
new file mode 100644
index 0000000..e0d5fd6
--- /dev/null
+++ b/konphidroid/src/de/cstimming/konphidroid/SenderFloatResult.java
@@ -0,0 +1,5 @@
+package de.cstimming.konphidroid;
+
+public interface SenderFloatResult {
+ public void resultFloat(float value, boolean good);
+}
diff --git a/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java b/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java
index 6b606ff..9bc0589 100644
--- a/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java
+++ b/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java
@@ -1,94 +1,108 @@
package de.cstimming.konphidroid;
import java.io.IOException;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.HttpResponseException;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.BasicResponseHandler;
import android.graphics.Color;
import android.os.AsyncTask;
public class SliceSenderTask extends AsyncTask<HttpPost, Void, HttpResponse> {
private HttpClient m_httpclient;
private SliceSenderResult m_text_cb;
private String m_resultprefix;
private SenderInterface m_sender_cb;
+ private SenderFloatResult m_floatResult_cb;
- public SliceSenderTask(HttpClient client, String resultprefix, SliceSenderResult callback, SenderInterface callback2) {
+ public SliceSenderTask(HttpClient client, String resultprefix,
+ SliceSenderResult callback, SenderInterface c2, SenderFloatResult c3) {
super();
m_httpclient = client;
m_resultprefix = resultprefix;
m_text_cb = callback;
- m_sender_cb = callback2;
+ m_sender_cb = c2;
+ m_floatResult_cb = c3;
}
@Override
protected void onPreExecute() {
String text = "Sending Way...";
int color = Color.YELLOW;
if (m_text_cb != null) {
m_text_cb.sliceSenderResult(m_resultprefix + text, true, color);
}
if (m_sender_cb != null) {
m_sender_cb.startedSending();
}
}
@Override
protected HttpResponse doInBackground(HttpPost... params) {
if (params.length != 1)
return null;
try {
// Execute HTTP Post Request
HttpResponse response = m_httpclient.execute(params[0]);
return response;
} catch (ClientProtocolException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
@Override
protected void onPostExecute(HttpResponse response) {
// baos.reset();
// response.getEntity().writeTo(baos);
// m_webview.loadData(baos.toString(), "text/html", "utf-8");
String text;
boolean good = true;
if (response != null) {
StatusLine rstatus = response.getStatusLine();
int rcode = rstatus.getStatusCode();
text = String.valueOf(rcode) + " " + rstatus.getReasonPhrase();
if (rcode >= 200 && rcode < 300) {
try {
text = new BasicResponseHandler().handleResponse(response);
//System.out.println("rtext=" + rtext);
} catch (HttpResponseException e) {
good = false;
} catch (IOException e) {
good = false;
}
} else {
good = false;
}
} else {
text = "Exception during HTTP connect";
good = false;
}
+ float resultfloat = 0;
+ try {
+ int firstWhitespace = text.indexOf(" ");
+ String tmp = (firstWhitespace == -1) ? text : text.substring(0, firstWhitespace);
+ resultfloat = Float.parseFloat(tmp);
+ } catch (NumberFormatException ex) {
+ // do nothing
+ }
+ if (m_floatResult_cb != null) {
+ m_floatResult_cb.resultFloat(resultfloat, good);
+ }
if (m_text_cb != null) {
m_text_cb.sliceSenderResult(m_resultprefix + text, good, good ? Color.GREEN : Color.RED);
}
if (m_sender_cb != null) {
m_sender_cb.stoppedSending(good);
}
}
}
|
cstim/carcomm
|
763689593bcecda1447a7eb25b1bfc36cba43a73
|
Set http connection parameter timeouts to some lower values.
|
diff --git a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
index dfa1486..36db1e8 100644
--- a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
+++ b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
@@ -1,168 +1,182 @@
package de.cstimming.konphidroid;
import java.io.CharArrayWriter;
import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import org.apache.http.HttpEntity;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.HttpParams;
import android.location.Location;
import android.location.LocationListener;
import android.os.Bundle;
public class LocationCollector implements LocationListener, SenderInterface {
private ArrayList<Location> m_collectingLocations;
private ArrayList<Location> m_sendingLocations;
private boolean m_currentlySending;
private String m_server;
private SliceSenderResult m_result_cb;
private SimpleDateFormat m_dateFormatter;
private int m_instanceid;
private int m_categoryId;
private LocationListener m_location_cb;
private long m_sendingIntervalSecs;
+ private HttpParams m_httpParameters;
public LocationCollector(String serveraddress, SliceSenderResult result_cb, int instanceid, int mCategoryId, LocationListener another_location_cb) {
m_currentlySending = false;
m_server = serveraddress;
m_result_cb = result_cb;
m_instanceid = instanceid;
m_categoryId = mCategoryId;
m_location_cb = another_location_cb;
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
resetCollecting();
+
+ m_httpParameters = new BasicHttpParams();
+ // Set the timeout in milliseconds until a connection is established.
+ int timeoutConnection = 5000;
+ HttpConnectionParams.setConnectionTimeout(m_httpParameters, timeoutConnection);
+ // Set the default socket timeout (SO_TIMEOUT)
+ // in milliseconds which is the timeout for waiting for data.
+ int timeoutSocket = 5000;
+ HttpConnectionParams.setSoTimeout(m_httpParameters, timeoutSocket);
+
}
private void resetCollecting() {
m_collectingLocations = new ArrayList<Location>();
}
@Override
public void onLocationChanged(Location loc) {
if (m_location_cb != null) {
m_location_cb.onLocationChanged(loc);
}
m_collectingLocations.add(loc);
checkForSending();
}
public void setSendingIntervalSecs(long secs) {
m_sendingIntervalSecs = secs;
}
public long getSendingIntervalSecs() {
return m_sendingIntervalSecs;
}
private void checkForSending() {
if (m_currentlySending
|| m_collectingLocations.size() <= 1
|| m_sendingIntervalSecs == 0) {
return;
}
Location first = m_collectingLocations.get(0);
Location last = m_collectingLocations.get(m_collectingLocations.size() - 1);
long secdiff = (last.getTime() - first.getTime()) / 1000;
if (m_sendingIntervalSecs > 0 && secdiff >= m_sendingIntervalSecs) {
sendNow();
}
}
private void sendNow() {
m_sendingLocations = m_collectingLocations;
m_currentlySending = true;
scheduleSending();
resetCollecting();
}
private static String listToString(ArrayList<Location> ul, int instanceid, int categoryid) {
CharArrayWriter gpxoutput = new GpxCharArrayWriter(ul, instanceid, categoryid);
String gpxstring = gpxoutput.toString();
return gpxstring;
}
private void scheduleSending() {
- HttpClient httpclient = new DefaultHttpClient();
+ HttpClient httpclient = new DefaultHttpClient(m_httpParameters);
HttpPost httppost = new HttpPost(m_server + "home/gpxUpload"); // FIXME: Different URL for GPX upload!
final String displaytime = m_dateFormatter.format(new Date(m_sendingLocations.get(m_sendingLocations.size() - 1).getTime())) + ": ";
// Copied from http://www.anddev.org/upload_files_to_web_server-t443-s30.html
final String lineEnd = "\r\n";
final String twoHyphens = "--";
final String boundary = "*****";
httppost.setHeader("Content-Type", "multipart/form-data; boundary="+boundary);
String gpxstring = listToString(m_sendingLocations, m_instanceid, m_categoryId);
String output = twoHyphens + boundary + lineEnd;
output += "Content-Disposition: form-data; name=\"upload\"; filename=\"anonym\"" + lineEnd;
output += "Content-Type: text/plain; charset=UTF-8" + lineEnd;
output += lineEnd;
// send file data
output += gpxstring;
// send multipart form data necesssary after file data.
output += lineEnd;
output += twoHyphens + boundary + twoHyphens + lineEnd;
// Put the string into the http entity
try {
HttpEntity entity = new StringEntity(output);
httppost.setEntity(entity);
} catch (UnsupportedEncodingException e) {
// Auto-generated catch block
e.printStackTrace();
return;
}
//HttpEntity entity = listToStreamEntity(m_sendingLocations, m_instanceid);
// The network connection is moved into a separate task
SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, m_result_cb, this);
// Execute HTTP Post Request
task.execute(httppost);
}
@Override
public void startedSending() {
// TODO Auto-generated method stub
}
@Override
public void stoppedSending(boolean successful) {
if (successful) {
m_currentlySending = false;
m_sendingLocations = null;
} else {
scheduleSending(); // TODO: what now?
}
}
@Override
public void onProviderDisabled(String arg0) {
// TODO Auto-generated method stub
if (m_location_cb != null) {
m_location_cb.onProviderDisabled(arg0);
}
}
@Override
public void onProviderEnabled(String arg0) {
// TODO Auto-generated method stub
if (m_location_cb != null) {
m_location_cb.onProviderEnabled(arg0);
}
}
@Override
public void onStatusChanged(String arg0, int arg1, Bundle arg2) {
// TODO Auto-generated method stub
}
}
|
cstim/carcomm
|
d8aedd59088c46d3010d56ccf2c5e60b65ba02ce
|
Add parsing of HTTPResponse to String.
|
diff --git a/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java b/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java
index f2fed68..6b606ff 100644
--- a/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java
+++ b/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java
@@ -1,84 +1,94 @@
package de.cstimming.konphidroid;
import java.io.IOException;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
+import org.apache.http.client.HttpResponseException;
import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.BasicResponseHandler;
import android.graphics.Color;
import android.os.AsyncTask;
public class SliceSenderTask extends AsyncTask<HttpPost, Void, HttpResponse> {
private HttpClient m_httpclient;
private SliceSenderResult m_text_cb;
private String m_resultprefix;
private SenderInterface m_sender_cb;
public SliceSenderTask(HttpClient client, String resultprefix, SliceSenderResult callback, SenderInterface callback2) {
super();
m_httpclient = client;
m_resultprefix = resultprefix;
m_text_cb = callback;
m_sender_cb = callback2;
}
@Override
protected void onPreExecute() {
String text = "Sending Way...";
int color = Color.YELLOW;
if (m_text_cb != null) {
m_text_cb.sliceSenderResult(m_resultprefix + text, true, color);
}
if (m_sender_cb != null) {
m_sender_cb.startedSending();
}
}
@Override
protected HttpResponse doInBackground(HttpPost... params) {
if (params.length != 1)
return null;
try {
// Execute HTTP Post Request
HttpResponse response = m_httpclient.execute(params[0]);
return response;
} catch (ClientProtocolException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
@Override
protected void onPostExecute(HttpResponse response) {
// baos.reset();
// response.getEntity().writeTo(baos);
// m_webview.loadData(baos.toString(), "text/html", "utf-8");
String text;
boolean good = true;
if (response != null) {
StatusLine rstatus = response.getStatusLine();
int rcode = rstatus.getStatusCode();
text = String.valueOf(rcode) + " " + rstatus.getReasonPhrase();
if (rcode >= 200 && rcode < 300) {
+ try {
+ text = new BasicResponseHandler().handleResponse(response);
+ //System.out.println("rtext=" + rtext);
+ } catch (HttpResponseException e) {
+ good = false;
+ } catch (IOException e) {
+ good = false;
+ }
} else {
good = false;
}
} else {
text = "Exception during HTTP connect";
good = false;
}
if (m_text_cb != null) {
m_text_cb.sliceSenderResult(m_resultprefix + text, good, good ? Color.GREEN : Color.RED);
}
if (m_sender_cb != null) {
m_sender_cb.stoppedSending(good);
}
}
}
|
cstim/carcomm
|
eaef19990f561f7cc90734c93c7f9f7d23c8fabc
|
Write out categoryId as well.
|
diff --git a/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java
index 13cf8a3..cd59f45 100644
--- a/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java
+++ b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java
@@ -1,67 +1,68 @@
package de.cstimming.konphidroid;
import java.io.CharArrayWriter;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Iterator;
import java.util.List;
import android.location.Location;
public class GpxCharArrayWriter extends CharArrayWriter {
- private int pointsCount = 0;
+ //private int pointsCount = 0;
private SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd");
private SimpleDateFormat time = new SimpleDateFormat("HH:mm:ss");
Calendar cal = Calendar.getInstance();
private String gpxFoter =
"</trkseg>\n"+
"</trk>\n"+
"</gpx>\n";
- public GpxCharArrayWriter(List<Location> l, int instanceid){
+ public GpxCharArrayWriter(List<Location> l, int instanceid, int catid){
super(50); // FIXME: calculate meaningful value
String gpxHeader =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<gpx\n"+
" version=\"1.0\"\n"+
"creator=\"KonPhiDroid\"\n"+
"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"+
"xmlns=\"http://www.topografix.com/GPX/1/0\"\n"+
"xsi:schemaLocation=\"http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd\">\"\n"+
"<time>"+this.date.format(this.cal.getTime())+"T"+this.time.format(this.cal.getTime())+"Z</time>\n" +
"<trk>\n"+
"<trkseg>\n"
;
super.append(gpxHeader);
for (Iterator<Location> iter = l.iterator(); iter.hasNext(); ) {
- saveLocation(iter.next(), instanceid);
+ saveLocation(iter.next(), instanceid, catid);
}
closeFile();
}
private void closeFile() {
super.append(this.gpxFoter);
}
- public void saveLocation(Location loc, int instanceid) {
+ public void saveLocation(Location loc, int instanceid, int catid) {
super.append(
"<trkpt lat=\""+loc.getLatitude()
+ "\" lon=\""+loc.getLongitude()
+ "\" avgvel=\"" + loc.getSpeed()
+ "\" headingdeg=\"" + loc.getBearing()
+ "\" accuracy=\"" + loc.getAccuracy()
+ "\" instanceid=\"" + instanceid
+ + "\" categoryid=\"" + catid
+ "\">\n"+
" <time>"+this.date.format(loc.getTime())
+ "T" + this.time.format(loc.getTime())+"Z</time>\n" +
//"<name>TP"+(pointsCount++)+"</name>\n"+
//"<fix>none</fix>\n"+
"</trkpt>\n");
}
}
diff --git a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
index 7e87261..dfa1486 100644
--- a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
+++ b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
@@ -1,168 +1,168 @@
package de.cstimming.konphidroid;
import java.io.CharArrayWriter;
import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import org.apache.http.HttpEntity;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import android.location.Location;
import android.location.LocationListener;
import android.os.Bundle;
public class LocationCollector implements LocationListener, SenderInterface {
private ArrayList<Location> m_collectingLocations;
private ArrayList<Location> m_sendingLocations;
private boolean m_currentlySending;
private String m_server;
private SliceSenderResult m_result_cb;
private SimpleDateFormat m_dateFormatter;
private int m_instanceid;
private int m_categoryId;
private LocationListener m_location_cb;
private long m_sendingIntervalSecs;
public LocationCollector(String serveraddress, SliceSenderResult result_cb, int instanceid, int mCategoryId, LocationListener another_location_cb) {
m_currentlySending = false;
m_server = serveraddress;
m_result_cb = result_cb;
m_instanceid = instanceid;
m_categoryId = mCategoryId;
m_location_cb = another_location_cb;
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
resetCollecting();
}
private void resetCollecting() {
m_collectingLocations = new ArrayList<Location>();
}
@Override
public void onLocationChanged(Location loc) {
if (m_location_cb != null) {
m_location_cb.onLocationChanged(loc);
}
m_collectingLocations.add(loc);
checkForSending();
}
public void setSendingIntervalSecs(long secs) {
m_sendingIntervalSecs = secs;
}
public long getSendingIntervalSecs() {
return m_sendingIntervalSecs;
}
private void checkForSending() {
if (m_currentlySending
|| m_collectingLocations.size() <= 1
|| m_sendingIntervalSecs == 0) {
return;
}
Location first = m_collectingLocations.get(0);
Location last = m_collectingLocations.get(m_collectingLocations.size() - 1);
long secdiff = (last.getTime() - first.getTime()) / 1000;
if (m_sendingIntervalSecs > 0 && secdiff >= m_sendingIntervalSecs) {
sendNow();
}
}
private void sendNow() {
m_sendingLocations = m_collectingLocations;
m_currentlySending = true;
scheduleSending();
resetCollecting();
}
- private static String listToString(ArrayList<Location> ul, int instanceid) {
- CharArrayWriter gpxoutput = new GpxCharArrayWriter(ul, instanceid);
+ private static String listToString(ArrayList<Location> ul, int instanceid, int categoryid) {
+ CharArrayWriter gpxoutput = new GpxCharArrayWriter(ul, instanceid, categoryid);
String gpxstring = gpxoutput.toString();
return gpxstring;
}
private void scheduleSending() {
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(m_server + "home/gpxUpload"); // FIXME: Different URL for GPX upload!
final String displaytime = m_dateFormatter.format(new Date(m_sendingLocations.get(m_sendingLocations.size() - 1).getTime())) + ": ";
// Copied from http://www.anddev.org/upload_files_to_web_server-t443-s30.html
final String lineEnd = "\r\n";
final String twoHyphens = "--";
final String boundary = "*****";
httppost.setHeader("Content-Type", "multipart/form-data; boundary="+boundary);
- String gpxstring = listToString(m_sendingLocations, m_instanceid);
+ String gpxstring = listToString(m_sendingLocations, m_instanceid, m_categoryId);
String output = twoHyphens + boundary + lineEnd;
output += "Content-Disposition: form-data; name=\"upload\"; filename=\"anonym\"" + lineEnd;
output += "Content-Type: text/plain; charset=UTF-8" + lineEnd;
output += lineEnd;
// send file data
output += gpxstring;
// send multipart form data necesssary after file data.
output += lineEnd;
output += twoHyphens + boundary + twoHyphens + lineEnd;
// Put the string into the http entity
try {
HttpEntity entity = new StringEntity(output);
httppost.setEntity(entity);
} catch (UnsupportedEncodingException e) {
// Auto-generated catch block
e.printStackTrace();
return;
}
//HttpEntity entity = listToStreamEntity(m_sendingLocations, m_instanceid);
// The network connection is moved into a separate task
SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, m_result_cb, this);
// Execute HTTP Post Request
task.execute(httppost);
}
@Override
public void startedSending() {
// TODO Auto-generated method stub
}
@Override
public void stoppedSending(boolean successful) {
if (successful) {
m_currentlySending = false;
m_sendingLocations = null;
} else {
scheduleSending(); // TODO: what now?
}
}
@Override
public void onProviderDisabled(String arg0) {
// TODO Auto-generated method stub
if (m_location_cb != null) {
m_location_cb.onProviderDisabled(arg0);
}
}
@Override
public void onProviderEnabled(String arg0) {
// TODO Auto-generated method stub
if (m_location_cb != null) {
m_location_cb.onProviderEnabled(arg0);
}
}
@Override
public void onStatusChanged(String arg0, int arg1, Bundle arg2) {
// TODO Auto-generated method stub
}
}
diff --git a/konphidroidTest/src/de/cstimming/konphidroid/test/GpxFileTest.java b/konphidroidTest/src/de/cstimming/konphidroid/test/GpxFileTest.java
index 7e32cd2..4058a88 100644
--- a/konphidroidTest/src/de/cstimming/konphidroid/test/GpxFileTest.java
+++ b/konphidroidTest/src/de/cstimming/konphidroid/test/GpxFileTest.java
@@ -1,34 +1,34 @@
package de.cstimming.konphidroid.test;
import java.util.ArrayList;
import java.util.List;
import android.location.Location;
import junit.framework.TestCase;
import de.cstimming.konphidroid.GpxCharArrayWriter;
public class GpxFileTest extends TestCase {
private List<Location> m_list;
protected void setUp() throws Exception {
super.setUp();
m_list = new ArrayList<Location>();
Location loc = new Location("foo");
loc.setLongitude(0);
loc.setLatitude(0);
m_list.add(loc);
m_list.add(loc);
}
public void testWriter() {
- GpxCharArrayWriter w = new GpxCharArrayWriter(m_list, 17);
+ GpxCharArrayWriter w = new GpxCharArrayWriter(m_list, 17, 32);
System.out.println(w.toString());
System.out.println("blabla");
assertTrue(true);
}
protected void tearDown() throws Exception {
m_list = null;
super.tearDown();
}
}
|
cstim/carcomm
|
9a9af9ea0493d80e558ce3d9c0ce1579ca544c39
|
More gitignores. Add GPX example file for upload.
|
diff --git a/.gitignore b/.gitignore
index 1b32385..8748330 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,12 @@
-db/development.sqlite3
*~
-log/development.log
.metadata
+db/development.sqlite3
+doc/abfotografiert/05_umgebungsmodell_raster2.jpg
+gps-tracks/slices-hessen-2011-01-27.gpx
+konphidroid/*pid*.log
+log/development.log
+webapp/.buildpath
+webapp/.project
+webapp/db/test.sqlite3
+webapp/log/test.log
+webapp/spec/
diff --git a/gps-tracks/testgpx.gpx b/gps-tracks/testgpx.gpx
new file mode 100644
index 0000000..7d108f2
--- /dev/null
+++ b/gps-tracks/testgpx.gpx
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gpx version="1.0" creator="OpenStreetMap.org" xmlns="http://www.topografix.com/GPX/1/0/">
+<trk>
+<trkseg>
+<trkpt lat="48.0" lon="10.0"
+ avgvel="20.0" headingdeg="0.0" accuracy="3.0" instanceid="17">
+ <time>2010-10-01T00:00:00Z</time>
+</trkpt>
+<trkpt lat="48.0" lon="10.0003"
+ avgvel="20.0" headingdeg="0.0" accuracy="4.0" instanceid="17">
+ <time>2010-10-01T00:01:00Z</time>
+</trkpt>
+<trkpt lat="48.0" lon="10.0006"
+ avgvel="20.0" headingdeg="0.0" accuracy="5.0" instanceid="17">
+ <time>2010-10-01T00:02:00Z</time>
+</trkpt>
+</trkseg>
+</trk>
+</gpx>
|
cstim/carcomm
|
54db5adf9682365f01beaf03a38878690f7d9a27
|
Refactor gpx and nmea upload into separate ruby files.
|
diff --git a/webapp/app/controllers/home_controller.rb b/webapp/app/controllers/home_controller.rb
index 24965af..94532c1 100644
--- a/webapp/app/controllers/home_controller.rb
+++ b/webapp/app/controllers/home_controller.rb
@@ -1,193 +1,33 @@
-require 'rexml/document'
-require 'time'
-require 'date'
-
-# Represents one point of a GPX or NMEA track
-class Trkpt
- attr_reader :time, :lat, :lon,
- :avgvel, :headingdeg,
- :accuracy, :instanceid, :categoryid
-
- def initialize(_time, _lat, _lon)
- @time = _time
- @lat = _lat
- @lon = _lon
- @avgvel = nil
- @headingdeg = nil
- @accuracy = 0
- @instanceid = 0
- @categoryid = 0
- end
-
- def fromXml(elem)
- @avgvel = nil
- @headingdeg = nil
- @accuracy = 0
- @instanceid = 0
- @categoryid = 0
- if not elem.attribute("lat").nil?
- @lat = elem.attribute("lat").to_s
- end
- if not elem.attribute("lon").nil?
- @lon = elem.attribute("lon").to_s
- end
- if elem.elements["time"]
- strtime = elem.elements["time"].text
- @time = Time.parse strtime
- end
- if not elem.attribute("avgvel").nil?
- @avgvel = elem.attribute("avgvel").to_s
- end
- if not elem.attribute("headingdeg").nil?
- @headingdeg = elem.attribute("headingdeg").to_s
- end
- if not elem.attribute("accuracy").nil?
- @accuracy = elem.attribute("accuracy").to_s
- end
- if not elem.attribute("instanceid").nil?
- @instanceid = elem.attribute("instanceid").to_s
- end
- if not elem.attribute("categoryid").nil?
- @categoryid = elem.attribute("categoryid").to_s
- end
- end
-end
-
-# Convert a NMEA coordinate string to a floating point number
-def dmmm2dec(degrees, sw)
- deg = (degrees/100.0).floor #decimal degrees
- frac = ((degrees/100.0)-deg)/0.6 #decimal fraction
- ret = deg+frac #positive return value
- if ((sw=="S") or (sw=="W")):
- ret=ret*(-1) #flip sign if south or west
- end
- return ret
-end
-
-# Post a slice into our database
-def postSlice(trkpt, prev)
- duration = prev.time.nil? ? 0 : trkpt.time - prev.time
- if duration < 95
- slice = Slice.new(:time => trkpt.time,
- :lat => trkpt.lat,
- :lon => trkpt.lon,
- :startlat => prev.lat,
- :startlon => prev.lon,
- :duration => duration,
- :avgvel => trkpt.avgvel,
- :headingdeg => trkpt.headingdeg,
- :startaccuracy => prev.accuracy,
- :endaccuracy => trkpt.accuracy,
- :instanceid => trkpt.instanceid,
- :categoryid => trkpt.categoryid)
- slice.save
- return true
- else
- return false
- end
-end
-
+require 'nmea'
+require 'gpx'
# The controller class
class HomeController < ApplicationController
attr_reader :minSliceDuration
def initialize
@minSliceDuration = 0 # formerly: 30
super
end
protect_from_forgery :except => :gpxUpload
def index
end
def gpxUpload
- resulttext = storeGpx(params[:upload])
+ resulttext = Gpx.storeGpx(params[:upload], minSliceDuration)
render :text => "File has been uploaded successfully: #{resulttext}"
#r = runMyAlgo
#render :text => r.to_s
end
def nmeaUpload
- resulttext = storeNMEA(params[:upload])
+ resulttext = Nmea.storeNMEA(params[:upload], minSliceDuration)
render :text => "File has been uploaded successfully: #{resulttext}, with duration #{minSliceDuration} seconds each."
end
- protected
- def storeGpx(file)
- originalname = (defined? file.original_filename) ? file.original_filename : "<anonymous>"
- content = file.read
-
- doc = REXML::Document.new content
- newslices = 0
- doc.elements.each("gpx/trk/trkseg") do | track |
- prev = nil
- track.elements.each do | elem_trkpt |
- trkpt = Trkpt.new(nil, nil, nil)
- trkpt.fromXml elem_trkpt
- #logger.info("#{Time.now} Trying trkpt, got #{trkpt} from #{elem_trkpt}")
- if prev.nil? or trkpt.time.nil?
- prev = trkpt
- else
- duration = prev.time.nil? ? 0 : trkpt.time - prev.time
- # Skip slices smaller than 30 seconds
- if duration > minSliceDuration
- # Ignore everything above 95 seconds altogether
- if postSlice(trkpt, prev)
- newslices = 1 + newslices
- end
- prev = trkpt
- end
- end
- end # track.points.each
- end # gpx.tracks.each
- "Added #{newslices} new slices from #{originalname}"
- end
-
- protected
- def storeNMEA(file)
- originalname = file.original_filename
- date = nil
- prev = nil
- newslices = 0
-
- while (line = file.gets) do
- if line =~ /\$GPRMC/
- tokens = line.split(",")
- date = Date.strptime(tokens[9], '%d%m%y')
- end
- if line =~ /\$GPGGA/
- tokens = line.split(",")
- time = Time.parse tokens[1]
- if tokens[6] != '0' and not date.nil?
- datetime = Time.utc(date.year, date.month, date.day,
- time.hour, time.min, time.sec, time.usec)
- lat = dmmm2dec((tokens[2]).to_f,tokens[3])
- lon = dmmm2dec((tokens[4]).to_f,tokens[5])
- trkpt = Trkpt.new(datetime, lat, lon)
-
- if prev.nil? or trkpt.time.nil?
- prev = trkpt
- else
- duration = prev.time.nil? ? 0 : trkpt.time - prev.time
- # Skip slices smaller than the minimum duration
- if duration >= minSliceDuration
- # Ignore everything above 95 seconds altogether
- if postSlice(trkpt, prev)
- newslices = 1 + newslices
- end
- prev = trkpt
- end
- end # end else prev.nil? or trkpt.time.nil?
-
- end # end tokens[6] != '0' and not date.nil?
- end # end line =~ /\$GPGGA/
- end # end while (line = file.gets) do
-
- "Added #{newslices} new slices from #{originalname}"
- end
end
diff --git a/webapp/lib/geo.rb b/webapp/lib/geo.rb
index 7e84727..8cb792f 100644
--- a/webapp/lib/geo.rb
+++ b/webapp/lib/geo.rb
@@ -1,24 +1,23 @@
class Geo
DEG_TO_RAD = Math::PI / 180.0
RAD_TO_DEG = 180.0 / Math::PI
-
def self.haversine_dist(startlat, lat, startlon, lon)
# We have the start and end point in WGS84 and want to calculate
# the distance. This uses the Haversine formula, see
# http://www.movable-type.co.uk/scripts/latlong.html
earthR = 6371000 # m
lat_rad = lat * DEG_TO_RAD
startlat_rad = startlat * DEG_TO_RAD
dLat = (lat - startlat) * DEG_TO_RAD
dLon = (lon - startlon) * DEG_TO_RAD
a = Math::sin(dLat / 2) * Math::sin(dLat / 2) \
- + Math::cos(startlat_rad) * Math::cos(lat_rad) \
- * Math::sin(dLon / 2) * Math::sin(dLon / 2)
+ + Math::cos(startlat_rad) * Math::cos(lat_rad) \
+ * Math::sin(dLon / 2) * Math::sin(dLon / 2)
c = 2 * Math::atan2(Math::sqrt(a), Math::sqrt(1 - a))
earthR * c
end
end
diff --git a/webapp/lib/gpx.rb b/webapp/lib/gpx.rb
new file mode 100644
index 0000000..263df33
--- /dev/null
+++ b/webapp/lib/gpx.rb
@@ -0,0 +1,35 @@
+require 'rexml/document'
+require 'trkpt'
+
+class Gpx
+ def self.storeGpx(file, minSliceDuration)
+ originalname = (defined? file.original_filename) ? file.original_filename : "<anonymous>"
+ content = file.read
+
+ doc = REXML::Document.new content
+ newslices = 0
+ doc.elements.each("gpx/trk/trkseg") do | track |
+ prev = nil
+ track.elements.each do | elem_trkpt |
+ trkpt = Trkpt.new(nil, nil, nil)
+ trkpt.fromXml elem_trkpt
+ #logger.info("#{Time.now} Trying trkpt, got #{trkpt} from #{elem_trkpt}")
+ if prev.nil? or trkpt.time.nil?
+ prev = trkpt
+ else
+ duration = prev.time.nil? ? 0 : trkpt.time - prev.time
+ # Skip slices smaller than 30 seconds
+ if duration > minSliceDuration
+ # Ignore everything above 95 seconds altogether
+ if Trkpt.postSlice(trkpt, prev)
+ newslices = 1 + newslices
+ end
+ prev = trkpt
+ end
+ end
+ end # track.points.each
+ end # gpx.tracks.each
+ "Added #{newslices} new slices from #{originalname}"
+ end
+
+end
\ No newline at end of file
diff --git a/webapp/lib/nmea.rb b/webapp/lib/nmea.rb
new file mode 100644
index 0000000..7f2ec83
--- /dev/null
+++ b/webapp/lib/nmea.rb
@@ -0,0 +1,60 @@
+require 'time'
+require 'date'
+require 'trkpt'
+
+class Nmea
+ # Convert a NMEA coordinate string to a floating point number
+ def self.dmmm2dec(degrees, sw)
+ deg = (degrees/100.0).floor #decimal degrees
+ frac = ((degrees/100.0)-deg)/0.6 #decimal fraction
+ ret = deg+frac #positive return value
+ if ((sw=="S") or (sw=="W")):
+ ret=ret*(-1) #flip sign if south or west
+ end
+ return ret
+ end
+
+ def self.storeNMEA(file, minSliceDuration)
+ originalname = file.original_filename
+
+ date = nil
+ prev = nil
+ newslices = 0
+
+ while (line = file.gets) do
+ if line =~ /\$GPRMC/
+ tokens = line.split(",")
+ date = Date.strptime(tokens[9], '%d%m%y')
+ end
+ if line =~ /\$GPGGA/
+ tokens = line.split(",")
+ time = Time.parse tokens[1]
+ if tokens[6] != '0' and not date.nil?
+ datetime = Time.utc(date.year, date.month, date.day,
+ time.hour, time.min, time.sec, time.usec)
+ lat = Nmea.dmmm2dec((tokens[2]).to_f,tokens[3])
+ lon = Nmea.dmmm2dec((tokens[4]).to_f,tokens[5])
+ trkpt = Trkpt.new(datetime, lat, lon)
+
+ if prev.nil? or trkpt.time.nil?
+ prev = trkpt
+ else
+ duration = prev.time.nil? ? 0 : trkpt.time - prev.time
+ # Skip slices smaller than the minimum duration
+ if duration >= minSliceDuration
+ # Ignore everything above 95 seconds altogether
+ if Trkpt.postSlice(trkpt, prev)
+ newslices = 1 + newslices
+ end
+ prev = trkpt
+ end
+ end # end else prev.nil? or trkpt.time.nil?
+
+ end # end tokens[6] != '0' and not date.nil?
+ end # end line =~ /\$GPGGA/
+ end # end while (line = file.gets) do
+
+ "Added #{newslices} new slices from #{originalname}"
+ end
+
+end
\ No newline at end of file
diff --git a/webapp/lib/trkpt.rb b/webapp/lib/trkpt.rb
new file mode 100644
index 0000000..f50b09c
--- /dev/null
+++ b/webapp/lib/trkpt.rb
@@ -0,0 +1,76 @@
+require 'time'
+
+# Represents one point of a GPX or NMEA track
+class Trkpt
+ attr_reader :time, :lat, :lon,
+ :avgvel, :headingdeg,
+ :accuracy, :instanceid, :categoryid
+
+ def initialize(_time, _lat, _lon)
+ @time = _time
+ @lat = _lat
+ @lon = _lon
+ @avgvel = nil
+ @headingdeg = nil
+ @accuracy = 0
+ @instanceid = 0
+ @categoryid = 0
+ end
+
+ def fromXml(elem)
+ @avgvel = nil
+ @headingdeg = nil
+ @accuracy = 0
+ @instanceid = 0
+ @categoryid = 0
+ if not elem.attribute("lat").nil?
+ @lat = elem.attribute("lat").to_s
+ end
+ if not elem.attribute("lon").nil?
+ @lon = elem.attribute("lon").to_s
+ end
+ if elem.elements["time"]
+ strtime = elem.elements["time"].text
+ @time = Time.parse strtime
+ end
+ if not elem.attribute("avgvel").nil?
+ @avgvel = elem.attribute("avgvel").to_s
+ end
+ if not elem.attribute("headingdeg").nil?
+ @headingdeg = elem.attribute("headingdeg").to_s
+ end
+ if not elem.attribute("accuracy").nil?
+ @accuracy = elem.attribute("accuracy").to_s
+ end
+ if not elem.attribute("instanceid").nil?
+ @instanceid = elem.attribute("instanceid").to_s
+ end
+ if not elem.attribute("categoryid").nil?
+ @categoryid = elem.attribute("categoryid").to_s
+ end
+ end
+
+ # Post a slice into our database
+ def self.postSlice(trkpt, prev)
+ duration = prev.time.nil? ? 0 : trkpt.time - prev.time
+ if duration < 95
+ slice = Slice.new(:time => trkpt.time,
+ :lat => trkpt.lat,
+ :lon => trkpt.lon,
+ :startlat => prev.lat,
+ :startlon => prev.lon,
+ :duration => duration,
+ :avgvel => trkpt.avgvel,
+ :headingdeg => trkpt.headingdeg,
+ :startaccuracy => prev.accuracy,
+ :endaccuracy => trkpt.accuracy,
+ :instanceid => trkpt.instanceid,
+ :categoryid => trkpt.categoryid)
+ slice.save
+ return true
+ else
+ return false
+ end
+ end
+
+end
|
cstim/carcomm
|
681b1cc4bc0e014235b9f75a641fd412b486a2a0
|
Some rudimentary unittesting
|
diff --git a/webapp/test/test_helper.rb b/webapp/test/test_helper.rb
index 9f19269..73eecbb 100644
--- a/webapp/test/test_helper.rb
+++ b/webapp/test/test_helper.rb
@@ -1,38 +1,38 @@
ENV["RAILS_ENV"] = "test"
require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
require 'test_help'
class Test::Unit::TestCase
# Transactional fixtures accelerate your tests by wrapping each test method
# in a transaction that's rolled back on completion. This ensures that the
# test database remains unchanged so your fixtures don't have to be reloaded
# between every test method. Fewer database queries means faster tests.
#
# Read Mike Clark's excellent walkthrough at
# http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
#
# Every Active Record database supports transactions except MyISAM tables
# in MySQL. Turn off transactional fixtures in this case; however, if you
# don't care one way or the other, switching from MyISAM to InnoDB tables
# is recommended.
#
# The only drawback to using transactional fixtures is when you actually
# need to test transactions. Since your test is bracketed by a transaction,
# any transactions started in your code will be automatically rolled back.
- self.use_transactional_fixtures = true
+# self.use_transactional_fixtures = true
# Instantiated fixtures are slow, but give you @david where otherwise you
# would need people(:david). If you don't want to migrate your existing
# test cases which use the @david style and don't mind the speed hit (each
# instantiated fixtures translates to a database query per test method),
# then set this back to true.
- self.use_instantiated_fixtures = false
+# self.use_instantiated_fixtures = false
# Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
#
# Note: You'll currently still have to declare fixtures explicitly in integration tests
# -- they do not yet inherit this setting
- fixtures :all
+# fixtures :all
# Add more helper methods to be used by all tests here...
end
diff --git a/webapp/test/unit/slice_test.rb b/webapp/test/unit/slice_test.rb
index 7d251c8..b7d5822 100644
--- a/webapp/test/unit/slice_test.rb
+++ b/webapp/test/unit/slice_test.rb
@@ -1,8 +1,12 @@
require 'test_helper'
+require 'geo'
class SliceTest < ActiveSupport::TestCase
# Replace this with your real tests.
- test "the truth" do
- assert true
+# test "the truth" do
+# assert true
+# end
+ test "geo haversine_dist" do
+ assert Geo.haversine_dist(2,4,3,5)# == 314283.255073684
end
end
|
cstim/carcomm
|
b476371653ffa432048b966cfaa819dc1bddc41e
|
Here we add the algo code
|
diff --git a/webapp/app/controllers/home_controller.rb b/webapp/app/controllers/home_controller.rb
index a1af5ca..24965af 100644
--- a/webapp/app/controllers/home_controller.rb
+++ b/webapp/app/controllers/home_controller.rb
@@ -1,189 +1,193 @@
require 'rexml/document'
require 'time'
require 'date'
# Represents one point of a GPX or NMEA track
class Trkpt
attr_reader :time, :lat, :lon,
:avgvel, :headingdeg,
:accuracy, :instanceid, :categoryid
def initialize(_time, _lat, _lon)
@time = _time
@lat = _lat
@lon = _lon
@avgvel = nil
@headingdeg = nil
@accuracy = 0
@instanceid = 0
@categoryid = 0
end
def fromXml(elem)
@avgvel = nil
@headingdeg = nil
@accuracy = 0
@instanceid = 0
@categoryid = 0
if not elem.attribute("lat").nil?
@lat = elem.attribute("lat").to_s
end
if not elem.attribute("lon").nil?
@lon = elem.attribute("lon").to_s
end
if elem.elements["time"]
strtime = elem.elements["time"].text
@time = Time.parse strtime
end
if not elem.attribute("avgvel").nil?
@avgvel = elem.attribute("avgvel").to_s
end
if not elem.attribute("headingdeg").nil?
@headingdeg = elem.attribute("headingdeg").to_s
end
if not elem.attribute("accuracy").nil?
@accuracy = elem.attribute("accuracy").to_s
end
if not elem.attribute("instanceid").nil?
@instanceid = elem.attribute("instanceid").to_s
end
if not elem.attribute("categoryid").nil?
@categoryid = elem.attribute("categoryid").to_s
end
end
end
# Convert a NMEA coordinate string to a floating point number
def dmmm2dec(degrees, sw)
deg = (degrees/100.0).floor #decimal degrees
frac = ((degrees/100.0)-deg)/0.6 #decimal fraction
ret = deg+frac #positive return value
if ((sw=="S") or (sw=="W")):
ret=ret*(-1) #flip sign if south or west
end
return ret
end
# Post a slice into our database
def postSlice(trkpt, prev)
duration = prev.time.nil? ? 0 : trkpt.time - prev.time
if duration < 95
slice = Slice.new(:time => trkpt.time,
:lat => trkpt.lat,
:lon => trkpt.lon,
:startlat => prev.lat,
:startlon => prev.lon,
:duration => duration,
:avgvel => trkpt.avgvel,
:headingdeg => trkpt.headingdeg,
:startaccuracy => prev.accuracy,
:endaccuracy => trkpt.accuracy,
:instanceid => trkpt.instanceid,
:categoryid => trkpt.categoryid)
slice.save
return true
else
return false
end
end
# The controller class
class HomeController < ApplicationController
attr_reader :minSliceDuration
def initialize
@minSliceDuration = 0 # formerly: 30
super
end
protect_from_forgery :except => :gpxUpload
def index
end
def gpxUpload
resulttext = storeGpx(params[:upload])
render :text => "File has been uploaded successfully: #{resulttext}"
+
+ #r = runMyAlgo
+
+ #render :text => r.to_s
end
def nmeaUpload
resulttext = storeNMEA(params[:upload])
render :text => "File has been uploaded successfully: #{resulttext}, with duration #{minSliceDuration} seconds each."
end
protected
def storeGpx(file)
originalname = (defined? file.original_filename) ? file.original_filename : "<anonymous>"
content = file.read
doc = REXML::Document.new content
newslices = 0
doc.elements.each("gpx/trk/trkseg") do | track |
prev = nil
track.elements.each do | elem_trkpt |
trkpt = Trkpt.new(nil, nil, nil)
trkpt.fromXml elem_trkpt
#logger.info("#{Time.now} Trying trkpt, got #{trkpt} from #{elem_trkpt}")
if prev.nil? or trkpt.time.nil?
prev = trkpt
else
duration = prev.time.nil? ? 0 : trkpt.time - prev.time
# Skip slices smaller than 30 seconds
if duration > minSliceDuration
# Ignore everything above 95 seconds altogether
if postSlice(trkpt, prev)
newslices = 1 + newslices
end
prev = trkpt
end
end
end # track.points.each
end # gpx.tracks.each
"Added #{newslices} new slices from #{originalname}"
end
protected
def storeNMEA(file)
originalname = file.original_filename
date = nil
prev = nil
newslices = 0
while (line = file.gets) do
if line =~ /\$GPRMC/
tokens = line.split(",")
date = Date.strptime(tokens[9], '%d%m%y')
end
if line =~ /\$GPGGA/
tokens = line.split(",")
time = Time.parse tokens[1]
if tokens[6] != '0' and not date.nil?
datetime = Time.utc(date.year, date.month, date.day,
time.hour, time.min, time.sec, time.usec)
lat = dmmm2dec((tokens[2]).to_f,tokens[3])
lon = dmmm2dec((tokens[4]).to_f,tokens[5])
trkpt = Trkpt.new(datetime, lat, lon)
if prev.nil? or trkpt.time.nil?
prev = trkpt
else
duration = prev.time.nil? ? 0 : trkpt.time - prev.time
# Skip slices smaller than the minimum duration
if duration >= minSliceDuration
# Ignore everything above 95 seconds altogether
if postSlice(trkpt, prev)
newslices = 1 + newslices
end
prev = trkpt
end
end # end else prev.nil? or trkpt.time.nil?
end # end tokens[6] != '0' and not date.nil?
end # end line =~ /\$GPGGA/
end # end while (line = file.gets) do
"Added #{newslices} new slices from #{originalname}"
end
end
|
cstim/carcomm
|
f299a378b3765492466d2dcb6ee2cc4d25fbdd87
|
Refactoring into separate file.
|
diff --git a/webapp/app/models/slice.rb b/webapp/app/models/slice.rb
index f8cebd3..b84de99 100644
--- a/webapp/app/models/slice.rb
+++ b/webapp/app/models/slice.rb
@@ -1,72 +1,59 @@
+require "geo"
+
class Slice < ActiveRecord::Base
validates_presence_of :time, :lat, :lon, :avgvel
validates_numericality_of :avgvel, :greater_than_or_equal_to => 0, :less_than => 100
validates_numericality_of :lon, :startlon,
:greater_than_or_equal_to => -180, :less_than_or_equal_to => 180
validates_numericality_of :lat, :startlat,
:greater_than_or_equal_to => -90, :less_than_or_equal_to => 90
before_validation :calc_dist_if_empty!, :calc_heading_if_empty!,
:calc_duration_from_avgvel!, :calc_avgvel_from_duration!
# Set the lines per page in pagination view
cattr_reader :per_page
@@per_page = 50
DEG_TO_RAD = Math::PI / 180.0
RAD_TO_DEG = 180.0 / Math::PI
protected
+
def calc_dist_if_empty!
if dist.nil? and not (startlat.nil? or startlon.nil? or lat.nil? or lon.nil?)
# We have the start and end point in WGS84 and want to calculate
# the distance. This uses the Haversine formula, see
# http://www.movable-type.co.uk/scripts/latlong.html
- earthR = 6371000 # m
- lat_rad = lat * DEG_TO_RAD
- startlat_rad = startlat * DEG_TO_RAD
-
- dLat = (lat - startlat) * DEG_TO_RAD
- dLon = (lon - startlon) * DEG_TO_RAD
-
- a = Math::sin(dLat / 2) * Math::sin(dLat / 2) \
- + Math::cos(startlat_rad) * Math::cos(lat_rad) \
- * Math::sin(dLon / 2) * Math::sin(dLon / 2)
- c = 2 * Math::atan2(Math::sqrt(a), Math::sqrt(1 - a))
- d = earthR * c
-
- self.dist = d
+ self.dist = Geo.haversine_dist(startlat, lat, startlon, lon)
end
end
- protected
def calc_heading_if_empty!
if headingdeg.nil? and not (startlat.nil? or startlon.nil? or lat.nil? or lon.nil?)
startlat_rad = startlat * DEG_TO_RAD
endlat_rad = lat * DEG_TO_RAD
dLon = (lon - startlon) * DEG_TO_RAD
y = Math::sin(dLon) * Math::cos(startlat_rad)
x = Math::cos(endlat_rad) * Math::sin(startlat_rad) \
- Math::sin(endlat_rad) * Math::cos(startlat_rad) \
* Math::cos(dLon)
bearing_rad = Math::atan2(y, x)
self.headingdeg = ((-bearing_rad + Math::PI) * RAD_TO_DEG) % 360
end
end
- protected
def calc_duration_from_avgvel!
if duration.nil? and not dist.nil? and not avgvel.nil?
self.duration = dist / avgvel
end
end
- protected
def calc_avgvel_from_duration!
if avgvel.nil? and not dist.nil? and not duration.nil?
self.avgvel = dist / duration
end
end
end
diff --git a/webapp/lib/geo.rb b/webapp/lib/geo.rb
new file mode 100644
index 0000000..7e84727
--- /dev/null
+++ b/webapp/lib/geo.rb
@@ -0,0 +1,24 @@
+class Geo
+ DEG_TO_RAD = Math::PI / 180.0
+ RAD_TO_DEG = 180.0 / Math::PI
+
+ def self.haversine_dist(startlat, lat, startlon, lon)
+ # We have the start and end point in WGS84 and want to calculate
+ # the distance. This uses the Haversine formula, see
+ # http://www.movable-type.co.uk/scripts/latlong.html
+
+ earthR = 6371000 # m
+ lat_rad = lat * DEG_TO_RAD
+ startlat_rad = startlat * DEG_TO_RAD
+
+ dLat = (lat - startlat) * DEG_TO_RAD
+ dLon = (lon - startlon) * DEG_TO_RAD
+
+ a = Math::sin(dLat / 2) * Math::sin(dLat / 2) \
+ + Math::cos(startlat_rad) * Math::cos(lat_rad) \
+ * Math::sin(dLon / 2) * Math::sin(dLon / 2)
+ c = 2 * Math::atan2(Math::sqrt(a), Math::sqrt(1 - a))
+ earthR * c
+ end
+
+end
|
cstim/carcomm
|
4ee9de78314c239163643769d4039993cf67d223
|
Add icons "Stautimer".
|
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml
index 4fe90bc..ad33776 100644
--- a/konphidroid/AndroidManifest.xml
+++ b/konphidroid/AndroidManifest.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.cstimming.konphidroid"
android:versionName="0.7" android:versionCode="7">
- <application android:icon="@drawable/icon" android:label="@string/app_name">
+ <application android:icon="@drawable/stautimer_icon" android:label="@string/app_name">
<activity android:name=".KonPhiActivity"
android:label="@string/app_name" android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4"></uses-sdk>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
</manifest>
diff --git a/konphidroid/res/drawable-hdpi/stautimer_icon.png b/konphidroid/res/drawable-hdpi/stautimer_icon.png
new file mode 100644
index 0000000..690f252
Binary files /dev/null and b/konphidroid/res/drawable-hdpi/stautimer_icon.png differ
diff --git a/konphidroid/res/drawable-ldpi/stautimer_icon.png b/konphidroid/res/drawable-ldpi/stautimer_icon.png
new file mode 100644
index 0000000..e0fc118
Binary files /dev/null and b/konphidroid/res/drawable-ldpi/stautimer_icon.png differ
diff --git a/konphidroid/res/drawable-mdpi/stautimer_icon.png b/konphidroid/res/drawable-mdpi/stautimer_icon.png
new file mode 100644
index 0000000..b25749a
Binary files /dev/null and b/konphidroid/res/drawable-mdpi/stautimer_icon.png differ
|
cstim/carcomm
|
047d325851d4a08ac08e828a94d15e367f11c8e0
|
Set minimum target API to 4 to avoid requesting phone calls permission.
|
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml
index b2db3d2..4fe90bc 100644
--- a/konphidroid/AndroidManifest.xml
+++ b/konphidroid/AndroidManifest.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="de.cstimming.konphidroid"
- android:versionName="0.7" android:versionCode="7">
+ package="de.cstimming.konphidroid"
+ android:versionName="0.7" android:versionCode="7">
<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".KonPhiActivity"
android:label="@string/app_name" android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
- <uses-sdk android:minSdkVersion="3" />
+ <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4"></uses-sdk>
-<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
-<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
-<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"></uses-permission>
-<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
-<uses-permission android:name="android.permission.INTERNET"></uses-permission>
-</manifest>
\ No newline at end of file
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
+ <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"></uses-permission>
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
+ <uses-permission android:name="android.permission.INTERNET"></uses-permission>
+</manifest>
diff --git a/konphidroid/default.properties b/konphidroid/default.properties
index 4513a1e..9d79b12 100644
--- a/konphidroid/default.properties
+++ b/konphidroid/default.properties
@@ -1,11 +1,11 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system use,
# "build.properties", and override values to adapt the script to your
# project structure.
# Project target.
-target=android-3
+target=android-4
|
cstim/carcomm
|
e811f3f72e038a4b5c844f820516d3368b144152
|
Add download buttons on website: Download as GPX or as CSV. Add CSV renderer.
|
diff --git a/webapp/app/controllers/slices_controller.rb b/webapp/app/controllers/slices_controller.rb
index 18f29d0..495cd00 100644
--- a/webapp/app/controllers/slices_controller.rb
+++ b/webapp/app/controllers/slices_controller.rb
@@ -1,117 +1,118 @@
class SlicesController < ApplicationController
before_filter :find_slice,
:only => [:show, :edit, :update, :destroy]
protect_from_forgery :except => :create
# GET /slices
# GET /slices.xml
def index
# Build the conditions for the sub-set of slices
conds = {}
if params.has_key?(:min_lat) and params.has_key?(:max_lat)
conds[:lat] = params[:min_lat]..params[:max_lat]
end
if params.has_key?(:min_lon) and params.has_key?(:max_lon)
conds[:lon] = params[:min_lon]..params[:max_lon]
end
if params.has_key?(:min_time) and params.has_key?(:max_time)
conds[:time] = params[:min_time]..params[:max_time]
end
# Run the query
if request.format == Mime::HTML
# HTML gets only the reduces set of records
@slices = Slice.paginate :page => params[:page], :conditions => conds
else
# Non-HTML formats still get all records
@slices = Slice.all(:conditions => conds)
end
# And choose the output format
respond_to do |format|
format.html # index.html.erb
+ format.csv # index.erb
format.gpx # index.gpx.builder
format.xml { render :xml => @slices }
end
response.headers['Access-Control-Allow-Origin'] = '*'
end
# GET /slices/1
# GET /slices/1.xml
def show
# The before_filter find_slice is run beforehand
respond_to do |format|
format.html # show.html.erb
format.xml { render :xml => @slice }
end
end
# GET /slices/new
# GET /slices/new.xml
def new
@slice = Slice.new
respond_to do |format|
format.html # new.html.erb
format.xml { render :xml => @slice }
end
end
# GET /slices/1/edit
def edit
# The before_filter find_slice is run beforehand
end
# POST /slices
# POST /slices.xml
def create
@slice = Slice.new(params[:slice])
respond_to do |format|
if @slice.save
flash[:notice] = 'Slice was successfully created.'
format.html { redirect_to(@slice) }
format.xml { render :xml => @slice, :status => :created, :location => @slice }
else
format.html { render :action => "new" }
format.xml { render :xml => @slice.errors, :status => :unprocessable_entity }
end
end
end
# PUT /slices/1
# PUT /slices/1.xml
def update
# The before_filter find_slice is run beforehand
respond_to do |format|
if @slice.update_attributes(params[:slice])
flash[:notice] = 'Slice was successfully updated.'
format.html { redirect_to(@slice) }
format.xml { head :ok }
else
format.html { render :action => "edit" }
format.xml { render :xml => @slice.errors, :status => :unprocessable_entity }
end
end
end
# DELETE /slices/1
# DELETE /slices/1.xml
def destroy
# The before_filter find_slice is run beforehand
@slice.destroy
respond_to do |format|
format.html { redirect_to(:back) }
format.xml { head :ok }
end
end
private
def find_slice
@slice = Slice.find(params[:id])
end
end
diff --git a/webapp/app/views/home/index.html.erb b/webapp/app/views/home/index.html.erb
index ac1e433..e3b98a7 100644
--- a/webapp/app/views/home/index.html.erb
+++ b/webapp/app/views/home/index.html.erb
@@ -1,200 +1,247 @@
<head>
<title>Car Comm Server Prototype, 2010-04-12</title>
<!-- bring in the OpenLayers javascript library
(here we bring it from the remote site, but you could
easily serve up this javascript yourself) -->
<script src="OpenLayers.js"></script>
<!--script src="http://www.openlayers.org/api/OpenLayers.js"></script-->
<!-- bring in the OpenStreetMap OpenLayers layers.
Using this hosted file will make sure we are kept up
to date with any necessary changes -->
<script src="OpenStreetMap.js"></script>
<!--script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script-->
<!-- The personal functions from CS -->
<script src="csfuncs.js"></script>
<script type="text/javascript">
var map; //complex object of type OpenLayers.Map
var layerGpx;
var gpxStyleMap;
var serverUrl;
function zoomTo(lat, lon, zoom) {
var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
map.setCenter (lonLat, zoom);
updateExtent();
}
function zoomToHamburg() {
// Start position for the map (hardcoded here for simplicity)
zoomTo(53.5514, 9.99, 12);
}
function zoomToMuenchen() {
zoomTo(48.1361, 11.5376, 12);
}
//Initialise the 'map' object
function init() {
serverUrl = ""; // "http://carcomm.cstimming.de/";
// Define the map layer
map = csCreateMap();
// Define the styles for the way slices
gpxStyleMap = csCreateGpxStyleMap();
+ // Set the initial date interval to 2 weeks
+ var num_minutes = 10080 * 2 + 60; // 2 weeks + 1 hour
+ var max_time = new Date();
+ document.forms.extent.max_time.value = dateToString(max_time);
+ var min_time = new Date(max_time.getTime() - num_minutes * 60 * 1000);
+ document.forms.extent.min_time.value = dateToString(min_time);
+
// Choose Hamburg as center
zoomToHamburg();
}
function setServerUrl(value) {
serverUrl = value;
}
function on_osm_loadstart() {
}
function on_osm_tileloaded() {
}
function reloadWays() {
if (layerGpx) {
map.removeLayer(layerGpx);
layerGpx.destroy();
}
var min_lat = document.forms.extent.min_lat.value;
var max_lat = document.forms.extent.max_lat.value;
var min_lon = document.forms.extent.min_lon.value;
var max_lon = document.forms.extent.max_lon.value;
var min_time = document.forms.extent.min_time.value;
var max_time = document.forms.extent.max_time.value;
// Add the Layer with GPX Track
layerGpx = csCreateLayerGpx(serverUrl,
min_lat, max_lat,
min_lon, max_lon,
min_time, max_time);
map.addLayer(layerGpx);
}
+ function loadWaysGpx() {
+ var min_lat = document.forms.extent.min_lat.value;
+ var max_lat = document.forms.extent.max_lat.value;
+ var min_lon = document.forms.extent.min_lon.value;
+ var max_lon = document.forms.extent.max_lon.value;
+
+ var min_time = document.forms.extent.min_time.value;
+ var max_time = document.forms.extent.max_time.value;
+
+ var fullURL = serverUrl + "slices.gpx?"
+ + "min_lat=" + min_lat
+ + "&max_lat=" + max_lat
+ + "&min_lon=" + min_lon
+ + "&max_lon=" + max_lon
+ + "&min_time=" + min_time
+ + "&max_time=" + max_time;
+
+ window.open(fullURL, "Zweitfenster");
+ }
+
+ function loadWaysCsv() {
+ var min_lat = document.forms.extent.min_lat.value;
+ var max_lat = document.forms.extent.max_lat.value;
+ var min_lon = document.forms.extent.min_lon.value;
+ var max_lon = document.forms.extent.max_lon.value;
+
+ var min_time = document.forms.extent.min_time.value;
+ var max_time = document.forms.extent.max_time.value;
+
+ var fullURL = serverUrl + "slices.csv?"
+ + "min_lat=" + min_lat
+ + "&max_lat=" + max_lat
+ + "&min_lon=" + min_lon
+ + "&max_lon=" + max_lon
+ + "&min_time=" + min_time
+ + "&max_time=" + max_time;
+
+ window.open(fullURL, "Zweitfenster");
+ }
+
function updateExtent() {
var lonLatUR = map.getLonLatFromPixel(new OpenLayers.Pixel(0,0))
.transform(map.getProjectionObject(),
new OpenLayers.Projection("EPSG:4326"));
var mapSize = map.getSize();
var lonLatLL = map.getLonLatFromPixel(new OpenLayers.Pixel(mapSize.w, mapSize.h))
.transform(map.getProjectionObject(),
new OpenLayers.Projection("EPSG:4326"));
document.forms.extent.min_lat.value = lonLatLL.lat;
document.forms.extent.max_lon.value = lonLatLL.lon;
document.forms.extent.max_lat.value = lonLatUR.lat;
document.forms.extent.min_lon.value = lonLatUR.lon;
document.forms.extent.max_time.value = dateToString(new Date());
reloadWays();
}
</script>
</head>
<!-- body.onload is called once the page is loaded (call the 'init' function) -->
<body onload="init();">
<h1>Car Comm Server Prototype, 2010-05-19</h1>
<p>This is our prototype for a traffic information system using a
client-server architecture.</p>
<p>Current Status: We can view and edit the table of travel report
"slices". A "slice" is the smallest section of the travel reports from
the mobile devices, and it can represent 60 seconds of travel (or
maybe 20 or 90 seconds). The slice is represented by its starting and
ending point in WGS84 coordinates (latitude and longitude), and the
average velocity in between.</p>
<p>Go <a href="map.html">here for a Web application implementation</a> of this system.</p>
<p>You can <%=
link_to "view the table of reported slices", slices_path %>.</p>
<% form_tag('home/gpxUpload', :multipart => true ) do %>
<label for="upload">You can upload a GPX file with GPS logs. Select
File: </label>
<%= file_field_tag 'upload' %>
and <%= submit_tag "Upload GPX" %>
<% end %>
<% form_tag('home/nmeaUpload', :multipart => true ) do %>
<label for="upload">You can upload a NMEA file with GPS logs. Select
File: </label>
<%= file_field_tag 'upload' %>
and <%= submit_tag "Upload NMEA" %>
<% end %>
<p>(File upload will store way slices in a 30-second raster, not finer
than that for now.)</p>
<h2>Displaying the ways on a map</h2>
<p>This display uses the <a
href="http://www.openstreetmap.org">openstreetmap.org</a>
map. Additionally, all the way slices from <%= link_to "here",
slices_path %> are shown as well, and the "average velocity" (in [m/s] in the table, but in [km/h] for the colors)
chooses the display color, as shown below.</p>
<table><tr><td>
<!-- define a DIV into which the map will appear. Make it take up 400 pixels -->
<div style="width:400px; height:400px" id="map"></div>
</td><td valign="top">
<form name="extent">
<table>
<tr><td>min_lat</td><td><input type="text" name="min_lat" value=""></td></tr>
<tr><td>max_lat</td><td><input type="text" name="max_lat" value=""></td></tr>
<tr><td>min_lon</td><td><input type="text" name="min_lon" value=""></td></tr>
<tr><td>max_lon</td><td><input type="text" name="max_lon" value=""></td></tr>
<tr><td>min_time</td><td><input type="text" name="min_time" value="2009-05-01T00:00:00Z"></td></tr>
<tr><td>max_time</td><td><input type="text" name="max_time" value=""></td></tr>
-<tr><td colspan="2"><input type="button" value="Only Reload Ways" onClick="reloadWays()"> according to the coordinates above</td></tr>
<tr><td colspan="2"><input type="button" value="Reload" onClick="updateExtent()"> everything (coordinates from map, and ways from coordinates)</td></tr>
+<tr><td colspan="2">File Download: <input type="button" value="As GPX" onClick="loadWaysGpx()"> <input type="button" value="As CSV" onClick="loadWaysCsv()"></td></tr>
</table>
</form>
<br>
<table><tr><td>Average [km/h]</td><td>Color</td></tr>
<tr><td>0 - 18</td><td style="background-color:red">Red</td></tr>
<tr><td>18 - 40</td><td style="background-color:yellow">Yellow</td></tr>
<tr><td>40 - 65</td><td style="background-color:green">Green</td></tr>
<tr><td>65 - 95</td><td style="background-color:cyan">Cyan</td></tr>
<tr><td>95 - 250</td><td style="background-color:blue">Blue</td></tr>
</table>
</td></tr></table>
<p>Zoom to
<input type="button" value="Hamburg" onClick="zoomToHamburg()">
<input type="button" value="München" onClick="zoomToMuenchen()">
</p>
</body>
<!-- Local Variables: -->
<!-- mode: javascript -->
<!-- indent-tabs-mode:nil -->
<!-- c-basic-offset:4 -->
<!-- tab-width:8 -->
<!-- End: -->
diff --git a/webapp/app/views/slices/index.erb b/webapp/app/views/slices/index.erb
new file mode 100644
index 0000000..ac28cb7
--- /dev/null
+++ b/webapp/app/views/slices/index.erb
@@ -0,0 +1,3 @@
+# Time StartLat[deg] StartLon[deg] EndLat[deg] EndLon[deg] AvgVel[m/s] Headingdeg[deg] Dist[m] Duration[s] StartAccuracy[m] EndAccuracy[m] InstanceId Category
+<% for slice in @slices %><%=h slice.time %> <%=h slice.startlat %> <%=h slice.startlon %> <%=h slice.lat %> <%=h slice.lon %> <%=h slice.avgvel %> <%=h slice.headingdeg %> <%=h slice.dist %> <%=h slice.duration %> <%=h slice.startaccuracy %> <%=h slice.endaccuracy %> <%=h slice.instanceid %> <%=h slice.categoryid %>
+<% end %>
diff --git a/webapp/public/map.html b/webapp/public/map.html
index fa25a90..43a7932 100644
--- a/webapp/public/map.html
+++ b/webapp/public/map.html
@@ -1,430 +1,430 @@
<html>
<head>
<meta name="viewport" content="width = device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=no;">
<title>Car Communication App</title>
<script src="http://code.google.com/apis/gears/gears_init.js"></script>
<!-- bring in the OpenLayers javascript library
(here we bring it from the remote site, but you could
easily serve up this javascript yourself) -->
<script src="OpenLayers.js"></script>
<!--script src="http://www.openlayers.org/api/OpenLayers.js"></script-->
<!-- bring in the OpenStreetMap OpenLayers layers.
Using this hosted file will make sure we are kept up
to date with any necessary changes -->
<script src="OpenStreetMap.js"></script>
<!--script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script-->
<!-- The geo-location-javascript code -->
<script src="geo.js"></script>
<!-- The personal functions from CS -->
<script src="csfuncs.js"></script>
<!-- ------------------------------------------------------ -->
<script type="text/javascript">
function setStatus(id, text, bgcolor) {
var td = document.getElementById(id);
var div = document.getElementById(id + "Text");
if (td && div) {
if (text) {
div.firstChild.nodeValue = text;
}
if (bgcolor) {
td.setAttribute("bgcolor", bgcolor);
}
} else {
window.onerror ("Function setStatus() was called with non-existing ID of html element, \"" + id + "\"");
}
}
function csErrorHandler (msg, file, line) {
var fullMsg = "General Error: " + msg + " in file: " + file + ":" + line;
setStatus("GPSStatus", "General", "red");
var span2 = document.getElementById("GeneralError");
if (span2) {
span2.firstChild.nodeValue = fullMsg;
}
return true;
}
OpenLayers.Util.onImageLoadError = function() {
setStatus("MapStatus", "Map: Cannot load images", "red");
};
// Complex object of type OpenLayers.Map
var map;
var layerGpx1;
var layerGpx2;
var useLayerGpx1;
var gpxStyleMap;
var serverUrl;
var initialized;
var lastPos;
var currentPos;
var sendInterval;
// Global error handler
window.onerror = csErrorHandler;
function setLatLon(lat, lon) {
var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
var currentZoom = map.getZoom();
map.setCenter (lonLat, currentZoom);
}
function zoomTo(lat, lon, zoom) {
var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
map.setCenter (lonLat, zoom);
}
function zoomToHamburg() {
// Start position for the map (hardcoded here for simplicity)
zoomTo(53.5514, 9.99, 12);
}
function on_gpx_loadstart() {
var numWays = this.features.length;
setStatus("SliceStatus", "Loading... " + numWays, "lightyellow");
}
function on_gpx_loadend() {
var numWays = this.features.length;
if (numWays > 0) {
setStatus("SliceStatus", "Ways ok: " + numWays + " lines", "lightgreen");
} else {
setStatus("SliceStatus", "No Ways received", "yellow");
}
if (useLayerGpx1) {
if (layerGpx1) {
layerGpx1.destroy();
}
} else {
if (layerGpx2) {
layerGpx2.destroy();
}
}
}
function loadWaysLayer(min_time, max_time) {
var lonLatUR = map.getLonLatFromPixel(new OpenLayers.Pixel(0,0))
.transform(map.getProjectionObject(),
new OpenLayers.Projection("EPSG:4326"));
var mapSize = map.getSize();
var lonLatLL = map.getLonLatFromPixel(new OpenLayers.Pixel(mapSize.w, mapSize.h))
.transform(map.getProjectionObject(),
new OpenLayers.Projection("EPSG:4326"));
var min_lat = lonLatLL.lat;
var max_lon = lonLatLL.lon;
var max_lat = lonLatUR.lat;
var min_lon = lonLatUR.lon;
// Add the Layer with GPX Track
var layerGpx = csCreateLayerGpx(serverUrl,
min_lat, max_lat,
min_lon, max_lon,
min_time, max_time);
layerGpx.events.register("loadend", layerGpx, on_gpx_loadend);
layerGpx.events.register("loadstart", layerGpx, on_gpx_loadstart);
return layerGpx;
}
function loadWays(min_time, max_time) {
if (useLayerGpx1) {
useLayerGpx1 = false;
if (layerGpx1) {
layerGpx1.destroy();
}
layerGpx1 = loadWaysLayer(min_time, max_time);
map.addLayer(layerGpx1);
} else {
useLayerGpx1 = true;
if (layerGpx2) {
layerGpx2.destroy();
}
layerGpx2 = loadWaysLayer(min_time, max_time);
map.addLayer(layerGpx2);
}
}
function loadWaysDefault() {
if (!document.forms.checkboxes.elements.SliceCheck.checked) {
setStatus("SliceStatus", "Ways disabled", "yellow");
return;
}
- var num_minutes = 10080 * 6 + 60; // 6 weeks + 1 hour
+ var num_minutes = 10080 * 4 + 60; // 4 weeks + 1 hour
var max_time = new Date();
- var min_time = new Date(max_time.getDate() - num_minutes * 60 * 1000);
+ var min_time = new Date(max_time.getTime() - num_minutes * 60 * 1000);
loadWays(dateToString(min_time), dateToString(max_time));
}
function sendDataNow() {
if (!document.forms.checkboxes.elements.SendCheck.checked) {
setStatus("SendStatus", "Sending disabled", "yellow");
return;
}
if (!currentPos) {
setStatus("SendStatus", "No Valid Positions to send", "red");
return;
}
if (!lastPos) {
lastPos = currentPos;
}
setStatus("SendStatus", "Sending...", "lightgreen");
var endTimestamp = currentPos.timestamp;
var diffsec = (endTimestamp - lastPos.timestamp) / 1000;
if (diffsec == 0) {
endTimestamp = (new Date()).getTime();
diffsec = (endTimestamp - lastPos.timestamp) / 1000;
}
var endLat = currentPos.coords.latitude.toFixed(6);
var endLon = currentPos.coords.longitude.toFixed(6);
var startLat = lastPos.coords.latitude.toFixed(6);
var startLon = lastPos.coords.longitude.toFixed(6);
var time = dateToString(new Date(endTimestamp));
if (diffsec == 0) {
setStatus("SendStatus", "Oops, diffsec = 0", "red");
alert("currentPos.timestamp=" + currentPos.timestamp + " lastPos.timestamp=" + lastPos.timestamp + " date=" + (new Date()).getTime());
return;
}
var dur = diffsec.toFixed(2);
var url = serverUrl + "slices";
var params = "slice[lat]=" + endLat
+ "&slice[lon]=" + endLon
+ "&slice[time]=" + time
+ "&slice[duration]=" + dur
+ "&slice[startlat]=" + startLat
+ "&slice[startlon]=" + startLon;
var http = new XMLHttpRequest();
http.open("POST", url, true);
//Send the proper header information along with the request
http.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
http.setRequestHeader("Content-length", params.length);
http.setRequestHeader("Connection", "close");
http.onreadystatechange = function() { //Call a function when the state changes.
if (http.readyState) {
if (http.status >= 200 && http.status <= 210) {
setStatus("SendStatus", "Sent", "lightgreen");
//alert(http.responseText);
} else {
setStatus("SendStatus", "Position not sent (" + http.status + ")", "yellow");
//alert(http.responseText);
}
}
};
http.send(params);
//alert("Will send: " + url + "?" + params);
lastPos = currentPos;
}
function sendDataMaybe() {
if (currentPos) {
if (!lastPos) {
lastPos = currentPos;
}
var diffmsec = currentPos.timestamp - lastPos.timestamp;
var diffsec = diffmsec / 1000;
if (diffsec >= 2 * sendInterval) {
// The position difference is too large, forget about the
// old one
lastPos = currentPos;
} else if (diffsec >= sendInterval) {
sendDataNow();
}
}
}
function on_geo_error(p) {
setStatus("GPSStatus", "GPS Error", "red");
}
function on_geo_success(p) {
setStatus("GPSStatus", "GPS ok", "lightgreen");
setLatLon(p.coords.latitude, p.coords.longitude);
currentPos = p;
sendDataMaybe();
loadWaysDefault();
}
function requestPos() {
if (!document.forms.checkboxes.elements.GPSCheck.checked) {
setStatus("GPSStatus", "GPS disabled", "yellow");
} else {
setStatus("GPSStatus", "Request GPS...", "lightgreen");
geo_position_js.getCurrentPosition(on_geo_success, on_geo_error,
{enableHighAccuracy : true,
timeout : 15000,
maximumAge : 30000});
//{enableHighAccuracy : true});
// timeout : 1000, // milliseconds
// maximumAge : 10000 // milliseconds
// });
//setStatus("MapStatus", "Map: 3b", "yellow");
}
}
function on_interval() {
if (!document.forms.checkboxes.elements.GPSCheck.checked) {
//setStatus("GPSStatus", "GPS disabled", "yellow");
return;
}
if (currentPos) {
var now = new Date();
var diffmsec = now.getTime() - currentPos.timestamp;
var diffsec = diffmsec / 1000;
var diffstr = diffsec.toFixed(1);
setStatus("GPSStatus",
"GPS ok", //; " + diffstr + "s old",
"lightgreen");
if (diffsec >= sendInterval) {
// The currentPos is rather old - we assume it were still
// valid right now and fake a new object. FIXME: Maybe
// this isn't such a good idea?
currentPos = { timestamp: now.getTime(),
coords : {
latitude : currentPos.coords.latitude,
longitude : currentPos.coords.longitude
}};
sendDataMaybe();
} else if (diffsec > 7) {
requestPos();
}
} else {
setStatus("SendStatus",
"Waiting for GPS",
"yellow");
requestPos();
}
}
//Initialise the 'map' object
function init() {
sendInterval = 60;
serverUrl = "";
useLayerGpx1 = true;
// Did we get our auxiliary files? Then switch General to green
if (OpenLayers && csCreateMap) {
//setStatus("GeneralStatus", null, "lightgreen");
}
if (typeof(window.google) != "undefined" && typeof(window.google.gears) != "undefined"){
setStatus("GPSStatus", "GPS: Google Gears", "lightyellow");
} else if (typeof(navigator.geolocation) != "undefined") {
setStatus("GPSStatus", "GPS: Mozilla Navigator available", "lightyellow");
} else {
setStatus("GPSStatus", "GPS: Please install Google Gears, http://gears.google.com", "yellow");
}
//setStatus("MapStatus", "Map: 1", "yellow");
// Define the map layer
map = csCreateMap();
//setStatus("MapStatus", "Map: 2", "yellow");
// Define the styles for the way slices
gpxStyleMap = csCreateGpxStyleMap();
// Choose Hamburg as center
zoomToHamburg();
initialized = 1;
loadWaysDefault();
setInterval(on_interval, 2500); // milliseconds
//determine if the handset has client side geo location capabilities
if (geo_position_js.init()) {
requestPos();
} else {
on_geo_error({message: "No GPS available"});
}
}
function setServerUrl(value) {
serverUrl = value;
}
function on_osm_loadstart() {
setStatus("MapStatus", "Loading...", "yellow");
setStatus("SendStatus", "", "lightyellow");
}
function on_osm_tileloaded() {
var numRemainingTiles = this.numLoadingTiles;
if (numRemainingTiles > 0) {
setStatus("MapStatus", "Loading; " + this.numLoadingTiles + " images remaining", "lightgreen");
}
else {
setStatus("MapStatus", "Loaded", "lightgreen");
}
}
function toggleCheckBox(cbox) {
if (cbox) {
cbox.checked = !cbox.checked;
}
}
</script>
<!-- ------------------------------------------------------ -->
</head>
<!-- body.onload is called once the page is loaded (call the 'init' function) -->
<body onload="init();">
<form name="checkboxes" action="">
<table border="1" width="100%"><tr>
<td align="center" id="GPSStatus" bgcolor="lightyellow" onclick="toggleCheckBox(document.forms.checkboxes.elements.GPSCheck);">
<input type="checkbox" name="GPSCheck" value="1" checked="checked"/>
<span id="GPSStatusText">GPS</span>
</td>
<td align="center" id="MapStatus" bgcolor="yellow">
<span id="MapStatusText">Map</span>
</td>
<td align="center" id="SliceStatus" bgcolor="lightyellow" onclick="toggleCheckBox(document.forms.checkboxes.elements.SliceCheck);">
<input type="checkbox" name="SliceCheck" value="1" checked="checked">
<span id="SliceStatusText">Ways</span>
</td>
<td align="center" id="SendStatus" onclick="toggleCheckBox(document.forms.checkboxes.elements.SendCheck);">
<input type="checkbox" name="SendCheck" value="1" checked="checked">
<span id="SendStatusText">Sending</span>
</td>
</tr>
</table>
</form>
<!-- define a DIV into which the map will appear. Make it take up 400 pixels -->
<div id="map"></div>
<span name="GeneralError"></span>
</body>
</html>
<!-- Local Variables: -->
<!-- mode: javascript -->
<!-- indent-tabs-mode:nil -->
<!-- c-basic-offset:4 -->
<!-- tab-width:8 -->
<!-- End: -->
diff --git a/webapp/public/view.html b/webapp/public/view.html
index 43bc315..1906002 100644
--- a/webapp/public/view.html
+++ b/webapp/public/view.html
@@ -1,365 +1,365 @@
<html>
<head>
<meta name="viewport" content="width = device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=no;">
<title>Car Communication App</title>
<script src="http://code.google.com/apis/gears/gears_init.js"></script>
<!-- bring in the OpenLayers javascript library
(here we bring it from the remote site, but you could
easily serve up this javascript yourself) -->
<script src="OpenLayers.js"></script>
<!--script src="http://www.openlayers.org/api/OpenLayers.js"></script-->
<!-- bring in the OpenStreetMap OpenLayers layers.
Using this hosted file will make sure we are kept up
to date with any necessary changes -->
<script src="OpenStreetMap.js"></script>
<!--script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script-->
<!-- The geo-location-javascript code -->
<script src="geo.js"></script>
<!-- The personal functions from CS -->
<script src="csfuncs.js"></script>
<!-- ------------------------------------------------------ -->
<script type="text/javascript">
function setStatus(id, text, bgcolor) {
var td = document.getElementById(id);
var div = document.getElementById(id + "Text");
if (td && div) {
if (text) {
div.firstChild.nodeValue = text;
}
if (bgcolor) {
td.setAttribute("bgcolor", bgcolor);
}
} else {
window.onerror ("Function setStatus() was called with non-existing ID of html element, \"" + id + "\"");
}
}
function csErrorHandler (msg, file, line) {
var fullMsg = "General Error: " + msg + " in file: " + file + ":" + line;
setStatus("GPSStatus", "General", "red");
var span2 = document.getElementById("GeneralError");
if (span2) {
span2.firstChild.nodeValue = fullMsg;
}
return true;
}
OpenLayers.Util.onImageLoadError = function() {
setStatus("MapStatus", "Map: Cannot load images", "red");
};
// Complex object of type OpenLayers.Map
var map;
var layerGpx1;
var layerGpx2;
var useLayerGpx1;
var gpxStyleMap;
var serverUrl;
var initialized;
var lastPos;
var currentPos;
var sendInterval;
// Global error handler
window.onerror = csErrorHandler;
function setLatLon(lat, lon) {
var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
var currentZoom = map.getZoom();
map.setCenter (lonLat, currentZoom);
}
function zoomTo(lat, lon, zoom) {
var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
map.setCenter (lonLat, zoom);
}
function zoomToHamburg() {
// Start position for the map (hardcoded here for simplicity)
zoomTo(53.5514, 9.99, 12);
}
function on_gpx_loadstart() {
var numWays = this.features.length;
setStatus("SliceStatus", "Loading... " + numWays, "lightyellow");
}
function on_gpx_loadend() {
var numWays = this.features.length;
if (numWays > 0) {
setStatus("SliceStatus", "Ways ok: " + numWays + " lines", "lightgreen");
} else {
setStatus("SliceStatus", "No Ways received", "yellow");
}
if (useLayerGpx1) {
if (layerGpx1) {
layerGpx1.destroy();
}
} else {
if (layerGpx2) {
layerGpx2.destroy();
}
}
}
function loadWaysLayer(min_time, max_time) {
var lonLatUR = map.getLonLatFromPixel(new OpenLayers.Pixel(0,0))
.transform(map.getProjectionObject(),
new OpenLayers.Projection("EPSG:4326"));
var mapSize = map.getSize();
var lonLatLL = map.getLonLatFromPixel(new OpenLayers.Pixel(mapSize.w, mapSize.h))
.transform(map.getProjectionObject(),
new OpenLayers.Projection("EPSG:4326"));
var min_lat = lonLatLL.lat;
var max_lon = lonLatLL.lon;
var max_lat = lonLatUR.lat;
var min_lon = lonLatUR.lon;
// Add the Layer with GPX Track
var layerGpx = csCreateLayerGpx(serverUrl,
min_lat, max_lat,
min_lon, max_lon,
min_time, max_time);
layerGpx.events.register("loadend", layerGpx, on_gpx_loadend);
layerGpx.events.register("loadstart", layerGpx, on_gpx_loadstart);
return layerGpx;
}
function loadWays(min_time, max_time) {
if (useLayerGpx1) {
useLayerGpx1 = false;
if (layerGpx1) {
layerGpx1.destroy();
}
layerGpx1 = loadWaysLayer(min_time, max_time);
map.addLayer(layerGpx1);
} else {
useLayerGpx1 = true;
if (layerGpx2) {
layerGpx2.destroy();
}
layerGpx2 = loadWaysLayer(min_time, max_time);
map.addLayer(layerGpx2);
}
}
function loadWaysDefault() {
if (!document.forms.checkboxes.elements.SliceCheck.checked) {
setStatus("SliceStatus", "Ways disabled", "yellow");
return;
}
- var num_minutes = 10080 * 6 + 60; // 6 weeks + 1 hour
+ var num_minutes = 10080 * 4 + 60; // 4 weeks + 1 hour
var max_time = new Date();
- var min_time = new Date(max_time.getDate() - num_minutes * 60 * 1000);
+ var min_time = new Date(max_time.getTime() - num_minutes * 60 * 1000);
loadWays(dateToString(min_time), dateToString(max_time));
}
function sendDataNow() {
}
function sendDataMaybe() {
if (currentPos) {
if (!lastPos) {
lastPos = currentPos;
}
var diffmsec = currentPos.timestamp - lastPos.timestamp;
var diffsec = diffmsec / 1000;
if (diffsec >= 2 * sendInterval) {
// The position difference is too large, forget about the
// old one
lastPos = currentPos;
} else if (diffsec >= sendInterval) {
sendDataNow();
}
}
}
function on_geo_error(p) {
setStatus("GPSStatus", "GPS Error", "red");
}
function on_geo_success(p) {
setStatus("GPSStatus", "GPS ok", "lightgreen");
setLatLon(p.coords.latitude, p.coords.longitude);
currentPos = p;
sendDataMaybe();
loadWaysDefault();
}
function requestPos() {
if (!document.forms.checkboxes.elements.GPSCheck.checked) {
setStatus("GPSStatus", "GPS disabled", "yellow");
} else {
setStatus("GPSStatus", "Request GPS...", "lightgreen");
geo_position_js.getCurrentPosition(on_geo_success, on_geo_error,
{enableHighAccuracy : true,
timeout : 15000,
maximumAge : 30000});
//{enableHighAccuracy : true});
// timeout : 1000, // milliseconds
// maximumAge : 10000 // milliseconds
// });
//setStatus("MapStatus", "Map: 3b", "yellow");
}
}
function on_interval() {
if (!document.forms.checkboxes.elements.GPSCheck.checked) {
//setStatus("GPSStatus", "GPS disabled", "yellow");
return;
}
if (currentPos) {
var now = new Date();
var diffmsec = now.getTime() - currentPos.timestamp;
var diffsec = diffmsec / 1000;
var diffstr = diffsec.toFixed(1);
setStatus("GPSStatus",
"GPS ok", //; " + diffstr + "s old",
"lightgreen");
if (diffsec >= sendInterval) {
// The currentPos is rather old - we assume it were still
// valid right now and fake a new object. FIXME: Maybe
// this isn't such a good idea?
currentPos = { timestamp: now.getTime(),
coords : {
latitude : currentPos.coords.latitude,
longitude : currentPos.coords.longitude
}};
sendDataMaybe();
} else if (diffsec > 7) {
requestPos();
}
} else {
setStatus("SendStatus",
"Waiting for GPS",
"yellow");
requestPos();
}
}
//Initialise the 'map' object
function init() {
sendInterval = 60;
serverUrl = "";
useLayerGpx1 = true;
// Did we get our auxiliary files? Then switch General to green
if (OpenLayers && csCreateMap) {
//setStatus("GeneralStatus", null, "lightgreen");
}
if (typeof(window.google) != "undefined" && typeof(window.google.gears) != "undefined"){
setStatus("GPSStatus", "GPS: Google Gears", "lightyellow");
} else if (typeof(navigator.geolocation) != "undefined") {
setStatus("GPSStatus", "GPS: Mozilla Navigator available", "lightyellow");
} else {
setStatus("GPSStatus", "GPS: Please install Google Gears, http://gears.google.com", "yellow");
}
//setStatus("MapStatus", "Map: 1", "yellow");
// Define the map layer
map = csCreateMap();
//setStatus("MapStatus", "Map: 2", "yellow");
// Define the styles for the way slices
gpxStyleMap = csCreateGpxStyleMap();
// Choose Hamburg as center
zoomToHamburg();
initialized = 1;
loadWaysDefault();
setInterval(on_interval, 5000); // milliseconds
//determine if the handset has client side geo location capabilities
if (geo_position_js.init()) {
requestPos();
} else {
on_geo_error({message: "No GPS available"});
}
}
function setServerUrl(value) {
serverUrl = value;
}
function on_osm_loadstart() {
setStatus("MapStatus", "Loading...", "yellow");
setStatus("SendStatus", "", "lightyellow");
}
function on_osm_tileloaded() {
var numRemainingTiles = this.numLoadingTiles;
if (numRemainingTiles > 0) {
setStatus("MapStatus", "Loading; " + this.numLoadingTiles + " images remaining", "lightgreen");
}
else {
setStatus("MapStatus", "Loaded", "lightgreen");
}
}
function toggleCheckBox(cbox) {
if (cbox) {
cbox.checked = !cbox.checked;
}
}
</script>
<!-- ------------------------------------------------------ -->
</head>
<!-- body.onload is called once the page is loaded (call the 'init' function) -->
<body onload="init();">
<form name="checkboxes" action="">
<table border="1" width="100%"><tr>
<td align="center" id="GPSStatus" bgcolor="lightyellow" onclick="toggleCheckBox(document.forms.checkboxes.elements.GPSCheck);">
<input type="checkbox" name="GPSCheck" value="1" checked="checked"/>
<span id="GPSStatusText">GPS</span>
</td>
<td align="center" id="MapStatus" bgcolor="yellow">
<span id="MapStatusText">Map</span>
</td>
<td align="center" id="SliceStatus" bgcolor="lightyellow" onclick="toggleCheckBox(document.forms.checkboxes.elements.SliceCheck);">
<input type="checkbox" name="SliceCheck" value="1" checked="checked">
<span id="SliceStatusText">Ways</span>
</td>
</tr>
</table>
</form>
<!-- define a DIV into which the map will appear. Make it take up 400 pixels -->
<div id="map"></div>
<span name="GeneralError"></span>
</body>
</html>
<!-- Local Variables: -->
<!-- mode: javascript -->
<!-- indent-tabs-mode:nil -->
<!-- c-basic-offset:4 -->
<!-- tab-width:8 -->
<!-- End: -->
|
cstim/carcomm
|
467a8bfe3c73690480f2cba855914dfdcab9a2c1
|
Fix broken instanceID in constructor. Fix item id default.
|
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml
index 1e66279..b2db3d2 100644
--- a/konphidroid/AndroidManifest.xml
+++ b/konphidroid/AndroidManifest.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.cstimming.konphidroid"
- android:versionCode="6" android:versionName="0.6">
+ android:versionName="0.7" android:versionCode="7">
<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".KonPhiActivity"
android:label="@string/app_name" android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<uses-sdk android:minSdkVersion="3" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
</manifest>
\ No newline at end of file
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index 0e43959..35951bb 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,330 +1,331 @@
package de.cstimming.konphidroid;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
import android.widget.ToggleButton;
public class KonPhiActivity extends Activity implements LocationListener, SliceSenderResult {
private ToggleButton m_togglebuttonGps;
private Button m_togglebuttonSender;
private Button m_togglebuttonRecord;
private SimpleDateFormat m_dateFormatter;
private SimpleDateFormat m_dateFormatSender;
private NumberFormat m_speedFormatter;
private Location m_lastLocation;
private boolean m_lastLocationValid;
private long m_recordIntervalSecs;
private String m_server = "http://carcomm.cstimming.de/";
//private WebView m_webview;
private TextView m_labelSender;
private int m_instanceId;
private int m_categoryId;
private LocationCollector m_locationCollector;
private static final int DIALOG_GPSWARNING = 1;
private static final int DIALOG_RECORDINTERVAL_MULTICHOICE = 2;
private static final int DIALOG_SENDERINTERVAL_MULTICHOICE = 3;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
m_dateFormatSender = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
m_dateFormatSender.setTimeZone(TimeZone.getTimeZone("GMT00"));
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
m_speedFormatter = NumberFormat.getInstance();
m_speedFormatter.setMaximumFractionDigits(1);
m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebuttonGps);
m_togglebuttonSender = (Button) findViewById(R.id.togglebuttonSender);
m_togglebuttonRecord = (Button) findViewById(R.id.togglebuttonRecord);
m_labelSender = (TextView) findViewById(R.id.TextLabelSender);
+ java.util.Random rg = new java.util.Random();
+ m_instanceId = rg.nextInt();
+ m_categoryId = 1;
+
m_recordIntervalSecs = 0;
m_locationCollector = new LocationCollector(m_server, this, m_instanceId, m_categoryId, this);
- setRecordIntervalSecs(2);
+ setRecordIntervalSecs(10);
setSenderIntervalSecs(60);
- java.util.Random rg = new java.util.Random();
- m_instanceId = rg.nextInt();
- m_categoryId = 1;
// Print the version number into the UI
TextView versionView = (TextView) findViewById(R.id.TextViewVersion);
String versionString;
try {
versionString = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
} catch (NameNotFoundException e) {
versionString = "Not found";
e.printStackTrace();
}
versionView.setText(" " + versionString);
//final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
//m_webview = new WebView(this);
//ell.addView(m_webview);
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
m_togglebuttonSender.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
showDialog(DIALOG_SENDERINTERVAL_MULTICHOICE);
}});
m_togglebuttonRecord.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
showDialog(DIALOG_RECORDINTERVAL_MULTICHOICE);
}});
registerAtLocationManager(getRecordIntervalSecs());
}
private void registerAtLocationManager(long intervalSecs) {
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
LocationListener listener = m_locationCollector;//this;
if (intervalSecs == 0) {
locationManager.removeUpdates(listener);
} else {
if (!locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
long minTime = 1000 * intervalSecs; // [milliseconds]
float minDistance = 0; // 10; // [meters]
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
minTime, minDistance, listener);
}
}
public long getRecordIntervalSecs() {
return m_recordIntervalSecs;
}
public void setSenderIntervalSecs(long v) {
if (v == m_locationCollector.getSendingIntervalSecs())
return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (v == 0) {
m_togglebuttonSender.setText(R.string.transmission_off);
m_labelSender.setText(R.string.labelsender_off);
m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
} else {
m_togglebuttonSender.setText(getString(R.string.transmission_on) + " " + String.valueOf(v / 60) + "min");
m_labelSender.setText(R.string.labelsender_on);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
m_labelSender.setTextColor(viewSecs.getTextColors());
}
m_locationCollector.setSendingIntervalSecs(v);
}
public void setRecordIntervalSecs(long v) {
//if (v == m_recordIntervalSecs)
//return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (v == 0) {
m_togglebuttonRecord.setText(R.string.recording_off);
m_labelSender.setText(R.string.labelsender_off);
m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
} else {
m_togglebuttonRecord.setText(getString(R.string.recording_on) + " " + String.valueOf(v) + "s");
m_labelSender.setText(R.string.labelsender_on);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
m_labelSender.setTextColor(viewSecs.getTextColors());
}
registerAtLocationManager(v);
m_recordIntervalSecs = v;
}
protected Dialog onCreateDialog(int d) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
switch (d) {
case DIALOG_GPSWARNING:
builder.setMessage(R.string.ask_activate_gps_settings)
.setCancelable(false)
.setPositiveButton(R.string.yes,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
}
})
.setNegativeButton(R.string.no,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
dialog.cancel();
}
});
break;
case DIALOG_RECORDINTERVAL_MULTICHOICE:
builder.setTitle(R.string.choose_record_interval);
final CharSequence[] items = {"60", "30", "20", "10", "2", "1", "off"};
- builder.setSingleChoiceItems(items, 1, new DialogInterface.OnClickListener() {
+ builder.setSingleChoiceItems(items, 3, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
String item = items[which].toString();
final int secs = (item == "off" ? 0 : Integer.parseInt(item));
setRecordIntervalSecs(secs);
dismissDialog(DIALOG_RECORDINTERVAL_MULTICHOICE);
}
});
break;
case DIALOG_SENDERINTERVAL_MULTICHOICE:
builder.setTitle(R.string.choose_sending_interval);
final CharSequence[] items1 = {"10", "5", "2", "1", "off"};
- builder.setSingleChoiceItems(items1, 1, new DialogInterface.OnClickListener() {
+ builder.setSingleChoiceItems(items1, 3, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
String item = items1[which].toString();
final int mins = (item == "off" ? 0 : Integer.parseInt(item));
setSenderIntervalSecs(60 * mins);
dismissDialog(DIALOG_SENDERINTERVAL_MULTICHOICE);
}
});
break;
default:
return null;
}
Dialog result = builder.create();
return result;
}
@Override
public void onLocationChanged(Location loc) {
// Toast.makeText(KonPhiActivity.this, "Received location from " +
// loc.getProvider(), Toast.LENGTH_SHORT).show();
printLocInfo(loc);
m_lastLocationValid = true;
m_lastLocation = loc;
}
private void printLocInfo(Location loc) {
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
final TextView viewSpeed = (TextView) findViewById(R.id.TextViewSpeed);
viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy())
: "...");
float speed = loc.getSpeed();
viewSpeed.setText(m_speedFormatter.format(3.6 * speed) + " km/h");
if (m_lastLocationValid) {
long msecdiff = loc.getTime() - m_lastLocation.getTime();
float distance = m_lastLocation.distanceTo(loc);
String secs = String.valueOf(msecdiff / 1000);
String dist = String.valueOf(distance);
viewDist.setText(dist);
viewSecs.setText(secs);
} else {
viewDist.setText("...");
viewSecs.setText("...");
}
}
@Override
public void onProviderDisabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " disabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider +
// " enabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " out of service", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " tmp. unavailable", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider
// + " available", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
break;
}
}
@Override
public void sliceSenderResult(String text, boolean good, int color) {
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
resultview.setText(text);
resultview.setTextColor(ColorStateList.valueOf(color));
}
}
\ No newline at end of file
|
cstim/carcomm
|
1067edc8f495f5e84ab1f1a3d70bf0a81fcb27f0
|
Final cleanups. Increase version number to 0.6.
|
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml
index 33de089..1e66279 100644
--- a/konphidroid/AndroidManifest.xml
+++ b/konphidroid/AndroidManifest.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.cstimming.konphidroid"
- android:versionCode="5" android:versionName="0.5">
+ android:versionCode="6" android:versionName="0.6">
<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".KonPhiActivity"
android:label="@string/app_name" android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<uses-sdk android:minSdkVersion="3" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
</manifest>
\ No newline at end of file
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index 2656e84..0e43959 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,343 +1,330 @@
package de.cstimming.konphidroid;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
import android.widget.ToggleButton;
public class KonPhiActivity extends Activity implements LocationListener, SliceSenderResult {
private ToggleButton m_togglebuttonGps;
private Button m_togglebuttonSender;
private Button m_togglebuttonRecord;
private SimpleDateFormat m_dateFormatter;
private SimpleDateFormat m_dateFormatSender;
private NumberFormat m_speedFormatter;
private Location m_lastLocation;
private boolean m_lastLocationValid;
private long m_recordIntervalSecs;
private String m_server = "http://carcomm.cstimming.de/";
//private WebView m_webview;
private TextView m_labelSender;
private int m_instanceId;
private int m_categoryId;
private LocationCollector m_locationCollector;
private static final int DIALOG_GPSWARNING = 1;
private static final int DIALOG_RECORDINTERVAL_MULTICHOICE = 2;
private static final int DIALOG_SENDERINTERVAL_MULTICHOICE = 3;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
m_dateFormatSender = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
m_dateFormatSender.setTimeZone(TimeZone.getTimeZone("GMT00"));
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
m_speedFormatter = NumberFormat.getInstance();
m_speedFormatter.setMaximumFractionDigits(1);
m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebuttonGps);
m_togglebuttonSender = (Button) findViewById(R.id.togglebuttonSender);
m_togglebuttonRecord = (Button) findViewById(R.id.togglebuttonRecord);
m_labelSender = (TextView) findViewById(R.id.TextLabelSender);
m_recordIntervalSecs = 0;
m_locationCollector = new LocationCollector(m_server, this, m_instanceId, m_categoryId, this);
- setRecordIntervalSecs(30);
+ setRecordIntervalSecs(2);
setSenderIntervalSecs(60);
java.util.Random rg = new java.util.Random();
m_instanceId = rg.nextInt();
m_categoryId = 1;
// Print the version number into the UI
TextView versionView = (TextView) findViewById(R.id.TextViewVersion);
String versionString;
try {
versionString = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
} catch (NameNotFoundException e) {
versionString = "Not found";
e.printStackTrace();
}
versionView.setText(" " + versionString);
//final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
//m_webview = new WebView(this);
//ell.addView(m_webview);
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
m_togglebuttonSender.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
showDialog(DIALOG_SENDERINTERVAL_MULTICHOICE);
}});
m_togglebuttonRecord.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
showDialog(DIALOG_RECORDINTERVAL_MULTICHOICE);
}});
registerAtLocationManager(getRecordIntervalSecs());
}
private void registerAtLocationManager(long intervalSecs) {
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
LocationListener listener = m_locationCollector;//this;
- locationManager.removeUpdates(listener);
- if (intervalSecs > 0) { //< m_senderIntervalSecs) {
+ if (intervalSecs == 0) {
+ locationManager.removeUpdates(listener);
+ } else {
if (!locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
long minTime = 1000 * intervalSecs; // [milliseconds]
float minDistance = 0; // 10; // [meters]
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
minTime, minDistance, listener);
}
}
public long getRecordIntervalSecs() {
return m_recordIntervalSecs;
}
public void setSenderIntervalSecs(long v) {
if (v == m_locationCollector.getSendingIntervalSecs())
return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (v == 0) {
m_togglebuttonSender.setText(R.string.transmission_off);
m_labelSender.setText(R.string.labelsender_off);
m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
} else {
m_togglebuttonSender.setText(getString(R.string.transmission_on) + " " + String.valueOf(v / 60) + "min");
m_labelSender.setText(R.string.labelsender_on);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
m_labelSender.setTextColor(viewSecs.getTextColors());
}
m_locationCollector.setSendingIntervalSecs(v);
}
public void setRecordIntervalSecs(long v) {
- if (v == m_recordIntervalSecs)
- return;
+ //if (v == m_recordIntervalSecs)
+ //return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (v == 0) {
m_togglebuttonRecord.setText(R.string.recording_off);
m_labelSender.setText(R.string.labelsender_off);
m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
} else {
m_togglebuttonRecord.setText(getString(R.string.recording_on) + " " + String.valueOf(v) + "s");
m_labelSender.setText(R.string.labelsender_on);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
m_labelSender.setTextColor(viewSecs.getTextColors());
}
registerAtLocationManager(v);
m_recordIntervalSecs = v;
}
protected Dialog onCreateDialog(int d) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
switch (d) {
case DIALOG_GPSWARNING:
builder.setMessage(R.string.ask_activate_gps_settings)
.setCancelable(false)
.setPositiveButton(R.string.yes,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
}
})
.setNegativeButton(R.string.no,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
dialog.cancel();
}
});
break;
case DIALOG_RECORDINTERVAL_MULTICHOICE:
builder.setTitle(R.string.choose_record_interval);
- final CharSequence[] items = {"60", "30", "20", "10", "2", "off"};
+ final CharSequence[] items = {"60", "30", "20", "10", "2", "1", "off"};
builder.setSingleChoiceItems(items, 1, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
String item = items[which].toString();
final int secs = (item == "off" ? 0 : Integer.parseInt(item));
setRecordIntervalSecs(secs);
dismissDialog(DIALOG_RECORDINTERVAL_MULTICHOICE);
}
});
break;
case DIALOG_SENDERINTERVAL_MULTICHOICE:
builder.setTitle(R.string.choose_sending_interval);
final CharSequence[] items1 = {"10", "5", "2", "1", "off"};
builder.setSingleChoiceItems(items1, 1, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
String item = items1[which].toString();
final int mins = (item == "off" ? 0 : Integer.parseInt(item));
setSenderIntervalSecs(60 * mins);
dismissDialog(DIALOG_SENDERINTERVAL_MULTICHOICE);
}
});
break;
default:
return null;
}
Dialog result = builder.create();
return result;
}
@Override
public void onLocationChanged(Location loc) {
// Toast.makeText(KonPhiActivity.this, "Received location from " +
// loc.getProvider(), Toast.LENGTH_SHORT).show();
printLocInfo(loc);
- if (m_lastLocationValid) {
- long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
- long intervalSecs = getRecordIntervalSecs();
- if (intervalSecs > 0 && secdiff >= intervalSecs) {
- if (secdiff <= 4 * intervalSecs) {
- //sendPairNow(m_lastLocation, loc);
- }
- m_lastLocation = loc;
- }
- // Note: We don't set the m_lastLocation if we are smaller than
- // m_senderIntervalSecs.
- } else {
- m_lastLocationValid = true;
- m_lastLocation = loc;
- }
+ m_lastLocationValid = true;
+ m_lastLocation = loc;
}
private void printLocInfo(Location loc) {
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
final TextView viewSpeed = (TextView) findViewById(R.id.TextViewSpeed);
viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy())
: "...");
+ float speed = loc.getSpeed();
+ viewSpeed.setText(m_speedFormatter.format(3.6 * speed) + " km/h");
if (m_lastLocationValid) {
long msecdiff = loc.getTime() - m_lastLocation.getTime();
float distance = m_lastLocation.distanceTo(loc);
- float speed = m_lastLocation.getSpeed();
String secs = String.valueOf(msecdiff / 1000);
String dist = String.valueOf(distance);
viewDist.setText(dist);
viewSecs.setText(secs);
- viewSpeed.setText(m_speedFormatter.format(3.6 * speed) + " km/h");
} else {
viewDist.setText("...");
viewSecs.setText("...");
- viewSpeed.setText("...");
}
}
@Override
public void onProviderDisabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " disabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider +
// " enabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " out of service", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " tmp. unavailable", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider
// + " available", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
break;
}
}
@Override
public void sliceSenderResult(String text, boolean good, int color) {
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
resultview.setText(text);
resultview.setTextColor(ColorStateList.valueOf(color));
}
}
\ No newline at end of file
diff --git a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
index fc96e15..7e87261 100644
--- a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
+++ b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
@@ -1,162 +1,168 @@
package de.cstimming.konphidroid;
import java.io.CharArrayWriter;
import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import org.apache.http.HttpEntity;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import android.location.Location;
import android.location.LocationListener;
import android.os.Bundle;
public class LocationCollector implements LocationListener, SenderInterface {
private ArrayList<Location> m_collectingLocations;
private ArrayList<Location> m_sendingLocations;
private boolean m_currentlySending;
private String m_server;
private SliceSenderResult m_result_cb;
private SimpleDateFormat m_dateFormatter;
private int m_instanceid;
private int m_categoryId;
private LocationListener m_location_cb;
private long m_sendingIntervalSecs;
public LocationCollector(String serveraddress, SliceSenderResult result_cb, int instanceid, int mCategoryId, LocationListener another_location_cb) {
m_currentlySending = false;
m_server = serveraddress;
m_result_cb = result_cb;
m_instanceid = instanceid;
m_categoryId = mCategoryId;
m_location_cb = another_location_cb;
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
resetCollecting();
}
private void resetCollecting() {
m_collectingLocations = new ArrayList<Location>();
}
@Override
public void onLocationChanged(Location loc) {
if (m_location_cb != null) {
m_location_cb.onLocationChanged(loc);
}
m_collectingLocations.add(loc);
checkForSending();
}
public void setSendingIntervalSecs(long secs) {
m_sendingIntervalSecs = secs;
}
public long getSendingIntervalSecs() {
return m_sendingIntervalSecs;
}
private void checkForSending() {
if (m_currentlySending
|| m_collectingLocations.size() <= 1
|| m_sendingIntervalSecs == 0) {
return;
}
Location first = m_collectingLocations.get(0);
Location last = m_collectingLocations.get(m_collectingLocations.size() - 1);
long secdiff = (last.getTime() - first.getTime()) / 1000;
if (m_sendingIntervalSecs > 0 && secdiff >= m_sendingIntervalSecs) {
sendNow();
}
}
private void sendNow() {
m_sendingLocations = m_collectingLocations;
m_currentlySending = true;
scheduleSending();
resetCollecting();
}
private static String listToString(ArrayList<Location> ul, int instanceid) {
CharArrayWriter gpxoutput = new GpxCharArrayWriter(ul, instanceid);
String gpxstring = gpxoutput.toString();
return gpxstring;
}
private void scheduleSending() {
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(m_server + "home/gpxUpload"); // FIXME: Different URL for GPX upload!
final String displaytime = m_dateFormatter.format(new Date(m_sendingLocations.get(m_sendingLocations.size() - 1).getTime())) + ": ";
// Copied from http://www.anddev.org/upload_files_to_web_server-t443-s30.html
final String lineEnd = "\r\n";
final String twoHyphens = "--";
final String boundary = "*****";
httppost.setHeader("Content-Type", "multipart/form-data; boundary="+boundary);
String gpxstring = listToString(m_sendingLocations, m_instanceid);
String output = twoHyphens + boundary + lineEnd;
output += "Content-Disposition: form-data; name=\"upload\"; filename=\"anonym\"" + lineEnd;
output += "Content-Type: text/plain; charset=UTF-8" + lineEnd;
output += lineEnd;
// send file data
output += gpxstring;
// send multipart form data necesssary after file data.
output += lineEnd;
output += twoHyphens + boundary + twoHyphens + lineEnd;
// Put the string into the http entity
try {
HttpEntity entity = new StringEntity(output);
httppost.setEntity(entity);
} catch (UnsupportedEncodingException e) {
// Auto-generated catch block
e.printStackTrace();
return;
}
//HttpEntity entity = listToStreamEntity(m_sendingLocations, m_instanceid);
// The network connection is moved into a separate task
SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, m_result_cb, this);
// Execute HTTP Post Request
task.execute(httppost);
}
@Override
public void startedSending() {
// TODO Auto-generated method stub
}
@Override
public void stoppedSending(boolean successful) {
if (successful) {
m_currentlySending = false;
m_sendingLocations = null;
} else {
scheduleSending(); // TODO: what now?
}
}
@Override
public void onProviderDisabled(String arg0) {
// TODO Auto-generated method stub
+ if (m_location_cb != null) {
+ m_location_cb.onProviderDisabled(arg0);
+ }
}
@Override
public void onProviderEnabled(String arg0) {
// TODO Auto-generated method stub
+ if (m_location_cb != null) {
+ m_location_cb.onProviderEnabled(arg0);
+ }
}
@Override
public void onStatusChanged(String arg0, int arg1, Bundle arg2) {
// TODO Auto-generated method stub
}
}
|
cstim/carcomm
|
a4314c704351f99a8ea679c223654720209808af
|
Add separate button for recording/transmission interval.
|
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml
index 8a5dcfa..2cea2f1 100644
--- a/konphidroid/res/layout/main.xml
+++ b/konphidroid/res/layout/main.xml
@@ -1,97 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
android:id="@+id/MainLayout" android:layout_height="fill_parent">
<LinearLayout android:layout_width="wrap_content"
android:layout_height="wrap_content" android:orientation="horizontal">
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="@string/hello" />
<TextView android:id="@+id/TextViewVersion"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:text="" />
</LinearLayout>
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content" android:orientation="horizontal">
<ToggleButton android:id="@+id/togglebuttonGps"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:textOn="@string/gpsbutton" android:textOff="@string/gpsbutton" />
+ <Button android:text="@string/recording_on" android:layout_width="wrap_content"
+ android:layout_height="wrap_content" android:id="@+id/togglebuttonRecord" />
+
<Button android:id="@+id/togglebuttonSender"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:text="@string/transmission_on" />
-
+
</LinearLayout>
<TableLayout android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="@string/gps_timestamp"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewGPSAge"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Latitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLat"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Longitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLon"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Accuracy [m]:" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewAcc"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Dist to previous [m]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewDist"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Time to previous [s]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewSecs"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="@string/labelsender_on" android:id="@+id/TextLabelSender"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewSender"
android:scrollHorizontally="true" android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="@string/labelspeed"
android:textSize="40sp" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView android:id="@+id/TextViewSpeed" android:textSize="40sp"
android:layout_width="fill_parent" android:layout_height="fill_parent" />
</TableRow>
</TableLayout>
<TextView android:text="@string/bottom_url_text" android:id="@+id/TextViewBottom"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:autoLink="web" />
<LinearLayout android:id="@+id/LayoutWebview"
- android:layout_width="fill_parent" android:layout_height="fill_parent"></LinearLayout>
+ android:layout_width="fill_parent" android:layout_height="fill_parent" />
</LinearLayout>
diff --git a/konphidroid/res/values-de/strings.xml b/konphidroid/res/values-de/strings.xml
index 3ea6170..77aacb5 100644
--- a/konphidroid/res/values-de/strings.xml
+++ b/konphidroid/res/values-de/strings.xml
@@ -1,18 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">KonPhiDroid</string>
<string name="hello">KonPhiDense Test-App, Version</string>
<string name="transmission_on">Ãbertragung</string>
<string name="transmission_off">Keine Ãbertragung</string>
+ <string name="recording_on">Logging</string>
+ <string name="recording_off">Kein Logging</string>
<string name="gpsbutton">GPS</string>
<string name="gps_timestamp">GPS Zeitstempel:</string>
<string name="transmission_on_toast">Bewegung wird zum Server übertragen</string>
<string name="transmission_off_toast">Es wird keine Bewegung mehr übertragen</string>
<string name="labelsender_on">Ãbertragungsergebnis:</string>
<string name="labelsender_off">Pause; Letzte:</string>
<string name="ask_activate_gps_settings">Das GPS ist ausgeschaltet. Wollen Sie die Einstellungen für Standort & Sicherheit bearbeiten, um GPS einzuschalten?</string>
<string name="yes">Ja</string>
<string name="no">Nein</string>
<string name="labelspeed">Speed:</string>
- <string name="choose_sending_interval">Sende-Intervall wählen [s]:</string>
+ <string name="choose_sending_interval">Sende-Intervall wählen [Min]:</string>
+ <string name="choose_record_interval">Aufzeichnungs-Intervall wählen [Sek]:</string>
</resources>
diff --git a/konphidroid/res/values/strings.xml b/konphidroid/res/values/strings.xml
index 73e0b6c..ab9ba9c 100644
--- a/konphidroid/res/values/strings.xml
+++ b/konphidroid/res/values/strings.xml
@@ -1,19 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">KonPhiDroid</string>
<string name="hello">KonPhiDense Test App, Version</string>
<string name="transmission_on">Transmission</string>
<string name="transmission_off">No Transmission</string>
+ <string name="recording_on">Recording</string>
+ <string name="recording_off">No Recording</string>
<string name="gpsbutton">GPS</string>
<string name="gps_timestamp">GPS Timestamp:</string>
<string name="transmission_on_toast">Sending movement to server</string>
<string name="transmission_off_toast">No movement is sent to server</string>
<string name="labelsender_on">Sending Result:</string>
<string name="labelsender_off">Paused; Last:</string>
<string name="ask_activate_gps_settings">The GPS receiver is not active. Do you want to edit your location settings in order to activate GPS now?</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="bottom_url_text">http://carcomm.cstimming.de/view.html</string>
<string name="labelspeed">Speed:</string>
- <string name="choose_sending_interval">Choose a sending time interval</string>
+ <string name="choose_sending_interval">Choose a sending time interval (minutes):</string>
+ <string name="choose_record_interval">Choose a recording time interval (seconds):</string>
</resources>
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index 5c4f815..2656e84 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,355 +1,343 @@
package de.cstimming.konphidroid;
-import java.io.IOException;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.DefaultHttpClient;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
import android.widget.ToggleButton;
public class KonPhiActivity extends Activity implements LocationListener, SliceSenderResult {
private ToggleButton m_togglebuttonGps;
private Button m_togglebuttonSender;
+ private Button m_togglebuttonRecord;
private SimpleDateFormat m_dateFormatter;
private SimpleDateFormat m_dateFormatSender;
private NumberFormat m_speedFormatter;
private Location m_lastLocation;
private boolean m_lastLocationValid;
- private boolean m_currentlySendingSlices;
-
- private long m_senderIntervalSecs;
+ private long m_recordIntervalSecs;
private String m_server = "http://carcomm.cstimming.de/";
//private WebView m_webview;
private TextView m_labelSender;
private int m_instanceId;
private int m_categoryId;
private LocationCollector m_locationCollector;
private static final int DIALOG_GPSWARNING = 1;
- private static final int DIALOG_INTERVAL_MULTICHOICE = 2;
+ private static final int DIALOG_RECORDINTERVAL_MULTICHOICE = 2;
+ private static final int DIALOG_SENDERINTERVAL_MULTICHOICE = 3;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
m_dateFormatSender = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
m_dateFormatSender.setTimeZone(TimeZone.getTimeZone("GMT00"));
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
m_speedFormatter = NumberFormat.getInstance();
m_speedFormatter.setMaximumFractionDigits(1);
m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebuttonGps);
m_togglebuttonSender = (Button) findViewById(R.id.togglebuttonSender);
+ m_togglebuttonRecord = (Button) findViewById(R.id.togglebuttonRecord);
m_labelSender = (TextView) findViewById(R.id.TextLabelSender);
- m_senderIntervalSecs = 0;
- setSenderIntervalSecs(30);
- m_currentlySendingSlices = false;
+ m_recordIntervalSecs = 0;
+ m_locationCollector = new LocationCollector(m_server, this, m_instanceId, m_categoryId, this);
+ setRecordIntervalSecs(30);
+ setSenderIntervalSecs(60);
java.util.Random rg = new java.util.Random();
m_instanceId = rg.nextInt();
m_categoryId = 1;
- m_locationCollector = new LocationCollector(m_server, this, m_instanceId);
-
// Print the version number into the UI
TextView versionView = (TextView) findViewById(R.id.TextViewVersion);
String versionString;
try {
versionString = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
} catch (NameNotFoundException e) {
versionString = "Not found";
e.printStackTrace();
}
versionView.setText(" " + versionString);
//final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
//m_webview = new WebView(this);
//ell.addView(m_webview);
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
m_togglebuttonSender.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
- showDialog(DIALOG_INTERVAL_MULTICHOICE);
+ showDialog(DIALOG_SENDERINTERVAL_MULTICHOICE);
+ }});
+ m_togglebuttonRecord.setOnClickListener(new OnClickListener() {
+ public void onClick(View v) {
+ showDialog(DIALOG_RECORDINTERVAL_MULTICHOICE);
}});
- registerAtLocationManager(getSenderIntervalSecs());
+ registerAtLocationManager(getRecordIntervalSecs());
}
private void registerAtLocationManager(long intervalSecs) {
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
- if (!locationManager
- .isProviderEnabled(LocationManager.GPS_PROVIDER)) {
- showDialog(DIALOG_GPSWARNING);
- }
- if (intervalSecs < m_senderIntervalSecs) {
+ LocationListener listener = m_locationCollector;//this;
+ locationManager.removeUpdates(listener);
+ if (intervalSecs > 0) { //< m_senderIntervalSecs) {
+ if (!locationManager
+ .isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+ showDialog(DIALOG_GPSWARNING);
+ }
+
long minTime = 1000 * intervalSecs; // [milliseconds]
float minDistance = 0; // 10; // [meters]
- LocationListener listener = m_locationCollector;//this;
- locationManager.removeUpdates(listener);
- locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
- minTime, minDistance, listener);
- listener = this;
- locationManager.removeUpdates(listener);
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
minTime, minDistance, listener);
}
}
- public long getSenderIntervalSecs() {
- return m_senderIntervalSecs;
+ public long getRecordIntervalSecs() {
+ return m_recordIntervalSecs;
}
+
public void setSenderIntervalSecs(long v) {
- if (v == m_senderIntervalSecs)
+ if (v == m_locationCollector.getSendingIntervalSecs())
return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (v == 0) {
m_togglebuttonSender.setText(R.string.transmission_off);
m_labelSender.setText(R.string.labelsender_off);
m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
} else {
- m_togglebuttonSender.setText(getString(R.string.transmission_on) + " " + String.valueOf(v) + "s");
+ m_togglebuttonSender.setText(getString(R.string.transmission_on) + " " + String.valueOf(v / 60) + "min");
+ m_labelSender.setText(R.string.labelsender_on);
+ final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
+ m_labelSender.setTextColor(viewSecs.getTextColors());
+ }
+ m_locationCollector.setSendingIntervalSecs(v);
+ }
+
+ public void setRecordIntervalSecs(long v) {
+ if (v == m_recordIntervalSecs)
+ return;
+ final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
+ if (v == 0) {
+ m_togglebuttonRecord.setText(R.string.recording_off);
+ m_labelSender.setText(R.string.labelsender_off);
+ m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
+ resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
+ } else {
+ m_togglebuttonRecord.setText(getString(R.string.recording_on) + " " + String.valueOf(v) + "s");
m_labelSender.setText(R.string.labelsender_on);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
m_labelSender.setTextColor(viewSecs.getTextColors());
- registerAtLocationManager(v);
}
- m_senderIntervalSecs = v;
+ registerAtLocationManager(v);
+ m_recordIntervalSecs = v;
}
protected Dialog onCreateDialog(int d) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
switch (d) {
case DIALOG_GPSWARNING:
builder.setMessage(R.string.ask_activate_gps_settings)
.setCancelable(false)
.setPositiveButton(R.string.yes,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
}
})
.setNegativeButton(R.string.no,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
dialog.cancel();
}
});
break;
- case DIALOG_INTERVAL_MULTICHOICE:
- builder.setTitle(R.string.choose_sending_interval);
- final CharSequence[] items = {"60", "30", "20", "10", "2", "0"};
+ case DIALOG_RECORDINTERVAL_MULTICHOICE:
+ builder.setTitle(R.string.choose_record_interval);
+ final CharSequence[] items = {"60", "30", "20", "10", "2", "off"};
builder.setSingleChoiceItems(items, 1, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
String item = items[which].toString();
- setSenderIntervalSecs(Integer.parseInt(item));
- dismissDialog(DIALOG_INTERVAL_MULTICHOICE);
+ final int secs = (item == "off" ? 0 : Integer.parseInt(item));
+ setRecordIntervalSecs(secs);
+ dismissDialog(DIALOG_RECORDINTERVAL_MULTICHOICE);
+ }
+ });
+ break;
+ case DIALOG_SENDERINTERVAL_MULTICHOICE:
+ builder.setTitle(R.string.choose_sending_interval);
+ final CharSequence[] items1 = {"10", "5", "2", "1", "off"};
+ builder.setSingleChoiceItems(items1, 1, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ String item = items1[which].toString();
+ final int mins = (item == "off" ? 0 : Integer.parseInt(item));
+ setSenderIntervalSecs(60 * mins);
+ dismissDialog(DIALOG_SENDERINTERVAL_MULTICHOICE);
}
});
break;
default:
return null;
}
Dialog result = builder.create();
return result;
}
@Override
public void onLocationChanged(Location loc) {
// Toast.makeText(KonPhiActivity.this, "Received location from " +
// loc.getProvider(), Toast.LENGTH_SHORT).show();
printLocInfo(loc);
if (m_lastLocationValid) {
long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
- long intervalSecs = getSenderIntervalSecs();
+ long intervalSecs = getRecordIntervalSecs();
if (intervalSecs > 0 && secdiff >= intervalSecs) {
if (secdiff <= 4 * intervalSecs) {
//sendPairNow(m_lastLocation, loc);
}
m_lastLocation = loc;
}
// Note: We don't set the m_lastLocation if we are smaller than
// m_senderIntervalSecs.
} else {
m_lastLocationValid = true;
m_lastLocation = loc;
}
}
private void printLocInfo(Location loc) {
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
final TextView viewSpeed = (TextView) findViewById(R.id.TextViewSpeed);
viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy())
: "...");
if (m_lastLocationValid) {
long msecdiff = loc.getTime() - m_lastLocation.getTime();
float distance = m_lastLocation.distanceTo(loc);
+ float speed = m_lastLocation.getSpeed();
String secs = String.valueOf(msecdiff / 1000);
String dist = String.valueOf(distance);
viewDist.setText(dist);
viewSecs.setText(secs);
- viewSpeed.setText(m_speedFormatter.format(3600.0 * distance / (float) msecdiff) + " km/h");
+ viewSpeed.setText(m_speedFormatter.format(3.6 * speed) + " km/h");
} else {
viewDist.setText("...");
viewSecs.setText("...");
viewSpeed.setText("...");
}
}
- private void sendPairNow(Location startLoc, Location endLoc) {
- // Only send if the togglebutton is active
- if (getSenderIntervalSecs() == 0)
- return;
-
- final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
-
- if (m_currentlySendingSlices) {
- resultview.setText("Still sending (ignoring newer position)...");
- return;
- }
-
- Slice slice = new Slice(startLoc, endLoc, m_instanceId, m_categoryId, m_dateFormatSender);
-
- HttpClient httpclient = new DefaultHttpClient();
- HttpPost httppost = new HttpPost(m_server + "slices");
-
- resultview.setText("Sending to " + httppost.getURI().toString());
- final String displaytime = m_dateFormatter.format(new Date(endLoc.getTime())) + ": ";
- try {
- // Add your data
- httppost.setEntity(new UrlEncodedFormEntity(slice.toNameValuePair()));
-
- // ByteArrayOutputStream baos = new ByteArrayOutputStream();
- // httppost.getEntity().writeTo(baos);
- // m_webview.loadData(baos.toString(), "text/html", "utf-8");
-
- // The network connection is moved into a separate task
- SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, this, null);
-
- // Execute HTTP Post Request
- m_currentlySendingSlices = true;
- task.execute(httppost);
-
- } catch (IOException e) {
- resultview.setText(displaytime + "Sending failed (IO): "
- + e.getLocalizedMessage());
- resultview.setTextColor(ColorStateList.valueOf(Color.RED));
- }
- }
-
@Override
public void onProviderDisabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " disabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider +
// " enabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " out of service", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " tmp. unavailable", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider
// + " available", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
break;
}
}
@Override
public void sliceSenderResult(String text, boolean good, int color) {
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
resultview.setText(text);
resultview.setTextColor(ColorStateList.valueOf(color));
- m_currentlySendingSlices = false;
}
}
\ No newline at end of file
diff --git a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
index 1c129c1..fc96e15 100644
--- a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
+++ b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
@@ -1,157 +1,162 @@
package de.cstimming.konphidroid;
import java.io.CharArrayWriter;
import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import org.apache.http.HttpEntity;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import android.location.Location;
import android.location.LocationListener;
import android.os.Bundle;
public class LocationCollector implements LocationListener, SenderInterface {
private ArrayList<Location> m_collectingLocations;
private ArrayList<Location> m_sendingLocations;
private boolean m_currentlySending;
private String m_server;
private SliceSenderResult m_result_cb;
private SimpleDateFormat m_dateFormatter;
private int m_instanceid;
+ private int m_categoryId;
+ private LocationListener m_location_cb;
+ private long m_sendingIntervalSecs;
- public LocationCollector(String serveraddress, SliceSenderResult result_cb, int instanceid) {
+ public LocationCollector(String serveraddress, SliceSenderResult result_cb, int instanceid, int mCategoryId, LocationListener another_location_cb) {
m_currentlySending = false;
m_server = serveraddress;
m_result_cb = result_cb;
m_instanceid = instanceid;
+ m_categoryId = mCategoryId;
+ m_location_cb = another_location_cb;
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
resetCollecting();
}
private void resetCollecting() {
m_collectingLocations = new ArrayList<Location>();
}
@Override
public void onLocationChanged(Location loc) {
+ if (m_location_cb != null) {
+ m_location_cb.onLocationChanged(loc);
+ }
m_collectingLocations.add(loc);
checkForSending();
}
+ public void setSendingIntervalSecs(long secs) {
+ m_sendingIntervalSecs = secs;
+ }
+
+ public long getSendingIntervalSecs() {
+ return m_sendingIntervalSecs;
+ }
+
private void checkForSending() {
- if (m_currentlySending || m_collectingLocations.size() <= 1) {
+ if (m_currentlySending
+ || m_collectingLocations.size() <= 1
+ || m_sendingIntervalSecs == 0) {
return;
}
Location first = m_collectingLocations.get(0);
Location last = m_collectingLocations.get(m_collectingLocations.size() - 1);
long secdiff = (last.getTime() - first.getTime()) / 1000;
- long intervalSecs = 30; // FIXME getSenderIntervalSecs();
- if (intervalSecs > 0 && secdiff >= intervalSecs) {
+ if (m_sendingIntervalSecs > 0 && secdiff >= m_sendingIntervalSecs) {
sendNow();
}
}
private void sendNow() {
m_sendingLocations = m_collectingLocations;
m_currentlySending = true;
scheduleSending();
resetCollecting();
}
- // FIXME: This must be tested!
private static String listToString(ArrayList<Location> ul, int instanceid) {
CharArrayWriter gpxoutput = new GpxCharArrayWriter(ul, instanceid);
String gpxstring = gpxoutput.toString();
return gpxstring;
}
-// private static HttpEntity listToStreamEntity(ArrayList<Location> ul, int instanceid) {
-// String gpxstring = listToString(ul, instanceid);
-// try {
-// return new StringEntity(gpxstring);
-// } catch (UnsupportedEncodingException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// return null;
-// }
-// }
-
private void scheduleSending() {
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(m_server + "home/gpxUpload"); // FIXME: Different URL for GPX upload!
final String displaytime = m_dateFormatter.format(new Date(m_sendingLocations.get(m_sendingLocations.size() - 1).getTime())) + ": ";
// Copied from http://www.anddev.org/upload_files_to_web_server-t443-s30.html
final String lineEnd = "\r\n";
final String twoHyphens = "--";
final String boundary = "*****";
httppost.setHeader("Content-Type", "multipart/form-data; boundary="+boundary);
String gpxstring = listToString(m_sendingLocations, m_instanceid);
String output = twoHyphens + boundary + lineEnd;
output += "Content-Disposition: form-data; name=\"upload\"; filename=\"anonym\"" + lineEnd;
output += "Content-Type: text/plain; charset=UTF-8" + lineEnd;
output += lineEnd;
// send file data
output += gpxstring;
// send multipart form data necesssary after file data.
output += lineEnd;
output += twoHyphens + boundary + twoHyphens + lineEnd;
// Put the string into the http entity
try {
HttpEntity entity = new StringEntity(output);
httppost.setEntity(entity);
} catch (UnsupportedEncodingException e) {
// Auto-generated catch block
e.printStackTrace();
return;
}
//HttpEntity entity = listToStreamEntity(m_sendingLocations, m_instanceid);
// The network connection is moved into a separate task
SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, m_result_cb, this);
// Execute HTTP Post Request
task.execute(httppost);
}
@Override
public void startedSending() {
// TODO Auto-generated method stub
}
@Override
public void stoppedSending(boolean successful) {
if (successful) {
m_currentlySending = false;
m_sendingLocations = null;
} else {
scheduleSending(); // TODO: what now?
}
}
@Override
public void onProviderDisabled(String arg0) {
// TODO Auto-generated method stub
}
@Override
public void onProviderEnabled(String arg0) {
// TODO Auto-generated method stub
}
@Override
public void onStatusChanged(String arg0, int arg1, Bundle arg2) {
// TODO Auto-generated method stub
}
}
|
cstim/carcomm
|
2d59f3bd1588fbd3052d6119c5f6aea358248d45
|
Finally get the collection upload to work.
|
diff --git a/ftp-command.txt b/ftp-command.txt
index c16aa3e..b25481f 100644
--- a/ftp-command.txt
+++ b/ftp-command.txt
@@ -1,30 +1,42 @@
# Local directory is carcomm/
lftp [email protected]
cd webapps/
cd carcomm/
mirror -R -x .git -n .
# -x REGEX - to exclude REGEX from transfer
# -n - to transfer only newer files
# -R - Reverse mirror to transfer in upload direction
ssh [email protected]
# Datenbank von Duplikaten befreien - Alle Zeilen abfragen, die
# duplizierte times haben:
select distinct slices.id, slices.time, slices.instanceid from slices, slices as b where slices.time = b.time and slices.id <> b.id;
# Von Duplikat-Zeilen jeweils nur eine anzeigen - die kann man dann
# alle zum Löschen auswählen, solange bis keine derartigen Zeilen mehr
# übrig sind:
select distinct slices.id, slices.time from slices, slices as b where slices.time = b.time and slices.id <> b.id GROUP BY slices.time HAVING COUNT(*) > 1;
Von Timo:
Delete from slices where id in(
Select min(id) as id, time from slices group by time having count(*) > 1
)
+
+
+# ############################################################
+
+Android installieren:
+
+# Switch the Vodafone 845 for linux
+usb_modeswitch -v 0x12d1 -p 0x1031 -s 20 -M "55534243123456780600000080000601000000000000000000000000000000"
+
+cd $HOME/android-sdk-linux_86/tools
+./adb -d uninstall de.cstimming.konphidroid
+./adb -d install -r ~/org/carcomm/konphidroid/bin/konphidroid.apk
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index e2ae95b..5c4f815 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,351 +1,355 @@
package de.cstimming.konphidroid;
import java.io.IOException;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpClient;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
import android.widget.ToggleButton;
public class KonPhiActivity extends Activity implements LocationListener, SliceSenderResult {
private ToggleButton m_togglebuttonGps;
private Button m_togglebuttonSender;
private SimpleDateFormat m_dateFormatter;
private SimpleDateFormat m_dateFormatSender;
private NumberFormat m_speedFormatter;
private Location m_lastLocation;
private boolean m_lastLocationValid;
private boolean m_currentlySendingSlices;
private long m_senderIntervalSecs;
private String m_server = "http://carcomm.cstimming.de/";
//private WebView m_webview;
private TextView m_labelSender;
private int m_instanceId;
private int m_categoryId;
private LocationCollector m_locationCollector;
private static final int DIALOG_GPSWARNING = 1;
private static final int DIALOG_INTERVAL_MULTICHOICE = 2;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
m_dateFormatSender = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
m_dateFormatSender.setTimeZone(TimeZone.getTimeZone("GMT00"));
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
m_speedFormatter = NumberFormat.getInstance();
m_speedFormatter.setMaximumFractionDigits(1);
m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebuttonGps);
m_togglebuttonSender = (Button) findViewById(R.id.togglebuttonSender);
m_labelSender = (TextView) findViewById(R.id.TextLabelSender);
m_senderIntervalSecs = 0;
setSenderIntervalSecs(30);
m_currentlySendingSlices = false;
java.util.Random rg = new java.util.Random();
m_instanceId = rg.nextInt();
m_categoryId = 1;
m_locationCollector = new LocationCollector(m_server, this, m_instanceId);
// Print the version number into the UI
TextView versionView = (TextView) findViewById(R.id.TextViewVersion);
String versionString;
try {
versionString = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
} catch (NameNotFoundException e) {
versionString = "Not found";
e.printStackTrace();
}
versionView.setText(" " + versionString);
//final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
//m_webview = new WebView(this);
//ell.addView(m_webview);
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
m_togglebuttonSender.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
showDialog(DIALOG_INTERVAL_MULTICHOICE);
}});
registerAtLocationManager(getSenderIntervalSecs());
}
private void registerAtLocationManager(long intervalSecs) {
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
if (!locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
if (intervalSecs < m_senderIntervalSecs) {
long minTime = 1000 * intervalSecs; // [milliseconds]
float minDistance = 0; // 10; // [meters]
- LocationListener listener = this;//m_locationCollector;//this;
+ LocationListener listener = m_locationCollector;//this;
+ locationManager.removeUpdates(listener);
+ locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
+ minTime, minDistance, listener);
+ listener = this;
locationManager.removeUpdates(listener);
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
minTime, minDistance, listener);
}
}
public long getSenderIntervalSecs() {
return m_senderIntervalSecs;
}
public void setSenderIntervalSecs(long v) {
if (v == m_senderIntervalSecs)
return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (v == 0) {
m_togglebuttonSender.setText(R.string.transmission_off);
m_labelSender.setText(R.string.labelsender_off);
m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
} else {
m_togglebuttonSender.setText(getString(R.string.transmission_on) + " " + String.valueOf(v) + "s");
m_labelSender.setText(R.string.labelsender_on);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
m_labelSender.setTextColor(viewSecs.getTextColors());
registerAtLocationManager(v);
}
m_senderIntervalSecs = v;
}
protected Dialog onCreateDialog(int d) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
switch (d) {
case DIALOG_GPSWARNING:
builder.setMessage(R.string.ask_activate_gps_settings)
.setCancelable(false)
.setPositiveButton(R.string.yes,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
}
})
.setNegativeButton(R.string.no,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
dialog.cancel();
}
});
break;
case DIALOG_INTERVAL_MULTICHOICE:
builder.setTitle(R.string.choose_sending_interval);
final CharSequence[] items = {"60", "30", "20", "10", "2", "0"};
builder.setSingleChoiceItems(items, 1, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
String item = items[which].toString();
setSenderIntervalSecs(Integer.parseInt(item));
dismissDialog(DIALOG_INTERVAL_MULTICHOICE);
}
});
break;
default:
return null;
}
Dialog result = builder.create();
return result;
}
@Override
public void onLocationChanged(Location loc) {
// Toast.makeText(KonPhiActivity.this, "Received location from " +
// loc.getProvider(), Toast.LENGTH_SHORT).show();
printLocInfo(loc);
if (m_lastLocationValid) {
long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
long intervalSecs = getSenderIntervalSecs();
if (intervalSecs > 0 && secdiff >= intervalSecs) {
if (secdiff <= 4 * intervalSecs) {
- sendPairNow(m_lastLocation, loc);
+ //sendPairNow(m_lastLocation, loc);
}
m_lastLocation = loc;
}
// Note: We don't set the m_lastLocation if we are smaller than
// m_senderIntervalSecs.
} else {
m_lastLocationValid = true;
m_lastLocation = loc;
}
}
private void printLocInfo(Location loc) {
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
final TextView viewSpeed = (TextView) findViewById(R.id.TextViewSpeed);
viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy())
: "...");
if (m_lastLocationValid) {
long msecdiff = loc.getTime() - m_lastLocation.getTime();
float distance = m_lastLocation.distanceTo(loc);
String secs = String.valueOf(msecdiff / 1000);
String dist = String.valueOf(distance);
viewDist.setText(dist);
viewSecs.setText(secs);
viewSpeed.setText(m_speedFormatter.format(3600.0 * distance / (float) msecdiff) + " km/h");
} else {
viewDist.setText("...");
viewSecs.setText("...");
viewSpeed.setText("...");
}
}
private void sendPairNow(Location startLoc, Location endLoc) {
// Only send if the togglebutton is active
if (getSenderIntervalSecs() == 0)
return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (m_currentlySendingSlices) {
resultview.setText("Still sending (ignoring newer position)...");
return;
}
Slice slice = new Slice(startLoc, endLoc, m_instanceId, m_categoryId, m_dateFormatSender);
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(m_server + "slices");
resultview.setText("Sending to " + httppost.getURI().toString());
final String displaytime = m_dateFormatter.format(new Date(endLoc.getTime())) + ": ";
try {
// Add your data
httppost.setEntity(new UrlEncodedFormEntity(slice.toNameValuePair()));
// ByteArrayOutputStream baos = new ByteArrayOutputStream();
// httppost.getEntity().writeTo(baos);
// m_webview.loadData(baos.toString(), "text/html", "utf-8");
// The network connection is moved into a separate task
SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, this, null);
// Execute HTTP Post Request
m_currentlySendingSlices = true;
task.execute(httppost);
} catch (IOException e) {
resultview.setText(displaytime + "Sending failed (IO): "
+ e.getLocalizedMessage());
resultview.setTextColor(ColorStateList.valueOf(Color.RED));
}
}
@Override
public void onProviderDisabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " disabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider +
// " enabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " out of service", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " tmp. unavailable", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider
// + " available", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
break;
}
}
@Override
public void sliceSenderResult(String text, boolean good, int color) {
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
resultview.setText(text);
resultview.setTextColor(ColorStateList.valueOf(color));
m_currentlySendingSlices = false;
}
}
\ No newline at end of file
diff --git a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
index 5e90c1f..1c129c1 100644
--- a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
+++ b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
@@ -1,126 +1,157 @@
package de.cstimming.konphidroid;
import java.io.CharArrayWriter;
import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import org.apache.http.HttpEntity;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import android.location.Location;
import android.location.LocationListener;
import android.os.Bundle;
public class LocationCollector implements LocationListener, SenderInterface {
private ArrayList<Location> m_collectingLocations;
private ArrayList<Location> m_sendingLocations;
private boolean m_currentlySending;
private String m_server;
private SliceSenderResult m_result_cb;
private SimpleDateFormat m_dateFormatter;
private int m_instanceid;
public LocationCollector(String serveraddress, SliceSenderResult result_cb, int instanceid) {
m_currentlySending = false;
m_server = serveraddress;
m_result_cb = result_cb;
m_instanceid = instanceid;
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
resetCollecting();
}
private void resetCollecting() {
m_collectingLocations = new ArrayList<Location>();
}
@Override
public void onLocationChanged(Location loc) {
m_collectingLocations.add(loc);
checkForSending();
}
private void checkForSending() {
if (m_currentlySending || m_collectingLocations.size() <= 1) {
return;
}
Location first = m_collectingLocations.get(0);
Location last = m_collectingLocations.get(m_collectingLocations.size() - 1);
long secdiff = (last.getTime() - first.getTime()) / 1000;
long intervalSecs = 30; // FIXME getSenderIntervalSecs();
if (intervalSecs > 0 && secdiff >= intervalSecs) {
sendNow();
}
}
private void sendNow() {
m_sendingLocations = m_collectingLocations;
m_currentlySending = true;
scheduleSending();
resetCollecting();
}
// FIXME: This must be tested!
- private static HttpEntity listToStreamEntity(ArrayList<Location> ul, int instanceid) {
+ private static String listToString(ArrayList<Location> ul, int instanceid) {
CharArrayWriter gpxoutput = new GpxCharArrayWriter(ul, instanceid);
String gpxstring = gpxoutput.toString();
- try {
- return new StringEntity(gpxstring);
- } catch (UnsupportedEncodingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- return null;
- }
+ return gpxstring;
}
+// private static HttpEntity listToStreamEntity(ArrayList<Location> ul, int instanceid) {
+// String gpxstring = listToString(ul, instanceid);
+// try {
+// return new StringEntity(gpxstring);
+// } catch (UnsupportedEncodingException e) {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// return null;
+// }
+// }
+
private void scheduleSending() {
HttpClient httpclient = new DefaultHttpClient();
- HttpPost httppost = new HttpPost(m_server + "slices"); // FIXME: Different URL for GPX upload!
+ HttpPost httppost = new HttpPost(m_server + "home/gpxUpload"); // FIXME: Different URL for GPX upload!
final String displaytime = m_dateFormatter.format(new Date(m_sendingLocations.get(m_sendingLocations.size() - 1).getTime())) + ": ";
- HttpEntity entity = listToStreamEntity(m_sendingLocations, m_instanceid);
- httppost.setEntity(entity);
+
+ // Copied from http://www.anddev.org/upload_files_to_web_server-t443-s30.html
+ final String lineEnd = "\r\n";
+ final String twoHyphens = "--";
+ final String boundary = "*****";
+ httppost.setHeader("Content-Type", "multipart/form-data; boundary="+boundary);
+
+ String gpxstring = listToString(m_sendingLocations, m_instanceid);
+ String output = twoHyphens + boundary + lineEnd;
+ output += "Content-Disposition: form-data; name=\"upload\"; filename=\"anonym\"" + lineEnd;
+ output += "Content-Type: text/plain; charset=UTF-8" + lineEnd;
+ output += lineEnd;
+ // send file data
+ output += gpxstring;
+ // send multipart form data necesssary after file data.
+ output += lineEnd;
+ output += twoHyphens + boundary + twoHyphens + lineEnd;
+
+ // Put the string into the http entity
+ try {
+ HttpEntity entity = new StringEntity(output);
+ httppost.setEntity(entity);
+ } catch (UnsupportedEncodingException e) {
+ // Auto-generated catch block
+ e.printStackTrace();
+ return;
+ }
+ //HttpEntity entity = listToStreamEntity(m_sendingLocations, m_instanceid);
// The network connection is moved into a separate task
SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, m_result_cb, this);
// Execute HTTP Post Request
task.execute(httppost);
}
@Override
public void startedSending() {
// TODO Auto-generated method stub
}
@Override
public void stoppedSending(boolean successful) {
if (successful) {
m_currentlySending = false;
m_sendingLocations = null;
} else {
scheduleSending(); // TODO: what now?
}
}
@Override
public void onProviderDisabled(String arg0) {
// TODO Auto-generated method stub
}
@Override
public void onProviderEnabled(String arg0) {
// TODO Auto-generated method stub
}
@Override
public void onStatusChanged(String arg0, int arg1, Bundle arg2) {
// TODO Auto-generated method stub
}
}
|
cstim/carcomm
|
fa8689a71fdce3d84a66e694ef857aea651191ee
|
Fix gpx upload from app: Allow non-authenticated upload. Accept unknown original filename.
|
diff --git a/webapp/app/controllers/home_controller.rb b/webapp/app/controllers/home_controller.rb
index 750bb8d..a1af5ca 100644
--- a/webapp/app/controllers/home_controller.rb
+++ b/webapp/app/controllers/home_controller.rb
@@ -1,187 +1,189 @@
require 'rexml/document'
require 'time'
require 'date'
# Represents one point of a GPX or NMEA track
class Trkpt
attr_reader :time, :lat, :lon,
:avgvel, :headingdeg,
:accuracy, :instanceid, :categoryid
def initialize(_time, _lat, _lon)
@time = _time
@lat = _lat
@lon = _lon
@avgvel = nil
@headingdeg = nil
@accuracy = 0
@instanceid = 0
@categoryid = 0
end
def fromXml(elem)
@avgvel = nil
@headingdeg = nil
@accuracy = 0
@instanceid = 0
@categoryid = 0
if not elem.attribute("lat").nil?
@lat = elem.attribute("lat").to_s
end
if not elem.attribute("lon").nil?
@lon = elem.attribute("lon").to_s
end
if elem.elements["time"]
strtime = elem.elements["time"].text
@time = Time.parse strtime
end
if not elem.attribute("avgvel").nil?
@avgvel = elem.attribute("avgvel").to_s
end
if not elem.attribute("headingdeg").nil?
@headingdeg = elem.attribute("headingdeg").to_s
end
if not elem.attribute("accuracy").nil?
@accuracy = elem.attribute("accuracy").to_s
end
if not elem.attribute("instanceid").nil?
@instanceid = elem.attribute("instanceid").to_s
end
if not elem.attribute("categoryid").nil?
@categoryid = elem.attribute("categoryid").to_s
end
end
end
# Convert a NMEA coordinate string to a floating point number
def dmmm2dec(degrees, sw)
deg = (degrees/100.0).floor #decimal degrees
frac = ((degrees/100.0)-deg)/0.6 #decimal fraction
ret = deg+frac #positive return value
if ((sw=="S") or (sw=="W")):
ret=ret*(-1) #flip sign if south or west
end
return ret
end
# Post a slice into our database
def postSlice(trkpt, prev)
duration = prev.time.nil? ? 0 : trkpt.time - prev.time
if duration < 95
slice = Slice.new(:time => trkpt.time,
:lat => trkpt.lat,
:lon => trkpt.lon,
:startlat => prev.lat,
:startlon => prev.lon,
:duration => duration,
:avgvel => trkpt.avgvel,
:headingdeg => trkpt.headingdeg,
:startaccuracy => prev.accuracy,
:endaccuracy => trkpt.accuracy,
:instanceid => trkpt.instanceid,
:categoryid => trkpt.categoryid)
slice.save
return true
else
return false
end
end
# The controller class
class HomeController < ApplicationController
attr_reader :minSliceDuration
def initialize
@minSliceDuration = 0 # formerly: 30
super
end
+ protect_from_forgery :except => :gpxUpload
+
def index
end
def gpxUpload
resulttext = storeGpx(params[:upload])
render :text => "File has been uploaded successfully: #{resulttext}"
end
def nmeaUpload
resulttext = storeNMEA(params[:upload])
render :text => "File has been uploaded successfully: #{resulttext}, with duration #{minSliceDuration} seconds each."
end
protected
def storeGpx(file)
- originalname = file.original_filename
+ originalname = (defined? file.original_filename) ? file.original_filename : "<anonymous>"
content = file.read
doc = REXML::Document.new content
newslices = 0
doc.elements.each("gpx/trk/trkseg") do | track |
prev = nil
track.elements.each do | elem_trkpt |
trkpt = Trkpt.new(nil, nil, nil)
trkpt.fromXml elem_trkpt
#logger.info("#{Time.now} Trying trkpt, got #{trkpt} from #{elem_trkpt}")
if prev.nil? or trkpt.time.nil?
prev = trkpt
else
duration = prev.time.nil? ? 0 : trkpt.time - prev.time
# Skip slices smaller than 30 seconds
if duration > minSliceDuration
# Ignore everything above 95 seconds altogether
if postSlice(trkpt, prev)
newslices = 1 + newslices
end
prev = trkpt
end
end
end # track.points.each
end # gpx.tracks.each
"Added #{newslices} new slices from #{originalname}"
end
protected
def storeNMEA(file)
originalname = file.original_filename
date = nil
prev = nil
newslices = 0
while (line = file.gets) do
if line =~ /\$GPRMC/
tokens = line.split(",")
date = Date.strptime(tokens[9], '%d%m%y')
end
if line =~ /\$GPGGA/
tokens = line.split(",")
time = Time.parse tokens[1]
if tokens[6] != '0' and not date.nil?
datetime = Time.utc(date.year, date.month, date.day,
time.hour, time.min, time.sec, time.usec)
lat = dmmm2dec((tokens[2]).to_f,tokens[3])
lon = dmmm2dec((tokens[4]).to_f,tokens[5])
trkpt = Trkpt.new(datetime, lat, lon)
if prev.nil? or trkpt.time.nil?
prev = trkpt
else
duration = prev.time.nil? ? 0 : trkpt.time - prev.time
# Skip slices smaller than the minimum duration
if duration >= minSliceDuration
# Ignore everything above 95 seconds altogether
if postSlice(trkpt, prev)
newslices = 1 + newslices
end
prev = trkpt
end
end # end else prev.nil? or trkpt.time.nil?
end # end tokens[6] != '0' and not date.nil?
end # end line =~ /\$GPGGA/
end # end while (line = file.gets) do
"Added #{newslices} new slices from #{originalname}"
end
end
|
cstim/carcomm
|
e072288354c3e8c0ce14a1a8534bd8b7696d0396
|
Integrate the new LocationCollector into the main activity.
|
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index 7280f39..e2ae95b 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,349 +1,351 @@
package de.cstimming.konphidroid;
import java.io.IOException;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Date;
-import java.util.List;
import java.util.TimeZone;
-import org.apache.http.NameValuePair;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
import android.widget.ToggleButton;
public class KonPhiActivity extends Activity implements LocationListener, SliceSenderResult {
private ToggleButton m_togglebuttonGps;
private Button m_togglebuttonSender;
private SimpleDateFormat m_dateFormatter;
private SimpleDateFormat m_dateFormatSender;
private NumberFormat m_speedFormatter;
private Location m_lastLocation;
private boolean m_lastLocationValid;
private boolean m_currentlySendingSlices;
private long m_senderIntervalSecs;
private String m_server = "http://carcomm.cstimming.de/";
//private WebView m_webview;
private TextView m_labelSender;
private int m_instanceId;
private int m_categoryId;
+
+ private LocationCollector m_locationCollector;
private static final int DIALOG_GPSWARNING = 1;
private static final int DIALOG_INTERVAL_MULTICHOICE = 2;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
m_dateFormatSender = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
m_dateFormatSender.setTimeZone(TimeZone.getTimeZone("GMT00"));
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
m_speedFormatter = NumberFormat.getInstance();
m_speedFormatter.setMaximumFractionDigits(1);
m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebuttonGps);
m_togglebuttonSender = (Button) findViewById(R.id.togglebuttonSender);
m_labelSender = (TextView) findViewById(R.id.TextLabelSender);
m_senderIntervalSecs = 0;
setSenderIntervalSecs(30);
m_currentlySendingSlices = false;
java.util.Random rg = new java.util.Random();
m_instanceId = rg.nextInt();
m_categoryId = 1;
+ m_locationCollector = new LocationCollector(m_server, this, m_instanceId);
+
// Print the version number into the UI
TextView versionView = (TextView) findViewById(R.id.TextViewVersion);
String versionString;
try {
versionString = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
} catch (NameNotFoundException e) {
versionString = "Not found";
e.printStackTrace();
}
versionView.setText(" " + versionString);
//final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
//m_webview = new WebView(this);
//ell.addView(m_webview);
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
m_togglebuttonSender.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
showDialog(DIALOG_INTERVAL_MULTICHOICE);
}});
- long minTime = 1000 * getSenderIntervalSecs(); // [milliseconds]
- float minDistance = 0; // 10; // [meters]
- locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
- minTime, minDistance, this);
+ registerAtLocationManager(getSenderIntervalSecs());
+ }
+
+ private void registerAtLocationManager(long intervalSecs) {
+ final LocationManager locationManager = (LocationManager) getApplicationContext()
+ .getSystemService(Context.LOCATION_SERVICE);
+ if (!locationManager
+ .isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+ showDialog(DIALOG_GPSWARNING);
+ }
+ if (intervalSecs < m_senderIntervalSecs) {
+ long minTime = 1000 * intervalSecs; // [milliseconds]
+ float minDistance = 0; // 10; // [meters]
+ LocationListener listener = this;//m_locationCollector;//this;
+ locationManager.removeUpdates(listener);
+ locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
+ minTime, minDistance, listener);
+ }
}
public long getSenderIntervalSecs() {
return m_senderIntervalSecs;
}
public void setSenderIntervalSecs(long v) {
if (v == m_senderIntervalSecs)
return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (v == 0) {
m_togglebuttonSender.setText(R.string.transmission_off);
m_labelSender.setText(R.string.labelsender_off);
m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
} else {
m_togglebuttonSender.setText(getString(R.string.transmission_on) + " " + String.valueOf(v) + "s");
m_labelSender.setText(R.string.labelsender_on);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
m_labelSender.setTextColor(viewSecs.getTextColors());
- final LocationManager locationManager = (LocationManager) getApplicationContext()
- .getSystemService(Context.LOCATION_SERVICE);
- if (!locationManager
- .isProviderEnabled(LocationManager.GPS_PROVIDER)) {
- showDialog(DIALOG_GPSWARNING);
- }
- if (v < m_senderIntervalSecs) {
- long minTime = 1000 * v; // [milliseconds]
- float minDistance = 0; // 10; // [meters]
- locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
- minTime, minDistance, this);
- }
+ registerAtLocationManager(v);
}
m_senderIntervalSecs = v;
}
protected Dialog onCreateDialog(int d) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
switch (d) {
case DIALOG_GPSWARNING:
builder.setMessage(R.string.ask_activate_gps_settings)
.setCancelable(false)
.setPositiveButton(R.string.yes,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
}
})
.setNegativeButton(R.string.no,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
dialog.cancel();
}
});
break;
case DIALOG_INTERVAL_MULTICHOICE:
builder.setTitle(R.string.choose_sending_interval);
final CharSequence[] items = {"60", "30", "20", "10", "2", "0"};
builder.setSingleChoiceItems(items, 1, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
String item = items[which].toString();
setSenderIntervalSecs(Integer.parseInt(item));
dismissDialog(DIALOG_INTERVAL_MULTICHOICE);
}
});
break;
default:
return null;
}
Dialog result = builder.create();
return result;
}
@Override
public void onLocationChanged(Location loc) {
// Toast.makeText(KonPhiActivity.this, "Received location from " +
// loc.getProvider(), Toast.LENGTH_SHORT).show();
printLocInfo(loc);
if (m_lastLocationValid) {
long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
long intervalSecs = getSenderIntervalSecs();
if (intervalSecs > 0 && secdiff >= intervalSecs) {
if (secdiff <= 4 * intervalSecs) {
sendPairNow(m_lastLocation, loc);
}
m_lastLocation = loc;
}
// Note: We don't set the m_lastLocation if we are smaller than
// m_senderIntervalSecs.
} else {
m_lastLocationValid = true;
m_lastLocation = loc;
}
}
private void printLocInfo(Location loc) {
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
final TextView viewSpeed = (TextView) findViewById(R.id.TextViewSpeed);
viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy())
: "...");
if (m_lastLocationValid) {
long msecdiff = loc.getTime() - m_lastLocation.getTime();
float distance = m_lastLocation.distanceTo(loc);
String secs = String.valueOf(msecdiff / 1000);
String dist = String.valueOf(distance);
viewDist.setText(dist);
viewSecs.setText(secs);
viewSpeed.setText(m_speedFormatter.format(3600.0 * distance / (float) msecdiff) + " km/h");
} else {
viewDist.setText("...");
viewSecs.setText("...");
viewSpeed.setText("...");
}
}
private void sendPairNow(Location startLoc, Location endLoc) {
// Only send if the togglebutton is active
if (getSenderIntervalSecs() == 0)
return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (m_currentlySendingSlices) {
resultview.setText("Still sending (ignoring newer position)...");
return;
}
Slice slice = new Slice(startLoc, endLoc, m_instanceId, m_categoryId, m_dateFormatSender);
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(m_server + "slices");
resultview.setText("Sending to " + httppost.getURI().toString());
final String displaytime = m_dateFormatter.format(new Date(endLoc.getTime())) + ": ";
try {
// Add your data
httppost.setEntity(new UrlEncodedFormEntity(slice.toNameValuePair()));
// ByteArrayOutputStream baos = new ByteArrayOutputStream();
// httppost.getEntity().writeTo(baos);
// m_webview.loadData(baos.toString(), "text/html", "utf-8");
// The network connection is moved into a separate task
SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, this, null);
// Execute HTTP Post Request
m_currentlySendingSlices = true;
task.execute(httppost);
} catch (IOException e) {
resultview.setText(displaytime + "Sending failed (IO): "
+ e.getLocalizedMessage());
resultview.setTextColor(ColorStateList.valueOf(Color.RED));
}
}
@Override
public void onProviderDisabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " disabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider +
// " enabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " out of service", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " tmp. unavailable", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider
// + " available", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
break;
}
}
@Override
public void sliceSenderResult(String text, boolean good, int color) {
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
resultview.setText(text);
resultview.setTextColor(ColorStateList.valueOf(color));
m_currentlySendingSlices = false;
}
}
\ No newline at end of file
|
cstim/carcomm
|
cec0b8938035452976c4ec3474c71c8784082e23
|
Choose the correct Http StringEntity which hopefully gets our correct data.
|
diff --git a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
index c470c03..5e90c1f 100644
--- a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
+++ b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
@@ -1,119 +1,126 @@
package de.cstimming.konphidroid;
import java.io.CharArrayWriter;
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
+import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
+
+import org.apache.http.HttpEntity;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.InputStreamEntity;
+import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import android.location.Location;
import android.location.LocationListener;
import android.os.Bundle;
public class LocationCollector implements LocationListener, SenderInterface {
private ArrayList<Location> m_collectingLocations;
private ArrayList<Location> m_sendingLocations;
private boolean m_currentlySending;
private String m_server;
private SliceSenderResult m_result_cb;
private SimpleDateFormat m_dateFormatter;
+ private int m_instanceid;
- public LocationCollector(String serveraddress, SliceSenderResult result_cb) {
+ public LocationCollector(String serveraddress, SliceSenderResult result_cb, int instanceid) {
m_currentlySending = false;
m_server = serveraddress;
m_result_cb = result_cb;
+ m_instanceid = instanceid;
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
resetCollecting();
}
private void resetCollecting() {
m_collectingLocations = new ArrayList<Location>();
}
@Override
public void onLocationChanged(Location loc) {
m_collectingLocations.add(loc);
checkForSending();
}
private void checkForSending() {
if (m_currentlySending || m_collectingLocations.size() <= 1) {
return;
}
Location first = m_collectingLocations.get(0);
Location last = m_collectingLocations.get(m_collectingLocations.size() - 1);
long secdiff = (last.getTime() - first.getTime()) / 1000;
long intervalSecs = 30; // FIXME getSenderIntervalSecs();
if (intervalSecs > 0 && secdiff >= intervalSecs) {
sendNow();
}
}
private void sendNow() {
m_sendingLocations = m_collectingLocations;
m_currentlySending = true;
scheduleSending();
resetCollecting();
}
// FIXME: This must be tested!
- private static InputStreamEntity listToStreamEntity(ArrayList<Location> ul) {
- CharArrayWriter gpxoutput = new GpxCharArrayWriter(ul);
+ private static HttpEntity listToStreamEntity(ArrayList<Location> ul, int instanceid) {
+ CharArrayWriter gpxoutput = new GpxCharArrayWriter(ul, instanceid);
String gpxstring = gpxoutput.toString();
- @SuppressWarnings("deprecation")
- InputStream istr = new StringBufferInputStream(gpxstring);
- return new InputStreamEntity(istr, gpxstring.length());
+ try {
+ return new StringEntity(gpxstring);
+ } catch (UnsupportedEncodingException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return null;
+ }
}
private void scheduleSending() {
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(m_server + "slices"); // FIXME: Different URL for GPX upload!
final String displaytime = m_dateFormatter.format(new Date(m_sendingLocations.get(m_sendingLocations.size() - 1).getTime())) + ": ";
- InputStreamEntity entity = listToStreamEntity(m_sendingLocations);
+ HttpEntity entity = listToStreamEntity(m_sendingLocations, m_instanceid);
httppost.setEntity(entity);
// The network connection is moved into a separate task
SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, m_result_cb, this);
// Execute HTTP Post Request
task.execute(httppost);
}
@Override
public void startedSending() {
// TODO Auto-generated method stub
}
@Override
public void stoppedSending(boolean successful) {
if (successful) {
m_currentlySending = false;
m_sendingLocations = null;
} else {
scheduleSending(); // TODO: what now?
}
}
@Override
public void onProviderDisabled(String arg0) {
// TODO Auto-generated method stub
}
@Override
public void onProviderEnabled(String arg0) {
// TODO Auto-generated method stub
}
@Override
public void onStatusChanged(String arg0, int arg1, Bundle arg2) {
// TODO Auto-generated method stub
}
}
|
cstim/carcomm
|
094d828b2163e319ce39714c7235b19f2e4d66d8
|
Finish the GPX file creation so that it contains all data that we want.
|
diff --git a/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java
index cceebb9..13cf8a3 100644
--- a/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java
+++ b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java
@@ -1,62 +1,67 @@
package de.cstimming.konphidroid;
import java.io.CharArrayWriter;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Iterator;
import java.util.List;
import android.location.Location;
public class GpxCharArrayWriter extends CharArrayWriter {
private int pointsCount = 0;
private SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd");
private SimpleDateFormat time = new SimpleDateFormat("HH:mm:ss");
Calendar cal = Calendar.getInstance();
private String gpxFoter =
"</trkseg>\n"+
"</trk>\n"+
"</gpx>\n";
- public GpxCharArrayWriter(List<Location> l){
+ public GpxCharArrayWriter(List<Location> l, int instanceid){
super(50); // FIXME: calculate meaningful value
String gpxHeader =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<gpx\n"+
" version=\"1.0\"\n"+
- "creator=\"GPS Logger\"\n"+
+ "creator=\"KonPhiDroid\"\n"+
"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"+
"xmlns=\"http://www.topografix.com/GPX/1/0\"\n"+
"xsi:schemaLocation=\"http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd\">\"\n"+
"<time>"+this.date.format(this.cal.getTime())+"T"+this.time.format(this.cal.getTime())+"Z</time>\n" +
"<trk>\n"+
"<trkseg>\n"
;
super.append(gpxHeader);
for (Iterator<Location> iter = l.iterator(); iter.hasNext(); ) {
- saveLocation(iter.next());
+ saveLocation(iter.next(), instanceid);
}
closeFile();
}
private void closeFile() {
super.append(this.gpxFoter);
}
- public void saveLocation(Location loc) {
-
+ public void saveLocation(Location loc, int instanceid) {
super.append(
- "<trkpt lat=\""+loc.getLatitude()+"\" lon=\""+loc.getLongitude()+"\">\n"+
- " <time>"+this.date.format(this.cal.getTime())+"T"+this.time.format(this.cal.getTime())+"Z</time>\n" +
- " <speed>" + loc.getSpeed() + "</speed>\n"+
+ "<trkpt lat=\""+loc.getLatitude()
+ + "\" lon=\""+loc.getLongitude()
+ + "\" avgvel=\"" + loc.getSpeed()
+ + "\" headingdeg=\"" + loc.getBearing()
+ + "\" accuracy=\"" + loc.getAccuracy()
+ + "\" instanceid=\"" + instanceid
+ + "\">\n"+
+ " <time>"+this.date.format(loc.getTime())
+ + "T" + this.time.format(loc.getTime())+"Z</time>\n" +
//"<name>TP"+(pointsCount++)+"</name>\n"+
//"<fix>none</fix>\n"+
"</trkpt>\n");
}
}
diff --git a/konphidroidTest/src/de/cstimming/konphidroid/test/GpxFileTest.java b/konphidroidTest/src/de/cstimming/konphidroid/test/GpxFileTest.java
index b5dc570..7e32cd2 100644
--- a/konphidroidTest/src/de/cstimming/konphidroid/test/GpxFileTest.java
+++ b/konphidroidTest/src/de/cstimming/konphidroid/test/GpxFileTest.java
@@ -1,34 +1,34 @@
package de.cstimming.konphidroid.test;
import java.util.ArrayList;
import java.util.List;
import android.location.Location;
import junit.framework.TestCase;
import de.cstimming.konphidroid.GpxCharArrayWriter;
public class GpxFileTest extends TestCase {
private List<Location> m_list;
protected void setUp() throws Exception {
super.setUp();
m_list = new ArrayList<Location>();
Location loc = new Location("foo");
loc.setLongitude(0);
loc.setLatitude(0);
m_list.add(loc);
m_list.add(loc);
}
public void testWriter() {
- GpxCharArrayWriter w = new GpxCharArrayWriter(m_list);
+ GpxCharArrayWriter w = new GpxCharArrayWriter(m_list, 17);
System.out.println(w.toString());
System.out.println("blabla");
assertTrue(true);
}
protected void tearDown() throws Exception {
m_list = null;
super.tearDown();
}
}
|
cstim/carcomm
|
395b6747f0459fb6ab697e2e2bd45edc043db0db
|
Fix GPX file uploading which was broken since e3eb81957d7ad7117f284f2f15cbbf9e4ef7e944
|
diff --git a/webapp/app/controllers/home_controller.rb b/webapp/app/controllers/home_controller.rb
index 0b9c9f7..750bb8d 100644
--- a/webapp/app/controllers/home_controller.rb
+++ b/webapp/app/controllers/home_controller.rb
@@ -1,185 +1,187 @@
require 'rexml/document'
require 'time'
require 'date'
# Represents one point of a GPX or NMEA track
class Trkpt
attr_reader :time, :lat, :lon,
:avgvel, :headingdeg,
:accuracy, :instanceid, :categoryid
def initialize(_time, _lat, _lon)
@time = _time
@lat = _lat
@lon = _lon
@avgvel = nil
@headingdeg = nil
@accuracy = 0
@instanceid = 0
@categoryid = 0
end
- def Trkpt.fromXml(elem)
+ def fromXml(elem)
@avgvel = nil
@headingdeg = nil
@accuracy = 0
@instanceid = 0
@categoryid = 0
if not elem.attribute("lat").nil?
@lat = elem.attribute("lat").to_s
end
if not elem.attribute("lon").nil?
@lon = elem.attribute("lon").to_s
end
if elem.elements["time"]
strtime = elem.elements["time"].text
@time = Time.parse strtime
end
if not elem.attribute("avgvel").nil?
@avgvel = elem.attribute("avgvel").to_s
end
if not elem.attribute("headingdeg").nil?
@headingdeg = elem.attribute("headingdeg").to_s
end
if not elem.attribute("accuracy").nil?
@accuracy = elem.attribute("accuracy").to_s
end
if not elem.attribute("instanceid").nil?
@instanceid = elem.attribute("instanceid").to_s
end
if not elem.attribute("categoryid").nil?
@categoryid = elem.attribute("categoryid").to_s
end
end
end
# Convert a NMEA coordinate string to a floating point number
def dmmm2dec(degrees, sw)
deg = (degrees/100.0).floor #decimal degrees
frac = ((degrees/100.0)-deg)/0.6 #decimal fraction
ret = deg+frac #positive return value
if ((sw=="S") or (sw=="W")):
ret=ret*(-1) #flip sign if south or west
end
return ret
end
# Post a slice into our database
def postSlice(trkpt, prev)
duration = prev.time.nil? ? 0 : trkpt.time - prev.time
if duration < 95
slice = Slice.new(:time => trkpt.time,
:lat => trkpt.lat,
:lon => trkpt.lon,
:startlat => prev.lat,
:startlon => prev.lon,
:duration => duration,
:avgvel => trkpt.avgvel,
- :headingdev => trkpt.headingdeg,
+ :headingdeg => trkpt.headingdeg,
:startaccuracy => prev.accuracy,
:endaccuracy => trkpt.accuracy,
:instanceid => trkpt.instanceid,
:categoryid => trkpt.categoryid)
slice.save
return true
else
return false
end
end
# The controller class
class HomeController < ApplicationController
attr_reader :minSliceDuration
def initialize
@minSliceDuration = 0 # formerly: 30
super
end
def index
end
def gpxUpload
resulttext = storeGpx(params[:upload])
render :text => "File has been uploaded successfully: #{resulttext}"
end
def nmeaUpload
resulttext = storeNMEA(params[:upload])
render :text => "File has been uploaded successfully: #{resulttext}, with duration #{minSliceDuration} seconds each."
end
protected
def storeGpx(file)
originalname = file.original_filename
content = file.read
doc = REXML::Document.new content
newslices = 0
doc.elements.each("gpx/trk/trkseg") do | track |
prev = nil
track.elements.each do | elem_trkpt |
- trkpt = Trkpt.fromXml elem_trkpt
+ trkpt = Trkpt.new(nil, nil, nil)
+ trkpt.fromXml elem_trkpt
+ #logger.info("#{Time.now} Trying trkpt, got #{trkpt} from #{elem_trkpt}")
if prev.nil? or trkpt.time.nil?
prev = trkpt
else
duration = prev.time.nil? ? 0 : trkpt.time - prev.time
# Skip slices smaller than 30 seconds
if duration > minSliceDuration
# Ignore everything above 95 seconds altogether
if postSlice(trkpt, prev)
newslices = 1 + newslices
end
prev = trkpt
end
end
end # track.points.each
end # gpx.tracks.each
"Added #{newslices} new slices from #{originalname}"
end
protected
def storeNMEA(file)
originalname = file.original_filename
date = nil
prev = nil
newslices = 0
while (line = file.gets) do
if line =~ /\$GPRMC/
tokens = line.split(",")
date = Date.strptime(tokens[9], '%d%m%y')
end
if line =~ /\$GPGGA/
tokens = line.split(",")
time = Time.parse tokens[1]
if tokens[6] != '0' and not date.nil?
datetime = Time.utc(date.year, date.month, date.day,
time.hour, time.min, time.sec, time.usec)
lat = dmmm2dec((tokens[2]).to_f,tokens[3])
lon = dmmm2dec((tokens[4]).to_f,tokens[5])
trkpt = Trkpt.new(datetime, lat, lon)
if prev.nil? or trkpt.time.nil?
prev = trkpt
else
duration = prev.time.nil? ? 0 : trkpt.time - prev.time
# Skip slices smaller than the minimum duration
if duration >= minSliceDuration
# Ignore everything above 95 seconds altogether
if postSlice(trkpt, prev)
newslices = 1 + newslices
end
prev = trkpt
end
end # end else prev.nil? or trkpt.time.nil?
end # end tokens[6] != '0' and not date.nil?
end # end line =~ /\$GPGGA/
end # end while (line = file.gets) do
"Added #{newslices} new slices from #{originalname}"
end
end
|
cstim/carcomm
|
fd4d77e5cfa03e6d1c055940db8a55519b6dafcd
|
Add junit testcase for our android app, now to test the gpx writer.
|
diff --git a/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java
index 6498936..cceebb9 100644
--- a/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java
+++ b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java
@@ -1,63 +1,62 @@
package de.cstimming.konphidroid;
import java.io.CharArrayWriter;
-import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Iterator;
import java.util.List;
import android.location.Location;
public class GpxCharArrayWriter extends CharArrayWriter {
private int pointsCount = 0;
private SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd");
private SimpleDateFormat time = new SimpleDateFormat("HH:mm:ss");
Calendar cal = Calendar.getInstance();
private String gpxFoter =
"</trkseg>\n"+
"</trk>\n"+
"</gpx>\n";
- GpxCharArrayWriter(List<Location> l){
+ public GpxCharArrayWriter(List<Location> l){
super(50); // FIXME: calculate meaningful value
String gpxHeader =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<gpx\n"+
" version=\"1.0\"\n"+
"creator=\"GPS Logger\"\n"+
"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"+
"xmlns=\"http://www.topografix.com/GPX/1/0\"\n"+
"xsi:schemaLocation=\"http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd\">\"\n"+
"<time>"+this.date.format(this.cal.getTime())+"T"+this.time.format(this.cal.getTime())+"Z</time>\n" +
"<trk>\n"+
"<trkseg>\n"
;
super.append(gpxHeader);
for (Iterator<Location> iter = l.iterator(); iter.hasNext(); ) {
saveLocation(iter.next());
}
closeFile();
}
private void closeFile() {
super.append(this.gpxFoter);
}
public void saveLocation(Location loc) {
super.append(
"<trkpt lat=\""+loc.getLatitude()+"\" lon=\""+loc.getLongitude()+"\">\n"+
- "<time>"+this.date.format(this.cal.getTime())+"T"+this.time.format(this.cal.getTime())+"Z</time>\n" +
- "<speed>0.000000</speed>\n"+
- "<name>TP"+(pointsCount++)+"</name>\n"+
- "<fix>none</fix>\n"+
+ " <time>"+this.date.format(this.cal.getTime())+"T"+this.time.format(this.cal.getTime())+"Z</time>\n" +
+ " <speed>" + loc.getSpeed() + "</speed>\n"+
+ //"<name>TP"+(pointsCount++)+"</name>\n"+
+ //"<fix>none</fix>\n"+
"</trkpt>\n");
}
}
diff --git a/konphidroidTest/.classpath b/konphidroidTest/.classpath
new file mode 100644
index 0000000..8748872
--- /dev/null
+++ b/konphidroidTest/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="gen"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/konphidroid"/>
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/konphidroidTest/.gitignore b/konphidroidTest/.gitignore
new file mode 100644
index 0000000..479c192
--- /dev/null
+++ b/konphidroidTest/.gitignore
@@ -0,0 +1,4 @@
+bin
+build.xml
+local.properties
+gen
diff --git a/konphidroidTest/.project b/konphidroidTest/.project
new file mode 100644
index 0000000..4116be5
--- /dev/null
+++ b/konphidroidTest/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>konphidroidTest</name>
+ <comment></comment>
+ <projects>
+ <project>konphidroid</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ApkBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/konphidroidTest/AndroidManifest.xml b/konphidroidTest/AndroidManifest.xml
new file mode 100644
index 0000000..503d764
--- /dev/null
+++ b/konphidroidTest/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="de.cstimming.konphidroid.test"
+ android:versionCode="1"
+ android:versionName="1.0">
+ <application android:icon="@drawable/icon" android:label="@string/app_name">
+
+ <uses-library android:name="android.test.runner" />
+ </application>
+ <uses-sdk android:minSdkVersion="3" />
+ <instrumentation android:targetPackage="de.cstimming.konphidroid" android:name="android.test.InstrumentationTestRunner" />
+</manifest>
\ No newline at end of file
diff --git a/konphidroidTest/default.properties b/konphidroidTest/default.properties
new file mode 100644
index 0000000..4513a1e
--- /dev/null
+++ b/konphidroidTest/default.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-3
diff --git a/konphidroidTest/res/drawable/icon.png b/konphidroidTest/res/drawable/icon.png
new file mode 100644
index 0000000..a07c69f
Binary files /dev/null and b/konphidroidTest/res/drawable/icon.png differ
diff --git a/konphidroidTest/res/layout/main.xml b/konphidroidTest/res/layout/main.xml
new file mode 100644
index 0000000..3a5f117
--- /dev/null
+++ b/konphidroidTest/res/layout/main.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ >
+<TextView
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/hello"
+ />
+</LinearLayout>
diff --git a/konphidroidTest/res/values/strings.xml b/konphidroidTest/res/values/strings.xml
new file mode 100644
index 0000000..2d19d33
--- /dev/null
+++ b/konphidroidTest/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="hello">Hello World!</string>
+ <string name="app_name">konphidroidTest</string>
+</resources>
diff --git a/konphidroidTest/src/de/cstimming/konphidroid/test/GpxFileTest.java b/konphidroidTest/src/de/cstimming/konphidroid/test/GpxFileTest.java
new file mode 100644
index 0000000..b5dc570
--- /dev/null
+++ b/konphidroidTest/src/de/cstimming/konphidroid/test/GpxFileTest.java
@@ -0,0 +1,34 @@
+package de.cstimming.konphidroid.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import android.location.Location;
+import junit.framework.TestCase;
+import de.cstimming.konphidroid.GpxCharArrayWriter;
+
+public class GpxFileTest extends TestCase {
+ private List<Location> m_list;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ m_list = new ArrayList<Location>();
+ Location loc = new Location("foo");
+ loc.setLongitude(0);
+ loc.setLatitude(0);
+ m_list.add(loc);
+ m_list.add(loc);
+ }
+
+ public void testWriter() {
+ GpxCharArrayWriter w = new GpxCharArrayWriter(m_list);
+ System.out.println(w.toString());
+ System.out.println("blabla");
+ assertTrue(true);
+ }
+ protected void tearDown() throws Exception {
+ m_list = null;
+ super.tearDown();
+ }
+
+}
|
cstim/carcomm
|
177e62782590ecaf678e195c2e105f67e75bb33e
|
Fix line endings.
|
diff --git a/579651/C2C low_cost beacon/messages/32623592.html b/579651/C2C low_cost beacon/messages/32623592.html
index 616f14e..d8f5148 100644
--- a/579651/C2C low_cost beacon/messages/32623592.html
+++ b/579651/C2C low_cost beacon/messages/32623592.html
@@ -1,70 +1,70 @@
<!DOCTYPE html>
<html>
<head>
<title>C2C low-cost beacon - Web-Applikation im Browser funktioniert auch!</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
</head>
<body class="message">
<p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
<div class="header">
<h2>C2C low-cost beacon — citytraffic</h2>
</div>
<p class="nav"><a href="../messages.html">← Back to messages</a></p>
<div class="message">
<h3 class="title">
Web-Applikation im Browser funktioniert auch!
</h3>
<p>Posted by Christian Stimming on 19 May, 2010<br />
Category: No category</p>
<div class="body">
<div>Anders als neulich im Telefonat vermutet, ist eine Implementierung als reine Web-Anwendung im Browser tatsächlich mit vertretbarem Aufwand möglich. Also: Man zücke sein GPS-fähiges Handy mit Browser und wähle folgende Webseite an:</div><div><br /></div><div><a href="http://carcomm.cstimming.de/map.html">http://carcomm.cstimming.de/map.html</a></div><div><br /></div><div>Sodann muss das Handy zunächst ca. 800 KByte Javascript laden und fragt nach, ob der Benutzer die eigene Position der Webseite mitteilen will. Wenn ja, geht es sofort los:<br /></div><ul><li>Die OpenStreetMap-Karte wird mit der eigenen Position in der Mitte angezeigt</li><li>Die bunten Wege aus der Datenbank werden geladen und eingetragen (z.Zt. noch ohne zeitliche Einschränkung, also erstmal alles, was in der Datenbank ist)</li><li>Alle 60 Sekunden wird die eigene Position und die vorige Position als neues Wegstück an die Datenbank geschickt.</li></ul><div>Dies funktioniert jedenfalls im Firefox am PC zuhause. Ich brauche dann Rückmeldungen aus anderen Browsern und natürlich aus den Browsern vom Handy: iPhone, Android, Nokia, whatnot.<br /></div>
</div>
</div>
<div class="comments">
<h3>Comments</h3>
<div class="comment">
<p>Christian Stimming on 19 May, 2010:</p>
<div class="body">
<div>(Beim Aufräumen habe ich zusätzlich noch sämtliche Wegstücke aus der Datenbank gelöscht, die ich seinerzeit aus OpenStreetMap-GPS-Traces rüberkopiert habe. Die hätten ja eventuell Lizenz-Auswirkungen gehabt. Aber jetzt sind sie alle wieder drauÃen und wir haben nur unsere eigenen Daten, über die wir dementsprechend auch alle Rechte haben.)<br /></div>
</div>
</div>
<div class="comment">
<p>Philippe Dreiling on 21 May, 2010:</p>
<div class="body">
- <div>Hallo Christian, Hallo Niels,</div>
-<div><br /></div>
-<div>leider hat uns eine influenza am Anfang der Woche flachgelegt.</div>
-<div>Soweit wieder fit und auf dem Weg in den Urlaub.</div>
-<div>Kurz vorher noch ein paar Dinge vom Flughafen München :-)</div>
-<div><br /></div>
-<div>Ich werde zwei Beispiele hochladen, wie ich mir das Interface vorstelle.</div>
-<div>Ausserdem habe ich mit der Grafik Designer Freundin gesprochen.</div>
-<div>Sie kennt einen Spieleentwickler, der uns vielleicht weiterhelfen könnte, grafisch ist er allerdings nicht Oberklasse meinte sie :-)</div>
-<div><br /></div>
-<div>Habe Deine neue SW runtergeladen, und der Browserlink funktionierte bei mir auch, hatte aber kein GPS dran.</div>
-<div><br /></div>
-<div>Ciao Philippe</div>
-<div>Ab dem 7.7 wieder in München, ab und zu per Mail.</div>
-<div><br /></div>
+ <div>Hallo Christian, Hallo Niels,</div>
+<div><br /></div>
+<div>leider hat uns eine influenza am Anfang der Woche flachgelegt.</div>
+<div>Soweit wieder fit und auf dem Weg in den Urlaub.</div>
+<div>Kurz vorher noch ein paar Dinge vom Flughafen München :-)</div>
+<div><br /></div>
+<div>Ich werde zwei Beispiele hochladen, wie ich mir das Interface vorstelle.</div>
+<div>Ausserdem habe ich mit der Grafik Designer Freundin gesprochen.</div>
+<div>Sie kennt einen Spieleentwickler, der uns vielleicht weiterhelfen könnte, grafisch ist er allerdings nicht Oberklasse meinte sie :-)</div>
+<div><br /></div>
+<div>Habe Deine neue SW runtergeladen, und der Browserlink funktionierte bei mir auch, hatte aber kein GPS dran.</div>
+<div><br /></div>
+<div>Ciao Philippe</div>
+<div>Ab dem 7.7 wieder in München, ab und zu per Mail.</div>
+<div><br /></div>
<div><br /></div>
</div>
</div>
<div class="comment">
<p>Christian Stimming on 22 May, 2010:</p>
<div class="body">
<div>Hallo Philippe, Niels, kurze Statusmeldung über diese Woche:<br /></div><ul><li> Von der Laptop-Software hatte ich letzten Montag die neue Version gemacht, die dann die von Philippe vorgeschlagenen Status-Anzeigen ("Grünes Licht") enthält.</li><li>Und dann habe ich herausgefunden, dass die bisherige Funktionalität auch über eine reine Javascript-Implementierung (d.h. eine Webseite im Browser) möglich ist - eben der Link oben. ABER: Die GPS-Position bekommt die Webseite nur auf einem Smartphone heraus, nicht auf einem Laptop. Die überraschenden Ergebnisse Funktionstest bei verschiedenen Bekannten: Auf dem iPhone funktioniert das sofort!!! Auf einem Android-Phone dagegen kommt zwar die Karte, aber die Abfrage der GPS-Position scheint noch nicht zu funktionieren. Auf einem Windows-Phone im Internet Explorer kommt die Fehlermeldung, dass Vektoren nicht angezeigt werden können, so dass also keine Wegstücke angezeigt werden können. Ein Windows-Phone mit Firefox oder Opera müsste noch getestet werden, ebenso ein Nokia/Symbian-Phone.</li></ul><div>Denkbar ist bei der Javascript/Webseiten-Lösung also nun auch, dass die grafische Darstellung Schritt für Schritt weiter in Richtung des Konphidense-Spiel umgebaut wird - und man hat das in den verschiedenen Phones dann sofort fertig.<br /></div>
</div>
</div>
<div class="comment">
<p>Christian Stimming on 22 May, 2010:</p>
<div class="body">
<div>Auf Philippes Bildern kann ich leider noch nicht so viel erkennen. Da brauche ich wohl noch die telefonische Erklärung.<br /></div>
</div>
</div>
</div>
</body>
</html>
diff --git a/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java
index 059477a..6498936 100644
--- a/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java
+++ b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java
@@ -1,63 +1,63 @@
-package de.cstimming.konphidroid;
-
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Iterator;
-import java.util.List;
-
-import android.location.Location;
-
-public class GpxCharArrayWriter extends CharArrayWriter {
-
- private int pointsCount = 0;
- private SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd");
- private SimpleDateFormat time = new SimpleDateFormat("HH:mm:ss");
- Calendar cal = Calendar.getInstance();
-
- private String gpxFoter =
- "</trkseg>\n"+
- "</trk>\n"+
- "</gpx>\n";
-
- GpxCharArrayWriter(List<Location> l){
- super(50); // FIXME: calculate meaningful value
-
- String gpxHeader =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<gpx\n"+
- " version=\"1.0\"\n"+
- "creator=\"GPS Logger\"\n"+
- "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"+
- "xmlns=\"http://www.topografix.com/GPX/1/0\"\n"+
- "xsi:schemaLocation=\"http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd\">\"\n"+
- "<time>"+this.date.format(this.cal.getTime())+"T"+this.time.format(this.cal.getTime())+"Z</time>\n" +
- "<trk>\n"+
- "<trkseg>\n"
- ;
-
- super.append(gpxHeader);
-
- for (Iterator<Location> iter = l.iterator(); iter.hasNext(); ) {
- saveLocation(iter.next());
- }
- closeFile();
-
- }
- private void closeFile() {
- super.append(this.gpxFoter);
- }
-
- public void saveLocation(Location loc) {
-
- super.append(
- "<trkpt lat=\""+loc.getLatitude()+"\" lon=\""+loc.getLongitude()+"\">\n"+
- "<time>"+this.date.format(this.cal.getTime())+"T"+this.time.format(this.cal.getTime())+"Z</time>\n" +
- "<speed>0.000000</speed>\n"+
- "<name>TP"+(pointsCount++)+"</name>\n"+
- "<fix>none</fix>\n"+
- "</trkpt>\n");
- }
-
-}
+package de.cstimming.konphidroid;
+
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Iterator;
+import java.util.List;
+
+import android.location.Location;
+
+public class GpxCharArrayWriter extends CharArrayWriter {
+
+ private int pointsCount = 0;
+ private SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd");
+ private SimpleDateFormat time = new SimpleDateFormat("HH:mm:ss");
+ Calendar cal = Calendar.getInstance();
+
+ private String gpxFoter =
+ "</trkseg>\n"+
+ "</trk>\n"+
+ "</gpx>\n";
+
+ GpxCharArrayWriter(List<Location> l){
+ super(50); // FIXME: calculate meaningful value
+
+ String gpxHeader =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<gpx\n"+
+ " version=\"1.0\"\n"+
+ "creator=\"GPS Logger\"\n"+
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"+
+ "xmlns=\"http://www.topografix.com/GPX/1/0\"\n"+
+ "xsi:schemaLocation=\"http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd\">\"\n"+
+ "<time>"+this.date.format(this.cal.getTime())+"T"+this.time.format(this.cal.getTime())+"Z</time>\n" +
+ "<trk>\n"+
+ "<trkseg>\n"
+ ;
+
+ super.append(gpxHeader);
+
+ for (Iterator<Location> iter = l.iterator(); iter.hasNext(); ) {
+ saveLocation(iter.next());
+ }
+ closeFile();
+
+ }
+ private void closeFile() {
+ super.append(this.gpxFoter);
+ }
+
+ public void saveLocation(Location loc) {
+
+ super.append(
+ "<trkpt lat=\""+loc.getLatitude()+"\" lon=\""+loc.getLongitude()+"\">\n"+
+ "<time>"+this.date.format(this.cal.getTime())+"T"+this.time.format(this.cal.getTime())+"Z</time>\n" +
+ "<speed>0.000000</speed>\n"+
+ "<name>TP"+(pointsCount++)+"</name>\n"+
+ "<fix>none</fix>\n"+
+ "</trkpt>\n");
+ }
+
+}
diff --git a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
index f9cadfa..c470c03 100644
--- a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
+++ b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
@@ -1,119 +1,119 @@
-package de.cstimming.konphidroid;
-
-import java.io.CharArrayWriter;
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.InputStreamEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-
-import android.location.Location;
-import android.location.LocationListener;
-import android.os.Bundle;
-
-public class LocationCollector implements LocationListener, SenderInterface {
- private ArrayList<Location> m_collectingLocations;
- private ArrayList<Location> m_sendingLocations;
- private boolean m_currentlySending;
- private String m_server;
- private SliceSenderResult m_result_cb;
- private SimpleDateFormat m_dateFormatter;
-
- public LocationCollector(String serveraddress, SliceSenderResult result_cb) {
- m_currentlySending = false;
- m_server = serveraddress;
- m_result_cb = result_cb;
- m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
- resetCollecting();
- }
- private void resetCollecting() {
- m_collectingLocations = new ArrayList<Location>();
- }
-
- @Override
- public void onLocationChanged(Location loc) {
- m_collectingLocations.add(loc);
- checkForSending();
- }
-
- private void checkForSending() {
- if (m_currentlySending || m_collectingLocations.size() <= 1) {
- return;
- }
- Location first = m_collectingLocations.get(0);
- Location last = m_collectingLocations.get(m_collectingLocations.size() - 1);
- long secdiff = (last.getTime() - first.getTime()) / 1000;
- long intervalSecs = 30; // FIXME getSenderIntervalSecs();
- if (intervalSecs > 0 && secdiff >= intervalSecs) {
- sendNow();
- }
- }
-
- private void sendNow() {
- m_sendingLocations = m_collectingLocations;
- m_currentlySending = true;
- scheduleSending();
- resetCollecting();
- }
-
- // FIXME: This must be tested!
- private static InputStreamEntity listToStreamEntity(ArrayList<Location> ul) {
- CharArrayWriter gpxoutput = new GpxCharArrayWriter(ul);
- String gpxstring = gpxoutput.toString();
- @SuppressWarnings("deprecation")
- InputStream istr = new StringBufferInputStream(gpxstring);
- return new InputStreamEntity(istr, gpxstring.length());
- }
-
- private void scheduleSending() {
- HttpClient httpclient = new DefaultHttpClient();
- HttpPost httppost = new HttpPost(m_server + "slices"); // FIXME: Different URL for GPX upload!
- final String displaytime = m_dateFormatter.format(new Date(m_sendingLocations.get(m_sendingLocations.size() - 1).getTime())) + ": ";
- InputStreamEntity entity = listToStreamEntity(m_sendingLocations);
- httppost.setEntity(entity);
-
- // The network connection is moved into a separate task
- SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, m_result_cb, this);
-
- // Execute HTTP Post Request
- task.execute(httppost);
-
- }
-
- @Override
- public void startedSending() {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void stoppedSending(boolean successful) {
- if (successful) {
- m_currentlySending = false;
- m_sendingLocations = null;
- } else {
- scheduleSending(); // TODO: what now?
- }
- }
-
-
- @Override
- public void onProviderDisabled(String arg0) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void onProviderEnabled(String arg0) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public void onStatusChanged(String arg0, int arg1, Bundle arg2) {
- // TODO Auto-generated method stub
-
- }
-
-}
+package de.cstimming.konphidroid;
+
+import java.io.CharArrayWriter;
+import java.io.InputStream;
+import java.io.StringBufferInputStream;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.InputStreamEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+import android.location.Location;
+import android.location.LocationListener;
+import android.os.Bundle;
+
+public class LocationCollector implements LocationListener, SenderInterface {
+ private ArrayList<Location> m_collectingLocations;
+ private ArrayList<Location> m_sendingLocations;
+ private boolean m_currentlySending;
+ private String m_server;
+ private SliceSenderResult m_result_cb;
+ private SimpleDateFormat m_dateFormatter;
+
+ public LocationCollector(String serveraddress, SliceSenderResult result_cb) {
+ m_currentlySending = false;
+ m_server = serveraddress;
+ m_result_cb = result_cb;
+ m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
+ resetCollecting();
+ }
+ private void resetCollecting() {
+ m_collectingLocations = new ArrayList<Location>();
+ }
+
+ @Override
+ public void onLocationChanged(Location loc) {
+ m_collectingLocations.add(loc);
+ checkForSending();
+ }
+
+ private void checkForSending() {
+ if (m_currentlySending || m_collectingLocations.size() <= 1) {
+ return;
+ }
+ Location first = m_collectingLocations.get(0);
+ Location last = m_collectingLocations.get(m_collectingLocations.size() - 1);
+ long secdiff = (last.getTime() - first.getTime()) / 1000;
+ long intervalSecs = 30; // FIXME getSenderIntervalSecs();
+ if (intervalSecs > 0 && secdiff >= intervalSecs) {
+ sendNow();
+ }
+ }
+
+ private void sendNow() {
+ m_sendingLocations = m_collectingLocations;
+ m_currentlySending = true;
+ scheduleSending();
+ resetCollecting();
+ }
+
+ // FIXME: This must be tested!
+ private static InputStreamEntity listToStreamEntity(ArrayList<Location> ul) {
+ CharArrayWriter gpxoutput = new GpxCharArrayWriter(ul);
+ String gpxstring = gpxoutput.toString();
+ @SuppressWarnings("deprecation")
+ InputStream istr = new StringBufferInputStream(gpxstring);
+ return new InputStreamEntity(istr, gpxstring.length());
+ }
+
+ private void scheduleSending() {
+ HttpClient httpclient = new DefaultHttpClient();
+ HttpPost httppost = new HttpPost(m_server + "slices"); // FIXME: Different URL for GPX upload!
+ final String displaytime = m_dateFormatter.format(new Date(m_sendingLocations.get(m_sendingLocations.size() - 1).getTime())) + ": ";
+ InputStreamEntity entity = listToStreamEntity(m_sendingLocations);
+ httppost.setEntity(entity);
+
+ // The network connection is moved into a separate task
+ SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, m_result_cb, this);
+
+ // Execute HTTP Post Request
+ task.execute(httppost);
+
+ }
+
+ @Override
+ public void startedSending() {
+ // TODO Auto-generated method stub
+
+ }
+ @Override
+ public void stoppedSending(boolean successful) {
+ if (successful) {
+ m_currentlySending = false;
+ m_sendingLocations = null;
+ } else {
+ scheduleSending(); // TODO: what now?
+ }
+ }
+
+
+ @Override
+ public void onProviderDisabled(String arg0) {
+ // TODO Auto-generated method stub
+
+ }
+ @Override
+ public void onProviderEnabled(String arg0) {
+ // TODO Auto-generated method stub
+
+ }
+ @Override
+ public void onStatusChanged(String arg0, int arg1, Bundle arg2) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
diff --git a/konphidroid/src/de/cstimming/konphidroid/SenderInterface.java b/konphidroid/src/de/cstimming/konphidroid/SenderInterface.java
index e45f96e..e544b1a 100644
--- a/konphidroid/src/de/cstimming/konphidroid/SenderInterface.java
+++ b/konphidroid/src/de/cstimming/konphidroid/SenderInterface.java
@@ -1,6 +1,6 @@
-package de.cstimming.konphidroid;
-
-public interface SenderInterface {
- public void startedSending();
- public void stoppedSending(boolean successful);
-}
+package de.cstimming.konphidroid;
+
+public interface SenderInterface {
+ public void startedSending();
+ public void stoppedSending(boolean successful);
+}
diff --git a/konphidroid/src/de/cstimming/konphidroid/Slice.java b/konphidroid/src/de/cstimming/konphidroid/Slice.java
index c574d33..3f9add3 100644
--- a/konphidroid/src/de/cstimming/konphidroid/Slice.java
+++ b/konphidroid/src/de/cstimming/konphidroid/Slice.java
@@ -1,58 +1,58 @@
-package de.cstimming.konphidroid;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.http.NameValuePair;
-import org.apache.http.message.BasicNameValuePair;
-
-import android.location.Location;
-
-public class Slice {
- private Location m_startLoc, m_endLoc;
- private int m_instanceId;
- private int m_categoryId;
- private SimpleDateFormat m_dateFormatSender;
-
- public Slice(Location startLoc, Location endLoc, int instanceId, int categoryId, SimpleDateFormat dateFormat) {
- m_startLoc = startLoc;
- m_endLoc = endLoc;
- m_instanceId = instanceId;
- m_categoryId = categoryId;
- m_dateFormatSender = dateFormat;
- }
-
- private static String degToString(double deg) {
- return String.valueOf(deg);
- }
-
- public List<NameValuePair> toNameValuePair() {
- String startLat = degToString(m_startLoc.getLatitude());
- String startLon = degToString(m_startLoc.getLongitude());
- String endLat = degToString(m_endLoc.getLatitude());
- String endLon = degToString(m_endLoc.getLongitude());
- String duration = String
- .valueOf((m_endLoc.getTime() - m_startLoc.getTime()) / 1000);
- String endTime = m_dateFormatSender.format(new Date(m_endLoc.getTime()));
- // FIXME: Need to transfer speed at both points, and also
- // group selection
-
- List<NameValuePair> nvpairs = new ArrayList<NameValuePair>(10);
- nvpairs.add(new BasicNameValuePair("slice[startlat]",
- startLat));
- nvpairs.add(new BasicNameValuePair("slice[startlon]",
- startLon));
- nvpairs.add(new BasicNameValuePair("slice[lat]", endLat));
- nvpairs.add(new BasicNameValuePair("slice[lon]", endLon));
- nvpairs.add(new BasicNameValuePair("slice[duration]",
- duration));
- nvpairs.add(new BasicNameValuePair("slice[time]", endTime));
- nvpairs.add(new BasicNameValuePair("slice[startaccuracy]", String.valueOf(m_startLoc.getAccuracy())));
- nvpairs.add(new BasicNameValuePair("slice[endaccuracy]", String.valueOf(m_endLoc.getAccuracy())));
- nvpairs.add(new BasicNameValuePair("slice[instanceid]", String.valueOf(m_instanceId)));
- nvpairs.add(new BasicNameValuePair("slice[categoryid]", String.valueOf(m_categoryId)));
- return nvpairs;
- }
-}
+package de.cstimming.konphidroid;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.http.NameValuePair;
+import org.apache.http.message.BasicNameValuePair;
+
+import android.location.Location;
+
+public class Slice {
+ private Location m_startLoc, m_endLoc;
+ private int m_instanceId;
+ private int m_categoryId;
+ private SimpleDateFormat m_dateFormatSender;
+
+ public Slice(Location startLoc, Location endLoc, int instanceId, int categoryId, SimpleDateFormat dateFormat) {
+ m_startLoc = startLoc;
+ m_endLoc = endLoc;
+ m_instanceId = instanceId;
+ m_categoryId = categoryId;
+ m_dateFormatSender = dateFormat;
+ }
+
+ private static String degToString(double deg) {
+ return String.valueOf(deg);
+ }
+
+ public List<NameValuePair> toNameValuePair() {
+ String startLat = degToString(m_startLoc.getLatitude());
+ String startLon = degToString(m_startLoc.getLongitude());
+ String endLat = degToString(m_endLoc.getLatitude());
+ String endLon = degToString(m_endLoc.getLongitude());
+ String duration = String
+ .valueOf((m_endLoc.getTime() - m_startLoc.getTime()) / 1000);
+ String endTime = m_dateFormatSender.format(new Date(m_endLoc.getTime()));
+ // FIXME: Need to transfer speed at both points, and also
+ // group selection
+
+ List<NameValuePair> nvpairs = new ArrayList<NameValuePair>(10);
+ nvpairs.add(new BasicNameValuePair("slice[startlat]",
+ startLat));
+ nvpairs.add(new BasicNameValuePair("slice[startlon]",
+ startLon));
+ nvpairs.add(new BasicNameValuePair("slice[lat]", endLat));
+ nvpairs.add(new BasicNameValuePair("slice[lon]", endLon));
+ nvpairs.add(new BasicNameValuePair("slice[duration]",
+ duration));
+ nvpairs.add(new BasicNameValuePair("slice[time]", endTime));
+ nvpairs.add(new BasicNameValuePair("slice[startaccuracy]", String.valueOf(m_startLoc.getAccuracy())));
+ nvpairs.add(new BasicNameValuePair("slice[endaccuracy]", String.valueOf(m_endLoc.getAccuracy())));
+ nvpairs.add(new BasicNameValuePair("slice[instanceid]", String.valueOf(m_instanceId)));
+ nvpairs.add(new BasicNameValuePair("slice[categoryid]", String.valueOf(m_categoryId)));
+ return nvpairs;
+ }
+}
diff --git a/konphidroid/src/de/cstimming/konphidroid/SliceSenderResult.java b/konphidroid/src/de/cstimming/konphidroid/SliceSenderResult.java
index f9535e4..37923be 100644
--- a/konphidroid/src/de/cstimming/konphidroid/SliceSenderResult.java
+++ b/konphidroid/src/de/cstimming/konphidroid/SliceSenderResult.java
@@ -1,5 +1,5 @@
-package de.cstimming.konphidroid;
-
-public interface SliceSenderResult {
- public void sliceSenderResult(String text, boolean good, int color);
-}
+package de.cstimming.konphidroid;
+
+public interface SliceSenderResult {
+ public void sliceSenderResult(String text, boolean good, int color);
+}
diff --git a/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java b/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java
index 24fa13a..f2fed68 100644
--- a/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java
+++ b/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java
@@ -1,84 +1,84 @@
-package de.cstimming.konphidroid;
-
-import java.io.IOException;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.StatusLine;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-
-import android.graphics.Color;
-import android.os.AsyncTask;
-
-public class SliceSenderTask extends AsyncTask<HttpPost, Void, HttpResponse> {
- private HttpClient m_httpclient;
- private SliceSenderResult m_text_cb;
- private String m_resultprefix;
- private SenderInterface m_sender_cb;
-
- public SliceSenderTask(HttpClient client, String resultprefix, SliceSenderResult callback, SenderInterface callback2) {
- super();
- m_httpclient = client;
- m_resultprefix = resultprefix;
- m_text_cb = callback;
- m_sender_cb = callback2;
- }
-
- @Override
- protected void onPreExecute() {
- String text = "Sending Way...";
- int color = Color.YELLOW;
- if (m_text_cb != null) {
- m_text_cb.sliceSenderResult(m_resultprefix + text, true, color);
- }
- if (m_sender_cb != null) {
- m_sender_cb.startedSending();
- }
- }
-
- @Override
- protected HttpResponse doInBackground(HttpPost... params) {
- if (params.length != 1)
- return null;
- try {
- // Execute HTTP Post Request
- HttpResponse response = m_httpclient.execute(params[0]);
- return response;
- } catch (ClientProtocolException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- @Override
- protected void onPostExecute(HttpResponse response) {
- // baos.reset();
- // response.getEntity().writeTo(baos);
- // m_webview.loadData(baos.toString(), "text/html", "utf-8");
-
- String text;
- boolean good = true;
- if (response != null) {
- StatusLine rstatus = response.getStatusLine();
- int rcode = rstatus.getStatusCode();
- text = String.valueOf(rcode) + " " + rstatus.getReasonPhrase();
- if (rcode >= 200 && rcode < 300) {
- } else {
- good = false;
- }
- } else {
- text = "Exception during HTTP connect";
- good = false;
- }
- if (m_text_cb != null) {
- m_text_cb.sliceSenderResult(m_resultprefix + text, good, good ? Color.GREEN : Color.RED);
- }
- if (m_sender_cb != null) {
- m_sender_cb.stoppedSending(good);
- }
- }
-
-}
+package de.cstimming.konphidroid;
+
+import java.io.IOException;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.StatusLine;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+
+import android.graphics.Color;
+import android.os.AsyncTask;
+
+public class SliceSenderTask extends AsyncTask<HttpPost, Void, HttpResponse> {
+ private HttpClient m_httpclient;
+ private SliceSenderResult m_text_cb;
+ private String m_resultprefix;
+ private SenderInterface m_sender_cb;
+
+ public SliceSenderTask(HttpClient client, String resultprefix, SliceSenderResult callback, SenderInterface callback2) {
+ super();
+ m_httpclient = client;
+ m_resultprefix = resultprefix;
+ m_text_cb = callback;
+ m_sender_cb = callback2;
+ }
+
+ @Override
+ protected void onPreExecute() {
+ String text = "Sending Way...";
+ int color = Color.YELLOW;
+ if (m_text_cb != null) {
+ m_text_cb.sliceSenderResult(m_resultprefix + text, true, color);
+ }
+ if (m_sender_cb != null) {
+ m_sender_cb.startedSending();
+ }
+ }
+
+ @Override
+ protected HttpResponse doInBackground(HttpPost... params) {
+ if (params.length != 1)
+ return null;
+ try {
+ // Execute HTTP Post Request
+ HttpResponse response = m_httpclient.execute(params[0]);
+ return response;
+ } catch (ClientProtocolException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(HttpResponse response) {
+ // baos.reset();
+ // response.getEntity().writeTo(baos);
+ // m_webview.loadData(baos.toString(), "text/html", "utf-8");
+
+ String text;
+ boolean good = true;
+ if (response != null) {
+ StatusLine rstatus = response.getStatusLine();
+ int rcode = rstatus.getStatusCode();
+ text = String.valueOf(rcode) + " " + rstatus.getReasonPhrase();
+ if (rcode >= 200 && rcode < 300) {
+ } else {
+ good = false;
+ }
+ } else {
+ text = "Exception during HTTP connect";
+ good = false;
+ }
+ if (m_text_cb != null) {
+ m_text_cb.sliceSenderResult(m_resultprefix + text, good, good ? Color.GREEN : Color.RED);
+ }
+ if (m_sender_cb != null) {
+ m_sender_cb.stoppedSending(good);
+ }
+ }
+
+}
|
cstim/carcomm
|
788332cf69520c0926cc0b8ef96b44848a921158
|
Implement new LocationCollector class that should take over the location collection instead of the activity.
|
diff --git a/konphidroid/src/de/cstimming/konphidroid/FollowGpsException.java b/konphidroid/src/de/cstimming/konphidroid/FollowGpsException.java
deleted file mode 100644
index a833538..0000000
--- a/konphidroid/src/de/cstimming/konphidroid/FollowGpsException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package de.cstimming.konphidroid;
-
-import java.io.IOException;
-
-public class FollowGpsException extends IOException {
- /**
- *
- */
- private static final long serialVersionUID = 7847957224049800119L;
-
- public FollowGpsException(final String string) {
- super(string);
- }
-
-}
diff --git a/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java
new file mode 100644
index 0000000..059477a
--- /dev/null
+++ b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java
@@ -0,0 +1,63 @@
+package de.cstimming.konphidroid;
+
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Iterator;
+import java.util.List;
+
+import android.location.Location;
+
+public class GpxCharArrayWriter extends CharArrayWriter {
+
+ private int pointsCount = 0;
+ private SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd");
+ private SimpleDateFormat time = new SimpleDateFormat("HH:mm:ss");
+ Calendar cal = Calendar.getInstance();
+
+ private String gpxFoter =
+ "</trkseg>\n"+
+ "</trk>\n"+
+ "</gpx>\n";
+
+ GpxCharArrayWriter(List<Location> l){
+ super(50); // FIXME: calculate meaningful value
+
+ String gpxHeader =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<gpx\n"+
+ " version=\"1.0\"\n"+
+ "creator=\"GPS Logger\"\n"+
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"+
+ "xmlns=\"http://www.topografix.com/GPX/1/0\"\n"+
+ "xsi:schemaLocation=\"http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd\">\"\n"+
+ "<time>"+this.date.format(this.cal.getTime())+"T"+this.time.format(this.cal.getTime())+"Z</time>\n" +
+ "<trk>\n"+
+ "<trkseg>\n"
+ ;
+
+ super.append(gpxHeader);
+
+ for (Iterator<Location> iter = l.iterator(); iter.hasNext(); ) {
+ saveLocation(iter.next());
+ }
+ closeFile();
+
+ }
+ private void closeFile() {
+ super.append(this.gpxFoter);
+ }
+
+ public void saveLocation(Location loc) {
+
+ super.append(
+ "<trkpt lat=\""+loc.getLatitude()+"\" lon=\""+loc.getLongitude()+"\">\n"+
+ "<time>"+this.date.format(this.cal.getTime())+"T"+this.time.format(this.cal.getTime())+"Z</time>\n" +
+ "<speed>0.000000</speed>\n"+
+ "<name>TP"+(pointsCount++)+"</name>\n"+
+ "<fix>none</fix>\n"+
+ "</trkpt>\n");
+ }
+
+}
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index 6836a44..7280f39 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,349 +1,349 @@
package de.cstimming.konphidroid;
import java.io.IOException;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import org.apache.http.NameValuePair;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
import android.widget.ToggleButton;
public class KonPhiActivity extends Activity implements LocationListener, SliceSenderResult {
private ToggleButton m_togglebuttonGps;
private Button m_togglebuttonSender;
private SimpleDateFormat m_dateFormatter;
private SimpleDateFormat m_dateFormatSender;
private NumberFormat m_speedFormatter;
private Location m_lastLocation;
private boolean m_lastLocationValid;
private boolean m_currentlySendingSlices;
private long m_senderIntervalSecs;
private String m_server = "http://carcomm.cstimming.de/";
//private WebView m_webview;
private TextView m_labelSender;
private int m_instanceId;
private int m_categoryId;
private static final int DIALOG_GPSWARNING = 1;
private static final int DIALOG_INTERVAL_MULTICHOICE = 2;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
m_dateFormatSender = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
m_dateFormatSender.setTimeZone(TimeZone.getTimeZone("GMT00"));
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
m_speedFormatter = NumberFormat.getInstance();
m_speedFormatter.setMaximumFractionDigits(1);
m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebuttonGps);
m_togglebuttonSender = (Button) findViewById(R.id.togglebuttonSender);
m_labelSender = (TextView) findViewById(R.id.TextLabelSender);
m_senderIntervalSecs = 0;
setSenderIntervalSecs(30);
m_currentlySendingSlices = false;
java.util.Random rg = new java.util.Random();
m_instanceId = rg.nextInt();
m_categoryId = 1;
// Print the version number into the UI
TextView versionView = (TextView) findViewById(R.id.TextViewVersion);
String versionString;
try {
versionString = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
} catch (NameNotFoundException e) {
versionString = "Not found";
e.printStackTrace();
}
versionView.setText(" " + versionString);
//final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
//m_webview = new WebView(this);
//ell.addView(m_webview);
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
m_togglebuttonSender.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
showDialog(DIALOG_INTERVAL_MULTICHOICE);
}});
long minTime = 1000 * getSenderIntervalSecs(); // [milliseconds]
float minDistance = 0; // 10; // [meters]
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
minTime, minDistance, this);
}
public long getSenderIntervalSecs() {
return m_senderIntervalSecs;
}
public void setSenderIntervalSecs(long v) {
if (v == m_senderIntervalSecs)
return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (v == 0) {
m_togglebuttonSender.setText(R.string.transmission_off);
m_labelSender.setText(R.string.labelsender_off);
m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
} else {
m_togglebuttonSender.setText(getString(R.string.transmission_on) + " " + String.valueOf(v) + "s");
m_labelSender.setText(R.string.labelsender_on);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
m_labelSender.setTextColor(viewSecs.getTextColors());
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
if (!locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
if (v < m_senderIntervalSecs) {
long minTime = 1000 * v; // [milliseconds]
float minDistance = 0; // 10; // [meters]
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
minTime, minDistance, this);
}
}
m_senderIntervalSecs = v;
}
protected Dialog onCreateDialog(int d) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
switch (d) {
case DIALOG_GPSWARNING:
builder.setMessage(R.string.ask_activate_gps_settings)
.setCancelable(false)
.setPositiveButton(R.string.yes,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
}
})
.setNegativeButton(R.string.no,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
dialog.cancel();
}
});
break;
case DIALOG_INTERVAL_MULTICHOICE:
builder.setTitle(R.string.choose_sending_interval);
final CharSequence[] items = {"60", "30", "20", "10", "2", "0"};
builder.setSingleChoiceItems(items, 1, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
String item = items[which].toString();
setSenderIntervalSecs(Integer.parseInt(item));
dismissDialog(DIALOG_INTERVAL_MULTICHOICE);
}
});
break;
default:
return null;
}
Dialog result = builder.create();
return result;
}
@Override
public void onLocationChanged(Location loc) {
// Toast.makeText(KonPhiActivity.this, "Received location from " +
// loc.getProvider(), Toast.LENGTH_SHORT).show();
printLocInfo(loc);
if (m_lastLocationValid) {
long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
long intervalSecs = getSenderIntervalSecs();
if (intervalSecs > 0 && secdiff >= intervalSecs) {
if (secdiff <= 4 * intervalSecs) {
sendPairNow(m_lastLocation, loc);
}
m_lastLocation = loc;
}
// Note: We don't set the m_lastLocation if we are smaller than
// m_senderIntervalSecs.
} else {
m_lastLocationValid = true;
m_lastLocation = loc;
}
}
private void printLocInfo(Location loc) {
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
final TextView viewSpeed = (TextView) findViewById(R.id.TextViewSpeed);
viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy())
: "...");
if (m_lastLocationValid) {
long msecdiff = loc.getTime() - m_lastLocation.getTime();
float distance = m_lastLocation.distanceTo(loc);
String secs = String.valueOf(msecdiff / 1000);
String dist = String.valueOf(distance);
viewDist.setText(dist);
viewSecs.setText(secs);
viewSpeed.setText(m_speedFormatter.format(3600.0 * distance / (float) msecdiff) + " km/h");
} else {
viewDist.setText("...");
viewSecs.setText("...");
viewSpeed.setText("...");
}
}
private void sendPairNow(Location startLoc, Location endLoc) {
// Only send if the togglebutton is active
if (getSenderIntervalSecs() == 0)
return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (m_currentlySendingSlices) {
resultview.setText("Still sending (ignoring newer position)...");
return;
}
Slice slice = new Slice(startLoc, endLoc, m_instanceId, m_categoryId, m_dateFormatSender);
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(m_server + "slices");
resultview.setText("Sending to " + httppost.getURI().toString());
final String displaytime = m_dateFormatter.format(new Date(endLoc.getTime())) + ": ";
try {
// Add your data
httppost.setEntity(new UrlEncodedFormEntity(slice.toNameValuePair()));
// ByteArrayOutputStream baos = new ByteArrayOutputStream();
// httppost.getEntity().writeTo(baos);
// m_webview.loadData(baos.toString(), "text/html", "utf-8");
// The network connection is moved into a separate task
- SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, this);
+ SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, this, null);
// Execute HTTP Post Request
m_currentlySendingSlices = true;
task.execute(httppost);
} catch (IOException e) {
resultview.setText(displaytime + "Sending failed (IO): "
+ e.getLocalizedMessage());
resultview.setTextColor(ColorStateList.valueOf(Color.RED));
}
}
@Override
public void onProviderDisabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " disabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider +
// " enabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " out of service", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " tmp. unavailable", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider
// + " available", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
break;
}
}
@Override
public void sliceSenderResult(String text, boolean good, int color) {
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
resultview.setText(text);
resultview.setTextColor(ColorStateList.valueOf(color));
m_currentlySendingSlices = false;
}
}
\ No newline at end of file
diff --git a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
new file mode 100644
index 0000000..f9cadfa
--- /dev/null
+++ b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java
@@ -0,0 +1,119 @@
+package de.cstimming.konphidroid;
+
+import java.io.CharArrayWriter;
+import java.io.InputStream;
+import java.io.StringBufferInputStream;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.InputStreamEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+import android.location.Location;
+import android.location.LocationListener;
+import android.os.Bundle;
+
+public class LocationCollector implements LocationListener, SenderInterface {
+ private ArrayList<Location> m_collectingLocations;
+ private ArrayList<Location> m_sendingLocations;
+ private boolean m_currentlySending;
+ private String m_server;
+ private SliceSenderResult m_result_cb;
+ private SimpleDateFormat m_dateFormatter;
+
+ public LocationCollector(String serveraddress, SliceSenderResult result_cb) {
+ m_currentlySending = false;
+ m_server = serveraddress;
+ m_result_cb = result_cb;
+ m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
+ resetCollecting();
+ }
+ private void resetCollecting() {
+ m_collectingLocations = new ArrayList<Location>();
+ }
+
+ @Override
+ public void onLocationChanged(Location loc) {
+ m_collectingLocations.add(loc);
+ checkForSending();
+ }
+
+ private void checkForSending() {
+ if (m_currentlySending || m_collectingLocations.size() <= 1) {
+ return;
+ }
+ Location first = m_collectingLocations.get(0);
+ Location last = m_collectingLocations.get(m_collectingLocations.size() - 1);
+ long secdiff = (last.getTime() - first.getTime()) / 1000;
+ long intervalSecs = 30; // FIXME getSenderIntervalSecs();
+ if (intervalSecs > 0 && secdiff >= intervalSecs) {
+ sendNow();
+ }
+ }
+
+ private void sendNow() {
+ m_sendingLocations = m_collectingLocations;
+ m_currentlySending = true;
+ scheduleSending();
+ resetCollecting();
+ }
+
+ // FIXME: This must be tested!
+ private static InputStreamEntity listToStreamEntity(ArrayList<Location> ul) {
+ CharArrayWriter gpxoutput = new GpxCharArrayWriter(ul);
+ String gpxstring = gpxoutput.toString();
+ @SuppressWarnings("deprecation")
+ InputStream istr = new StringBufferInputStream(gpxstring);
+ return new InputStreamEntity(istr, gpxstring.length());
+ }
+
+ private void scheduleSending() {
+ HttpClient httpclient = new DefaultHttpClient();
+ HttpPost httppost = new HttpPost(m_server + "slices"); // FIXME: Different URL for GPX upload!
+ final String displaytime = m_dateFormatter.format(new Date(m_sendingLocations.get(m_sendingLocations.size() - 1).getTime())) + ": ";
+ InputStreamEntity entity = listToStreamEntity(m_sendingLocations);
+ httppost.setEntity(entity);
+
+ // The network connection is moved into a separate task
+ SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, m_result_cb, this);
+
+ // Execute HTTP Post Request
+ task.execute(httppost);
+
+ }
+
+ @Override
+ public void startedSending() {
+ // TODO Auto-generated method stub
+
+ }
+ @Override
+ public void stoppedSending(boolean successful) {
+ if (successful) {
+ m_currentlySending = false;
+ m_sendingLocations = null;
+ } else {
+ scheduleSending(); // TODO: what now?
+ }
+ }
+
+
+ @Override
+ public void onProviderDisabled(String arg0) {
+ // TODO Auto-generated method stub
+
+ }
+ @Override
+ public void onProviderEnabled(String arg0) {
+ // TODO Auto-generated method stub
+
+ }
+ @Override
+ public void onStatusChanged(String arg0, int arg1, Bundle arg2) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
diff --git a/konphidroid/src/de/cstimming/konphidroid/SenderInterface.java b/konphidroid/src/de/cstimming/konphidroid/SenderInterface.java
new file mode 100644
index 0000000..e45f96e
--- /dev/null
+++ b/konphidroid/src/de/cstimming/konphidroid/SenderInterface.java
@@ -0,0 +1,6 @@
+package de.cstimming.konphidroid;
+
+public interface SenderInterface {
+ public void startedSending();
+ public void stoppedSending(boolean successful);
+}
diff --git a/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java b/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java
index 631a226..24fa13a 100644
--- a/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java
+++ b/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java
@@ -1,72 +1,84 @@
package de.cstimming.konphidroid;
import java.io.IOException;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import android.graphics.Color;
import android.os.AsyncTask;
public class SliceSenderTask extends AsyncTask<HttpPost, Void, HttpResponse> {
- HttpClient m_httpclient;
- SliceSenderResult m_callback;
- String m_resultprefix;
+ private HttpClient m_httpclient;
+ private SliceSenderResult m_text_cb;
+ private String m_resultprefix;
+ private SenderInterface m_sender_cb;
- public SliceSenderTask(HttpClient client, String resultprefix, SliceSenderResult callback) {
+ public SliceSenderTask(HttpClient client, String resultprefix, SliceSenderResult callback, SenderInterface callback2) {
super();
m_httpclient = client;
m_resultprefix = resultprefix;
- m_callback = callback;
+ m_text_cb = callback;
+ m_sender_cb = callback2;
}
@Override
protected void onPreExecute() {
String text = "Sending Way...";
int color = Color.YELLOW;
- m_callback.sliceSenderResult(m_resultprefix + text, true, color);
+ if (m_text_cb != null) {
+ m_text_cb.sliceSenderResult(m_resultprefix + text, true, color);
+ }
+ if (m_sender_cb != null) {
+ m_sender_cb.startedSending();
+ }
}
@Override
protected HttpResponse doInBackground(HttpPost... params) {
if (params.length != 1)
return null;
try {
// Execute HTTP Post Request
HttpResponse response = m_httpclient.execute(params[0]);
return response;
} catch (ClientProtocolException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
@Override
protected void onPostExecute(HttpResponse response) {
// baos.reset();
// response.getEntity().writeTo(baos);
// m_webview.loadData(baos.toString(), "text/html", "utf-8");
String text;
boolean good = true;
if (response != null) {
StatusLine rstatus = response.getStatusLine();
int rcode = rstatus.getStatusCode();
text = String.valueOf(rcode) + " " + rstatus.getReasonPhrase();
if (rcode >= 200 && rcode < 300) {
} else {
good = false;
}
} else {
text = "Exception during HTTP connect";
good = false;
}
- m_callback.sliceSenderResult(m_resultprefix + text, good, good ? Color.GREEN : Color.RED);
+ if (m_text_cb != null) {
+ m_text_cb.sliceSenderResult(m_resultprefix + text, good, good ? Color.GREEN : Color.RED);
+ }
+ if (m_sender_cb != null) {
+ m_sender_cb.stoppedSending(good);
+ }
}
}
diff --git a/konphidroid/src/de/cstimming/konphidroid/Tracker.java b/konphidroid/src/de/cstimming/konphidroid/Tracker.java
deleted file mode 100644
index d0f5410..0000000
--- a/konphidroid/src/de/cstimming/konphidroid/Tracker.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package de.cstimming.konphidroid;
-
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.os.Bundle;
-import android.util.Log;
-
-/**
- * GPS-Tracker. Holds a {@link Track} and manages it.
- *
- * @author mb
- */
-public class Tracker implements LocationListener {
-
- /**
- * Tag used for Android-logging.
- */
- private static final String DEBUG_TAG = Tracker.class.getName();
-
- private static final float LOCATION_MIN_ACCURACY = 200f;
-
- public static final byte STATE_START = 0;
-
- public static final byte STATE_PAUSE = 1;
-
- public static final byte STATE_STOP = 2;
-
- private int trackingState = STATE_START;
-
- private Location m_lastLocation;
- private boolean m_lastLocationValid;
-
- private LocationManager locationManager;
-
- private long m_GpsInterval;
- private float m_GpsDistance;
-
- Tracker(final LocationManager locationManager) {
- this.locationManager = locationManager;
- this.m_lastLocationValid = false;
- m_GpsInterval = 5000; // milliseconds
- m_GpsDistance = 20; // meters
- }
-
- boolean setFollowGps(final boolean followGps) throws FollowGpsException {
- if (followGps) {
- if (m_lastLocationValid) {
- return true;
- } else {
- throw new FollowGpsException("Got no current location");
- }
- } else {
- return false;
- }
- }
-
- void resetTrack() {
- m_lastLocationValid = false;
- }
-
- public Location getLocation() throws FollowGpsException {
- if (m_lastLocationValid) {
- return m_lastLocation;
- } else {
- throw new FollowGpsException("Got no current location");
- }
- }
-
- void addLocation(Location loc) {
- // FIXME!!
- }
-
- void setTrackingState(int newTrackingState) {
- //PAUSE is only a toggle-flag
- if (newTrackingState == STATE_PAUSE && (trackingState == STATE_PAUSE || trackingState == STATE_STOP)) {
- newTrackingState = STATE_START;
- }
- switch (newTrackingState) {
- case STATE_START:
- locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
- m_GpsInterval, m_GpsDistance,
- this);
- addLocation(locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER));
- break;
-
- case STATE_STOP:
- resetTrack();
- locationManager.removeUpdates(this);
- break;
-
- case STATE_PAUSE:
- locationManager.removeUpdates(this);
- break;
- }
- trackingState = newTrackingState;
- m_lastLocationValid = false;
-
- }
-
- /**
- * used for disable updates but not to set a new tracking state (e.g. on exiting)
- */
- void removeUpdates() {
- locationManager.removeUpdates(this);
- }
-
- @Override
- public void onLocationChanged(final Location location) {
- Log.w(DEBUG_TAG, "onLocationChanged() Got location: " + location);
- if (!location.hasAccuracy() || location.getAccuracy() <= LOCATION_MIN_ACCURACY) {
- addLocation(location);
- }
- }
-
- @Override
- public void onProviderDisabled(final String provider) {}
-
- @Override
- public void onProviderEnabled(final String provider) {}
-
- @Override
- public void onStatusChanged(final String provider, final int status, final Bundle extras) {}
-
-}
|
cstim/carcomm
|
5a2163767d98c856f1b613e47f218354e11d37fb
|
In GPX upload also receive the new data fields accuracy etc., and accept the velocity from the points, too.
|
diff --git a/webapp/app/controllers/home_controller.rb b/webapp/app/controllers/home_controller.rb
index e188f6f..0b9c9f7 100644
--- a/webapp/app/controllers/home_controller.rb
+++ b/webapp/app/controllers/home_controller.rb
@@ -1,152 +1,185 @@
require 'rexml/document'
require 'time'
require 'date'
# Represents one point of a GPX or NMEA track
class Trkpt
- attr_reader :time, :lat, :lon
+ attr_reader :time, :lat, :lon,
+ :avgvel, :headingdeg,
+ :accuracy, :instanceid, :categoryid
def initialize(_time, _lat, _lon)
@time = _time
@lat = _lat
@lon = _lon
+ @avgvel = nil
+ @headingdeg = nil
+ @accuracy = 0
+ @instanceid = 0
+ @categoryid = 0
end
def Trkpt.fromXml(elem)
+ @avgvel = nil
+ @headingdeg = nil
+ @accuracy = 0
+ @instanceid = 0
+ @categoryid = 0
if not elem.attribute("lat").nil?
@lat = elem.attribute("lat").to_s
end
if not elem.attribute("lon").nil?
@lon = elem.attribute("lon").to_s
end
if elem.elements["time"]
strtime = elem.elements["time"].text
@time = Time.parse strtime
end
+ if not elem.attribute("avgvel").nil?
+ @avgvel = elem.attribute("avgvel").to_s
+ end
+ if not elem.attribute("headingdeg").nil?
+ @headingdeg = elem.attribute("headingdeg").to_s
+ end
+ if not elem.attribute("accuracy").nil?
+ @accuracy = elem.attribute("accuracy").to_s
+ end
+ if not elem.attribute("instanceid").nil?
+ @instanceid = elem.attribute("instanceid").to_s
+ end
+ if not elem.attribute("categoryid").nil?
+ @categoryid = elem.attribute("categoryid").to_s
+ end
end
end
# Convert a NMEA coordinate string to a floating point number
def dmmm2dec(degrees, sw)
deg = (degrees/100.0).floor #decimal degrees
frac = ((degrees/100.0)-deg)/0.6 #decimal fraction
ret = deg+frac #positive return value
if ((sw=="S") or (sw=="W")):
ret=ret*(-1) #flip sign if south or west
end
return ret
end
# Post a slice into our database
def postSlice(trkpt, prev)
duration = prev.time.nil? ? 0 : trkpt.time - prev.time
if duration < 95
slice = Slice.new(:time => trkpt.time,
:lat => trkpt.lat,
:lon => trkpt.lon,
:startlat => prev.lat,
:startlon => prev.lon,
- :duration => duration)
+ :duration => duration,
+ :avgvel => trkpt.avgvel,
+ :headingdev => trkpt.headingdeg,
+ :startaccuracy => prev.accuracy,
+ :endaccuracy => trkpt.accuracy,
+ :instanceid => trkpt.instanceid,
+ :categoryid => trkpt.categoryid)
slice.save
return true
else
return false
end
end
# The controller class
class HomeController < ApplicationController
attr_reader :minSliceDuration
def initialize
- @minSliceDuration = 30
+ @minSliceDuration = 0 # formerly: 30
super
end
def index
end
def gpxUpload
resulttext = storeGpx(params[:upload])
render :text => "File has been uploaded successfully: #{resulttext}"
end
def nmeaUpload
resulttext = storeNMEA(params[:upload])
render :text => "File has been uploaded successfully: #{resulttext}, with duration #{minSliceDuration} seconds each."
end
protected
def storeGpx(file)
originalname = file.original_filename
content = file.read
doc = REXML::Document.new content
newslices = 0
doc.elements.each("gpx/trk/trkseg") do | track |
prev = nil
track.elements.each do | elem_trkpt |
trkpt = Trkpt.fromXml elem_trkpt
if prev.nil? or trkpt.time.nil?
prev = trkpt
else
duration = prev.time.nil? ? 0 : trkpt.time - prev.time
# Skip slices smaller than 30 seconds
if duration > minSliceDuration
# Ignore everything above 95 seconds altogether
if postSlice(trkpt, prev)
newslices = 1 + newslices
end
prev = trkpt
end
end
end # track.points.each
end # gpx.tracks.each
"Added #{newslices} new slices from #{originalname}"
end
protected
def storeNMEA(file)
originalname = file.original_filename
date = nil
prev = nil
newslices = 0
while (line = file.gets) do
if line =~ /\$GPRMC/
tokens = line.split(",")
date = Date.strptime(tokens[9], '%d%m%y')
end
if line =~ /\$GPGGA/
tokens = line.split(",")
time = Time.parse tokens[1]
if tokens[6] != '0' and not date.nil?
datetime = Time.utc(date.year, date.month, date.day,
time.hour, time.min, time.sec, time.usec)
lat = dmmm2dec((tokens[2]).to_f,tokens[3])
lon = dmmm2dec((tokens[4]).to_f,tokens[5])
trkpt = Trkpt.new(datetime, lat, lon)
if prev.nil? or trkpt.time.nil?
prev = trkpt
else
duration = prev.time.nil? ? 0 : trkpt.time - prev.time
# Skip slices smaller than the minimum duration
if duration >= minSliceDuration
# Ignore everything above 95 seconds altogether
if postSlice(trkpt, prev)
newslices = 1 + newslices
end
prev = trkpt
end
end # end else prev.nil? or trkpt.time.nil?
end # end tokens[6] != '0' and not date.nil?
end # end line =~ /\$GPGGA/
end # end while (line = file.gets) do
"Added #{newslices} new slices from #{originalname}"
end
end
|
cstim/carcomm
|
028c954b28e4746de0e013b667bc9c1dac7f78ca
|
Refactor way slice into separate class.
|
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index 417ee5b..6836a44 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,376 +1,349 @@
package de.cstimming.konphidroid;
import java.io.IOException;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import org.apache.http.NameValuePair;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
-import android.widget.Toast;
import android.widget.ToggleButton;
public class KonPhiActivity extends Activity implements LocationListener, SliceSenderResult {
private ToggleButton m_togglebuttonGps;
private Button m_togglebuttonSender;
private SimpleDateFormat m_dateFormatter;
private SimpleDateFormat m_dateFormatSender;
private NumberFormat m_speedFormatter;
private Location m_lastLocation;
private boolean m_lastLocationValid;
private boolean m_currentlySendingSlices;
private long m_senderIntervalSecs;
private String m_server = "http://carcomm.cstimming.de/";
//private WebView m_webview;
private TextView m_labelSender;
private int m_instanceId;
private int m_categoryId;
private static final int DIALOG_GPSWARNING = 1;
private static final int DIALOG_INTERVAL_MULTICHOICE = 2;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
m_dateFormatSender = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
m_dateFormatSender.setTimeZone(TimeZone.getTimeZone("GMT00"));
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
m_speedFormatter = NumberFormat.getInstance();
m_speedFormatter.setMaximumFractionDigits(1);
m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebuttonGps);
m_togglebuttonSender = (Button) findViewById(R.id.togglebuttonSender);
m_labelSender = (TextView) findViewById(R.id.TextLabelSender);
m_senderIntervalSecs = 0;
setSenderIntervalSecs(30);
m_currentlySendingSlices = false;
java.util.Random rg = new java.util.Random();
m_instanceId = rg.nextInt();
m_categoryId = 1;
// Print the version number into the UI
TextView versionView = (TextView) findViewById(R.id.TextViewVersion);
String versionString;
try {
versionString = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
} catch (NameNotFoundException e) {
versionString = "Not found";
e.printStackTrace();
}
versionView.setText(" " + versionString);
//final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
//m_webview = new WebView(this);
//ell.addView(m_webview);
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
m_togglebuttonSender.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
showDialog(DIALOG_INTERVAL_MULTICHOICE);
}});
long minTime = 1000 * getSenderIntervalSecs(); // [milliseconds]
float minDistance = 0; // 10; // [meters]
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
minTime, minDistance, this);
}
public long getSenderIntervalSecs() {
return m_senderIntervalSecs;
}
public void setSenderIntervalSecs(long v) {
if (v == m_senderIntervalSecs)
return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (v == 0) {
m_togglebuttonSender.setText(R.string.transmission_off);
m_labelSender.setText(R.string.labelsender_off);
m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
} else {
m_togglebuttonSender.setText(getString(R.string.transmission_on) + " " + String.valueOf(v) + "s");
m_labelSender.setText(R.string.labelsender_on);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
m_labelSender.setTextColor(viewSecs.getTextColors());
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
if (!locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
if (v < m_senderIntervalSecs) {
long minTime = 1000 * v; // [milliseconds]
float minDistance = 0; // 10; // [meters]
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
minTime, minDistance, this);
}
}
m_senderIntervalSecs = v;
}
protected Dialog onCreateDialog(int d) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
switch (d) {
case DIALOG_GPSWARNING:
builder.setMessage(R.string.ask_activate_gps_settings)
.setCancelable(false)
.setPositiveButton(R.string.yes,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
}
})
.setNegativeButton(R.string.no,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
dialog.cancel();
}
});
break;
case DIALOG_INTERVAL_MULTICHOICE:
builder.setTitle(R.string.choose_sending_interval);
final CharSequence[] items = {"60", "30", "20", "10", "2", "0"};
builder.setSingleChoiceItems(items, 1, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
String item = items[which].toString();
setSenderIntervalSecs(Integer.parseInt(item));
dismissDialog(DIALOG_INTERVAL_MULTICHOICE);
}
});
break;
default:
return null;
}
Dialog result = builder.create();
return result;
}
@Override
public void onLocationChanged(Location loc) {
// Toast.makeText(KonPhiActivity.this, "Received location from " +
// loc.getProvider(), Toast.LENGTH_SHORT).show();
printLocInfo(loc);
if (m_lastLocationValid) {
long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
long intervalSecs = getSenderIntervalSecs();
if (intervalSecs > 0 && secdiff >= intervalSecs) {
if (secdiff <= 4 * intervalSecs) {
sendPairNow(m_lastLocation, loc);
}
m_lastLocation = loc;
}
// Note: We don't set the m_lastLocation if we are smaller than
// m_senderIntervalSecs.
} else {
m_lastLocationValid = true;
m_lastLocation = loc;
}
}
private void printLocInfo(Location loc) {
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
final TextView viewSpeed = (TextView) findViewById(R.id.TextViewSpeed);
viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy())
: "...");
if (m_lastLocationValid) {
long msecdiff = loc.getTime() - m_lastLocation.getTime();
float distance = m_lastLocation.distanceTo(loc);
String secs = String.valueOf(msecdiff / 1000);
String dist = String.valueOf(distance);
viewDist.setText(dist);
viewSecs.setText(secs);
viewSpeed.setText(m_speedFormatter.format(3600.0 * distance / (float) msecdiff) + " km/h");
} else {
viewDist.setText("...");
viewSecs.setText("...");
viewSpeed.setText("...");
}
}
- private String degToString(double deg) {
- return String.valueOf(deg);
- }
-
private void sendPairNow(Location startLoc, Location endLoc) {
// Only send if the togglebutton is active
if (getSenderIntervalSecs() == 0)
return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (m_currentlySendingSlices) {
resultview.setText("Still sending (ignoring newer position)...");
return;
}
- String startLat = degToString(startLoc.getLatitude());
- String startLon = degToString(startLoc.getLongitude());
- String endLat = degToString(endLoc.getLatitude());
- String endLon = degToString(endLoc.getLongitude());
- String duration = String
- .valueOf((endLoc.getTime() - startLoc.getTime()) / 1000);
- String endTime = m_dateFormatSender.format(new Date(endLoc.getTime()));
- // FIXME: Need to transfer speed and accuracy at both points, and also
- // group selection
+ Slice slice = new Slice(startLoc, endLoc, m_instanceId, m_categoryId, m_dateFormatSender);
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(m_server + "slices");
resultview.setText("Sending to " + httppost.getURI().toString());
final String displaytime = m_dateFormatter.format(new Date(endLoc.getTime())) + ": ";
try {
// Add your data
- List<NameValuePair> nvpairs = new ArrayList<NameValuePair>(10);
- nvpairs.add(new BasicNameValuePair("slice[startlat]",
- startLat));
- nvpairs.add(new BasicNameValuePair("slice[startlon]",
- startLon));
- nvpairs.add(new BasicNameValuePair("slice[lat]", endLat));
- nvpairs.add(new BasicNameValuePair("slice[lon]", endLon));
- nvpairs.add(new BasicNameValuePair("slice[duration]",
- duration));
- nvpairs.add(new BasicNameValuePair("slice[time]", endTime));
- nvpairs.add(new BasicNameValuePair("slice[startaccuracy]", String.valueOf(startLoc.getAccuracy())));
- nvpairs.add(new BasicNameValuePair("slice[endaccuracy]", String.valueOf(endLoc.getAccuracy())));
- nvpairs.add(new BasicNameValuePair("slice[instanceid]", String.valueOf(m_instanceId)));
- nvpairs.add(new BasicNameValuePair("slice[categoryid]", String.valueOf(m_categoryId)));
- httppost.setEntity(new UrlEncodedFormEntity(nvpairs));
+ httppost.setEntity(new UrlEncodedFormEntity(slice.toNameValuePair()));
// ByteArrayOutputStream baos = new ByteArrayOutputStream();
// httppost.getEntity().writeTo(baos);
// m_webview.loadData(baos.toString(), "text/html", "utf-8");
// The network connection is moved into a separate task
SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, this);
// Execute HTTP Post Request
m_currentlySendingSlices = true;
task.execute(httppost);
} catch (IOException e) {
resultview.setText(displaytime + "Sending failed (IO): "
+ e.getLocalizedMessage());
resultview.setTextColor(ColorStateList.valueOf(Color.RED));
}
}
@Override
public void onProviderDisabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " disabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider +
// " enabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " out of service", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " tmp. unavailable", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider
// + " available", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
break;
}
}
@Override
public void sliceSenderResult(String text, boolean good, int color) {
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
resultview.setText(text);
resultview.setTextColor(ColorStateList.valueOf(color));
m_currentlySendingSlices = false;
}
}
\ No newline at end of file
diff --git a/konphidroid/src/de/cstimming/konphidroid/Slice.java b/konphidroid/src/de/cstimming/konphidroid/Slice.java
new file mode 100644
index 0000000..c574d33
--- /dev/null
+++ b/konphidroid/src/de/cstimming/konphidroid/Slice.java
@@ -0,0 +1,58 @@
+package de.cstimming.konphidroid;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.http.NameValuePair;
+import org.apache.http.message.BasicNameValuePair;
+
+import android.location.Location;
+
+public class Slice {
+ private Location m_startLoc, m_endLoc;
+ private int m_instanceId;
+ private int m_categoryId;
+ private SimpleDateFormat m_dateFormatSender;
+
+ public Slice(Location startLoc, Location endLoc, int instanceId, int categoryId, SimpleDateFormat dateFormat) {
+ m_startLoc = startLoc;
+ m_endLoc = endLoc;
+ m_instanceId = instanceId;
+ m_categoryId = categoryId;
+ m_dateFormatSender = dateFormat;
+ }
+
+ private static String degToString(double deg) {
+ return String.valueOf(deg);
+ }
+
+ public List<NameValuePair> toNameValuePair() {
+ String startLat = degToString(m_startLoc.getLatitude());
+ String startLon = degToString(m_startLoc.getLongitude());
+ String endLat = degToString(m_endLoc.getLatitude());
+ String endLon = degToString(m_endLoc.getLongitude());
+ String duration = String
+ .valueOf((m_endLoc.getTime() - m_startLoc.getTime()) / 1000);
+ String endTime = m_dateFormatSender.format(new Date(m_endLoc.getTime()));
+ // FIXME: Need to transfer speed at both points, and also
+ // group selection
+
+ List<NameValuePair> nvpairs = new ArrayList<NameValuePair>(10);
+ nvpairs.add(new BasicNameValuePair("slice[startlat]",
+ startLat));
+ nvpairs.add(new BasicNameValuePair("slice[startlon]",
+ startLon));
+ nvpairs.add(new BasicNameValuePair("slice[lat]", endLat));
+ nvpairs.add(new BasicNameValuePair("slice[lon]", endLon));
+ nvpairs.add(new BasicNameValuePair("slice[duration]",
+ duration));
+ nvpairs.add(new BasicNameValuePair("slice[time]", endTime));
+ nvpairs.add(new BasicNameValuePair("slice[startaccuracy]", String.valueOf(m_startLoc.getAccuracy())));
+ nvpairs.add(new BasicNameValuePair("slice[endaccuracy]", String.valueOf(m_endLoc.getAccuracy())));
+ nvpairs.add(new BasicNameValuePair("slice[instanceid]", String.valueOf(m_instanceId)));
+ nvpairs.add(new BasicNameValuePair("slice[categoryid]", String.valueOf(m_categoryId)));
+ return nvpairs;
+ }
+}
|
cstim/carcomm
|
bd8c4cc1e7974fe4e064c23218c9b16717110976
|
More SQL command notes.
|
diff --git a/ftp-command.txt b/ftp-command.txt
index 617ef3b..c16aa3e 100644
--- a/ftp-command.txt
+++ b/ftp-command.txt
@@ -1,24 +1,30 @@
# Local directory is carcomm/
lftp [email protected]
cd webapps/
cd carcomm/
mirror -R -x .git -n .
# -x REGEX - to exclude REGEX from transfer
# -n - to transfer only newer files
# -R - Reverse mirror to transfer in upload direction
ssh [email protected]
# Datenbank von Duplikaten befreien - Alle Zeilen abfragen, die
# duplizierte times haben:
-select distinct slices.id, slices.time from slices, slices as b where slices.time = b.time and slices.id <> b.id;
+select distinct slices.id, slices.time, slices.instanceid from slices, slices as b where slices.time = b.time and slices.id <> b.id;
# Von Duplikat-Zeilen jeweils nur eine anzeigen - die kann man dann
# alle zum Löschen auswählen, solange bis keine derartigen Zeilen mehr
# übrig sind:
select distinct slices.id, slices.time from slices, slices as b where slices.time = b.time and slices.id <> b.id GROUP BY slices.time HAVING COUNT(*) > 1;
+
+Von Timo:
+
+Delete from slices where id in(
+ Select min(id) as id, time from slices group by time having count(*) > 1
+)
|
cstim/carcomm
|
cad9c77e71538d1875b370f5f076681ebcf09a21
|
Add pop-up menu for choosing the sending time interval
|
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml
index b2950d6..8a5dcfa 100644
--- a/konphidroid/res/layout/main.xml
+++ b/konphidroid/res/layout/main.xml
@@ -1,98 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
android:id="@+id/MainLayout" android:layout_height="fill_parent">
<LinearLayout android:layout_width="wrap_content"
android:layout_height="wrap_content" android:orientation="horizontal">
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="@string/hello" />
<TextView android:id="@+id/TextViewVersion"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:text="" />
</LinearLayout>
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content" android:orientation="horizontal">
<ToggleButton android:id="@+id/togglebuttonGps"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:textOn="@string/gpsbutton" android:textOff="@string/gpsbutton" />
- <ToggleButton android:id="@+id/togglebuttonSender"
+ <Button android:id="@+id/togglebuttonSender"
android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:textOn="@string/transmission_on" android:textOff="@string/transmission_off"
- android:checked="true" />
+ android:text="@string/transmission_on" />
</LinearLayout>
<TableLayout android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="@string/gps_timestamp"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewGPSAge"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Latitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLat"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Longitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLon"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Accuracy [m]:" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewAcc"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Dist to previous [m]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewDist"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Time to previous [s]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewSecs"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="@string/labelsender_on" android:id="@+id/TextLabelSender"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewSender"
android:scrollHorizontally="true" android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="@string/labelspeed"
android:textSize="40sp" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView android:id="@+id/TextViewSpeed" android:textSize="40sp"
android:layout_width="fill_parent" android:layout_height="fill_parent" />
</TableRow>
</TableLayout>
<TextView android:text="@string/bottom_url_text" android:id="@+id/TextViewBottom"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:autoLink="web" />
<LinearLayout android:id="@+id/LayoutWebview"
android:layout_width="fill_parent" android:layout_height="fill_parent"></LinearLayout>
</LinearLayout>
diff --git a/konphidroid/res/values-de/strings.xml b/konphidroid/res/values-de/strings.xml
index 2a1a35a..3ea6170 100644
--- a/konphidroid/res/values-de/strings.xml
+++ b/konphidroid/res/values-de/strings.xml
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">KonPhiDroid</string>
<string name="hello">KonPhiDense Test-App, Version</string>
<string name="transmission_on">Ãbertragung</string>
<string name="transmission_off">Keine Ãbertragung</string>
<string name="gpsbutton">GPS</string>
<string name="gps_timestamp">GPS Zeitstempel:</string>
<string name="transmission_on_toast">Bewegung wird zum Server übertragen</string>
<string name="transmission_off_toast">Es wird keine Bewegung mehr übertragen</string>
<string name="labelsender_on">Ãbertragungsergebnis:</string>
<string name="labelsender_off">Pause; Letzte:</string>
<string name="ask_activate_gps_settings">Das GPS ist ausgeschaltet. Wollen Sie die Einstellungen für Standort & Sicherheit bearbeiten, um GPS einzuschalten?</string>
<string name="yes">Ja</string>
<string name="no">Nein</string>
<string name="labelspeed">Speed:</string>
+ <string name="choose_sending_interval">Sende-Intervall wählen [s]:</string>
</resources>
diff --git a/konphidroid/res/values/strings.xml b/konphidroid/res/values/strings.xml
index b6d64c1..73e0b6c 100644
--- a/konphidroid/res/values/strings.xml
+++ b/konphidroid/res/values/strings.xml
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">KonPhiDroid</string>
<string name="hello">KonPhiDense Test App, Version</string>
<string name="transmission_on">Transmission</string>
<string name="transmission_off">No Transmission</string>
<string name="gpsbutton">GPS</string>
<string name="gps_timestamp">GPS Timestamp:</string>
<string name="transmission_on_toast">Sending movement to server</string>
<string name="transmission_off_toast">No movement is sent to server</string>
<string name="labelsender_on">Sending Result:</string>
<string name="labelsender_off">Paused; Last:</string>
<string name="ask_activate_gps_settings">The GPS receiver is not active. Do you want to edit your location settings in order to activate GPS now?</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="bottom_url_text">http://carcomm.cstimming.de/view.html</string>
<string name="labelspeed">Speed:</string>
+ <string name="choose_sending_interval">Choose a sending time interval</string>
</resources>
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index e9ef17b..417ee5b 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,351 +1,376 @@
package de.cstimming.konphidroid;
import java.io.IOException;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import org.apache.http.NameValuePair;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
+import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
public class KonPhiActivity extends Activity implements LocationListener, SliceSenderResult {
private ToggleButton m_togglebuttonGps;
- private ToggleButton m_togglebuttonSender;
+ private Button m_togglebuttonSender;
private SimpleDateFormat m_dateFormatter;
private SimpleDateFormat m_dateFormatSender;
private NumberFormat m_speedFormatter;
private Location m_lastLocation;
private boolean m_lastLocationValid;
private boolean m_currentlySendingSlices;
private long m_senderIntervalSecs;
private String m_server = "http://carcomm.cstimming.de/";
//private WebView m_webview;
private TextView m_labelSender;
private int m_instanceId;
private int m_categoryId;
private static final int DIALOG_GPSWARNING = 1;
+ private static final int DIALOG_INTERVAL_MULTICHOICE = 2;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
m_dateFormatSender = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
m_dateFormatSender.setTimeZone(TimeZone.getTimeZone("GMT00"));
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
m_speedFormatter = NumberFormat.getInstance();
m_speedFormatter.setMaximumFractionDigits(1);
- m_senderIntervalSecs = 30;
- m_currentlySendingSlices = false;
-
m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebuttonGps);
- m_togglebuttonSender = (ToggleButton) findViewById(R.id.togglebuttonSender);
+ m_togglebuttonSender = (Button) findViewById(R.id.togglebuttonSender);
m_labelSender = (TextView) findViewById(R.id.TextLabelSender);
+ m_senderIntervalSecs = 0;
+ setSenderIntervalSecs(30);
+ m_currentlySendingSlices = false;
+
java.util.Random rg = new java.util.Random();
m_instanceId = rg.nextInt();
m_categoryId = 1;
// Print the version number into the UI
TextView versionView = (TextView) findViewById(R.id.TextViewVersion);
String versionString;
try {
versionString = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
} catch (NameNotFoundException e) {
versionString = "Not found";
e.printStackTrace();
}
versionView.setText(" " + versionString);
//final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
//m_webview = new WebView(this);
//ell.addView(m_webview);
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
m_togglebuttonSender.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
- final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
- if (m_togglebuttonSender.isChecked()) {
- m_labelSender.setText(R.string.labelsender_on);
- final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
- m_labelSender.setTextColor(viewSecs.getTextColors());
- if (locationManager
- .isProviderEnabled(LocationManager.GPS_PROVIDER)) {
- // Show the toast only if GPS is already on, but not if
- // we open the dialog as this would interfere visually
- // with the toast.
- Toast.makeText(KonPhiActivity.this,
- R.string.transmission_on_toast,
- Toast.LENGTH_SHORT).show();
- } else {
- showDialog(DIALOG_GPSWARNING);
- }
- } else {
- Toast.makeText(KonPhiActivity.this,
- R.string.transmission_off_toast, Toast.LENGTH_SHORT)
- .show();
- m_labelSender.setText(R.string.labelsender_off);
- m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
- resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
- }
- }
- });
+ showDialog(DIALOG_INTERVAL_MULTICHOICE);
+ }});
- long minTime = 1000 * m_senderIntervalSecs; // [milliseconds]
+ long minTime = 1000 * getSenderIntervalSecs(); // [milliseconds]
float minDistance = 0; // 10; // [meters]
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
minTime, minDistance, this);
}
+ public long getSenderIntervalSecs() {
+ return m_senderIntervalSecs;
+ }
+ public void setSenderIntervalSecs(long v) {
+ if (v == m_senderIntervalSecs)
+ return;
+ final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
+ if (v == 0) {
+ m_togglebuttonSender.setText(R.string.transmission_off);
+ m_labelSender.setText(R.string.labelsender_off);
+ m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
+ resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
+ } else {
+ m_togglebuttonSender.setText(getString(R.string.transmission_on) + " " + String.valueOf(v) + "s");
+ m_labelSender.setText(R.string.labelsender_on);
+ final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
+ m_labelSender.setTextColor(viewSecs.getTextColors());
+ final LocationManager locationManager = (LocationManager) getApplicationContext()
+ .getSystemService(Context.LOCATION_SERVICE);
+ if (!locationManager
+ .isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+ showDialog(DIALOG_GPSWARNING);
+ }
+ if (v < m_senderIntervalSecs) {
+ long minTime = 1000 * v; // [milliseconds]
+ float minDistance = 0; // 10; // [meters]
+ locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
+ minTime, minDistance, this);
+ }
+ }
+ m_senderIntervalSecs = v;
+ }
+
protected Dialog onCreateDialog(int d) {
- Dialog result;
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
switch (d) {
case DIALOG_GPSWARNING:
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
+
builder.setMessage(R.string.ask_activate_gps_settings)
.setCancelable(false)
.setPositiveButton(R.string.yes,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
}
})
.setNegativeButton(R.string.no,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
dialog.cancel();
}
});
- result = builder.create();
+ break;
+ case DIALOG_INTERVAL_MULTICHOICE:
+ builder.setTitle(R.string.choose_sending_interval);
+ final CharSequence[] items = {"60", "30", "20", "10", "2", "0"};
+ builder.setSingleChoiceItems(items, 1, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ String item = items[which].toString();
+ setSenderIntervalSecs(Integer.parseInt(item));
+ dismissDialog(DIALOG_INTERVAL_MULTICHOICE);
+ }
+ });
break;
default:
- result = null;
+ return null;
}
+ Dialog result = builder.create();
return result;
}
@Override
public void onLocationChanged(Location loc) {
// Toast.makeText(KonPhiActivity.this, "Received location from " +
// loc.getProvider(), Toast.LENGTH_SHORT).show();
printLocInfo(loc);
if (m_lastLocationValid) {
long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
- if (secdiff >= m_senderIntervalSecs) {
- if (secdiff <= 4 * m_senderIntervalSecs) {
+ long intervalSecs = getSenderIntervalSecs();
+ if (intervalSecs > 0 && secdiff >= intervalSecs) {
+ if (secdiff <= 4 * intervalSecs) {
sendPairNow(m_lastLocation, loc);
}
m_lastLocation = loc;
}
// Note: We don't set the m_lastLocation if we are smaller than
// m_senderIntervalSecs.
} else {
m_lastLocationValid = true;
m_lastLocation = loc;
}
}
private void printLocInfo(Location loc) {
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
final TextView viewSpeed = (TextView) findViewById(R.id.TextViewSpeed);
viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy())
: "...");
if (m_lastLocationValid) {
long msecdiff = loc.getTime() - m_lastLocation.getTime();
float distance = m_lastLocation.distanceTo(loc);
String secs = String.valueOf(msecdiff / 1000);
String dist = String.valueOf(distance);
viewDist.setText(dist);
viewSecs.setText(secs);
viewSpeed.setText(m_speedFormatter.format(3600.0 * distance / (float) msecdiff) + " km/h");
} else {
viewDist.setText("...");
viewSecs.setText("...");
viewSpeed.setText("...");
}
}
private String degToString(double deg) {
return String.valueOf(deg);
}
private void sendPairNow(Location startLoc, Location endLoc) {
// Only send if the togglebutton is active
- if (!m_togglebuttonSender.isChecked())
+ if (getSenderIntervalSecs() == 0)
return;
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (m_currentlySendingSlices) {
resultview.setText("Still sending (ignoring newer position)...");
return;
}
String startLat = degToString(startLoc.getLatitude());
String startLon = degToString(startLoc.getLongitude());
String endLat = degToString(endLoc.getLatitude());
String endLon = degToString(endLoc.getLongitude());
String duration = String
.valueOf((endLoc.getTime() - startLoc.getTime()) / 1000);
String endTime = m_dateFormatSender.format(new Date(endLoc.getTime()));
// FIXME: Need to transfer speed and accuracy at both points, and also
// group selection
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(m_server + "slices");
resultview.setText("Sending to " + httppost.getURI().toString());
final String displaytime = m_dateFormatter.format(new Date(endLoc.getTime())) + ": ";
try {
// Add your data
List<NameValuePair> nvpairs = new ArrayList<NameValuePair>(10);
nvpairs.add(new BasicNameValuePair("slice[startlat]",
startLat));
nvpairs.add(new BasicNameValuePair("slice[startlon]",
startLon));
nvpairs.add(new BasicNameValuePair("slice[lat]", endLat));
nvpairs.add(new BasicNameValuePair("slice[lon]", endLon));
nvpairs.add(new BasicNameValuePair("slice[duration]",
duration));
nvpairs.add(new BasicNameValuePair("slice[time]", endTime));
nvpairs.add(new BasicNameValuePair("slice[startaccuracy]", String.valueOf(startLoc.getAccuracy())));
nvpairs.add(new BasicNameValuePair("slice[endaccuracy]", String.valueOf(endLoc.getAccuracy())));
nvpairs.add(new BasicNameValuePair("slice[instanceid]", String.valueOf(m_instanceId)));
nvpairs.add(new BasicNameValuePair("slice[categoryid]", String.valueOf(m_categoryId)));
httppost.setEntity(new UrlEncodedFormEntity(nvpairs));
// ByteArrayOutputStream baos = new ByteArrayOutputStream();
// httppost.getEntity().writeTo(baos);
// m_webview.loadData(baos.toString(), "text/html", "utf-8");
// The network connection is moved into a separate task
SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, this);
// Execute HTTP Post Request
m_currentlySendingSlices = true;
task.execute(httppost);
} catch (IOException e) {
resultview.setText(displaytime + "Sending failed (IO): "
+ e.getLocalizedMessage());
resultview.setTextColor(ColorStateList.valueOf(Color.RED));
}
}
@Override
public void onProviderDisabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " disabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider +
// " enabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " out of service", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " tmp. unavailable", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider
// + " available", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
break;
}
}
@Override
public void sliceSenderResult(String text, boolean good, int color) {
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
resultview.setText(text);
resultview.setTextColor(ColorStateList.valueOf(color));
m_currentlySendingSlices = false;
}
}
\ No newline at end of file
|
cstim/carcomm
|
9c7e6ec4cc720fd93a7c9d4c19e5c9adad053cd8
|
Refactor network connection into separate AsyncTask. Ignore new GPS positions while sending.
|
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml
index f629a8c..33de089 100644
--- a/konphidroid/AndroidManifest.xml
+++ b/konphidroid/AndroidManifest.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.cstimming.konphidroid"
- android:versionName="0.3" android:versionCode="3">
+ android:versionCode="5" android:versionName="0.5">
<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".KonPhiActivity"
- android:label="@string/app_name">
+ android:label="@string/app_name" android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<uses-sdk android:minSdkVersion="3" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
</manifest>
\ No newline at end of file
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index 19976fb..e9ef17b 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,345 +1,351 @@
package de.cstimming.konphidroid;
import java.io.IOException;
+import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
-import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
-import org.apache.http.StatusLine;
-import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
-public class KonPhiActivity extends Activity implements LocationListener {
+public class KonPhiActivity extends Activity implements LocationListener, SliceSenderResult {
private ToggleButton m_togglebuttonGps;
private ToggleButton m_togglebuttonSender;
private SimpleDateFormat m_dateFormatter;
private SimpleDateFormat m_dateFormatSender;
+ private NumberFormat m_speedFormatter;
private Location m_lastLocation;
private boolean m_lastLocationValid;
+ private boolean m_currentlySendingSlices;
private long m_senderIntervalSecs;
private String m_server = "http://carcomm.cstimming.de/";
//private WebView m_webview;
private TextView m_labelSender;
private int m_instanceId;
private int m_categoryId;
private static final int DIALOG_GPSWARNING = 1;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
m_dateFormatSender = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
m_dateFormatSender.setTimeZone(TimeZone.getTimeZone("GMT00"));
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
+
+ m_speedFormatter = NumberFormat.getInstance();
+ m_speedFormatter.setMaximumFractionDigits(1);
+
m_senderIntervalSecs = 30;
+ m_currentlySendingSlices = false;
+
m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebuttonGps);
m_togglebuttonSender = (ToggleButton) findViewById(R.id.togglebuttonSender);
m_labelSender = (TextView) findViewById(R.id.TextLabelSender);
java.util.Random rg = new java.util.Random();
m_instanceId = rg.nextInt();
m_categoryId = 1;
// Print the version number into the UI
TextView versionView = (TextView) findViewById(R.id.TextViewVersion);
String versionString;
try {
versionString = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
} catch (NameNotFoundException e) {
versionString = "Not found";
e.printStackTrace();
}
versionView.setText(" " + versionString);
//final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
//m_webview = new WebView(this);
//ell.addView(m_webview);
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
m_togglebuttonSender.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (m_togglebuttonSender.isChecked()) {
m_labelSender.setText(R.string.labelsender_on);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
m_labelSender.setTextColor(viewSecs.getTextColors());
if (locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
// Show the toast only if GPS is already on, but not if
// we open the dialog as this would interfere visually
// with the toast.
Toast.makeText(KonPhiActivity.this,
R.string.transmission_on_toast,
Toast.LENGTH_SHORT).show();
} else {
showDialog(DIALOG_GPSWARNING);
}
} else {
Toast.makeText(KonPhiActivity.this,
R.string.transmission_off_toast, Toast.LENGTH_SHORT)
.show();
m_labelSender.setText(R.string.labelsender_off);
m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
}
}
});
long minTime = 1000 * m_senderIntervalSecs; // [milliseconds]
float minDistance = 0; // 10; // [meters]
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
minTime, minDistance, this);
}
protected Dialog onCreateDialog(int d) {
Dialog result;
switch (d) {
case DIALOG_GPSWARNING:
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(R.string.ask_activate_gps_settings)
.setCancelable(false)
.setPositiveButton(R.string.yes,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
}
})
.setNegativeButton(R.string.no,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
dialog.cancel();
}
});
result = builder.create();
break;
default:
result = null;
}
return result;
}
@Override
public void onLocationChanged(Location loc) {
// Toast.makeText(KonPhiActivity.this, "Received location from " +
// loc.getProvider(), Toast.LENGTH_SHORT).show();
printLocInfo(loc);
if (m_lastLocationValid) {
long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
if (secdiff >= m_senderIntervalSecs) {
if (secdiff <= 4 * m_senderIntervalSecs) {
sendPairNow(m_lastLocation, loc);
}
m_lastLocation = loc;
}
// Note: We don't set the m_lastLocation if we are smaller than
// m_senderIntervalSecs.
} else {
m_lastLocationValid = true;
m_lastLocation = loc;
}
}
private void printLocInfo(Location loc) {
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
final TextView viewSpeed = (TextView) findViewById(R.id.TextViewSpeed);
viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy())
: "...");
if (m_lastLocationValid) {
long msecdiff = loc.getTime() - m_lastLocation.getTime();
float distance = m_lastLocation.distanceTo(loc);
String secs = String.valueOf(msecdiff / 1000);
String dist = String.valueOf(distance);
viewDist.setText(dist);
viewSecs.setText(secs);
- viewSpeed.setText(String.valueOf(3600.0 * distance / (float) msecdiff) + " km/h");
+ viewSpeed.setText(m_speedFormatter.format(3600.0 * distance / (float) msecdiff) + " km/h");
} else {
viewDist.setText("...");
viewSecs.setText("...");
viewSpeed.setText("...");
}
}
private String degToString(double deg) {
return String.valueOf(deg);
}
private void sendPairNow(Location startLoc, Location endLoc) {
// Only send if the togglebutton is active
if (!m_togglebuttonSender.isChecked())
return;
+ final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
+
+ if (m_currentlySendingSlices) {
+ resultview.setText("Still sending (ignoring newer position)...");
+ return;
+ }
+
String startLat = degToString(startLoc.getLatitude());
String startLon = degToString(startLoc.getLongitude());
String endLat = degToString(endLoc.getLatitude());
String endLon = degToString(endLoc.getLongitude());
String duration = String
.valueOf((endLoc.getTime() - startLoc.getTime()) / 1000);
String endTime = m_dateFormatSender.format(new Date(endLoc.getTime()));
// FIXME: Need to transfer speed and accuracy at both points, and also
// group selection
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(m_server + "slices");
- final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
resultview.setText("Sending to " + httppost.getURI().toString());
- String displaytime = m_dateFormatter.format(new Date(endLoc.getTime()))
- + ": ";
+ final String displaytime = m_dateFormatter.format(new Date(endLoc.getTime())) + ": ";
try {
// Add your data
List<NameValuePair> nvpairs = new ArrayList<NameValuePair>(10);
nvpairs.add(new BasicNameValuePair("slice[startlat]",
startLat));
nvpairs.add(new BasicNameValuePair("slice[startlon]",
startLon));
nvpairs.add(new BasicNameValuePair("slice[lat]", endLat));
nvpairs.add(new BasicNameValuePair("slice[lon]", endLon));
nvpairs.add(new BasicNameValuePair("slice[duration]",
duration));
nvpairs.add(new BasicNameValuePair("slice[time]", endTime));
nvpairs.add(new BasicNameValuePair("slice[startaccuracy]", String.valueOf(startLoc.getAccuracy())));
nvpairs.add(new BasicNameValuePair("slice[endaccuracy]", String.valueOf(endLoc.getAccuracy())));
nvpairs.add(new BasicNameValuePair("slice[instanceid]", String.valueOf(m_instanceId)));
nvpairs.add(new BasicNameValuePair("slice[categoryid]", String.valueOf(m_categoryId)));
httppost.setEntity(new UrlEncodedFormEntity(nvpairs));
// ByteArrayOutputStream baos = new ByteArrayOutputStream();
// httppost.getEntity().writeTo(baos);
// m_webview.loadData(baos.toString(), "text/html", "utf-8");
+ // The network connection is moved into a separate task
+ SliceSenderTask task = new SliceSenderTask(httpclient, displaytime, this);
+
// Execute HTTP Post Request
- HttpResponse response = httpclient.execute(httppost);
- // baos.reset();
- // response.getEntity().writeTo(baos);
- // m_webview.loadData(baos.toString(), "text/html", "utf-8");
- StatusLine rstatus = response.getStatusLine();
- int rcode = rstatus.getStatusCode();
- if (rcode >= 200 && rcode < 300) {
- resultview.setText(displaytime + String.valueOf(rcode) + " "
- + rstatus.getReasonPhrase());
- resultview.setTextColor(ColorStateList.valueOf(Color.GREEN));
- } else {
- resultview.setText(displaytime + String.valueOf(rcode) + " "
- + rstatus.getReasonPhrase());
- resultview.setTextColor(ColorStateList.valueOf(Color.RED));
- }
- } catch (ClientProtocolException e) {
- resultview.setText(displaytime + "Sending failed (Protocol): "
- + e.getLocalizedMessage());
- resultview.setTextColor(ColorStateList.valueOf(Color.RED));
+ m_currentlySendingSlices = true;
+ task.execute(httppost);
+
} catch (IOException e) {
resultview.setText(displaytime + "Sending failed (IO): "
+ e.getLocalizedMessage());
resultview.setTextColor(ColorStateList.valueOf(Color.RED));
}
}
@Override
public void onProviderDisabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " disabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider +
// " enabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " out of service", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " tmp. unavailable", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider
// + " available", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
break;
}
}
+
+ @Override
+ public void sliceSenderResult(String text, boolean good, int color) {
+ final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
+ resultview.setText(text);
+ resultview.setTextColor(ColorStateList.valueOf(color));
+ m_currentlySendingSlices = false;
+ }
}
\ No newline at end of file
diff --git a/konphidroid/src/de/cstimming/konphidroid/SliceSenderResult.java b/konphidroid/src/de/cstimming/konphidroid/SliceSenderResult.java
new file mode 100644
index 0000000..f9535e4
--- /dev/null
+++ b/konphidroid/src/de/cstimming/konphidroid/SliceSenderResult.java
@@ -0,0 +1,5 @@
+package de.cstimming.konphidroid;
+
+public interface SliceSenderResult {
+ public void sliceSenderResult(String text, boolean good, int color);
+}
diff --git a/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java b/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java
new file mode 100644
index 0000000..631a226
--- /dev/null
+++ b/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java
@@ -0,0 +1,72 @@
+package de.cstimming.konphidroid;
+
+import java.io.IOException;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.StatusLine;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+
+import android.graphics.Color;
+import android.os.AsyncTask;
+
+public class SliceSenderTask extends AsyncTask<HttpPost, Void, HttpResponse> {
+ HttpClient m_httpclient;
+ SliceSenderResult m_callback;
+ String m_resultprefix;
+
+ public SliceSenderTask(HttpClient client, String resultprefix, SliceSenderResult callback) {
+ super();
+ m_httpclient = client;
+ m_resultprefix = resultprefix;
+ m_callback = callback;
+ }
+
+ @Override
+ protected void onPreExecute() {
+ String text = "Sending Way...";
+ int color = Color.YELLOW;
+ m_callback.sliceSenderResult(m_resultprefix + text, true, color);
+ }
+
+ @Override
+ protected HttpResponse doInBackground(HttpPost... params) {
+ if (params.length != 1)
+ return null;
+ try {
+ // Execute HTTP Post Request
+ HttpResponse response = m_httpclient.execute(params[0]);
+ return response;
+ } catch (ClientProtocolException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(HttpResponse response) {
+ // baos.reset();
+ // response.getEntity().writeTo(baos);
+ // m_webview.loadData(baos.toString(), "text/html", "utf-8");
+
+ String text;
+ boolean good = true;
+ if (response != null) {
+ StatusLine rstatus = response.getStatusLine();
+ int rcode = rstatus.getStatusCode();
+ text = String.valueOf(rcode) + " " + rstatus.getReasonPhrase();
+ if (rcode >= 200 && rcode < 300) {
+ } else {
+ good = false;
+ }
+ } else {
+ text = "Exception during HTTP connect";
+ good = false;
+ }
+ m_callback.sliceSenderResult(m_resultprefix + text, good, good ? Color.GREEN : Color.RED);
+ }
+
+}
|
cstim/carcomm
|
12fb60fc581e8e3f600e17109541c38cfa365e4a
|
Implement the new accuracy and category fields. Add speed and version display.
|
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml
index bc7ff71..f629a8c 100644
--- a/konphidroid/AndroidManifest.xml
+++ b/konphidroid/AndroidManifest.xml
@@ -1,23 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.cstimming.konphidroid"
- android:versionCode="2"
- android:versionName="0.2">
+ android:versionName="0.3" android:versionCode="3">
<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".KonPhiActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<uses-sdk android:minSdkVersion="3" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
</manifest>
\ No newline at end of file
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml
index 6bf7b6a..b2950d6 100644
--- a/konphidroid/res/layout/main.xml
+++ b/konphidroid/res/layout/main.xml
@@ -1,83 +1,98 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
android:id="@+id/MainLayout" android:layout_height="fill_parent">
- <TextView android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:text="@string/hello" />
+
+ <LinearLayout android:layout_width="wrap_content"
+ android:layout_height="wrap_content" android:orientation="horizontal">
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="@string/hello" />
+ <TextView android:id="@+id/TextViewVersion"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:text="" />
+ </LinearLayout>
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content" android:orientation="horizontal">
<ToggleButton android:id="@+id/togglebuttonGps"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:textOn="@string/gpsbutton" android:textOff="@string/gpsbutton" />
<ToggleButton android:id="@+id/togglebuttonSender"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:textOn="@string/transmission_on" android:textOff="@string/transmission_off"
android:checked="true" />
</LinearLayout>
<TableLayout android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="@string/gps_timestamp"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewGPSAge"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Latitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLat"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Longitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLon"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Accuracy [m]:" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewAcc"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Dist to previous [m]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewDist"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Time to previous [s]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewSecs"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="@string/labelsender_on" android:id="@+id/TextLabelSender"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewSender"
android:scrollHorizontally="true" android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</TableRow>
+ <TableRow android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <TextView android:text="@string/labelspeed"
+ android:textSize="40sp" android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <TextView android:id="@+id/TextViewSpeed" android:textSize="40sp"
+ android:layout_width="fill_parent" android:layout_height="fill_parent" />
+ </TableRow>
</TableLayout>
<TextView android:text="@string/bottom_url_text" android:id="@+id/TextViewBottom"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
android:autoLink="web" />
<LinearLayout android:id="@+id/LayoutWebview"
android:layout_width="fill_parent" android:layout_height="fill_parent"></LinearLayout>
</LinearLayout>
diff --git a/konphidroid/res/values-de/strings.xml b/konphidroid/res/values-de/strings.xml
index b497a96..2a1a35a 100644
--- a/konphidroid/res/values-de/strings.xml
+++ b/konphidroid/res/values-de/strings.xml
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">KonPhiDroid</string>
- <string name="hello">KonPhiDense Test-App. Die Bewegung der GPS-Position wird aufgenommen und zum Server übertragen.</string>
+ <string name="hello">KonPhiDense Test-App, Version</string>
<string name="transmission_on">Ãbertragung</string>
<string name="transmission_off">Keine Ãbertragung</string>
<string name="gpsbutton">GPS</string>
<string name="gps_timestamp">GPS Zeitstempel:</string>
<string name="transmission_on_toast">Bewegung wird zum Server übertragen</string>
<string name="transmission_off_toast">Es wird keine Bewegung mehr übertragen</string>
<string name="labelsender_on">Ãbertragungsergebnis:</string>
<string name="labelsender_off">Pause; Letzte:</string>
<string name="ask_activate_gps_settings">Das GPS ist ausgeschaltet. Wollen Sie die Einstellungen für Standort & Sicherheit bearbeiten, um GPS einzuschalten?</string>
<string name="yes">Ja</string>
<string name="no">Nein</string>
+ <string name="labelspeed">Speed:</string>
</resources>
diff --git a/konphidroid/res/values/strings.xml b/konphidroid/res/values/strings.xml
index f7c53ad..b6d64c1 100644
--- a/konphidroid/res/values/strings.xml
+++ b/konphidroid/res/values/strings.xml
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">KonPhiDroid</string>
- <string name="hello">KonPhiDense Test App. We receive GPS movements and send it to the server.</string>
+ <string name="hello">KonPhiDense Test App, Version</string>
<string name="transmission_on">Transmission</string>
<string name="transmission_off">No Transmission</string>
<string name="gpsbutton">GPS</string>
<string name="gps_timestamp">GPS Timestamp:</string>
<string name="transmission_on_toast">Sending movement to server</string>
<string name="transmission_off_toast">No movement is sent to server</string>
<string name="labelsender_on">Sending Result:</string>
<string name="labelsender_off">Paused; Last:</string>
<string name="ask_activate_gps_settings">The GPS receiver is not active. Do you want to edit your location settings in order to activate GPS now?</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="bottom_url_text">http://carcomm.cstimming.de/view.html</string>
+ <string name="labelspeed">Speed:</string>
</resources>
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index fa7c354..19976fb 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,319 +1,345 @@
package de.cstimming.konphidroid;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.StatusLine;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
+import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
public class KonPhiActivity extends Activity implements LocationListener {
private ToggleButton m_togglebuttonGps;
private ToggleButton m_togglebuttonSender;
private SimpleDateFormat m_dateFormatter;
private SimpleDateFormat m_dateFormatSender;
private Location m_lastLocation;
private boolean m_lastLocationValid;
private long m_senderIntervalSecs;
private String m_server = "http://carcomm.cstimming.de/";
//private WebView m_webview;
private TextView m_labelSender;
+ private int m_instanceId;
+ private int m_categoryId;
private static final int DIALOG_GPSWARNING = 1;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
m_dateFormatSender = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
m_dateFormatSender.setTimeZone(TimeZone.getTimeZone("GMT00"));
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
m_senderIntervalSecs = 30;
m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebuttonGps);
m_togglebuttonSender = (ToggleButton) findViewById(R.id.togglebuttonSender);
m_labelSender = (TextView) findViewById(R.id.TextLabelSender);
+ java.util.Random rg = new java.util.Random();
+ m_instanceId = rg.nextInt();
+ m_categoryId = 1;
+
+ // Print the version number into the UI
+ TextView versionView = (TextView) findViewById(R.id.TextViewVersion);
+ String versionString;
+ try {
+ versionString = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
+ } catch (NameNotFoundException e) {
+ versionString = "Not found";
+ e.printStackTrace();
+ }
+ versionView.setText(" " + versionString);
+
//final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
//m_webview = new WebView(this);
//ell.addView(m_webview);
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
m_togglebuttonSender.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (m_togglebuttonSender.isChecked()) {
m_labelSender.setText(R.string.labelsender_on);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
m_labelSender.setTextColor(viewSecs.getTextColors());
if (locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
// Show the toast only if GPS is already on, but not if
// we open the dialog as this would interfere visually
// with the toast.
Toast.makeText(KonPhiActivity.this,
R.string.transmission_on_toast,
Toast.LENGTH_SHORT).show();
} else {
showDialog(DIALOG_GPSWARNING);
}
} else {
Toast.makeText(KonPhiActivity.this,
R.string.transmission_off_toast, Toast.LENGTH_SHORT)
.show();
m_labelSender.setText(R.string.labelsender_off);
m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
}
}
});
long minTime = 1000 * m_senderIntervalSecs; // [milliseconds]
float minDistance = 0; // 10; // [meters]
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
minTime, minDistance, this);
}
protected Dialog onCreateDialog(int d) {
Dialog result;
switch (d) {
case DIALOG_GPSWARNING:
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(R.string.ask_activate_gps_settings)
.setCancelable(false)
.setPositiveButton(R.string.yes,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
}
})
.setNegativeButton(R.string.no,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
dialog.cancel();
}
});
result = builder.create();
break;
default:
result = null;
}
return result;
}
@Override
public void onLocationChanged(Location loc) {
// Toast.makeText(KonPhiActivity.this, "Received location from " +
// loc.getProvider(), Toast.LENGTH_SHORT).show();
printLocInfo(loc);
if (m_lastLocationValid) {
long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
if (secdiff >= m_senderIntervalSecs) {
if (secdiff <= 4 * m_senderIntervalSecs) {
sendPairNow(m_lastLocation, loc);
}
m_lastLocation = loc;
}
// Note: We don't set the m_lastLocation if we are smaller than
// m_senderIntervalSecs.
} else {
m_lastLocationValid = true;
m_lastLocation = loc;
}
}
private void printLocInfo(Location loc) {
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
+ final TextView viewSpeed = (TextView) findViewById(R.id.TextViewSpeed);
viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy())
: "...");
if (m_lastLocationValid) {
- long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
- String secs = String.valueOf(secdiff);
- String dist = String.valueOf(m_lastLocation.distanceTo(loc));
+ long msecdiff = loc.getTime() - m_lastLocation.getTime();
+ float distance = m_lastLocation.distanceTo(loc);
+ String secs = String.valueOf(msecdiff / 1000);
+ String dist = String.valueOf(distance);
viewDist.setText(dist);
viewSecs.setText(secs);
+ viewSpeed.setText(String.valueOf(3600.0 * distance / (float) msecdiff) + " km/h");
} else {
viewDist.setText("...");
viewSecs.setText("...");
+ viewSpeed.setText("...");
}
}
private String degToString(double deg) {
return String.valueOf(deg);
}
private void sendPairNow(Location startLoc, Location endLoc) {
// Only send if the togglebutton is active
if (!m_togglebuttonSender.isChecked())
return;
String startLat = degToString(startLoc.getLatitude());
String startLon = degToString(startLoc.getLongitude());
String endLat = degToString(endLoc.getLatitude());
String endLon = degToString(endLoc.getLongitude());
String duration = String
.valueOf((endLoc.getTime() - startLoc.getTime()) / 1000);
String endTime = m_dateFormatSender.format(new Date(endLoc.getTime()));
// FIXME: Need to transfer speed and accuracy at both points, and also
// group selection
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(m_server + "slices");
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
resultview.setText("Sending to " + httppost.getURI().toString());
String displaytime = m_dateFormatter.format(new Date(endLoc.getTime()))
+ ": ";
try {
// Add your data
- List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>(6);
- nameValuePairs.add(new BasicNameValuePair("slice[startlat]",
+ List<NameValuePair> nvpairs = new ArrayList<NameValuePair>(10);
+ nvpairs.add(new BasicNameValuePair("slice[startlat]",
startLat));
- nameValuePairs.add(new BasicNameValuePair("slice[startlon]",
+ nvpairs.add(new BasicNameValuePair("slice[startlon]",
startLon));
- nameValuePairs.add(new BasicNameValuePair("slice[lat]", endLat));
- nameValuePairs.add(new BasicNameValuePair("slice[lon]", endLon));
- nameValuePairs.add(new BasicNameValuePair("slice[duration]",
+ nvpairs.add(new BasicNameValuePair("slice[lat]", endLat));
+ nvpairs.add(new BasicNameValuePair("slice[lon]", endLon));
+ nvpairs.add(new BasicNameValuePair("slice[duration]",
duration));
- nameValuePairs.add(new BasicNameValuePair("slice[time]", endTime));
- httppost.setEntity(new UrlEncodedFormEntity(nameValuePairs));
+ nvpairs.add(new BasicNameValuePair("slice[time]", endTime));
+ nvpairs.add(new BasicNameValuePair("slice[startaccuracy]", String.valueOf(startLoc.getAccuracy())));
+ nvpairs.add(new BasicNameValuePair("slice[endaccuracy]", String.valueOf(endLoc.getAccuracy())));
+ nvpairs.add(new BasicNameValuePair("slice[instanceid]", String.valueOf(m_instanceId)));
+ nvpairs.add(new BasicNameValuePair("slice[categoryid]", String.valueOf(m_categoryId)));
+ httppost.setEntity(new UrlEncodedFormEntity(nvpairs));
// ByteArrayOutputStream baos = new ByteArrayOutputStream();
// httppost.getEntity().writeTo(baos);
// m_webview.loadData(baos.toString(), "text/html", "utf-8");
// Execute HTTP Post Request
HttpResponse response = httpclient.execute(httppost);
// baos.reset();
// response.getEntity().writeTo(baos);
// m_webview.loadData(baos.toString(), "text/html", "utf-8");
StatusLine rstatus = response.getStatusLine();
int rcode = rstatus.getStatusCode();
if (rcode >= 200 && rcode < 300) {
resultview.setText(displaytime + String.valueOf(rcode) + " "
+ rstatus.getReasonPhrase());
resultview.setTextColor(ColorStateList.valueOf(Color.GREEN));
} else {
resultview.setText(displaytime + String.valueOf(rcode) + " "
+ rstatus.getReasonPhrase());
resultview.setTextColor(ColorStateList.valueOf(Color.RED));
}
} catch (ClientProtocolException e) {
resultview.setText(displaytime + "Sending failed (Protocol): "
+ e.getLocalizedMessage());
resultview.setTextColor(ColorStateList.valueOf(Color.RED));
} catch (IOException e) {
resultview.setText(displaytime + "Sending failed (IO): "
+ e.getLocalizedMessage());
resultview.setTextColor(ColorStateList.valueOf(Color.RED));
}
}
@Override
public void onProviderDisabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " disabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider +
// " enabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " out of service", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " tmp. unavailable", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider
// + " available", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
break;
}
}
}
\ No newline at end of file
|
cstim/carcomm
|
1ac5f04a9686e2b43c3b0c21bbf6a345401f8d1e
|
Add documents from basecamp into git.
|
diff --git a/579651/C2C low_cost beacon/messages.html b/579651/C2C low_cost beacon/messages.html
new file mode 100644
index 0000000..c9e7229
--- /dev/null
+++ b/579651/C2C low_cost beacon/messages.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - All messages</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../html_exports/html_exports.css">
+ </head>
+ <body class="messages">
+ <p class="back_to_projects"><a href="../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav">
+ <strong>Messages</strong>
+ |
+ <a href="todo_lists.html">To-Do Lists</a>
+ |
+ <a href="milestones.html">Milestones</a>
+ |
+ <a href="time_entries.html">Time Entries</a>
+ |
+ <a href="people.html">People</a>
+ </p>
+ <div class="messages">
+ <table class="index">
+ <tr>
+ <th>Message</th>
+ <th>Author</th>
+ <th>Date posted</th>
+ <th>Comments</th>
+ </tr>
+ <tr>
+ <td><a href="messages/34448661.html">Ãnderungen: Basecamp schlieÃen, Android weiterprogrammieren</a></td>
+ <td>Christian Stimming</td>
+ <td>14 Jul, 2010</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <td><a href="messages/33456316.html">Brandenburger-Polizei-testet-Open-Source-Navigationssystem</a></td>
+ <td>Philippe Dreiling</td>
+ <td>14 Jun, 2010</td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td><a href="messages/32952781.html">Infos zum Stand Ende Mai</a></td>
+ <td>Niels Koch</td>
+ <td>29 May, 2010</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <td><a href="messages/32623592.html">Web-Applikation im Browser funktioniert auch!</a></td>
+ <td>Christian Stimming</td>
+ <td>19 May, 2010</td>
+ <td>4</td>
+ </tr>
+ <tr>
+ <td><a href="messages/32483570.html">Literatur</a></td>
+ <td>Christian Stimming</td>
+ <td>15 May, 2010</td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td><a href="messages/32151822.html">SP App Layout</a></td>
+ <td>Niels Koch</td>
+ <td> 5 May, 2010</td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td><a href="messages/31931729.html">Laptop-Client 1.0.0</a></td>
+ <td>Christian Stimming</td>
+ <td>29 Apr, 2010</td>
+ <td>2</td>
+ </tr>
+ <tr>
+ <td><a href="messages/31237148.html">Rechtliche Regelungen rund um die OpenStreetMap-Daten</a></td>
+ <td>Philippe Dreiling</td>
+ <td> 8 Apr, 2010</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <td><a href="messages/30986337.html">Sourcecode-Verwaltung</a></td>
+ <td>Christian Stimming</td>
+ <td>31 Mar, 2010</td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td><a href="messages/30868504.html">Ausprobieren von basecamp</a></td>
+ <td>Christian Stimming</td>
+ <td>29 Mar, 2010</td>
+ <td>1</td>
+ </tr>
+ </table>
+ </div>
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/messages/30868504.html b/579651/C2C low_cost beacon/messages/30868504.html
new file mode 100644
index 0000000..b57bc3f
--- /dev/null
+++ b/579651/C2C low_cost beacon/messages/30868504.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Ausprobieren von basecamp</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="message">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../messages.html">← Back to messages</a></p>
+ <div class="message">
+ <h3 class="title">
+ Ausprobieren von basecamp
+
+ </h3>
+ <p>Posted by Christian Stimming on 29 Mar, 2010<br />
+ Category: No category</p>
+ <div class="body">
+ <p>Ich habe diese Projektseite mal eingerichtet, weil ich von “basecamp” schon gehört hatte und ich mal sehen möchte, wie sich die Benutzung “anfühlt”.</p>
+
+ <p>Im Moment benutze ich folgende Sachen:</p>
+ <ul>
+ <li>Eines von den “Writeboards” enthält die Notizen run um Android-GPS-Tracking Software, die sich beim Suchen im Netz so gefunden haben</li>
+ <li>Die Todo-List ist eine erste grobe Skizzierung der Aufgabenpakete, die für die Server- und Clientseite gemacht werden müssen.</li>
+ </ul>
+ </div>
+ </div>
+ <div class="comments">
+ <h3>Comments</h3>
+ <div class="comment">
+ <p>Philippe Dreiling on 29 Mar, 2010:</p>
+ <div class="body">
+ <p>Hi Christian, </p>
+
+ <p>dann schaue ich mir das Tool auch mal an,</p>
+
+ <p>Danke,<br />
+Philippe</p>
+ </div>
+ </div>
+</div>
+
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/messages/30986337.html b/579651/C2C low_cost beacon/messages/30986337.html
new file mode 100644
index 0000000..0ec7804
--- /dev/null
+++ b/579651/C2C low_cost beacon/messages/30986337.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Sourcecode-Verwaltung</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="message">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../messages.html">← Back to messages</a></p>
+ <div class="message">
+ <h3 class="title">
+ Sourcecode-Verwaltung
+
+ </h3>
+ <p>Posted by Christian Stimming on 31 Mar, 2010<br />
+ Category: Code</p>
+ <div class="body">
+ <p>Der Sourcecode für den Server und (später auch) Client ist in einem privaten Repository auf <a href="http://github.com">http://github.com</a> . Man besorge sich bitte einen account auf github und sage mit den Account-Namen, woraufhin ich jeden dort mit als “Repository Collaborator” mit eintrage.</p>
+
+ <p>Das Sourcecode-Verwaltungssystem ist “git”. Auf Linux installiert man das mit “sudo apt-get install git”; auf Windows installiere man TortoiseGIT <a href="http://code.google.com/p/tortoisegit/">http://code.google.com/p/tortoisegit/</a></p>
+
+ <p>Die Server-Implementierung läuft nun mit ein bisschen Beispieldaten auf <a href="http://carcomm.cstimming.de">http://carcomm.cstimming.de</a> – da kann man die Beispieldaten als Tabelle oder als Linien auf der <span class="caps">OSM</span>-Karte ansehen.</p>
+ </div>
+ </div>
+ <div class="comments">
+ <p>There are no comments.</p>
+</div>
+
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/messages/31237148.html b/579651/C2C low_cost beacon/messages/31237148.html
new file mode 100644
index 0000000..d07d498
--- /dev/null
+++ b/579651/C2C low_cost beacon/messages/31237148.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Rechtliche Regelungen rund um die OpenStreetMap-Daten</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="message">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../messages.html">← Back to messages</a></p>
+ <div class="message">
+ <h3 class="title">
+ Rechtliche Regelungen rund um die OpenStreetMap-Daten
+
+ </h3>
+ <p>Posted by Philippe Dreiling on 8 Apr, 2010<br />
+ Category: No category</p>
+ <div class="body">
+ <p>Es ist uns ein bisschen unklar, was genau man mit dem <span>OSM</span>-Daten machen kann und was nicht. Die erste <span>FAQ</span>-Sammlung ist hier:</p>
+
+ <p><a href="http://www.openstreetmap.de/faq.html">http://www.openstreetmap.de/faq.html</a></p>
+
+ <p>Aber diese ist nur sehr unvollständig. Besser sind wohl die <span>FAQ</span> hier: <a href="http://wiki.openstreetmap.org/wiki/DE:Legal_FAQ#Abgeleitete_Werke">http://wiki.openstreetmap.org/wiki/DE:Legal_FAQ#Abgeleitete_Werke</a></p>
+
+ <p>Dort gibt’s die Frage: “Ich habe eine App / Routing- / anderes Programm geschrieben, das <span>OSM </span>Daten verwendet. Muss ich es unter die <span>OSM </span>Lizenz stellen?” </p>
+
+ <p>Antwort: “Wenn deine Software unabhängig und eigenständig von den <span>OSM </span>Daten ist, dann musst du sie nicht unter die <span>OSM </span>Lizenz stellen. Das gilt allerdings nur für deine Software – mitgelieferte <span>OSM</span>- und sonstige Daten, die von der Software auf Grundlage von <span>OSM </span>Daten erstellt worden sind, müssen unter die <span>OSM </span>Lizenz.” </p>
+ </div>
+ </div>
+ <div class="comments">
+ <h3>Comments</h3>
+ <div class="comment">
+ <p>Christian Stimming on 8 Apr, 2010:</p>
+ <div class="body">
+ <p><a href="http://wiki.openstreetmap.org/wiki/DE:Legal_FAQ#Abgeleitete_Werke">http://wiki.openstreetmap.org/wiki/DE:Legal_FAQ#Abgeleitete_Werke</a></p>
+ </div>
+ </div>
+</div>
+
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/messages/31931729.html b/579651/C2C low_cost beacon/messages/31931729.html
new file mode 100644
index 0000000..897928f
--- /dev/null
+++ b/579651/C2C low_cost beacon/messages/31931729.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Laptop-Client 1.0.0</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="message">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../messages.html">← Back to messages</a></p>
+ <div class="message">
+ <h3 class="title">
+ Laptop-Client 1.0.0
+
+ </h3>
+ <p>Posted by Christian Stimming on 29 Apr, 2010<br />
+ Category: No category</p>
+ <div class="body">
+ <p>Habe soeben die Version 1.0.0 des Laptop-Client hochgeladen. Man mache damit folgendes: Das Paket installiern. Sodann das Programm “Carclient” starten. Screenshot siehe Anhang.</p>
+
+ <p>Oben im Abschnitt “GPS Device Settings” den Port und die Baudrate des <span>GPS</span>-Empfängers auswählen und per “Connect” mit dem <span>GPS</span>-Empfänger verbinden. Der Portname kann sich je nach angeschlossenen <span>USB</span>-Geräten auch mal ändern. Nachsehen kann man das im Windows-Gerätemanager unter “Anschlüsse (COM und <span>LPT</span>)”, dort steht der <span>GPS</span>-Empfänger bei mir unter “Prolific <span>USB</span>-to-Serial Comm Port (COM4)”, also <span>COM4</span>. Bei der Baudrate muss man so lange ausprobieren, bis man den richtigen Wert gefunden hat. Umstellen geht z.B. mit der Software SiRFDemo <a href="http://forum.pocketnavigation.de/forum64-gps-tools/18039-sirf-demo-wo-kann-man-downloaden/">http://forum.pocketnavigation.de/forum64-gps-tools/18039-sirf-demo-wo-kann-man-downloaden/</a></p>
+
+ <p>Wenn der <span>GPS</span>-Empfänger verbunden ist, zeigt die Anzeige in “Latitude”, “Longitude”, “Time” die Werte vom <span>GPS</span>. Desweiteren wird bei aktiviertem “Auto-Send” alle 60 Sekunden das zurückgelegte Wegstück an den Server geschicken. Durch Drücken auf “Send Now” kann man schon früher das zurückgelegte Wegstück an den Server schicken, sofern man Netzverbindung hat (und sich das dann in der Tabelle auf der Webseite ansehen).</p>
+
+ <p>Die Karte wird bei jedem abgeschickten <span>GPS</span>-Wert aktualisiert und zeigt die auf dem Server gespeicherten Wege für das Zeitintervall, welches in “Map History” ausgewählt ist.</p>
+
+ <p>Bekannte Einschränkung 1: Die Anzeige der Karte ist über eine <span>HTML</span>-Seite und Javascript realisiert und funktioniert daher nur, wenn bei Programmstart ca. 500KB Javascript-Code aus dem Netz runtergeladen werden konnten. Sollte man also vielleicht nicht bei ausschlieÃlich <span>UMTS</span>-Anbindung starten, sondern vorher im Büro starten und dann mit <span>UMTS</span> ins Auto tragen.</p>
+
+ <p>Bekannte Einschränkung 2: Die eigene Position in der Karte ist nicht weiter markiert, sondern nur durch das Zentrum der Karte dargestellt.</p>
+ </div>
+ </div>
+ <div class="comments">
+ <h3>Comments</h3>
+ <div class="comment">
+ <p>Niels Koch on 29 Apr, 2010:</p>
+ <div class="body">
+ <p>Dafür benötigt man eine <span>UMTS</span>-Karte im Laptop, richtig ?</p>
+ </div>
+ </div>
+ <div class="comment">
+ <p>Christian Stimming on 29 Apr, 2010:</p>
+ <div class="body">
+ <p>Wenn man Daten an den Server schicken will (und die Karte sehen will), braucht man eine Verbindung ins Internet. Das kann von unterwegs wohl nur via <span>UMTS</span>-Karte funktionieren, ja. (Oder <span>GSM</span>). Zum Testen und beim Herumlaufen im Büro oder -Nähe könnte man auch schon mit <span>WLAN</span> oder Kabel auskommen.</p>
+ </div>
+ </div>
+</div>
+
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/messages/32151822.html b/579651/C2C low_cost beacon/messages/32151822.html
new file mode 100644
index 0000000..bac5631
--- /dev/null
+++ b/579651/C2C low_cost beacon/messages/32151822.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - SP App Layout</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="message">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../messages.html">← Back to messages</a></p>
+ <div class="message">
+ <h3 class="title">
+ SP App Layout
+
+ </h3>
+ <p>Posted by Niels Koch on 5 May, 2010<br />
+ Category: Design</p>
+ <div class="body">
+ <p>Hier die Zusammenfassung der 3-Vorwärtsschritte der letzten Tage und Nächte:<br />
+Stand 5.5.10, <span class="caps">KON</span></p>
+
+ <p>Phone Start → App wird in Hintergrund geladen<br />
+HintergrundprozeÃ: Monitoring <span class="caps">GPS</span>-Valid Data und Funkzellenwechsel für dynamische Erkennung der Bewegung und Strom zu sparen.<br />
+>5min <span class="caps">GPS </span>Data invalid → <span class="caps">GPS</span> ausschalten<br />
+Handover Request → <span class="caps">GPS</span> einschalten</p>
+
+ <p>Wenn <span class="caps">GPS </span>Data valid, Start Game<br />
+Startbildschirm anzeigen<br />
+Frage User: Start Game ja/nein<br />
+Ja:<br />
+Auswahl der Bewegungsart:<br />
+FuÃgänger → Späher (Stone Age)<br />
+Radfahrer → Kurier (Middle Age)<br />
+Auto → Rocket Man (Industrial Age)<br />
+Hintergrund: Für jeden Bewegungstyp eigenen Score und Unterscheidung in Datenbank, wie Daten behandelt werden, um Fehlinformationen zu vermeiden.<br />
+Weitere Auswahl: Gruppenfahrt<br />
+Hintergrund: manchmal will man in einer Gruppe gegeneinander das Spiel spielen, wer kommt auf unterschiedlichen Wegen in direkten Vergleich schneller an. Wie man das genau macht, müssen wir noch aushandeln. Mögliches Feature für Zukunft.</p>
+
+ <p>Phone kontaktiert Server, meldet sich an. <br />
+Server berechnet nächste Updatezeit für das Phone, um Systemlast zu nivellieren<br />
+Formel: mittlere Speed der letzten 10 <span class="caps">GPS</span>-Punkte [in m/s] * Serverlast / Normallast + Zufallszahl(1…5 min).<br />
+Ergebnis: hohe Serverlast, längere Zeitdauer bis User sich wieder meldet, geringe Serverlast öfter Teilabschnitte eingesendet Zufallszahl verhindert, daà bei gleicher Prozessorlast und mittlerer Speed sich alle solche User zur gleichen Zeit wieder melden und dann wieder Last hochschnellt, somit zeitlich entzerrt wird.</p>
+
+ <p>Logge Daten der Bewegung bis User Game beendet; kein Logging wenn <span class="caps">GPS</span>-Daten invalid<br />
+Wenn Timer (den Server vorgegeben hat) abgelaufen, kontaktiere Server und sende <span class="caps">GPS</span>-Daten bis zu diesem Zeitpunkt und bekomme aktuelle Verkehrslage als Bild vom Server. <br />
+Server-Bild nach Formel: mittlere Speed letzten 10 <span class="caps">GPS</span>-Punkte [in m/s]* 5 min Fahrt<br />
+Ergebnis: minimal 2km Umkreis, 200km/h = 17km Umkreis, max. 20km Umkreis</p>
+
+ <p>Darstellung des Bildes, Phone stellt um Umkreisbild des Servers nur Ausschnitt abhängig von aktueller Geschwindigkeit dar. Schnelle Fahrt-> weit vorausblickend, langsame Fahrt → näher heran.<br />
+StraÃen mit hoher mittlerer Speed-> breitere Linien, langsame Speed-> schmale Linie<br />
+evtl. einfärben mit Farben, um weitere Unterscheidung zu erreichen.</p>
+
+ <p>Server Updates:<br />
+Wenn Taste: “Force Update Now” von User gedrückt<br />
+Wenn Position >80% des Server-Bildes erreicht hat (Kartenende)<br />
+Wenn Timer abgelaufen</p>
+
+ <p>Wenn Game beendet wird:<br />
+Game kann von User beendet werden → Menü-Punkt “Ende Game” <br />
+Wenn <span class="caps">GPS</span>-Data >5min invalid<br />
+Bei Beendigung: Abmeldung des Phones vom Server, Berechnung des End-Scores und Anzeige der Score-Liste<br />
+Wenn neuer Highscore, Glückwunsch-Popup<br />
+Beendigung der Aufzeichnung des Tracks<br />
+Frage, ob dieser Track in Favoriten-Liste gespeichert werden soll, um ggfs. Upload in Openstreetmap oder für Google-Maps Darstellung oder wenn gute Route zur Wiederfahrt gespeichert werden soll.<br />
+Ansonsten verwerfen des Tracks, Speicher wieder freigeben.<br />
+App geht in Schlafmodus und überwacht nur, <span class="caps">GPS</span>-Speed und Zellenwechsel → siehe Anfang</p>
+
+ <p>Gameplay:<br />
+Credits werden für jeden gefahrenen Kilometer gewährt, z.B. 1000 Credits (evtll. logarithmisch über Strecke 1,5,10,20,50,100). Da das Spiel als Ziel hat, möglichst schnell sein Ziel zu erreichen, wird ein Speed-Multiplikator eingeführt.<br />
+Formel: (meine_mittlere Speed – Server_mittlere Speed) / 10 + 1 für meine Speed>Server Speed<br />
+1-(Server_mittlere_Speed – meine_mittlere_Speed) /10 für Speed < Server_Speed<br />
+Ergebnis: fährt jemand 2 km im Mittel schneller als die im Server hinterlegte mittlere Speed in der Region, dann wird ein Faktor 1,2 * gefahrene Kilometer angewendet. Fährt jemand 10km langsamer, dann wird er in den Credits bestraft mit 0,1 * km<br />
+Sonderpunkte für neue Strecken, die nicht in der Datenbank enthalten ist: Bonus 10’000 Credits<br />
+Fahrstrecke zu einer neuen Zeit, die nicht in der Datenbank enthalten ist: Bonus 5’000 Credits<br />
+Scores:<br />
+mit jedem Serverupdate wird Zwischen-Score berechnet und aufsummiert. <br />
+Ende des Games: Endsstand der Credits.</p>
+
+ <p>Popups:<br />
+New Highscore<br />
+Bonus Creditis<br />
+Monster Popup für Fahrt in den Stau hinein – nix geht mehr<br />
+aktuelle Stauansicht → kann mit 8888 Credits gekauft werden oder wenn Bonus / new highscore erreicht, kann der User mal den aktuellen Stau sehen 30 sek lang.</p>
+ </div>
+ </div>
+ <div class="comments">
+ <p>There are no comments.</p>
+</div>
+
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/messages/32483570.html b/579651/C2C low_cost beacon/messages/32483570.html
new file mode 100644
index 0000000..1977930
--- /dev/null
+++ b/579651/C2C low_cost beacon/messages/32483570.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Literatur</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="message">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../messages.html">← Back to messages</a></p>
+ <div class="message">
+ <h3 class="title">
+ Literatur
+
+ </h3>
+ <p>Posted by Christian Stimming on 15 May, 2010<br />
+ Category: No category</p>
+ <div class="body">
+ <p>Für die Umsetzung einer Web-Applikation hat mich folgendes Buch sehr inspiriert: “Getting Real” von “37 Signals”, online zu Lesen hier: <a href="http://gettingreal.37signals.com/">http://gettingreal.37signals.com/</a></p>
+ </div>
+ </div>
+ <div class="comments">
+ <p>There are no comments.</p>
+</div>
+
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/messages/32623592.html b/579651/C2C low_cost beacon/messages/32623592.html
new file mode 100644
index 0000000..616f14e
--- /dev/null
+++ b/579651/C2C low_cost beacon/messages/32623592.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Web-Applikation im Browser funktioniert auch!</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="message">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../messages.html">← Back to messages</a></p>
+ <div class="message">
+ <h3 class="title">
+ Web-Applikation im Browser funktioniert auch!
+
+ </h3>
+ <p>Posted by Christian Stimming on 19 May, 2010<br />
+ Category: No category</p>
+ <div class="body">
+ <div>Anders als neulich im Telefonat vermutet, ist eine Implementierung als reine Web-Anwendung im Browser tatsächlich mit vertretbarem Aufwand möglich. Also: Man zücke sein GPS-fähiges Handy mit Browser und wähle folgende Webseite an:</div><div><br /></div><div><a href="http://carcomm.cstimming.de/map.html">http://carcomm.cstimming.de/map.html</a></div><div><br /></div><div>Sodann muss das Handy zunächst ca. 800 KByte Javascript laden und fragt nach, ob der Benutzer die eigene Position der Webseite mitteilen will. Wenn ja, geht es sofort los:<br /></div><ul><li>Die OpenStreetMap-Karte wird mit der eigenen Position in der Mitte angezeigt</li><li>Die bunten Wege aus der Datenbank werden geladen und eingetragen (z.Zt. noch ohne zeitliche Einschränkung, also erstmal alles, was in der Datenbank ist)</li><li>Alle 60 Sekunden wird die eigene Position und die vorige Position als neues Wegstück an die Datenbank geschickt.</li></ul><div>Dies funktioniert jedenfalls im Firefox am PC zuhause. Ich brauche dann Rückmeldungen aus anderen Browsern und natürlich aus den Browsern vom Handy: iPhone, Android, Nokia, whatnot.<br /></div>
+ </div>
+ </div>
+ <div class="comments">
+ <h3>Comments</h3>
+ <div class="comment">
+ <p>Christian Stimming on 19 May, 2010:</p>
+ <div class="body">
+ <div>(Beim Aufräumen habe ich zusätzlich noch sämtliche Wegstücke aus der Datenbank gelöscht, die ich seinerzeit aus OpenStreetMap-GPS-Traces rüberkopiert habe. Die hätten ja eventuell Lizenz-Auswirkungen gehabt. Aber jetzt sind sie alle wieder drauÃen und wir haben nur unsere eigenen Daten, über die wir dementsprechend auch alle Rechte haben.)<br /></div>
+ </div>
+ </div>
+ <div class="comment">
+ <p>Philippe Dreiling on 21 May, 2010:</p>
+ <div class="body">
+ <div>Hallo Christian, Hallo Niels,</div>
+<div><br /></div>
+<div>leider hat uns eine influenza am Anfang der Woche flachgelegt.</div>
+<div>Soweit wieder fit und auf dem Weg in den Urlaub.</div>
+<div>Kurz vorher noch ein paar Dinge vom Flughafen München :-)</div>
+<div><br /></div>
+<div>Ich werde zwei Beispiele hochladen, wie ich mir das Interface vorstelle.</div>
+<div>Ausserdem habe ich mit der Grafik Designer Freundin gesprochen.</div>
+<div>Sie kennt einen Spieleentwickler, der uns vielleicht weiterhelfen könnte, grafisch ist er allerdings nicht Oberklasse meinte sie :-)</div>
+<div><br /></div>
+<div>Habe Deine neue SW runtergeladen, und der Browserlink funktionierte bei mir auch, hatte aber kein GPS dran.</div>
+<div><br /></div>
+<div>Ciao Philippe</div>
+<div>Ab dem 7.7 wieder in München, ab und zu per Mail.</div>
+<div><br /></div>
+<div><br /></div>
+ </div>
+ </div>
+ <div class="comment">
+ <p>Christian Stimming on 22 May, 2010:</p>
+ <div class="body">
+ <div>Hallo Philippe, Niels, kurze Statusmeldung über diese Woche:<br /></div><ul><li> Von der Laptop-Software hatte ich letzten Montag die neue Version gemacht, die dann die von Philippe vorgeschlagenen Status-Anzeigen ("Grünes Licht") enthält.</li><li>Und dann habe ich herausgefunden, dass die bisherige Funktionalität auch über eine reine Javascript-Implementierung (d.h. eine Webseite im Browser) möglich ist - eben der Link oben. ABER: Die GPS-Position bekommt die Webseite nur auf einem Smartphone heraus, nicht auf einem Laptop. Die überraschenden Ergebnisse Funktionstest bei verschiedenen Bekannten: Auf dem iPhone funktioniert das sofort!!! Auf einem Android-Phone dagegen kommt zwar die Karte, aber die Abfrage der GPS-Position scheint noch nicht zu funktionieren. Auf einem Windows-Phone im Internet Explorer kommt die Fehlermeldung, dass Vektoren nicht angezeigt werden können, so dass also keine Wegstücke angezeigt werden können. Ein Windows-Phone mit Firefox oder Opera müsste noch getestet werden, ebenso ein Nokia/Symbian-Phone.</li></ul><div>Denkbar ist bei der Javascript/Webseiten-Lösung also nun auch, dass die grafische Darstellung Schritt für Schritt weiter in Richtung des Konphidense-Spiel umgebaut wird - und man hat das in den verschiedenen Phones dann sofort fertig.<br /></div>
+ </div>
+ </div>
+ <div class="comment">
+ <p>Christian Stimming on 22 May, 2010:</p>
+ <div class="body">
+ <div>Auf Philippes Bildern kann ich leider noch nicht so viel erkennen. Da brauche ich wohl noch die telefonische Erklärung.<br /></div>
+ </div>
+ </div>
+</div>
+
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/messages/32952781.html b/579651/C2C low_cost beacon/messages/32952781.html
new file mode 100644
index 0000000..b1be948
--- /dev/null
+++ b/579651/C2C low_cost beacon/messages/32952781.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Infos zum Stand Ende Mai</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="message">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../messages.html">← Back to messages</a></p>
+ <div class="message">
+ <h3 class="title">
+ Infos zum Stand Ende Mai
+
+ </h3>
+ <p>Posted by Niels Koch on 29 May, 2010<br />
+ Category: No category</p>
+ <div class="body">
+ <div>Hi Freunde,<br /></div><div>nach den Feiertagen, alle wieder an Board, hoffe ich.<br /></div><div>OK, also ich habe ein LG GW620 Android 1.5 Smartphone besorgt und gestern bekommen. Habe versucht, das Programm vom Christian zu installieren, aber leider vergebens.<br /></div><div>Christian, kannst Du mir da ein Tip geben, wie ich das dort zum laufen bringen kann ?</div><div><br /></div><div>Dann hatte ich anfang Mai nach unserer wilden Nachtsessions die Zusammenfassung der Ergebnisse hier eingestellt. Leider habe ich kein Feedback erhalten, ob ihr damit was anfangen konntet und ob das so als Game Sinn macht. Bitte mir hier nochmals irgendwas an den Kopf schmeiÃen...</div><div><br /></div><div>Nachdem ich das Phone habe, würde ich in die Testphase einsteigen wollen. Wäre alles bereit dafür ?</div><div><br /></div><div>Soweit schon mal ein schönes Wochenende,<br /></div><div>Niels<br /></div>
+ </div>
+ </div>
+ <div class="comments">
+ <h3>Comments</h3>
+ <div class="comment">
+ <p>Christian Stimming on 31 May, 2010:</p>
+ <div class="body">
+ <div>Hi Niels, danke für die Rückmeldung. Ich habe hier nicht so ganz den Ãberblick, wann wer von euch denn nun anwesend ist oder auf Reisen oder Urlaub... Zuletzt hatte ich vor gut 2 Wochen mit Philippe telefoniert und da auch darum gebeten, dass wir uns möglichst eine regelmäÃigere Kommunikation absprechen sollten.</div><div><br /></div><div>Jedenfalls die Zusammenfassung vom Mai: Da sind sehr interessante Ideen beschrieben und das klingt ganz toll. Allerdings ist die Zusammenfassung auch sehr komprimiert und einige Punkte sind für mich nicht so direkt verständlich. Deshalb hatte ich bisher davon abgesehen, da schriftlich drauf zu reagieren - wir sollten darüber am Telefon sprechen.</div><div><br /></div><div>Glückwunsch zum Android-Phone. Welches Programm meinst du zum installieren? Es gibt das eine hier auf den basecamp-Files, aber das ist nicht für Android, sondern nur für Windows-PCs. Und es gibt die Webseite <a href="http://carcomm.cstimming.de/map.html">http://carcomm.cstimming.de/map.html</a> aber da muss man nichts installieren sondern nur die Webseite aufrufen. Anzeigen tun beide die ähnlichen Daten, wobei die Webseite noch experimenteller ist und ich weià nur bei manchen Phones, wie sie da überhaupt aussieht. Auch hier: Am Telefon mal beschreiben, was wirklich zu sehen ist.</div><div><br /></div><div>Bis bald! Christian<br /></div>
+ </div>
+ </div>
+</div>
+
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/messages/33456316.html b/579651/C2C low_cost beacon/messages/33456316.html
new file mode 100644
index 0000000..eabde37
--- /dev/null
+++ b/579651/C2C low_cost beacon/messages/33456316.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Brandenburger-Polizei-testet-Open-Source-Navigationssystem</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="message">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../messages.html">← Back to messages</a></p>
+ <div class="message">
+ <h3 class="title">
+ Brandenburger-Polizei-testet-Open-Source-Navigationssystem
+
+ </h3>
+ <p>Posted by Philippe Dreiling on 14 Jun, 2010<br />
+ Category: No category</p>
+ <div class="body">
+ <div><a href="http://www.heise.de/newsticker/meldung/Brandenburger-Polizei-testet-Open-Source-Navigationssystem-945269.html">http://www.heise.de/newsticker/meldung/Brandenburger-Polizei-testet-Open-Source-Navigationssystem-945269.html</a></div>
+ </div>
+ </div>
+ <div class="comments">
+ <p>There are no comments.</p>
+</div>
+
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/messages/34448661.html b/579651/C2C low_cost beacon/messages/34448661.html
new file mode 100644
index 0000000..a5cdc3d
--- /dev/null
+++ b/579651/C2C low_cost beacon/messages/34448661.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Ãnderungen: Basecamp schlieÃen, Android weiterprogrammieren</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="message">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../messages.html">← Back to messages</a></p>
+ <div class="message">
+ <h3 class="title">
+ Ãnderungen: Basecamp schlieÃen, Android weiterprogrammieren
+
+ </h3>
+ <p>Posted by Christian Stimming on 14 Jul, 2010<br />
+ Category: No category</p>
+ <div class="body">
+ <div>Hallo Niels + Philippe, ich möchte für's Projekt ein paar Sachen ändern, aber weiterhin in Richtung App weitermachen.</div><div><br /></div><div>Und zwar möchte ich 1. die basecamp-Seite hier schlieÃen, denn die kostet mich 28 Dollar im Monat und das ist mir zuviel, da wir die Seite ja doch nur gelegentlich nutzen. Es wäre die Frage, wo wir dann das "File Sharing" stattdessen machen können, um neue Releases und/oder Dokumente und Fotos miteinander austauschen können. @Philippe: Du sagtest was von einem wiki bei einem Bekannten - das wäre vielleicht die einfachere und z.Zt. billigere Möglichkeit.</div><div><br /></div><div>Den Sourcecode habe ich weiterhin auf "github.com" in einem privaten Repository gehostet und es gilt weiterhin die Einladung, dass ich euch da ebenfalls Leserechte für geben würde, wie hier beschrieben:<br /></div><div><a href="https://citytraffic.basecamphq.com/projects/4614845/posts/30986337/comments">https://citytraffic.basecamphq.com/projects/4614845/posts/30986337/comments</a></div><div><br /></div><div>Desweiteren hab ich mir 2. tatsächlich ein vodafone 845 Android-Handy gekauft (gerade heute). Da werde ich also demnächst wirklich sehen, was eine App so ausmacht und dann in den nächsten Wochen was sinnvolles hinbekommen. @Niels: Trotzdem müsstest du es irgendwie schon mit der Hello-World-App von neulich schaffen, die .apk-Datei von deinem Computer als App auf dem Phone zu installieren, denn das wird auf absehbare Zeit die einzige Weise sein, wie ich euch meine App-Fortschritte schicke.</div><div><br /></div><div>Und 3. ich würde gerne mal wieder eine Telco machen. Das geht z.B. heute oder morgen abend ab 20:30 Uhr.</div><div><br /></div><div>GruÃ, Christian<br /></div>
+ </div>
+ </div>
+ <div class="comments">
+ <h3>Comments</h3>
+ <div class="comment">
+ <p>Philippe Dreiling on 15 Jul, 2010:</p>
+ <div class="body">
+ <p>Hi Christian,</p>
+
+ <p>da ich die Mail gestern verpasst habe, sollten wir heute abend eine Telco machen. Ich bin dabei ab 20:30, Niels rufst Du uns an?</p>
+
+ <p>Bzgl Basecamp bin ich Deiner Meinung, aber wie bekommen wir die Imfos wieder runter? Gibt es eine Export Funktion? Nenn uns mal ein Datum bis zu dem wir das Zeug kopiert haben müssen, ohne dass es Dich noch mehr Kohle kostet.</p>
+
+ <p>Ciao Philippe</p>
+
+ <p>2010/7/14 Christian Stimming </p>
+ </div>
+ </div>
+</div>
+
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/milestones.html b/579651/C2C low_cost beacon/milestones.html
new file mode 100644
index 0000000..3dbd75c
--- /dev/null
+++ b/579651/C2C low_cost beacon/milestones.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - All milestones</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../html_exports/html_exports.css">
+ </head>
+ <body class="milestones">
+ <p class="back_to_projects"><a href="../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav">
+ <a href="messages.html">Messages</a>
+ |
+ <a href="todo_lists.html">To-Do Lists</a>
+ |
+ <strong>Milestones</strong>
+ |
+ <a href="time_entries.html">Time Entries</a>
+ |
+ <a href="people.html">People</a>
+ </p>
+ <h3>Completed milestones</h3>
+ <ul class="milestones">
+ <li class="milestone">
+ <strong>26 Apr, 2010</strong> — niels is back
+ <span class="comments">(<a href="milestones/14187296.html">1 comment</a>)</span>
+ <br />
+ <span class="responsible">
+ Completed
+ by Niels Koch
+ </span>
+</li>
+
+ </ul>
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/milestones/14187296.html b/579651/C2C low_cost beacon/milestones/14187296.html
new file mode 100644
index 0000000..a57bb92
--- /dev/null
+++ b/579651/C2C low_cost beacon/milestones/14187296.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - niels is back</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="milestone">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../milestones.html">← Back to milestones</a></p>
+ <h3>Completed milestone</h3>
+ <div class="body">
+ <p><strong>26 Apr, 2010</strong> — niels is back<br />
+ <span class="responsible">
+ Completed
+ by Niels Koch
+ </span>
+ </p>
+ </div>
+ <div class="comments">
+ <h3>Comments</h3>
+ <div class="comment">
+ <p>Niels Koch on 26 Apr, 2010:</p>
+ <div class="body">
+ <p>yes I am back. <br />
+So lets go – better: run !<br />
+Aufgehts Buam !<br />
+Niels</p>
+ </div>
+ </div>
+</div>
+
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/people.html b/579651/C2C low_cost beacon/people.html
new file mode 100644
index 0000000..9e06049
--- /dev/null
+++ b/579651/C2C low_cost beacon/people.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - All people</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../html_exports/html_exports.css">
+ </head>
+ <body>
+ <p class="back_to_projects"><a href="../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav">
+ <a href="messages.html">Messages</a>
+ |
+ <a href="todo_lists.html">To-Do Lists</a>
+ |
+ <a href="milestones.html">Milestones</a>
+ |
+ <a href="time_entries.html">Time Entries</a>
+ |
+ <strong>People</strong>
+ </p>
+ <div class="companies">
+ <h3 class="company">citytraffic</h3>
+ <div class="company">
+
+ <div class="people_column">
+ <p><strong>citytraffic</strong><br />
+ <div class="street-address"></div><div class="extended-address"></div><div> <span class="country-name"></span></div>
+
+
+
+ </p>
+
+ </div>
+ <div class="people_column">
+ <div class="person">
+ <p><strong>Christian Stimming</strong><br />
+
+ <a href="mailto:[email protected]" class="email">[email protected]</a><br />
+
+
+ <span class="label tel"><abbr class="type" title="Mobile">M</abbr>: <span class="value">0172-4195232</span></span><br />
+ <span class="label tel"><abbr class="type" title="Home">H</abbr>: <span class="value">040-32871772</span></span><br />
+
+ Basecamp account owner
+ </p>
+</div>
+
+
+ </div>
+ <div class="people_column">
+ <div class="person">
+ <p><strong>Philippe Dreiling</strong><br />
+
+ <a href="mailto:[email protected]" class="email">[email protected]</a><br />
+
+ <span class="label tel"><abbr class="type" title="Office">O</abbr>: <span class="value">089-2554714518</span></span><br />
+ <span class="label tel"><abbr class="type" title="Mobile">M</abbr>: <span class="value">0174 9298624</span></span><br />
+ <span class="label tel"><abbr class="type" title="Home">H</abbr>: <span class="value">089-23548630</span></span><br />
+
+ </p>
+</div>
+
+
+ </div>
+ <div class="people_column">
+ <div class="person">
+ <p><strong>Niels Koch</strong><br />
+
+ <a href="mailto:[email protected]" class="email">[email protected]</a><br />
+
+
+
+
+
+ </p>
+</div>
+
+
+ </div>
+
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/time_entries.html b/579651/C2C low_cost beacon/time_entries.html
new file mode 100644
index 0000000..8f797a3
--- /dev/null
+++ b/579651/C2C low_cost beacon/time_entries.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Time tracking report</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../html_exports/html_exports.css">
+ </head>
+ <body class="time_entries">
+ <p class="back_to_projects"><a href="../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav">
+ <a href="messages.html">Messages</a>
+ |
+ <a href="todo_lists.html">To-Do Lists</a>
+ |
+ <a href="milestones.html">Milestones</a>
+ |
+ <strong>Time Entries</strong>
+ |
+ <a href="people.html">People</a>
+ </p>
+ <p>This project has no time entries.</p>
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/todo_items/54527241.html b/579651/C2C low_cost beacon/todo_items/54527241.html
new file mode 100644
index 0000000..a8b64a9
--- /dev/null
+++ b/579651/C2C low_cost beacon/todo_items/54527241.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Hochlademöglichkeit für Raw NMEA-Datei auf dem Server anbieten</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="todo">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../todo_lists.html">← Back to Webserver-Implementierung</a></p>
+
+ <h3>
+ Completed
+ to-do item
+ </h3>
+
+ <ul>
+ <li>
+ 1 May, 2010 —
+
+ <strong>Christian Stimming:</strong>
+ Hochlademöglichkeit für Raw NMEA-Datei auf dem Server anbieten
+ </li>
+ </ul>
+ <div class="comments">
+ <h3>Comments</h3>
+ <div class="comment">
+ <p>Christian Stimming on 18 Apr, 2010:</p>
+ <div class="body">
+ <p>Allerdings kann man <span>NMEA</span> nach <span>GPX</span> konvertieren mit dem kostenlosen / freien Tool “gpsbabel” <a href="http://www.gpsbabel.org/">http://www.gpsbabel.org/</a> und das <span>GPX</span> dann hochladen.</p>
+ </div>
+ </div>
+</div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/579651/C2C low_cost beacon/todo_lists.html b/579651/C2C low_cost beacon/todo_lists.html
new file mode 100644
index 0000000..ee3c144
--- /dev/null
+++ b/579651/C2C low_cost beacon/todo_lists.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - All to-do lists</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../html_exports/html_exports.css">
+ </head>
+ <body class="todos">
+ <p class="back_to_projects"><a href="../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav">
+ <a href="messages.html">Messages</a>
+ |
+ <strong>To-Do Lists</strong>
+ |
+ <a href="milestones.html">Milestones</a>
+ |
+ <a href="time_entries.html">Time Entries</a>
+ |
+ <a href="people.html">People</a>
+ </p>
+ <div class="todo_lists">
+ <h3>Outstanding to-do lists</h3>
+ <ul>
+ <li>
+ <a href="todo_lists/9076601.html">Zeitplan</a>
+
+ </li>
+ <li>
+ <a href="todo_lists/9076574.html">Spezifikationen</a>
+
+ </li>
+ <li>
+ <a href="todo_lists/9076554.html">Roadmap</a>
+
+ </li>
+ <li>
+ <a href="todo_lists/8737253.html">Android-App Implementierung</a>
+
+ </li>
+ </ul>
+
+ <h3>Completed to-do lists</h3>
+ <ul>
+ <li>
+ <a href="todo_lists/9272910.html">Web-App erstellen</a>
+
+ </li>
+ <li>
+ <a href="todo_lists/8858776.html">Laptop-Client implementieren</a>
+
+ </li>
+ <li>
+ <a href="todo_lists/8737226.html">Webserver-Implementierung</a>
+
+ </li>
+ </ul>
+ </div>
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/todo_lists/8737226.html b/579651/C2C low_cost beacon/todo_lists/8737226.html
new file mode 100644
index 0000000..7bc44d7
--- /dev/null
+++ b/579651/C2C low_cost beacon/todo_lists/8737226.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Webserver-Implementierung</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="todo">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../todo_lists.html">← Back to to-do lists</a></p>
+ <div class="todo_list">
+ <h2>
+ Webserver-Implementierung
+
+ </h2>
+ <p><i>Für eine C2C-"Simulation" wird ein zentraler Webserver angelegt, der die Informationsvermittlung zwischen den C2C-Smartphones übernimmt. Der Webserver dienst hier zur Simulation der späteren direkten C2C-Kommunikation. Zusätzlich sollte das Web-Interface von Ruby-on-Rails auch ausreichend sein, um für Demo- und Kontrollzwecke sich die Daten am PC anzusehen.</i></p>
+ <div class="items">
+ <p class="label">
+ No outstanding items.</p>
+ <div class="completed">
+ <p class="label">
+ Completed items:</p>
+ <ul class="todo_items">
+ <li class="completed">
+ <span class="date"> 1 May, 2010 — </span>
+ <span class="content">
+ <strong>Christian Stimming:</strong>
+ Hochlademöglichkeit für Raw NMEA-Datei auf dem Server anbieten
+ </span>
+
+ <span class="comments">
+ (<a href="../todo_items/54527241.html">1 comment</a>)
+ </span>
+ </li>
+ <li class="completed">
+ <span class="date">12 Apr, 2010 — </span>
+ <span class="content">
+ <strong>Christian Stimming:</strong>
+ Hochlademöglichkeit für GPX-Datei auf dem Server anbieten
+ </span>
+
+ </li>
+ <li class="completed">
+ <span class="date"> 6 Apr, 2010 — </span>
+ <span class="content">
+ Abfragemöglichkeit mit den relevanten Kriterien: Zeitintervall, Entfernungsfenster
+ </span>
+
+ </li>
+ <li class="completed">
+ <span class="date"> 5 Apr, 2010 — </span>
+ <span class="content">
+ Hochlade-Möglichkeit für Inhalt von GPX-Dateien zwecks Beispieldaten
+ </span>
+
+ </li>
+ <li class="completed">
+ <span class="date"> 4 Apr, 2010 — </span>
+ <span class="content">
+ Linien über OSM-Karte mit Farbe entsprechend Geschwindigkeit
+ </span>
+
+ </li>
+ <li class="completed">
+ <span class="date"> 3 Apr, 2010 — </span>
+ <span class="content">
+ Grafische Präsentation des Datenbankinhalts: Linien über OSM-Karte zeichnen
+ </span>
+
+ </li>
+ <li class="completed">
+ <span class="date">31 Mar, 2010 — </span>
+ <span class="content">
+ Webhosting-Ort finden bzw. entscheiden
+ </span>
+
+ </li>
+ <li class="completed">
+ <span class="date">29 Mar, 2010 — </span>
+ <span class="content">
+ Einfache Rails-Weboberfläche, die den Datenbankinhalt als Tabelle anzeigt
+ </span>
+
+ </li>
+ <li class="completed">
+ <span class="date">29 Mar, 2010 — </span>
+ <span class="content">
+ Datenbankmodell entwerfen für die Informationsschnipsel, die von den Clients kommen
+ </span>
+
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/todo_lists/8737253.html b/579651/C2C low_cost beacon/todo_lists/8737253.html
new file mode 100644
index 0000000..0c27d53
--- /dev/null
+++ b/579651/C2C low_cost beacon/todo_lists/8737253.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Android-App Implementierung</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="todo">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../todo_lists.html">← Back to to-do lists</a></p>
+ <div class="todo_list">
+ <h2>
+ Android-App Implementierung
+
+ </h2>
+ <p><i>Auf einem Android-Smartphone soll die aktuelle Bewegung getrackt werden, an den Server geschickt werden und die Antwort vom Server entgegengenommen werden.</i></p>
+ <div class="items">
+ <p class="label">
+ Outstanding items:</p>
+ <ul class="todo_items">
+ <li>
+ <span class="content">
+ Eigene GPS-Tracking Applikation implementieren, http://developer.android.com/guide/topics/location/index.html
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ Aus GPS-Tracking die Wegstücke ("slices") an Serverimplementierung schicken
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ <strong>Christian Stimming:</strong>
+ Karte um eigene GPS-Position mit Ergebnisliste anzeigen, wie bei Laptop-Client
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ Eigene Position in Karte einzeichnen
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ Grafische Präsentation: Ideen sammeln
+ </span>
+ </li>
+ </ul>
+ <div class="completed">
+ <p class="label">
+ Completed items:</p>
+ <ul class="todo_items">
+ <li class="completed">
+ <span class="date"> 8 Apr, 2010 — </span>
+ <span class="content">
+ Android Tutorial Hello-World durcharbeiten http://developer.android.com/resources/tutorials/hello-world.html
+ </span>
+
+ </li>
+ <li class="completed">
+ <span class="date"> 6 Apr, 2010 — </span>
+ <span class="content">
+ Einen der Open Source GPS-Tracker im Emulator zum Laufen bringen
+ </span>
+
+ </li>
+ <li class="completed">
+ <span class="date">31 Mar, 2010 — </span>
+ <span class="content">
+ Android-SDK und -Emulator installieren
+ </span>
+
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/todo_lists/8858776.html b/579651/C2C low_cost beacon/todo_lists/8858776.html
new file mode 100644
index 0000000..cac9475
--- /dev/null
+++ b/579651/C2C low_cost beacon/todo_lists/8858776.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Laptop-Client implementieren</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="todo">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../todo_lists.html">← Back to to-do lists</a></p>
+ <div class="todo_list">
+ <h2>
+ Laptop-Client implementieren
+
+ </h2>
+ <p><i>Die Funktionalität des Smartphones auch für eine Laptop-Anwendung implementieren: Daten aufzeichnen, Daten hochladen, Karte darstellen. Programmiersprache C++/Qt, weil ich da am schnellsten drin bin. Für Installation ein self-contained installer mit C++/Qt notwendig. Primär für Windows, zusätzlich auch Linux. Logging ist hier nicht (mehr) vorgesehen; dafür genügen einfachere Tools, z.B. Sirfdemo http://www.falcom.de/support/software-tools/sirf/</i></p>
+ <div class="items">
+ <p class="label">
+ No outstanding items.</p>
+ <div class="completed">
+ <p class="label">
+ Completed items:</p>
+ <ul class="todo_items">
+ <li class="completed">
+ <span class="date"> 5 May, 2010 — </span>
+ <span class="content">
+ <strong>Christian Stimming:</strong>
+ Replay-Modus: GPX- oder NMEA-Datei abspielen, um die Live-Bewegung zu simulieren
+ </span>
+
+ </li>
+ <li class="completed">
+ <span class="date">29 Apr, 2010 — </span>
+ <span class="content">
+ <strong>Christian Stimming:</strong>
+ Aktuelle GPS-Positon an carcomm-Server schicken
+ </span>
+
+ </li>
+ <li class="completed">
+ <span class="date">18 Apr, 2010 — </span>
+ <span class="content">
+ <strong>Christian Stimming:</strong>
+ Ergebnisliste vom carcomm-Server in Karte einzeichnen
+ </span>
+
+ </li>
+ <li class="completed">
+ <span class="date">18 Apr, 2010 — </span>
+ <span class="content">
+ <strong>Christian Stimming:</strong>
+ Karte um eigene GPS-Position herum anzeigen
+ </span>
+
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/todo_lists/9076554.html b/579651/C2C low_cost beacon/todo_lists/9076554.html
new file mode 100644
index 0000000..a71ddef
--- /dev/null
+++ b/579651/C2C low_cost beacon/todo_lists/9076554.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Roadmap</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="todo">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../todo_lists.html">← Back to to-do lists</a></p>
+ <div class="todo_list">
+ <h2>
+ Roadmap
+
+ </h2>
+ <div class="items">
+ <p class="label">
+ Outstanding items:</p>
+ <ul class="todo_items">
+ <li>
+ <span class="content">
+ <strong>citytraffic:</strong>
+ Verfeinerung der neuen Roadmap
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ <strong>citytraffic:</strong>
+ Verabschiedung als Meilenstein Roadmap
+ </span>
+ </li>
+ </ul>
+ <div class="completed">
+ <p class="label">
+ Completed items:</p>
+ <ul class="todo_items">
+ <li class="completed">
+ <span class="date">29 Apr, 2010 — </span>
+ <span class="content">
+ Vorschlag zur neuen Roadmap
+ </span>
+
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/todo_lists/9076574.html b/579651/C2C low_cost beacon/todo_lists/9076574.html
new file mode 100644
index 0000000..d46d8b6
--- /dev/null
+++ b/579651/C2C low_cost beacon/todo_lists/9076574.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Spezifikationen</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="todo">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../todo_lists.html">← Back to to-do lists</a></p>
+ <div class="todo_list">
+ <h2>
+ Spezifikationen
+
+ </h2>
+ <p><i>Spezifikationen zur Erstellung der Apps und der Serveranwendung</i></p>
+ <div class="items">
+ <p class="label">
+ Outstanding items:</p>
+ <ul class="todo_items">
+ <li>
+ <span class="content">
+ <strong>citytraffic:</strong>
+ Gesamtarchitektur überdenken und fixieren
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ <strong>citytraffic:</strong>
+ Feature List erstellen
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ <strong>citytraffic:</strong>
+ Spezifikation für App (Android) als Game erstellen
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ <strong>citytraffic:</strong>
+ Anforderungen an Server und Features erstellen
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ <strong>citytraffic:</strong>
+ Load und Traffic des Servers prüfen, ggfs.Optimierung
+ </span>
+ </li>
+ </ul>
+ <div class="completed">
+ <p class="label">
+ No completed items.</p>
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/todo_lists/9076601.html b/579651/C2C low_cost beacon/todo_lists/9076601.html
new file mode 100644
index 0000000..93f44d3
--- /dev/null
+++ b/579651/C2C low_cost beacon/todo_lists/9076601.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Zeitplan</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="todo">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../todo_lists.html">← Back to to-do lists</a></p>
+ <div class="todo_list">
+ <h2>
+ Zeitplan
+
+ </h2>
+ <p><i>Hier ist ein vorläufiger Zeitplan</i></p>
+ <div class="items">
+ <p class="label">
+ Outstanding items:</p>
+ <ul class="todo_items">
+ <li>
+ <span class="content">
+ <strong>citytraffic:</strong>
+ Systemarchitektur fixieren
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ <strong>citytraffic:</strong>
+ Feature List und Anforderungen für App + Server erstellen
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ <strong>Christian Stimming:</strong>
+ App programmieren und Server aufsetzen
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ <strong>citytraffic:</strong>
+ Beschaffung von Smartphones
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ <strong>citytraffic:</strong>
+ Testphase Alpha in kleinen Kreis mit beschafften Smartphones. Ermittlung der Batterielebensdauer, Stabilität der App und des Servers, Mehrfachzugriff auf GPS-Infos im Phone, Mehrfachzugriff auf Server, Load und Speed vom Server
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ <strong>citytraffic:</strong>
+ Feedback der Tester und Liste der Optimierungen
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ <strong>Christian Stimming:</strong>
+ Implementierung der Optimierungen
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ <strong>citytraffic:</strong>
+ Beta Test mit ausgewählten Usern 2 Wochen
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ <strong>citytraffic:</strong>
+ Vorbereitung für App-Store Upload, Ãberprüfung des Servers, Tarif- und Marketing MaÃnahmen finalisieren
+ </span>
+ </li>
+ <li>
+ <span class="content">
+ <strong>citytraffic:</strong>
+ Launch im Appstore am 1.Juli 2010; Big Milestone
+ </span>
+ </li>
+ </ul>
+ <div class="completed">
+ <p class="label">
+ No completed items.</p>
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/579651/C2C low_cost beacon/todo_lists/9272910.html b/579651/C2C low_cost beacon/todo_lists/9272910.html
new file mode 100644
index 0000000..8ef581d
--- /dev/null
+++ b/579651/C2C low_cost beacon/todo_lists/9272910.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>C2C low-cost beacon - Web-App erstellen</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="../../html_exports/html_exports.css">
+ </head>
+ <body class="todo">
+ <p class="back_to_projects"><a href="../../projects.html">← Back to the list of projects</a></p>
+ <div class="header">
+ <h2>C2C low-cost beacon — citytraffic</h2>
+</div>
+
+ <p class="nav"><a href="../todo_lists.html">← Back to to-do lists</a></p>
+ <div class="todo_list">
+ <h2>
+ Web-App erstellen
+
+ </h2>
+ <p><i>Eine Realisierung über eine reine Web-App ist eventuell doch möglich. Man bekommt die aktuelle GPS-Position via javascript hierdurch: http://code.google.com/p/geo-location-javascript/</i></p>
+ <div class="items">
+ <p class="label">
+ No outstanding items.</p>
+ <div class="completed">
+ <p class="label">
+ Completed items:</p>
+ <ul class="todo_items">
+ <li class="completed">
+ <span class="date">19 May, 2010 — </span>
+ <span class="content">
+ Webseite mit Karte und GPS-Slice-Senden erstellen
+ </span>
+
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/579651/README.txt b/579651/README.txt
new file mode 100644
index 0000000..a27cb84
--- /dev/null
+++ b/579651/README.txt
@@ -0,0 +1,14 @@
+This Basecamp export was created on 15 Jul, 2010
+for the account:
+
+ citytraffic
+ https://citytraffic.basecamphq.com
+
+
+TO VIEW THE EXPORT:
+Open the file named 'projects.html' in your web browser.
+
+
+--
+Do you have questions about Basecamp? Please visit our support
+site at http://basecamphq.com/help/
diff --git a/579651/html_exports/html_exports.css b/579651/html_exports/html_exports.css
new file mode 100644
index 0000000..974c215
--- /dev/null
+++ b/579651/html_exports/html_exports.css
@@ -0,0 +1,120 @@
+body {
+ background: #fff;
+ font-family: helvetica, arial, sans-serif;
+ margin: 0 20px;
+}
+
+a:link, a:visited {
+ color: blue;
+}
+
+p.back_to_projects {
+ font-size: 80%;
+}
+
+p.back_to_projects a:link,
+p.back_to_projects a:visited {
+ color: #666;
+}
+
+div.header {
+}
+
+div.nav {
+ border-bottom: 1px solid #000;
+}
+
+p.nav {
+ padding-bottom: 1em;
+ border-bottom: 1px solid #000;
+}
+
+span.comments {
+ font-size: 80%;
+ color: #666;
+}
+
+div.comments {
+ border-top: 1px dashed #999;
+}
+
+div.comments div.comment {
+ border-bottom: 1px dashed #999;
+}
+
+div.body {
+ padding-left: 2em;
+}
+
+table.index {
+ margin: 1em 0;
+}
+
+table.index th {
+ text-align: left;
+ padding-right: 1em;
+}
+
+table.index td {
+ padding-right: 1em;
+}
+
+span.private {
+ font-weight: normal;
+ color: #c00;
+ font-size: 80%;
+}
+
+body.todo p.label {
+ margin-bottom: 0.5em;
+}
+
+body.todo ul {
+ margin-top: 0;
+ margin-bottom: 1.5em;
+}
+
+body.todo div.todo_list {
+ border-bottom: 1px dashed #999;
+}
+
+body.milestones li.milestone {
+ margin-bottom: 0.5em;
+}
+
+body.milestones li.milestone span.responsible,
+body.milestone div.body span.responsible {
+ font-size: 80%;
+}
+
+body.time_entries table.index {
+ border-collapse: collapse;
+}
+
+body.time_entries table.index td {
+ border-top: 1px solid #ddd;
+ vertical-align: top;
+ padding: 0.5em 1em 0.5em 0;
+}
+
+body.projects div.project_status_group {
+ border-bottom: 1px dashed #999;
+}
+
+div.people_column {
+ width: 25%;
+ float: left;
+}
+
+div.company {
+ font-size: 80%;
+ padding-bottom: 2em;
+ margin-left: 0.75em;
+ overflow: hidden;
+}
+
+h3.company {
+ background: #ccc;
+ padding: 0.25em 0.5em;
+ margin: 0;
+}
diff --git a/579651/people.html b/579651/people.html
new file mode 100644
index 0000000..36a69c2
--- /dev/null
+++ b/579651/people.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>citytraffic - All people</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="html_exports/html_exports.css">
+ </head>
+ <body>
+ <h2>citytraffic</h2>
+ <p class="nav">
+ <a href="projects.html">Projects</a>
+ |
+ <a href="time_entries.html">Time Entries</a>
+ |
+ <strong>All People</strong>
+ </p>
+ <div class="companies">
+ <h3 class="company">citytraffic</h3>
+ <div class="company">
+
+ <div class="people_column">
+ <p><strong>citytraffic</strong><br />
+ <div class="street-address"></div><div class="extended-address"></div><div> <span class="country-name"></span></div>
+
+
+
+ </p>
+
+ </div>
+ <div class="people_column">
+ <div class="person">
+ <p><strong>Christian Stimming</strong><br />
+
+ <a href="mailto:[email protected]" class="email">[email protected]</a><br />
+
+
+ <span class="label tel"><abbr class="type" title="Mobile">M</abbr>: <span class="value">0172-4195232</span></span><br />
+ <span class="label tel"><abbr class="type" title="Home">H</abbr>: <span class="value">040-32871772</span></span><br />
+
+ Basecamp account owner
+ </p>
+</div>
+
+
+ </div>
+ <div class="people_column">
+ <div class="person">
+ <p><strong>Philippe Dreiling</strong><br />
+
+ <a href="mailto:[email protected]" class="email">[email protected]</a><br />
+
+ <span class="label tel"><abbr class="type" title="Office">O</abbr>: <span class="value">089-2554714518</span></span><br />
+ <span class="label tel"><abbr class="type" title="Mobile">M</abbr>: <span class="value">0174 9298624</span></span><br />
+ <span class="label tel"><abbr class="type" title="Home">H</abbr>: <span class="value">089-23548630</span></span><br />
+
+ </p>
+</div>
+
+
+ </div>
+ <div class="people_column">
+ <div class="person">
+ <p><strong>Niels Koch</strong><br />
+
+ <a href="mailto:[email protected]" class="email">[email protected]</a><br />
+
+
+
+
+
+ </p>
+</div>
+
+
+ </div>
+
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/579651/projects.html b/579651/projects.html
new file mode 100644
index 0000000..9bdb454
--- /dev/null
+++ b/579651/projects.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>citytraffic - Projects</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="html_exports/html_exports.css">
+ </head>
+ <body class="projects">
+ <h2>citytraffic</h2>
+ <p class="nav">
+ <strong>Projects</strong>
+ |
+ <a href="time_entries.html">Time Entries</a>
+ |
+ <a href="people.html">All People</a>
+ </p>
+
+ <div class="project_status_group">
+ <p><i>
+ Active projects
+ </i></p>
+
+ <p><strong>citytraffic</strong><br />
+ <a href="C2C low_cost beacon/messages.html">C2C low-cost beacon</a><br />
+ </p>
+
+ </div>
+
+ <div class="project_status_group">
+ <p><i>
+ No projects on hold
+ </i></p>
+ </div>
+
+ <div class="project_status_group">
+ <p><i>
+ No archived projects
+ </i></p>
+ </div>
+
+ </body>
+</html>
diff --git a/579651/time_entries.csv b/579651/time_entries.csv
new file mode 100644
index 0000000..f763049
--- /dev/null
+++ b/579651/time_entries.csv
@@ -0,0 +1 @@
+date,person,hours,description,todo,list,company,project
diff --git a/579651/time_entries.html b/579651/time_entries.html
new file mode 100644
index 0000000..8dfe779
--- /dev/null
+++ b/579651/time_entries.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>citytraffic - All people</title>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="html_exports/html_exports.css">
+ </head>
+ <body>
+ <h2>citytraffic</h2>
+ <p class="nav">
+ <a href="projects.html">Projects</a>
+ |
+ <strong>Time Entries</strong>
+ |
+ <a href="people.html">All People</a>
+ </p>
+
+ <p>This account has no time entries.</p>
+ </body>
+</html>
|
cstim/carcomm
|
ed61c20d5c6947e190bb1602b607212f92b3b882
|
Add new table columns for accuracy and instance id.
|
diff --git a/webapp/app/views/slices/_form.html.erb b/webapp/app/views/slices/_form.html.erb
index 1cd4958..009a39e 100644
--- a/webapp/app/views/slices/_form.html.erb
+++ b/webapp/app/views/slices/_form.html.erb
@@ -1,43 +1,59 @@
<% form_for(@slice) do |f| %>
<%= f.error_messages %>
<p>
<%= f.label :time %><br />
<%= f.datetime_select :time %>
</p>
+ <p>
+ <%= f.label :startlat %> [deg]<br />
+ <%= f.text_field :startlat %>
+ </p>
+ <p>
+ <%= f.label :startlon %> [deg]<br />
+ <%= f.text_field :startlon %>
+ </p>
<p>
End Lat [deg]<br />
<%= f.text_field :lat %>
</p>
<p>
End Lon [deg]<br />
<%= f.text_field :lon %>
</p>
<p>
<%= f.label :avgvel %> [m/s]<br />
<%= f.text_field :avgvel %>
</p>
<p>
<%= f.label :headingdeg %> [deg], optional<br />
<%= f.text_field :headingdeg %>
</p>
<p>
<%= f.label :dist %> [m], optional<br />
<%= f.text_field :dist %>
</p>
<p>
<%= f.label :duration %> [s], optional<br />
<%= f.text_field :duration %>
</p>
<p>
- <%= f.label :startlat %> [deg]<br />
- <%= f.text_field :startlat %>
+ <%= f.label :startaccuracy %> [m], optional<br />
+ <%= f.text_field :startaccuracy %>
</p>
<p>
- <%= f.label :startlon %> [deg]<br />
- <%= f.text_field :startlon %>
+ <%= f.label :endaccuracy %> [m], optional<br />
+ <%= f.text_field :endaccuracy %>
+ </p>
+ <p>
+ <%= f.label :instanceid %>, optional<br />
+ <%= f.text_field :instanceid %>
+ </p>
+ <p>
+ <%= f.label :categoryid %>, optional<br />
+ <%= f.text_field :categoryid %>
</p>
<p>
<%= f.submit "Save" %>
</p>
<% end %>
diff --git a/webapp/app/views/slices/index.html.erb b/webapp/app/views/slices/index.html.erb
index a9eca0f..82ae1b4 100644
--- a/webapp/app/views/slices/index.html.erb
+++ b/webapp/app/views/slices/index.html.erb
@@ -1,43 +1,51 @@
<h1>Listing slices</h1>
<%= will_paginate @posts %>
<table>
<tr>
<th>Time</th>
+ <th>Start Lat [deg]</th>
+ <th>Start Lon [deg]</th>
<th>End Lat [deg]</th>
<th>End Lon [deg]</th>
<th>Avgvel [m/s]</th>
<th>Headingdeg [deg]</th>
<th>Dist [m]</th>
<th>Duration [s]</th>
- <th>Start Lat [deg]</th>
- <th>Start Lon [deg]</th>
+ <th>Start Accuracy [m]</th>
+ <th>End Accuracy [m]</th>
+ <th>Instance Id</th>
+ <th>Category</th>
</tr>
<% for slice in @slices %>
<tr>
<td><%=h slice.time %></td>
+ <td><%=h slice.startlat %></td>
+ <td><%=h slice.startlon %></td>
<td><%=h slice.lat %></td>
<td><%=h slice.lon %></td>
<td><%=h slice.avgvel %></td>
<td><%=h slice.headingdeg %></td>
<td><%=h slice.dist %></td>
<td><%=h slice.duration %></td>
- <td><%=h slice.startlat %></td>
- <td><%=h slice.startlon %></td>
+ <td><%=h slice.startaccuracy %></td>
+ <td><%=h slice.endaccuracy %></td>
+ <td><%=h slice.instanceid %></td>
+ <td><%=h slice.categoryid %></td>
<td><%= link_to 'Show', slice %></td>
<td><%= link_to 'Edit', edit_slice_path(slice) %></td>
<td><%= link_to 'Destroy', slice, :confirm => 'Are you sure?', :method => :delete %></td>
</tr>
<% end %>
</table>
<br />
<%= will_paginate @posts %>
<br />
<%= link_to 'New slice', new_slice_path %>
| <%= link_to 'Home', :controller => :home %>
diff --git a/webapp/app/views/slices/show.html.erb b/webapp/app/views/slices/show.html.erb
index 79b51a4..97aa7d5 100644
--- a/webapp/app/views/slices/show.html.erb
+++ b/webapp/app/views/slices/show.html.erb
@@ -1,50 +1,70 @@
<p>
<b>Time:</b>
<%=h @slice.time %>
</p>
+<p>
+ <b>Start Lat [deg]:</b>
+ <%=h @slice.startlat %>
+</p>
+
+<p>
+ <b>Start Lon [deg]:</b>
+ <%=h @slice.startlon %>
+</p>
+
<p>
<b>End Lat [deg]:</b>
<%=h @slice.lat %>
</p>
<p>
<b>End Lon [deg]:</b>
<%=h @slice.lon %>
</p>
<p>
<b>Avgvel [m/s]:</b>
<%=h @slice.avgvel %>
</p>
<p>
<b>Headingdeg [deg]:</b>
<%=h @slice.headingdeg %>
</p>
<p>
<b>Dist [m]:</b>
<%=h @slice.dist %>
</p>
<p>
<b>Duration [s]:</b>
<%=h @slice.duration %>
</p>
<p>
- <b>Start Lat [deg]:</b>
- <%=h @slice.startlat %>
+ <b>Start Accuracy [m]:</b>
+ <%=h @slice.startaccuracy %>
</p>
<p>
- <b>Start Lon [deg]:</b>
- <%=h @slice.startlon %>
+ <b>End Accuracy [m]:</b>
+ <%=h @slice.endaccuracy %>
+</p>
+
+<p>
+ <b>Instance ID:</b>
+ <%=h @slice.instanceid %>
+</p>
+
+<p>
+ <b>Category:</b>
+ <%=h @slice.categoryid %>
</p>
<%= link_to 'Edit', edit_slice_path(@slice) %> |
<%= link_to 'New slice', new_slice_path %> |
<%= link_to 'List all', slices_path %> |
<%= link_to 'Home', :controller => :home %>
diff --git a/webapp/db/migrate/20100728201227_add_acc_instance_to_slice.rb b/webapp/db/migrate/20100728201227_add_acc_instance_to_slice.rb
new file mode 100644
index 0000000..5ee8253
--- /dev/null
+++ b/webapp/db/migrate/20100728201227_add_acc_instance_to_slice.rb
@@ -0,0 +1,15 @@
+class AddAccInstanceToSlice < ActiveRecord::Migration
+ def self.up
+ add_column :slices, :startaccuracy, :float
+ add_column :slices, :endaccuracy, :float
+ add_column :slices, :instanceid, :integer
+ add_column :slices, :categoryid, :integer
+ end
+
+ def self.down
+ remove_column :slices, :categoryid
+ remove_column :slices, :instanceid
+ remove_column :slices, :endaccuracy
+ remove_column :slices, :startaccuracy
+ end
+end
|
cstim/carcomm
|
e8fb66bb23c0fe14fc6ca51d8d3e551245065656
|
Fix sending after intervals without GPS.
|
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml
index c3fab87..bc7ff71 100644
--- a/konphidroid/AndroidManifest.xml
+++ b/konphidroid/AndroidManifest.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.cstimming.konphidroid"
- android:versionCode="1"
- android:versionName="1.0">
+ android:versionCode="2"
+ android:versionName="0.2">
<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".KonPhiActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<uses-sdk android:minSdkVersion="3" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
</manifest>
\ No newline at end of file
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index fdfc473..fa7c354 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,317 +1,319 @@
package de.cstimming.konphidroid;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.StatusLine;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
public class KonPhiActivity extends Activity implements LocationListener {
private ToggleButton m_togglebuttonGps;
private ToggleButton m_togglebuttonSender;
private SimpleDateFormat m_dateFormatter;
private SimpleDateFormat m_dateFormatSender;
private Location m_lastLocation;
private boolean m_lastLocationValid;
private long m_senderIntervalSecs;
private String m_server = "http://carcomm.cstimming.de/";
//private WebView m_webview;
private TextView m_labelSender;
private static final int DIALOG_GPSWARNING = 1;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
m_dateFormatSender = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
m_dateFormatSender.setTimeZone(TimeZone.getTimeZone("GMT00"));
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
m_senderIntervalSecs = 30;
m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebuttonGps);
m_togglebuttonSender = (ToggleButton) findViewById(R.id.togglebuttonSender);
m_labelSender = (TextView) findViewById(R.id.TextLabelSender);
//final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
//m_webview = new WebView(this);
//ell.addView(m_webview);
final LocationManager locationManager = (LocationManager) getApplicationContext()
.getSystemService(Context.LOCATION_SERVICE);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
m_togglebuttonGps.setChecked(locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
m_togglebuttonSender.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (m_togglebuttonSender.isChecked()) {
m_labelSender.setText(R.string.labelsender_on);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
m_labelSender.setTextColor(viewSecs.getTextColors());
if (locationManager
.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
// Show the toast only if GPS is already on, but not if
// we open the dialog as this would interfere visually
// with the toast.
Toast.makeText(KonPhiActivity.this,
R.string.transmission_on_toast,
Toast.LENGTH_SHORT).show();
} else {
showDialog(DIALOG_GPSWARNING);
}
} else {
Toast.makeText(KonPhiActivity.this,
R.string.transmission_off_toast, Toast.LENGTH_SHORT)
.show();
m_labelSender.setText(R.string.labelsender_off);
m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
}
}
});
long minTime = 1000 * m_senderIntervalSecs; // [milliseconds]
float minDistance = 0; // 10; // [meters]
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
minTime, minDistance, this);
}
protected Dialog onCreateDialog(int d) {
Dialog result;
switch (d) {
case DIALOG_GPSWARNING:
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(R.string.ask_activate_gps_settings)
.setCancelable(false)
.setPositiveButton(R.string.yes,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
final Intent i = new Intent(
Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
}
})
.setNegativeButton(R.string.no,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int id) {
dialog.cancel();
}
});
result = builder.create();
break;
default:
result = null;
}
return result;
}
@Override
public void onLocationChanged(Location loc) {
// Toast.makeText(KonPhiActivity.this, "Received location from " +
// loc.getProvider(), Toast.LENGTH_SHORT).show();
printLocInfo(loc);
if (m_lastLocationValid) {
long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
if (secdiff >= m_senderIntervalSecs) {
- sendPairNow(m_lastLocation, loc);
+ if (secdiff <= 4 * m_senderIntervalSecs) {
+ sendPairNow(m_lastLocation, loc);
+ }
m_lastLocation = loc;
}
// Note: We don't set the m_lastLocation if we are smaller than
// m_senderIntervalSecs.
} else {
m_lastLocationValid = true;
m_lastLocation = loc;
}
}
private void printLocInfo(Location loc) {
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy())
: "...");
if (m_lastLocationValid) {
long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
String secs = String.valueOf(secdiff);
String dist = String.valueOf(m_lastLocation.distanceTo(loc));
viewDist.setText(dist);
viewSecs.setText(secs);
} else {
viewDist.setText("...");
viewSecs.setText("...");
}
}
private String degToString(double deg) {
return String.valueOf(deg);
}
private void sendPairNow(Location startLoc, Location endLoc) {
// Only send if the togglebutton is active
if (!m_togglebuttonSender.isChecked())
return;
String startLat = degToString(startLoc.getLatitude());
String startLon = degToString(startLoc.getLongitude());
String endLat = degToString(endLoc.getLatitude());
String endLon = degToString(endLoc.getLongitude());
String duration = String
.valueOf((endLoc.getTime() - startLoc.getTime()) / 1000);
String endTime = m_dateFormatSender.format(new Date(endLoc.getTime()));
// FIXME: Need to transfer speed and accuracy at both points, and also
// group selection
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(m_server + "slices");
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
resultview.setText("Sending to " + httppost.getURI().toString());
String displaytime = m_dateFormatter.format(new Date(endLoc.getTime()))
+ ": ";
try {
// Add your data
List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>(6);
nameValuePairs.add(new BasicNameValuePair("slice[startlat]",
startLat));
nameValuePairs.add(new BasicNameValuePair("slice[startlon]",
startLon));
nameValuePairs.add(new BasicNameValuePair("slice[lat]", endLat));
nameValuePairs.add(new BasicNameValuePair("slice[lon]", endLon));
nameValuePairs.add(new BasicNameValuePair("slice[duration]",
duration));
nameValuePairs.add(new BasicNameValuePair("slice[time]", endTime));
httppost.setEntity(new UrlEncodedFormEntity(nameValuePairs));
// ByteArrayOutputStream baos = new ByteArrayOutputStream();
// httppost.getEntity().writeTo(baos);
// m_webview.loadData(baos.toString(), "text/html", "utf-8");
// Execute HTTP Post Request
HttpResponse response = httpclient.execute(httppost);
// baos.reset();
// response.getEntity().writeTo(baos);
// m_webview.loadData(baos.toString(), "text/html", "utf-8");
StatusLine rstatus = response.getStatusLine();
int rcode = rstatus.getStatusCode();
if (rcode >= 200 && rcode < 300) {
resultview.setText(displaytime + String.valueOf(rcode) + " "
+ rstatus.getReasonPhrase());
resultview.setTextColor(ColorStateList.valueOf(Color.GREEN));
} else {
resultview.setText(displaytime + String.valueOf(rcode) + " "
+ rstatus.getReasonPhrase());
resultview.setTextColor(ColorStateList.valueOf(Color.RED));
}
} catch (ClientProtocolException e) {
resultview.setText(displaytime + "Sending failed (Protocol): "
+ e.getLocalizedMessage());
resultview.setTextColor(ColorStateList.valueOf(Color.RED));
} catch (IOException e) {
resultview.setText(displaytime + "Sending failed (IO): "
+ e.getLocalizedMessage());
resultview.setTextColor(ColorStateList.valueOf(Color.RED));
}
}
@Override
public void onProviderDisabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " disabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider +
// " enabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " out of service", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
// " tmp. unavailable", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
// Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider
// + " available", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
break;
}
}
}
\ No newline at end of file
|
cstim/carcomm
|
7ca607a80c4f8df95be83be3e18359b9f700e276
|
Add HTML page that only shows the map, but doesn't send anything to the server.
|
diff --git a/webapp/public/map.html b/webapp/public/map.html
index 2d62680..fa25a90 100644
--- a/webapp/public/map.html
+++ b/webapp/public/map.html
@@ -1,430 +1,430 @@
<html>
<head>
<meta name="viewport" content="width = device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=no;">
<title>Car Communication App</title>
<script src="http://code.google.com/apis/gears/gears_init.js"></script>
<!-- bring in the OpenLayers javascript library
(here we bring it from the remote site, but you could
easily serve up this javascript yourself) -->
<script src="OpenLayers.js"></script>
<!--script src="http://www.openlayers.org/api/OpenLayers.js"></script-->
<!-- bring in the OpenStreetMap OpenLayers layers.
Using this hosted file will make sure we are kept up
to date with any necessary changes -->
<script src="OpenStreetMap.js"></script>
<!--script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script-->
<!-- The geo-location-javascript code -->
<script src="geo.js"></script>
<!-- The personal functions from CS -->
<script src="csfuncs.js"></script>
<!-- ------------------------------------------------------ -->
<script type="text/javascript">
function setStatus(id, text, bgcolor) {
var td = document.getElementById(id);
var div = document.getElementById(id + "Text");
if (td && div) {
if (text) {
div.firstChild.nodeValue = text;
}
if (bgcolor) {
td.setAttribute("bgcolor", bgcolor);
}
} else {
window.onerror ("Function setStatus() was called with non-existing ID of html element, \"" + id + "\"");
}
}
function csErrorHandler (msg, file, line) {
var fullMsg = "General Error: " + msg + " in file: " + file + ":" + line;
setStatus("GPSStatus", "General", "red");
var span2 = document.getElementById("GeneralError");
if (span2) {
span2.firstChild.nodeValue = fullMsg;
}
return true;
}
OpenLayers.Util.onImageLoadError = function() {
setStatus("MapStatus", "Map: Cannot load images", "red");
};
// Complex object of type OpenLayers.Map
var map;
var layerGpx1;
var layerGpx2;
var useLayerGpx1;
var gpxStyleMap;
var serverUrl;
var initialized;
var lastPos;
var currentPos;
var sendInterval;
// Global error handler
window.onerror = csErrorHandler;
function setLatLon(lat, lon) {
var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
var currentZoom = map.getZoom();
map.setCenter (lonLat, currentZoom);
}
function zoomTo(lat, lon, zoom) {
var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
map.setCenter (lonLat, zoom);
}
function zoomToHamburg() {
// Start position for the map (hardcoded here for simplicity)
zoomTo(53.5514, 9.99, 12);
}
function on_gpx_loadstart() {
var numWays = this.features.length;
setStatus("SliceStatus", "Loading... " + numWays, "lightyellow");
}
function on_gpx_loadend() {
var numWays = this.features.length;
if (numWays > 0) {
setStatus("SliceStatus", "Ways ok: " + numWays + " lines", "lightgreen");
} else {
setStatus("SliceStatus", "No Ways received", "yellow");
}
if (useLayerGpx1) {
if (layerGpx1) {
layerGpx1.destroy();
}
} else {
if (layerGpx2) {
layerGpx2.destroy();
}
}
}
function loadWaysLayer(min_time, max_time) {
var lonLatUR = map.getLonLatFromPixel(new OpenLayers.Pixel(0,0))
.transform(map.getProjectionObject(),
new OpenLayers.Projection("EPSG:4326"));
var mapSize = map.getSize();
var lonLatLL = map.getLonLatFromPixel(new OpenLayers.Pixel(mapSize.w, mapSize.h))
.transform(map.getProjectionObject(),
new OpenLayers.Projection("EPSG:4326"));
var min_lat = lonLatLL.lat;
var max_lon = lonLatLL.lon;
var max_lat = lonLatUR.lat;
var min_lon = lonLatUR.lon;
// Add the Layer with GPX Track
var layerGpx = csCreateLayerGpx(serverUrl,
min_lat, max_lat,
min_lon, max_lon,
min_time, max_time);
layerGpx.events.register("loadend", layerGpx, on_gpx_loadend);
layerGpx.events.register("loadstart", layerGpx, on_gpx_loadstart);
return layerGpx;
}
function loadWays(min_time, max_time) {
if (useLayerGpx1) {
useLayerGpx1 = false;
if (layerGpx1) {
layerGpx1.destroy();
}
layerGpx1 = loadWaysLayer(min_time, max_time);
map.addLayer(layerGpx1);
} else {
useLayerGpx1 = true;
if (layerGpx2) {
layerGpx2.destroy();
}
layerGpx2 = loadWaysLayer(min_time, max_time);
map.addLayer(layerGpx2);
}
}
function loadWaysDefault() {
if (!document.forms.checkboxes.elements.SliceCheck.checked) {
setStatus("SliceStatus", "Ways disabled", "yellow");
return;
}
- var num_minutes = 20220; // 2 weeks + 1 hour
+ var num_minutes = 10080 * 6 + 60; // 6 weeks + 1 hour
var max_time = new Date();
var min_time = new Date(max_time.getDate() - num_minutes * 60 * 1000);
loadWays(dateToString(min_time), dateToString(max_time));
}
function sendDataNow() {
if (!document.forms.checkboxes.elements.SendCheck.checked) {
setStatus("SendStatus", "Sending disabled", "yellow");
return;
}
if (!currentPos) {
setStatus("SendStatus", "No Valid Positions to send", "red");
return;
}
if (!lastPos) {
lastPos = currentPos;
}
setStatus("SendStatus", "Sending...", "lightgreen");
var endTimestamp = currentPos.timestamp;
var diffsec = (endTimestamp - lastPos.timestamp) / 1000;
if (diffsec == 0) {
endTimestamp = (new Date()).getTime();
diffsec = (endTimestamp - lastPos.timestamp) / 1000;
}
var endLat = currentPos.coords.latitude.toFixed(6);
var endLon = currentPos.coords.longitude.toFixed(6);
var startLat = lastPos.coords.latitude.toFixed(6);
var startLon = lastPos.coords.longitude.toFixed(6);
var time = dateToString(new Date(endTimestamp));
if (diffsec == 0) {
setStatus("SendStatus", "Oops, diffsec = 0", "red");
alert("currentPos.timestamp=" + currentPos.timestamp + " lastPos.timestamp=" + lastPos.timestamp + " date=" + (new Date()).getTime());
return;
}
var dur = diffsec.toFixed(2);
var url = serverUrl + "slices";
var params = "slice[lat]=" + endLat
+ "&slice[lon]=" + endLon
+ "&slice[time]=" + time
+ "&slice[duration]=" + dur
+ "&slice[startlat]=" + startLat
+ "&slice[startlon]=" + startLon;
var http = new XMLHttpRequest();
http.open("POST", url, true);
//Send the proper header information along with the request
http.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
http.setRequestHeader("Content-length", params.length);
http.setRequestHeader("Connection", "close");
http.onreadystatechange = function() { //Call a function when the state changes.
if (http.readyState) {
if (http.status >= 200 && http.status <= 210) {
setStatus("SendStatus", "Sent", "lightgreen");
//alert(http.responseText);
} else {
setStatus("SendStatus", "Position not sent (" + http.status + ")", "yellow");
//alert(http.responseText);
}
}
};
http.send(params);
//alert("Will send: " + url + "?" + params);
lastPos = currentPos;
}
function sendDataMaybe() {
if (currentPos) {
if (!lastPos) {
lastPos = currentPos;
}
var diffmsec = currentPos.timestamp - lastPos.timestamp;
var diffsec = diffmsec / 1000;
if (diffsec >= 2 * sendInterval) {
// The position difference is too large, forget about the
// old one
lastPos = currentPos;
} else if (diffsec >= sendInterval) {
sendDataNow();
}
}
}
function on_geo_error(p) {
setStatus("GPSStatus", "GPS Error", "red");
}
function on_geo_success(p) {
setStatus("GPSStatus", "GPS ok", "lightgreen");
setLatLon(p.coords.latitude, p.coords.longitude);
currentPos = p;
sendDataMaybe();
loadWaysDefault();
}
function requestPos() {
if (!document.forms.checkboxes.elements.GPSCheck.checked) {
setStatus("GPSStatus", "GPS disabled", "yellow");
} else {
setStatus("GPSStatus", "Request GPS...", "lightgreen");
geo_position_js.getCurrentPosition(on_geo_success, on_geo_error,
{enableHighAccuracy : true,
timeout : 15000,
maximumAge : 30000});
//{enableHighAccuracy : true});
// timeout : 1000, // milliseconds
// maximumAge : 10000 // milliseconds
// });
//setStatus("MapStatus", "Map: 3b", "yellow");
}
}
function on_interval() {
if (!document.forms.checkboxes.elements.GPSCheck.checked) {
//setStatus("GPSStatus", "GPS disabled", "yellow");
return;
}
if (currentPos) {
var now = new Date();
var diffmsec = now.getTime() - currentPos.timestamp;
var diffsec = diffmsec / 1000;
var diffstr = diffsec.toFixed(1);
setStatus("GPSStatus",
"GPS ok", //; " + diffstr + "s old",
"lightgreen");
if (diffsec >= sendInterval) {
// The currentPos is rather old - we assume it were still
// valid right now and fake a new object. FIXME: Maybe
// this isn't such a good idea?
currentPos = { timestamp: now.getTime(),
coords : {
latitude : currentPos.coords.latitude,
longitude : currentPos.coords.longitude
}};
sendDataMaybe();
} else if (diffsec > 7) {
requestPos();
}
} else {
setStatus("SendStatus",
"Waiting for GPS",
"yellow");
requestPos();
}
}
//Initialise the 'map' object
function init() {
sendInterval = 60;
serverUrl = "";
useLayerGpx1 = true;
// Did we get our auxiliary files? Then switch General to green
if (OpenLayers && csCreateMap) {
//setStatus("GeneralStatus", null, "lightgreen");
}
if (typeof(window.google) != "undefined" && typeof(window.google.gears) != "undefined"){
setStatus("GPSStatus", "GPS: Google Gears", "lightyellow");
} else if (typeof(navigator.geolocation) != "undefined") {
setStatus("GPSStatus", "GPS: Mozilla Navigator available", "lightyellow");
} else {
setStatus("GPSStatus", "GPS: Please install Google Gears, http://gears.google.com", "yellow");
}
//setStatus("MapStatus", "Map: 1", "yellow");
// Define the map layer
map = csCreateMap();
//setStatus("MapStatus", "Map: 2", "yellow");
// Define the styles for the way slices
gpxStyleMap = csCreateGpxStyleMap();
// Choose Hamburg as center
zoomToHamburg();
initialized = 1;
loadWaysDefault();
setInterval(on_interval, 2500); // milliseconds
//determine if the handset has client side geo location capabilities
if (geo_position_js.init()) {
requestPos();
} else {
on_geo_error({message: "No GPS available"});
}
}
function setServerUrl(value) {
serverUrl = value;
}
function on_osm_loadstart() {
setStatus("MapStatus", "Loading...", "yellow");
setStatus("SendStatus", "", "lightyellow");
}
function on_osm_tileloaded() {
var numRemainingTiles = this.numLoadingTiles;
if (numRemainingTiles > 0) {
setStatus("MapStatus", "Loading; " + this.numLoadingTiles + " images remaining", "lightgreen");
}
else {
setStatus("MapStatus", "Loaded", "lightgreen");
}
}
function toggleCheckBox(cbox) {
if (cbox) {
cbox.checked = !cbox.checked;
}
}
</script>
<!-- ------------------------------------------------------ -->
</head>
<!-- body.onload is called once the page is loaded (call the 'init' function) -->
<body onload="init();">
<form name="checkboxes" action="">
<table border="1" width="100%"><tr>
<td align="center" id="GPSStatus" bgcolor="lightyellow" onclick="toggleCheckBox(document.forms.checkboxes.elements.GPSCheck);">
<input type="checkbox" name="GPSCheck" value="1" checked="checked"/>
<span id="GPSStatusText">GPS</span>
</td>
<td align="center" id="MapStatus" bgcolor="yellow">
<span id="MapStatusText">Map</span>
</td>
<td align="center" id="SliceStatus" bgcolor="lightyellow" onclick="toggleCheckBox(document.forms.checkboxes.elements.SliceCheck);">
<input type="checkbox" name="SliceCheck" value="1" checked="checked">
<span id="SliceStatusText">Ways</span>
</td>
<td align="center" id="SendStatus" onclick="toggleCheckBox(document.forms.checkboxes.elements.SendCheck);">
<input type="checkbox" name="SendCheck" value="1" checked="checked">
<span id="SendStatusText">Sending</span>
</td>
</tr>
</table>
</form>
<!-- define a DIV into which the map will appear. Make it take up 400 pixels -->
<div id="map"></div>
<span name="GeneralError"></span>
</body>
</html>
<!-- Local Variables: -->
<!-- mode: javascript -->
<!-- indent-tabs-mode:nil -->
<!-- c-basic-offset:4 -->
<!-- tab-width:8 -->
<!-- End: -->
diff --git a/webapp/public/view.html b/webapp/public/view.html
new file mode 100644
index 0000000..43bc315
--- /dev/null
+++ b/webapp/public/view.html
@@ -0,0 +1,365 @@
+<html>
+<head>
+<meta name="viewport" content="width = device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=no;">
+
+ <title>Car Communication App</title>
+
+ <script src="http://code.google.com/apis/gears/gears_init.js"></script>
+
+ <!-- bring in the OpenLayers javascript library
+ (here we bring it from the remote site, but you could
+ easily serve up this javascript yourself) -->
+ <script src="OpenLayers.js"></script>
+ <!--script src="http://www.openlayers.org/api/OpenLayers.js"></script-->
+
+ <!-- bring in the OpenStreetMap OpenLayers layers.
+ Using this hosted file will make sure we are kept up
+ to date with any necessary changes -->
+ <script src="OpenStreetMap.js"></script>
+ <!--script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script-->
+
+ <!-- The geo-location-javascript code -->
+ <script src="geo.js"></script>
+
+ <!-- The personal functions from CS -->
+ <script src="csfuncs.js"></script>
+
+ <!-- ------------------------------------------------------ -->
+ <script type="text/javascript">
+
+function setStatus(id, text, bgcolor) {
+ var td = document.getElementById(id);
+ var div = document.getElementById(id + "Text");
+ if (td && div) {
+ if (text) {
+ div.firstChild.nodeValue = text;
+ }
+ if (bgcolor) {
+ td.setAttribute("bgcolor", bgcolor);
+ }
+ } else {
+ window.onerror ("Function setStatus() was called with non-existing ID of html element, \"" + id + "\"");
+ }
+}
+
+function csErrorHandler (msg, file, line) {
+ var fullMsg = "General Error: " + msg + " in file: " + file + ":" + line;
+ setStatus("GPSStatus", "General", "red");
+
+ var span2 = document.getElementById("GeneralError");
+ if (span2) {
+ span2.firstChild.nodeValue = fullMsg;
+ }
+ return true;
+}
+
+OpenLayers.Util.onImageLoadError = function() {
+ setStatus("MapStatus", "Map: Cannot load images", "red");
+};
+
+// Complex object of type OpenLayers.Map
+var map;
+var layerGpx1;
+var layerGpx2;
+var useLayerGpx1;
+var gpxStyleMap;
+var serverUrl;
+var initialized;
+var lastPos;
+var currentPos;
+var sendInterval;
+
+// Global error handler
+window.onerror = csErrorHandler;
+
+
+function setLatLon(lat, lon) {
+ var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
+ var currentZoom = map.getZoom();
+ map.setCenter (lonLat, currentZoom);
+}
+
+function zoomTo(lat, lon, zoom) {
+ var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
+ map.setCenter (lonLat, zoom);
+}
+
+function zoomToHamburg() {
+ // Start position for the map (hardcoded here for simplicity)
+ zoomTo(53.5514, 9.99, 12);
+}
+
+function on_gpx_loadstart() {
+ var numWays = this.features.length;
+ setStatus("SliceStatus", "Loading... " + numWays, "lightyellow");
+}
+
+function on_gpx_loadend() {
+ var numWays = this.features.length;
+ if (numWays > 0) {
+ setStatus("SliceStatus", "Ways ok: " + numWays + " lines", "lightgreen");
+ } else {
+ setStatus("SliceStatus", "No Ways received", "yellow");
+ }
+
+ if (useLayerGpx1) {
+ if (layerGpx1) {
+ layerGpx1.destroy();
+ }
+ } else {
+ if (layerGpx2) {
+ layerGpx2.destroy();
+ }
+ }
+}
+
+function loadWaysLayer(min_time, max_time) {
+ var lonLatUR = map.getLonLatFromPixel(new OpenLayers.Pixel(0,0))
+ .transform(map.getProjectionObject(),
+ new OpenLayers.Projection("EPSG:4326"));
+
+ var mapSize = map.getSize();
+ var lonLatLL = map.getLonLatFromPixel(new OpenLayers.Pixel(mapSize.w, mapSize.h))
+ .transform(map.getProjectionObject(),
+ new OpenLayers.Projection("EPSG:4326"));
+
+ var min_lat = lonLatLL.lat;
+ var max_lon = lonLatLL.lon;
+ var max_lat = lonLatUR.lat;
+ var min_lon = lonLatUR.lon;
+
+ // Add the Layer with GPX Track
+ var layerGpx = csCreateLayerGpx(serverUrl,
+ min_lat, max_lat,
+ min_lon, max_lon,
+ min_time, max_time);
+
+ layerGpx.events.register("loadend", layerGpx, on_gpx_loadend);
+ layerGpx.events.register("loadstart", layerGpx, on_gpx_loadstart);
+
+ return layerGpx;
+}
+
+function loadWays(min_time, max_time) {
+ if (useLayerGpx1) {
+ useLayerGpx1 = false;
+ if (layerGpx1) {
+ layerGpx1.destroy();
+ }
+ layerGpx1 = loadWaysLayer(min_time, max_time);
+ map.addLayer(layerGpx1);
+ } else {
+ useLayerGpx1 = true;
+ if (layerGpx2) {
+ layerGpx2.destroy();
+ }
+ layerGpx2 = loadWaysLayer(min_time, max_time);
+ map.addLayer(layerGpx2);
+ }
+}
+
+function loadWaysDefault() {
+ if (!document.forms.checkboxes.elements.SliceCheck.checked) {
+ setStatus("SliceStatus", "Ways disabled", "yellow");
+ return;
+ }
+
+ var num_minutes = 10080 * 6 + 60; // 6 weeks + 1 hour
+ var max_time = new Date();
+ var min_time = new Date(max_time.getDate() - num_minutes * 60 * 1000);
+ loadWays(dateToString(min_time), dateToString(max_time));
+}
+
+function sendDataNow() {
+}
+
+function sendDataMaybe() {
+ if (currentPos) {
+ if (!lastPos) {
+ lastPos = currentPos;
+ }
+ var diffmsec = currentPos.timestamp - lastPos.timestamp;
+ var diffsec = diffmsec / 1000;
+ if (diffsec >= 2 * sendInterval) {
+ // The position difference is too large, forget about the
+ // old one
+ lastPos = currentPos;
+ } else if (diffsec >= sendInterval) {
+ sendDataNow();
+ }
+ }
+}
+
+function on_geo_error(p) {
+ setStatus("GPSStatus", "GPS Error", "red");
+}
+
+function on_geo_success(p) {
+ setStatus("GPSStatus", "GPS ok", "lightgreen");
+ setLatLon(p.coords.latitude, p.coords.longitude);
+ currentPos = p;
+ sendDataMaybe();
+ loadWaysDefault();
+}
+
+function requestPos() {
+ if (!document.forms.checkboxes.elements.GPSCheck.checked) {
+ setStatus("GPSStatus", "GPS disabled", "yellow");
+ } else {
+ setStatus("GPSStatus", "Request GPS...", "lightgreen");
+ geo_position_js.getCurrentPosition(on_geo_success, on_geo_error,
+ {enableHighAccuracy : true,
+ timeout : 15000,
+ maximumAge : 30000});
+ //{enableHighAccuracy : true});
+// timeout : 1000, // milliseconds
+// maximumAge : 10000 // milliseconds
+// });
+ //setStatus("MapStatus", "Map: 3b", "yellow");
+ }
+}
+
+function on_interval() {
+ if (!document.forms.checkboxes.elements.GPSCheck.checked) {
+ //setStatus("GPSStatus", "GPS disabled", "yellow");
+ return;
+ }
+
+ if (currentPos) {
+ var now = new Date();
+ var diffmsec = now.getTime() - currentPos.timestamp;
+ var diffsec = diffmsec / 1000;
+ var diffstr = diffsec.toFixed(1);
+ setStatus("GPSStatus",
+ "GPS ok", //; " + diffstr + "s old",
+ "lightgreen");
+ if (diffsec >= sendInterval) {
+ // The currentPos is rather old - we assume it were still
+ // valid right now and fake a new object. FIXME: Maybe
+ // this isn't such a good idea?
+ currentPos = { timestamp: now.getTime(),
+ coords : {
+ latitude : currentPos.coords.latitude,
+ longitude : currentPos.coords.longitude
+ }};
+ sendDataMaybe();
+ } else if (diffsec > 7) {
+ requestPos();
+ }
+ } else {
+ setStatus("SendStatus",
+ "Waiting for GPS",
+ "yellow");
+ requestPos();
+ }
+}
+
+//Initialise the 'map' object
+function init() {
+
+ sendInterval = 60;
+ serverUrl = "";
+ useLayerGpx1 = true;
+
+ // Did we get our auxiliary files? Then switch General to green
+ if (OpenLayers && csCreateMap) {
+ //setStatus("GeneralStatus", null, "lightgreen");
+ }
+
+ if (typeof(window.google) != "undefined" && typeof(window.google.gears) != "undefined"){
+ setStatus("GPSStatus", "GPS: Google Gears", "lightyellow");
+ } else if (typeof(navigator.geolocation) != "undefined") {
+ setStatus("GPSStatus", "GPS: Mozilla Navigator available", "lightyellow");
+ } else {
+ setStatus("GPSStatus", "GPS: Please install Google Gears, http://gears.google.com", "yellow");
+ }
+
+ //setStatus("MapStatus", "Map: 1", "yellow");
+ // Define the map layer
+ map = csCreateMap();
+
+ //setStatus("MapStatus", "Map: 2", "yellow");
+ // Define the styles for the way slices
+ gpxStyleMap = csCreateGpxStyleMap();
+
+ // Choose Hamburg as center
+ zoomToHamburg();
+
+ initialized = 1;
+
+ loadWaysDefault();
+
+ setInterval(on_interval, 5000); // milliseconds
+
+ //determine if the handset has client side geo location capabilities
+ if (geo_position_js.init()) {
+ requestPos();
+ } else {
+ on_geo_error({message: "No GPS available"});
+ }
+
+}
+
+function setServerUrl(value) {
+ serverUrl = value;
+}
+
+function on_osm_loadstart() {
+ setStatus("MapStatus", "Loading...", "yellow");
+ setStatus("SendStatus", "", "lightyellow");
+}
+
+function on_osm_tileloaded() {
+ var numRemainingTiles = this.numLoadingTiles;
+ if (numRemainingTiles > 0) {
+ setStatus("MapStatus", "Loading; " + this.numLoadingTiles + " images remaining", "lightgreen");
+ }
+ else {
+ setStatus("MapStatus", "Loaded", "lightgreen");
+ }
+}
+
+function toggleCheckBox(cbox) {
+ if (cbox) {
+ cbox.checked = !cbox.checked;
+ }
+}
+
+ </script>
+ <!-- ------------------------------------------------------ -->
+
+</head>
+
+<!-- body.onload is called once the page is loaded (call the 'init' function) -->
+<body onload="init();">
+
+<form name="checkboxes" action="">
+ <table border="1" width="100%"><tr>
+ <td align="center" id="GPSStatus" bgcolor="lightyellow" onclick="toggleCheckBox(document.forms.checkboxes.elements.GPSCheck);">
+ <input type="checkbox" name="GPSCheck" value="1" checked="checked"/>
+ <span id="GPSStatusText">GPS</span>
+ </td>
+ <td align="center" id="MapStatus" bgcolor="yellow">
+ <span id="MapStatusText">Map</span>
+ </td>
+ <td align="center" id="SliceStatus" bgcolor="lightyellow" onclick="toggleCheckBox(document.forms.checkboxes.elements.SliceCheck);">
+ <input type="checkbox" name="SliceCheck" value="1" checked="checked">
+ <span id="SliceStatusText">Ways</span>
+ </td>
+ </tr>
+ </table>
+</form>
+
+<!-- define a DIV into which the map will appear. Make it take up 400 pixels -->
+<div id="map"></div>
+<span name="GeneralError"></span>
+
+</body>
+</html>
+
+<!-- Local Variables: -->
+<!-- mode: javascript -->
+<!-- indent-tabs-mode:nil -->
+<!-- c-basic-offset:4 -->
+<!-- tab-width:8 -->
+<!-- End: -->
|
cstim/carcomm
|
97ab4fc234998fa20ecddecc856a272bbd3b63ee
|
Add i18n of the strings.
|
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml
index 1f7203b..6bf7b6a 100644
--- a/konphidroid/res/layout/main.xml
+++ b/konphidroid/res/layout/main.xml
@@ -1,78 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
android:id="@+id/MainLayout" android:layout_height="fill_parent">
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="@string/hello" />
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content" android:orientation="horizontal">
<ToggleButton android:id="@+id/togglebuttonGps"
android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:textOn="GPS" android:textOff="GPS" />
+ android:textOn="@string/gpsbutton" android:textOff="@string/gpsbutton" />
<ToggleButton android:id="@+id/togglebuttonSender"
android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:textOn="Transmission" android:textOff="No Transmission"
+ android:textOn="@string/transmission_on" android:textOff="@string/transmission_off"
android:checked="true" />
</LinearLayout>
<TableLayout android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
- <TextView android:text="GPS Timestamp:"
+ <TextView android:text="@string/gps_timestamp"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewGPSAge"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Latitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLat"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Longitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLon"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Accuracy [m]:" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewAcc"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Dist to previous [m]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewDist"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Time to previous [s]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewSecs"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
- <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content">
- <TextView android:text="Sending result:" android:id="@+id/TextLabelSender"
+ <TableRow android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <TextView android:text="@string/labelsender_on" android:id="@+id/TextLabelSender"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewSender"
android:scrollHorizontally="true" android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</TableRow>
</TableLayout>
+ <TextView android:text="@string/bottom_url_text" android:id="@+id/TextViewBottom"
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:autoLink="web" />
+
<LinearLayout android:id="@+id/LayoutWebview"
android:layout_width="fill_parent" android:layout_height="fill_parent"></LinearLayout>
</LinearLayout>
diff --git a/konphidroid/res/values-de/strings.xml b/konphidroid/res/values-de/strings.xml
new file mode 100644
index 0000000..b497a96
--- /dev/null
+++ b/konphidroid/res/values-de/strings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="app_name">KonPhiDroid</string>
+ <string name="hello">KonPhiDense Test-App. Die Bewegung der GPS-Position wird aufgenommen und zum Server übertragen.</string>
+ <string name="transmission_on">Ãbertragung</string>
+ <string name="transmission_off">Keine Ãbertragung</string>
+ <string name="gpsbutton">GPS</string>
+ <string name="gps_timestamp">GPS Zeitstempel:</string>
+ <string name="transmission_on_toast">Bewegung wird zum Server übertragen</string>
+ <string name="transmission_off_toast">Es wird keine Bewegung mehr übertragen</string>
+ <string name="labelsender_on">Ãbertragungsergebnis:</string>
+ <string name="labelsender_off">Pause; Letzte:</string>
+ <string name="ask_activate_gps_settings">Das GPS ist ausgeschaltet. Wollen Sie die Einstellungen für Standort & Sicherheit bearbeiten, um GPS einzuschalten?</string>
+ <string name="yes">Ja</string>
+ <string name="no">Nein</string>
+</resources>
diff --git a/konphidroid/res/values/strings.xml b/konphidroid/res/values/strings.xml
index 07bbad0..f7c53ad 100644
--- a/konphidroid/res/values/strings.xml
+++ b/konphidroid/res/values/strings.xml
@@ -1,5 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="hello">KonPhiDense Test App. We receive GPS and send it to the server.</string>
- <string name="app_name">KonphiDroid</string>
+ <string name="app_name">KonPhiDroid</string>
+ <string name="hello">KonPhiDense Test App. We receive GPS movements and send it to the server.</string>
+ <string name="transmission_on">Transmission</string>
+ <string name="transmission_off">No Transmission</string>
+ <string name="gpsbutton">GPS</string>
+ <string name="gps_timestamp">GPS Timestamp:</string>
+ <string name="transmission_on_toast">Sending movement to server</string>
+ <string name="transmission_off_toast">No movement is sent to server</string>
+ <string name="labelsender_on">Sending Result:</string>
+ <string name="labelsender_off">Paused; Last:</string>
+ <string name="ask_activate_gps_settings">The GPS receiver is not active. Do you want to edit your location settings in order to activate GPS now?</string>
+ <string name="yes">Yes</string>
+ <string name="no">No</string>
+ <string name="bottom_url_text">http://carcomm.cstimming.de/view.html</string>
</resources>
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index f127ca0..fdfc473 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,270 +1,317 @@
package de.cstimming.konphidroid;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.StatusLine;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
-import android.webkit.WebView;
-import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
public class KonPhiActivity extends Activity implements LocationListener {
private ToggleButton m_togglebuttonGps;
private ToggleButton m_togglebuttonSender;
private SimpleDateFormat m_dateFormatter;
private SimpleDateFormat m_dateFormatSender;
private Location m_lastLocation;
private boolean m_lastLocationValid;
private long m_senderIntervalSecs;
private String m_server = "http://carcomm.cstimming.de/";
- private WebView m_webview;
+ //private WebView m_webview;
private TextView m_labelSender;
private static final int DIALOG_GPSWARNING = 1;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
m_dateFormatSender = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
m_dateFormatSender.setTimeZone(TimeZone.getTimeZone("GMT00"));
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
m_senderIntervalSecs = 30;
m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebuttonGps);
m_togglebuttonSender = (ToggleButton) findViewById(R.id.togglebuttonSender);
m_labelSender = (TextView) findViewById(R.id.TextLabelSender);
- final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
- m_webview = new WebView(this);
- ell.addView(m_webview);
+ //final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
+ //m_webview = new WebView(this);
+ //ell.addView(m_webview);
- final LocationManager locationManager = (LocationManager) getApplicationContext().getSystemService(
- Context.LOCATION_SERVICE);
+ final LocationManager locationManager = (LocationManager) getApplicationContext()
+ .getSystemService(Context.LOCATION_SERVICE);
- m_togglebuttonGps.setChecked(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER));
+ m_togglebuttonGps.setChecked(locationManager
+ .isProviderEnabled(LocationManager.GPS_PROVIDER));
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
- final Intent i = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+ final Intent i = new Intent(
+ Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
- m_togglebuttonGps.setChecked(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER));
+ m_togglebuttonGps.setChecked(locationManager
+ .isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
m_togglebuttonSender.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
+ final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
if (m_togglebuttonSender.isChecked()) {
- Toast.makeText(KonPhiActivity.this, "Sending movement to server", Toast.LENGTH_SHORT).show();
- m_labelSender.setText("Sending Result:");
+ m_labelSender.setText(R.string.labelsender_on);
+ final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
+ m_labelSender.setTextColor(viewSecs.getTextColors());
+ if (locationManager
+ .isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+ // Show the toast only if GPS is already on, but not if
+ // we open the dialog as this would interfere visually
+ // with the toast.
+ Toast.makeText(KonPhiActivity.this,
+ R.string.transmission_on_toast,
+ Toast.LENGTH_SHORT).show();
+ } else {
+ showDialog(DIALOG_GPSWARNING);
+ }
} else {
- Toast.makeText(KonPhiActivity.this, "No movement is sent to server", Toast.LENGTH_SHORT).show();
- m_labelSender.setText("Paused; Last:");
+ Toast.makeText(KonPhiActivity.this,
+ R.string.transmission_off_toast, Toast.LENGTH_SHORT)
+ .show();
+ m_labelSender.setText(R.string.labelsender_off);
+ m_labelSender.setTextColor(ColorStateList.valueOf(Color.RED));
+ resultview.setTextColor(ColorStateList.valueOf(Color.GRAY));
}
}
});
long minTime = 1000 * m_senderIntervalSecs; // [milliseconds]
- float minDistance = 0; //10; // [meters]
+ float minDistance = 0; // 10; // [meters]
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
minTime, minDistance, this);
}
protected Dialog onCreateDialog(int d) {
Dialog result;
switch (d) {
case DIALOG_GPSWARNING:
AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setMessage("The GPS receiver is not active. Do you want to activate it now?")
+ builder.setMessage(R.string.ask_activate_gps_settings)
.setCancelable(false)
- .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- final Intent i = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+ .setPositiveButton(R.string.yes,
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog,
+ int id) {
+ final Intent i = new Intent(
+ Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
}
})
- .setNegativeButton("No", new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
+ .setNegativeButton(R.string.no,
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog,
+ int id) {
dialog.cancel();
}
});
result = builder.create();
break;
default:
result = null;
}
return result;
}
@Override
public void onLocationChanged(Location loc) {
- //Toast.makeText(KonPhiActivity.this, "Received location from " + loc.getProvider(), Toast.LENGTH_SHORT).show();
+ // Toast.makeText(KonPhiActivity.this, "Received location from " +
+ // loc.getProvider(), Toast.LENGTH_SHORT).show();
printLocInfo(loc);
if (m_lastLocationValid) {
long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
if (secdiff >= m_senderIntervalSecs) {
sendPairNow(m_lastLocation, loc);
m_lastLocation = loc;
}
- // Note: We don't set the m_lastLocation if we are smaller than m_senderIntervalSecs.
+ // Note: We don't set the m_lastLocation if we are smaller than
+ // m_senderIntervalSecs.
} else {
m_lastLocationValid = true;
m_lastLocation = loc;
}
}
private void printLocInfo(Location loc) {
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
- viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy()) : "...");
+ viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy())
+ : "...");
if (m_lastLocationValid) {
long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
String secs = String.valueOf(secdiff);
String dist = String.valueOf(m_lastLocation.distanceTo(loc));
viewDist.setText(dist);
viewSecs.setText(secs);
} else {
viewDist.setText("...");
viewSecs.setText("...");
}
}
private String degToString(double deg) {
return String.valueOf(deg);
}
private void sendPairNow(Location startLoc, Location endLoc) {
// Only send if the togglebutton is active
if (!m_togglebuttonSender.isChecked())
return;
String startLat = degToString(startLoc.getLatitude());
String startLon = degToString(startLoc.getLongitude());
String endLat = degToString(endLoc.getLatitude());
String endLon = degToString(endLoc.getLongitude());
- String duration = String.valueOf((endLoc.getTime() - startLoc.getTime()) / 1000);
+ String duration = String
+ .valueOf((endLoc.getTime() - startLoc.getTime()) / 1000);
String endTime = m_dateFormatSender.format(new Date(endLoc.getTime()));
- // FIXME: Need to transfer speed and accuracy at both points, and also group selection
+ // FIXME: Need to transfer speed and accuracy at both points, and also
+ // group selection
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(m_server + "slices");
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
resultview.setText("Sending to " + httppost.getURI().toString());
- String displaytime = m_dateFormatter.format(new Date(endLoc.getTime())) + ": ";
+ String displaytime = m_dateFormatter.format(new Date(endLoc.getTime()))
+ + ": ";
try {
- // Add your data
- List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>(6);
- nameValuePairs.add(new BasicNameValuePair("slice[startlat]", startLat));
- nameValuePairs.add(new BasicNameValuePair("slice[startlon]", startLon));
- nameValuePairs.add(new BasicNameValuePair("slice[lat]", endLat));
- nameValuePairs.add(new BasicNameValuePair("slice[lon]", endLon));
- nameValuePairs.add(new BasicNameValuePair("slice[duration]", duration));
- nameValuePairs.add(new BasicNameValuePair("slice[time]", endTime));
- httppost.setEntity(new UrlEncodedFormEntity(nameValuePairs));
-
- // ByteArrayOutputStream baos = new ByteArrayOutputStream();
- // httppost.getEntity().writeTo(baos);
- // m_webview.loadData(baos.toString(), "text/html", "utf-8");
-
- // Execute HTTP Post Request
+ // Add your data
+ List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>(6);
+ nameValuePairs.add(new BasicNameValuePair("slice[startlat]",
+ startLat));
+ nameValuePairs.add(new BasicNameValuePair("slice[startlon]",
+ startLon));
+ nameValuePairs.add(new BasicNameValuePair("slice[lat]", endLat));
+ nameValuePairs.add(new BasicNameValuePair("slice[lon]", endLon));
+ nameValuePairs.add(new BasicNameValuePair("slice[duration]",
+ duration));
+ nameValuePairs.add(new BasicNameValuePair("slice[time]", endTime));
+ httppost.setEntity(new UrlEncodedFormEntity(nameValuePairs));
+
+ // ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ // httppost.getEntity().writeTo(baos);
+ // m_webview.loadData(baos.toString(), "text/html", "utf-8");
+
+ // Execute HTTP Post Request
HttpResponse response = httpclient.execute(httppost);
- // baos.reset();
- // response.getEntity().writeTo(baos);
- // m_webview.loadData(baos.toString(), "text/html", "utf-8");
+ // baos.reset();
+ // response.getEntity().writeTo(baos);
+ // m_webview.loadData(baos.toString(), "text/html", "utf-8");
StatusLine rstatus = response.getStatusLine();
- resultview.setText(displaytime + String.valueOf(rstatus.getStatusCode()) + " " + rstatus.getReasonPhrase());
- resultview.setTextColor(ColorStateList.valueOf(Color.GREEN));
- } catch (ClientProtocolException e) {
- resultview.setText(displaytime + "Sending failed (Protocol): " + e.getLocalizedMessage());
+ int rcode = rstatus.getStatusCode();
+ if (rcode >= 200 && rcode < 300) {
+ resultview.setText(displaytime + String.valueOf(rcode) + " "
+ + rstatus.getReasonPhrase());
+ resultview.setTextColor(ColorStateList.valueOf(Color.GREEN));
+ } else {
+ resultview.setText(displaytime + String.valueOf(rcode) + " "
+ + rstatus.getReasonPhrase());
+ resultview.setTextColor(ColorStateList.valueOf(Color.RED));
+ }
+ } catch (ClientProtocolException e) {
+ resultview.setText(displaytime + "Sending failed (Protocol): "
+ + e.getLocalizedMessage());
resultview.setTextColor(ColorStateList.valueOf(Color.RED));
- } catch (IOException e) {
- resultview.setText(displaytime + "Sending failed (IO): " + e.getLocalizedMessage());
+ } catch (IOException e) {
+ resultview.setText(displaytime + "Sending failed (IO): "
+ + e.getLocalizedMessage());
resultview.setTextColor(ColorStateList.valueOf(Color.RED));
}
}
@Override
public void onProviderDisabled(String provider) {
- //Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " disabled", Toast.LENGTH_SHORT).show();
+ // Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
+ // " disabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
- //Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider + " enabled", Toast.LENGTH_SHORT).show();
+ // Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider +
+ // " enabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
- //Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " out of service", Toast.LENGTH_SHORT).show();
+ // Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
+ // " out of service", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
- //Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " tmp. unavailable", Toast.LENGTH_SHORT).show();
+ // Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider +
+ // " tmp. unavailable", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
- //Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider + " available", Toast.LENGTH_SHORT).show();
+ // Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider
+ // + " available", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
break;
}
}
}
\ No newline at end of file
|
cstim/carcomm
|
c5a89aba1404efcdcb7079096c053d57fd50e4d2
|
Final polishing of the transmission of the App.
|
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml
index 005cc38..1f7203b 100644
--- a/konphidroid/res/layout/main.xml
+++ b/konphidroid/res/layout/main.xml
@@ -1,78 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
android:id="@+id/MainLayout" android:layout_height="fill_parent">
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="@string/hello" />
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content" android:orientation="horizontal">
- <ToggleButton android:id="@+id/togglebutton"
+ <ToggleButton android:id="@+id/togglebuttonGps"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:textOn="GPS" android:textOff="GPS" />
<ToggleButton android:id="@+id/togglebuttonSender"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:textOn="Transmission" android:textOff="No Transmission"
android:checked="true" />
</LinearLayout>
<TableLayout android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="GPS Timestamp:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewGPSAge"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Latitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLat"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Longitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLon"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Accuracy [m]:" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewAcc"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Dist to previous [m]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewDist"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:text="Time to previous [s]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewSecs"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:layout_width="fill_parent" android:layout_height="wrap_content">
<TextView android:text="Sending result:" android:id="@+id/TextLabelSender"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewSender"
android:scrollHorizontally="true" android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</TableRow>
</TableLayout>
<LinearLayout android:id="@+id/LayoutWebview"
android:layout_width="fill_parent" android:layout_height="fill_parent"></LinearLayout>
</LinearLayout>
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index 40b8694..f127ca0 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,252 +1,270 @@
package de.cstimming.konphidroid;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.StatusLine;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
import android.webkit.WebView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
public class KonPhiActivity extends Activity implements LocationListener {
private ToggleButton m_togglebuttonGps;
private ToggleButton m_togglebuttonSender;
private SimpleDateFormat m_dateFormatter;
private SimpleDateFormat m_dateFormatSender;
private Location m_lastLocation;
private boolean m_lastLocationValid;
private long m_senderIntervalSecs;
private String m_server = "http://carcomm.cstimming.de/";
private WebView m_webview;
private TextView m_labelSender;
private static final int DIALOG_GPSWARNING = 1;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
m_dateFormatSender = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
m_dateFormatSender.setTimeZone(TimeZone.getTimeZone("GMT00"));
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
m_senderIntervalSecs = 30;
- m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebutton);
+ m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebuttonGps);
m_togglebuttonSender = (ToggleButton) findViewById(R.id.togglebuttonSender);
m_labelSender = (TextView) findViewById(R.id.TextLabelSender);
final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
m_webview = new WebView(this);
ell.addView(m_webview);
final LocationManager locationManager = (LocationManager) getApplicationContext().getSystemService(
Context.LOCATION_SERVICE);
m_togglebuttonGps.setChecked(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER));
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
final Intent i = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
m_togglebuttonGps.setChecked(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
m_togglebuttonSender.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
if (m_togglebuttonSender.isChecked()) {
+ Toast.makeText(KonPhiActivity.this, "Sending movement to server", Toast.LENGTH_SHORT).show();
m_labelSender.setText("Sending Result:");
} else {
+ Toast.makeText(KonPhiActivity.this, "No movement is sent to server", Toast.LENGTH_SHORT).show();
m_labelSender.setText("Paused; Last:");
}
}
});
long minTime = 1000 * m_senderIntervalSecs; // [milliseconds]
float minDistance = 0; //10; // [meters]
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
minTime, minDistance, this);
}
protected Dialog onCreateDialog(int d) {
Dialog result;
switch (d) {
case DIALOG_GPSWARNING:
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage("The GPS receiver is not active. Do you want to activate it now?")
.setCancelable(false)
.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
final Intent i = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
}
})
.setNegativeButton("No", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
});
result = builder.create();
break;
default:
result = null;
}
return result;
}
@Override
public void onLocationChanged(Location loc) {
//Toast.makeText(KonPhiActivity.this, "Received location from " + loc.getProvider(), Toast.LENGTH_SHORT).show();
+ printLocInfo(loc);
+
+ if (m_lastLocationValid) {
+ long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
+ if (secdiff >= m_senderIntervalSecs) {
+ sendPairNow(m_lastLocation, loc);
+ m_lastLocation = loc;
+ }
+ // Note: We don't set the m_lastLocation if we are smaller than m_senderIntervalSecs.
+ } else {
+ m_lastLocationValid = true;
+ m_lastLocation = loc;
+ }
+ }
+
+ private void printLocInfo(Location loc) {
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy()) : "...");
- String dist = "...";
- String secs = "...";
if (m_lastLocationValid) {
long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
- if (secdiff >= m_senderIntervalSecs) {
- sendPairNow(m_lastLocation, loc);
- }
- secs = String.valueOf(secdiff);
- dist = String.valueOf(m_lastLocation.distanceTo(loc));
+ String secs = String.valueOf(secdiff);
+ String dist = String.valueOf(m_lastLocation.distanceTo(loc));
+ viewDist.setText(dist);
+ viewSecs.setText(secs);
+ } else {
+ viewDist.setText("...");
+ viewSecs.setText("...");
}
- viewDist.setText(dist);
- viewSecs.setText(secs);
-
- m_lastLocationValid = true;
- m_lastLocation = loc;
}
private String degToString(double deg) {
return String.valueOf(deg);
}
private void sendPairNow(Location startLoc, Location endLoc) {
// Only send if the togglebutton is active
if (!m_togglebuttonSender.isChecked())
return;
String startLat = degToString(startLoc.getLatitude());
String startLon = degToString(startLoc.getLongitude());
String endLat = degToString(endLoc.getLatitude());
String endLon = degToString(endLoc.getLongitude());
String duration = String.valueOf((endLoc.getTime() - startLoc.getTime()) / 1000);
String endTime = m_dateFormatSender.format(new Date(endLoc.getTime()));
// FIXME: Need to transfer speed and accuracy at both points, and also group selection
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(m_server + "slices");
final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
resultview.setText("Sending to " + httppost.getURI().toString());
String displaytime = m_dateFormatter.format(new Date(endLoc.getTime())) + ": ";
try {
// Add your data
List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>(6);
nameValuePairs.add(new BasicNameValuePair("slice[startlat]", startLat));
nameValuePairs.add(new BasicNameValuePair("slice[startlon]", startLon));
nameValuePairs.add(new BasicNameValuePair("slice[lat]", endLat));
nameValuePairs.add(new BasicNameValuePair("slice[lon]", endLon));
nameValuePairs.add(new BasicNameValuePair("slice[duration]", duration));
nameValuePairs.add(new BasicNameValuePair("slice[time]", endTime));
httppost.setEntity(new UrlEncodedFormEntity(nameValuePairs));
// ByteArrayOutputStream baos = new ByteArrayOutputStream();
// httppost.getEntity().writeTo(baos);
// m_webview.loadData(baos.toString(), "text/html", "utf-8");
// Execute HTTP Post Request
HttpResponse response = httpclient.execute(httppost);
// baos.reset();
// response.getEntity().writeTo(baos);
// m_webview.loadData(baos.toString(), "text/html", "utf-8");
StatusLine rstatus = response.getStatusLine();
- resultview.setText(displaytime + String.valueOf(rstatus.getStatusCode()) + " " + rstatus.getReasonPhrase());
+ resultview.setText(displaytime + String.valueOf(rstatus.getStatusCode()) + " " + rstatus.getReasonPhrase());
+ resultview.setTextColor(ColorStateList.valueOf(Color.GREEN));
} catch (ClientProtocolException e) {
resultview.setText(displaytime + "Sending failed (Protocol): " + e.getLocalizedMessage());
+ resultview.setTextColor(ColorStateList.valueOf(Color.RED));
} catch (IOException e) {
resultview.setText(displaytime + "Sending failed (IO): " + e.getLocalizedMessage());
+ resultview.setTextColor(ColorStateList.valueOf(Color.RED));
}
}
@Override
public void onProviderDisabled(String provider) {
//Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " disabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
//Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider + " enabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
//Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " out of service", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
//Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " tmp. unavailable", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
//Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider + " available", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
break;
}
}
}
\ No newline at end of file
|
cstim/carcomm
|
096c972b64abf1076df9b3e3bf39ca18b91e2b4a
|
Implement sending of the slices to the server. Yay, this really works!
|
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml
index b41edff..005cc38 100644
--- a/konphidroid/res/layout/main.xml
+++ b/konphidroid/res/layout/main.xml
@@ -1,51 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:id="@+id/MainLayout" android:layout_height="fill_parent">
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="@string/hello" />
- <ToggleButton android:id="@+id/togglebutton"
- android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:textOn="GPS" android:textOff="GPS" />
+ <LinearLayout android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:orientation="horizontal">
- <TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
- <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <ToggleButton android:id="@+id/togglebutton"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:textOn="GPS" android:textOff="GPS" />
+
+ <ToggleButton android:id="@+id/togglebuttonSender"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:textOn="Transmission" android:textOff="No Transmission"
+ android:checked="true" />
+
+ </LinearLayout>
+
+ <TableLayout android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <TableRow android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
<TextView android:text="GPS Timestamp:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewGPSAge"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
- <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <TableRow android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
<TextView android:text="Latitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLat"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
- <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <TableRow android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
<TextView android:text="Longitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLon"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
- <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content">
- <TextView android:text="Accuracy [m]:"
- android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ <TableRow android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <TextView android:text="Accuracy [m]:" android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewAcc"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
- <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <TableRow android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
<TextView android:text="Dist to previous [m]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewDist"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
- <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <TableRow android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
<TextView android:text="Time to previous [s]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewSecs"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
+ <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <TextView android:text="Sending result:" android:id="@+id/TextLabelSender"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ <TextView android:text="..." android:id="@+id/TextViewSender"
+ android:scrollHorizontally="true" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" />
+ </TableRow>
</TableLayout>
+ <LinearLayout android:id="@+id/LayoutWebview"
+ android:layout_width="fill_parent" android:layout_height="fill_parent"></LinearLayout>
+
</LinearLayout>
diff --git a/konphidroid/res/values/strings.xml b/konphidroid/res/values/strings.xml
index dd05310..07bbad0 100644
--- a/konphidroid/res/values/strings.xml
+++ b/konphidroid/res/values/strings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="hello">This is the Test App for the KonPhiDense game. We receive start GPS and send it to the server.</string>
+ <string name="hello">KonPhiDense Test App. We receive GPS and send it to the server.</string>
<string name="app_name">KonphiDroid</string>
</resources>
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index 0d516f5..40b8694 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,170 +1,252 @@
package de.cstimming.konphidroid;
+import java.io.IOException;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.StatusLine;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.message.BasicNameValuePair;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
+import android.webkit.WebView;
+import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
public class KonPhiActivity extends Activity implements LocationListener {
private ToggleButton m_togglebuttonGps;
-
+ private ToggleButton m_togglebuttonSender;
+
private SimpleDateFormat m_dateFormatter;
-
+ private SimpleDateFormat m_dateFormatSender;
+
private Location m_lastLocation;
private boolean m_lastLocationValid;
private long m_senderIntervalSecs;
-
+ private String m_server = "http://carcomm.cstimming.de/";
+
+ private WebView m_webview;
+ private TextView m_labelSender;
+
private static final int DIALOG_GPSWARNING = 1;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
+ m_dateFormatSender = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+ m_dateFormatSender.setTimeZone(TimeZone.getTimeZone("GMT00"));
m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
m_senderIntervalSecs = 30;
-
+ m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebutton);
+ m_togglebuttonSender = (ToggleButton) findViewById(R.id.togglebuttonSender);
+ m_labelSender = (TextView) findViewById(R.id.TextLabelSender);
+
+ final LinearLayout ell = (LinearLayout) findViewById(R.id.LayoutWebview);
+ m_webview = new WebView(this);
+ ell.addView(m_webview);
+
final LocationManager locationManager = (LocationManager) getApplicationContext().getSystemService(
Context.LOCATION_SERVICE);
- m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebutton);
m_togglebuttonGps.setChecked(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER));
-
+
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
showDialog(DIALOG_GPSWARNING);
}
m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
-// if (togglebuttonGps.isChecked()) {
-// Toast.makeText(KonPhiActivity.this, "Checked", Toast.LENGTH_SHORT).show();
-// } else {
-// Toast.makeText(KonPhiActivity.this, "Not checked", Toast.LENGTH_SHORT).show();
-// }
final Intent i = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
startActivity(i);
m_togglebuttonGps.setChecked(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
+ m_togglebuttonSender.setOnClickListener(new OnClickListener() {
+ public void onClick(View v) {
+ if (m_togglebuttonSender.isChecked()) {
+ m_labelSender.setText("Sending Result:");
+ } else {
+ m_labelSender.setText("Paused; Last:");
+ }
+ }
+ });
+ long minTime = 1000 * m_senderIntervalSecs; // [milliseconds]
+ float minDistance = 0; //10; // [meters]
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
- 5000, 10,
- this);
+ minTime, minDistance, this);
}
protected Dialog onCreateDialog(int d) {
Dialog result;
switch (d) {
case DIALOG_GPSWARNING:
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage("The GPS receiver is not active. Do you want to activate it now?")
- .setCancelable(false)
- .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- final Intent i = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
- i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
- startActivity(i);
- }
- })
- .setNegativeButton("No", new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- dialog.cancel();
- }
- });
+ .setCancelable(false)
+ .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ final Intent i = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+ i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ startActivity(i);
+ }
+ })
+ .setNegativeButton("No", new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.cancel();
+ }
+ });
result = builder.create();
break;
default:
result = null;
}
return result;
}
-
+
@Override
public void onLocationChanged(Location loc) {
- Toast.makeText(KonPhiActivity.this, "Received location from " + loc.getProvider(), Toast.LENGTH_SHORT).show();
+ //Toast.makeText(KonPhiActivity.this, "Received location from " + loc.getProvider(), Toast.LENGTH_SHORT).show();
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy()) : "...");
String dist = "...";
String secs = "...";
if (m_lastLocationValid) {
long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
if (secdiff >= m_senderIntervalSecs) {
- sendPair(m_lastLocation, loc);
+ sendPairNow(m_lastLocation, loc);
}
secs = String.valueOf(secdiff);
dist = String.valueOf(m_lastLocation.distanceTo(loc));
}
viewDist.setText(dist);
viewSecs.setText(secs);
-
+
m_lastLocationValid = true;
m_lastLocation = loc;
}
- private void sendPair(Location startLoc, Location endLoc) {
- // TODO Auto-generated method stub
-
+ private String degToString(double deg) {
+ return String.valueOf(deg);
+ }
+
+ private void sendPairNow(Location startLoc, Location endLoc) {
+ // Only send if the togglebutton is active
+ if (!m_togglebuttonSender.isChecked())
+ return;
+
+ String startLat = degToString(startLoc.getLatitude());
+ String startLon = degToString(startLoc.getLongitude());
+ String endLat = degToString(endLoc.getLatitude());
+ String endLon = degToString(endLoc.getLongitude());
+ String duration = String.valueOf((endLoc.getTime() - startLoc.getTime()) / 1000);
+ String endTime = m_dateFormatSender.format(new Date(endLoc.getTime()));
+ // FIXME: Need to transfer speed and accuracy at both points, and also group selection
+
+ HttpClient httpclient = new DefaultHttpClient();
+ HttpPost httppost = new HttpPost(m_server + "slices");
+
+ final TextView resultview = (TextView) findViewById(R.id.TextViewSender);
+ resultview.setText("Sending to " + httppost.getURI().toString());
+ String displaytime = m_dateFormatter.format(new Date(endLoc.getTime())) + ": ";
+ try {
+ // Add your data
+ List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>(6);
+ nameValuePairs.add(new BasicNameValuePair("slice[startlat]", startLat));
+ nameValuePairs.add(new BasicNameValuePair("slice[startlon]", startLon));
+ nameValuePairs.add(new BasicNameValuePair("slice[lat]", endLat));
+ nameValuePairs.add(new BasicNameValuePair("slice[lon]", endLon));
+ nameValuePairs.add(new BasicNameValuePair("slice[duration]", duration));
+ nameValuePairs.add(new BasicNameValuePair("slice[time]", endTime));
+ httppost.setEntity(new UrlEncodedFormEntity(nameValuePairs));
+
+ // ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ // httppost.getEntity().writeTo(baos);
+ // m_webview.loadData(baos.toString(), "text/html", "utf-8");
+
+ // Execute HTTP Post Request
+ HttpResponse response = httpclient.execute(httppost);
+ // baos.reset();
+ // response.getEntity().writeTo(baos);
+ // m_webview.loadData(baos.toString(), "text/html", "utf-8");
+ StatusLine rstatus = response.getStatusLine();
+ resultview.setText(displaytime + String.valueOf(rstatus.getStatusCode()) + " " + rstatus.getReasonPhrase());
+ } catch (ClientProtocolException e) {
+ resultview.setText(displaytime + "Sending failed (Protocol): " + e.getLocalizedMessage());
+ } catch (IOException e) {
+ resultview.setText(displaytime + "Sending failed (IO): " + e.getLocalizedMessage());
+ }
}
@Override
public void onProviderDisabled(String provider) {
//Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " disabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
//Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider + " enabled", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
//Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " out of service", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
//Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " tmp. unavailable", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
//Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider + " available", Toast.LENGTH_SHORT).show();
m_togglebuttonGps.setChecked(true);
break;
}
}
}
\ No newline at end of file
|
cstim/carcomm
|
1291c0165d8c3e946349f8d5362661a85451638e
|
Really fix receiving of GPS locations.
|
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml
index 7b90023..b41edff 100644
--- a/konphidroid/res/layout/main.xml
+++ b/konphidroid/res/layout/main.xml
@@ -1,51 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="@string/hello" />
<ToggleButton android:id="@+id/togglebutton"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:textOn="GPS" android:textOff="GPS" />
- <TableLayout android:id="@+id/TableLayout01"
- android:layout_width="fill_parent" android:layout_height="wrap_content">
- <TableRow android:id="@+id/TableRow03" android:layout_width="fill_parent"
- android:layout_height="wrap_content">
- <TextView android:text="GPS Time:" android:id="@+id/TextView02"
+ <TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <TextView android:text="GPS Timestamp:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewGPSAge"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
- <TableRow android:id="@+id/TableRow01" android:layout_width="fill_parent"
- android:layout_height="wrap_content">
- <TextView android:text="Latitude [deg]:" android:id="@+id/TextView01"
+ <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <TextView android:text="Latitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLat"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
- <TableRow android:id="@+id/TableRow02" android:layout_width="fill_parent"
- android:layout_height="wrap_content">
- <TextView android:text="Longitude [deg]:" android:id="@+id/TextView03"
+ <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <TextView android:text="Longitude [deg]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLon"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
- <TableRow android:id="@+id/TableRow04" android:layout_width="fill_parent"
- android:layout_height="wrap_content">
- <TextView android:text="Accuracy [m]]:" android:id="@+id/TextView04"
+ <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <TextView android:text="Accuracy [m]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewAcc"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
- <TableRow android:id="@+id/TableRow05" android:layout_width="fill_parent"
- android:layout_height="wrap_content">
- <TextView android:text="Dist to previous [m]]:" android:id="@+id/TextView05"
+ <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <TextView android:text="Dist to previous [m]:"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewDist"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
+ <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <TextView android:text="Time to previous [s]:"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ <TextView android:text="..." android:id="@+id/TextViewSecs"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ </TableRow>
</TableLayout>
</LinearLayout>
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index e37f70c..0d516f5 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,108 +1,170 @@
package de.cstimming.konphidroid;
import java.text.SimpleDateFormat;
import java.util.Date;
import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
+import android.provider.Settings;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
public class KonPhiActivity extends Activity implements LocationListener {
- private ToggleButton togglebuttonGps;
+ private ToggleButton m_togglebuttonGps;
- private SimpleDateFormat dateFormatter;
+ private SimpleDateFormat m_dateFormatter;
private Location m_lastLocation;
private boolean m_lastLocationValid;
+ private long m_senderIntervalSecs;
+
+ private static final int DIALOG_GPSWARNING = 1;
+
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
- dateFormatter = new SimpleDateFormat("hh:mm:ss");
+ m_dateFormatter = new SimpleDateFormat("HH:mm:ss");
+ m_senderIntervalSecs = 30;
- LocationManager locationManager = (LocationManager) getApplicationContext().getSystemService(
+ final LocationManager locationManager = (LocationManager) getApplicationContext().getSystemService(
Context.LOCATION_SERVICE);
- togglebuttonGps = (ToggleButton) findViewById(R.id.togglebutton);
- togglebuttonGps.setChecked(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER));
+ m_togglebuttonGps = (ToggleButton) findViewById(R.id.togglebutton);
+ m_togglebuttonGps.setChecked(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER));
- togglebuttonGps.setOnClickListener(new OnClickListener() {
+ if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+ showDialog(DIALOG_GPSWARNING);
+ }
+
+ m_togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
- if (togglebuttonGps.isChecked()) {
- Toast.makeText(KonPhiActivity.this, "Checked", Toast.LENGTH_SHORT).show();
- } else {
- Toast.makeText(KonPhiActivity.this, "Not checked", Toast.LENGTH_SHORT).show();
- }
+// if (togglebuttonGps.isChecked()) {
+// Toast.makeText(KonPhiActivity.this, "Checked", Toast.LENGTH_SHORT).show();
+// } else {
+// Toast.makeText(KonPhiActivity.this, "Not checked", Toast.LENGTH_SHORT).show();
+// }
+ final Intent i = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+ i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ startActivity(i);
+ m_togglebuttonGps.setChecked(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER));
}
});
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
5000, 10,
this);
}
+ protected Dialog onCreateDialog(int d) {
+ Dialog result;
+ switch (d) {
+ case DIALOG_GPSWARNING:
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setMessage("The GPS receiver is not active. Do you want to activate it now?")
+ .setCancelable(false)
+ .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ final Intent i = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+ i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ startActivity(i);
+ }
+ })
+ .setNegativeButton("No", new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.cancel();
+ }
+ });
+ result = builder.create();
+ break;
+ default:
+ result = null;
+ }
+ return result;
+ }
+
@Override
public void onLocationChanged(Location loc) {
+ Toast.makeText(KonPhiActivity.this, "Received location from " + loc.getProvider(), Toast.LENGTH_SHORT).show();
+
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
+ final TextView viewSecs = (TextView) findViewById(R.id.TextViewSecs);
- viewgpsage.setText(dateFormatter.format(new Date(loc.getTime())));
+ viewgpsage.setText(m_dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy()) : "...");
String dist = "...";
+ String secs = "...";
if (m_lastLocationValid) {
+ long secdiff = (loc.getTime() - m_lastLocation.getTime()) / 1000;
+ if (secdiff >= m_senderIntervalSecs) {
+ sendPair(m_lastLocation, loc);
+ }
+ secs = String.valueOf(secdiff);
dist = String.valueOf(m_lastLocation.distanceTo(loc));
}
viewDist.setText(dist);
+ viewSecs.setText(secs);
m_lastLocationValid = true;
m_lastLocation = loc;
}
+ private void sendPair(Location startLoc, Location endLoc) {
+ // TODO Auto-generated method stub
+
+ }
+
@Override
public void onProviderDisabled(String provider) {
- Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " disabled", Toast.LENGTH_SHORT).show();
+ //Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " disabled", Toast.LENGTH_SHORT).show();
+ m_togglebuttonGps.setChecked(false);
}
@Override
public void onProviderEnabled(String provider) {
- Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider + " enabled", Toast.LENGTH_SHORT).show();
+ //Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider + " enabled", Toast.LENGTH_SHORT).show();
+ m_togglebuttonGps.setChecked(true);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
- Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " out of service", Toast.LENGTH_SHORT).show();
- togglebuttonGps.setChecked(false);
+ //Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " out of service", Toast.LENGTH_SHORT).show();
+ m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
- Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " tmp. unavailable", Toast.LENGTH_SHORT).show();
- togglebuttonGps.setChecked(false);
+ //Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " tmp. unavailable", Toast.LENGTH_SHORT).show();
+ m_togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
- Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider + " available", Toast.LENGTH_SHORT).show();
- togglebuttonGps.setChecked(true);
+ //Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider + " available", Toast.LENGTH_SHORT).show();
+ m_togglebuttonGps.setChecked(true);
break;
}
}
}
\ No newline at end of file
|
cstim/carcomm
|
47fc8b234c79dcb79c05584626de0d9a0f3e8677
|
We can now receive the GPS points and show something in the display.
|
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml
index cfe36a8..7b90023 100644
--- a/konphidroid/res/layout/main.xml
+++ b/konphidroid/res/layout/main.xml
@@ -1,37 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="@string/hello" />
<ToggleButton android:id="@+id/togglebutton"
android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:textOn="GPS switched on" android:textOff="GPS switched off" />
+ android:textOn="GPS" android:textOff="GPS" />
<TableLayout android:id="@+id/TableLayout01"
android:layout_width="fill_parent" android:layout_height="wrap_content">
<TableRow android:id="@+id/TableRow03" android:layout_width="fill_parent"
android:layout_height="wrap_content">
- <TextView android:text="Provider:" android:id="@+id/TextView02"
+ <TextView android:text="GPS Time:" android:id="@+id/TextView02"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewGPSAge"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:id="@+id/TableRow01" android:layout_width="fill_parent"
android:layout_height="wrap_content">
- <TextView android:text="Latitude:" android:id="@+id/TextView01"
+ <TextView android:text="Latitude [deg]:" android:id="@+id/TextView01"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLat"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
<TableRow android:id="@+id/TableRow02" android:layout_width="fill_parent"
android:layout_height="wrap_content">
- <TextView android:text="Longitude:" android:id="@+id/TextView03"
+ <TextView android:text="Longitude [deg]:" android:id="@+id/TextView03"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="..." android:id="@+id/TextViewLon"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
</TableRow>
+ <TableRow android:id="@+id/TableRow04" android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <TextView android:text="Accuracy [m]]:" android:id="@+id/TextView04"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ <TextView android:text="..." android:id="@+id/TextViewAcc"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ </TableRow>
+ <TableRow android:id="@+id/TableRow05" android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <TextView android:text="Dist to previous [m]]:" android:id="@+id/TextView05"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ <TextView android:text="..." android:id="@+id/TextViewDist"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ </TableRow>
</TableLayout>
</LinearLayout>
diff --git a/konphidroid/res/values/strings.xml b/konphidroid/res/values/strings.xml
index bf4a85b..dd05310 100644
--- a/konphidroid/res/values/strings.xml
+++ b/konphidroid/res/values/strings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="hello">This is the initial Android test app for the KonPhiDroid game. We start by receiving the GPS positing and sending them to the server regularly.</string>
+ <string name="hello">This is the Test App for the KonPhiDense game. We receive start GPS and send it to the server.</string>
<string name="app_name">KonphiDroid</string>
</resources>
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
index 62c1657..e37f70c 100644
--- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -1,82 +1,108 @@
package de.cstimming.konphidroid;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
import android.app.Activity;
import android.content.Context;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
public class KonPhiActivity extends Activity implements LocationListener {
- ToggleButton togglebuttonGps;
+ private ToggleButton togglebuttonGps;
+
+ private SimpleDateFormat dateFormatter;
+ private Location m_lastLocation;
+ private boolean m_lastLocationValid;
+
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
+ dateFormatter = new SimpleDateFormat("hh:mm:ss");
+
+ LocationManager locationManager = (LocationManager) getApplicationContext().getSystemService(
+ Context.LOCATION_SERVICE);
+
togglebuttonGps = (ToggleButton) findViewById(R.id.togglebutton);
+ togglebuttonGps.setChecked(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER));
+
togglebuttonGps.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
// Perform action on clicks
if (togglebuttonGps.isChecked()) {
Toast.makeText(KonPhiActivity.this, "Checked", Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(KonPhiActivity.this, "Not checked", Toast.LENGTH_SHORT).show();
}
}
});
- LocationManager locationManager = (LocationManager) getApplicationContext().getSystemService(
- Context.LOCATION_SERVICE);
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
5000, 10,
this);
}
@Override
public void onLocationChanged(Location loc) {
final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
+ final TextView viewAcc = (TextView) findViewById(R.id.TextViewAcc);
+ final TextView viewDist = (TextView) findViewById(R.id.TextViewDist);
- viewgpsage.setText(loc.getProvider());
+ viewgpsage.setText(dateFormatter.format(new Date(loc.getTime())));
viewLat.setText(String.valueOf(loc.getLatitude()));
viewLon.setText(String.valueOf(loc.getLongitude()));
+ viewAcc.setText(loc.hasAccuracy() ? String.valueOf(loc.getAccuracy()) : "...");
+
+ String dist = "...";
+ if (m_lastLocationValid) {
+ dist = String.valueOf(m_lastLocation.distanceTo(loc));
+ }
+ viewDist.setText(dist);
+
+ m_lastLocationValid = true;
+ m_lastLocation = loc;
}
@Override
public void onProviderDisabled(String provider) {
Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " disabled", Toast.LENGTH_SHORT).show();
}
@Override
public void onProviderEnabled(String provider) {
Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider + " enabled", Toast.LENGTH_SHORT).show();
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
switch (status) {
case LocationProvider.OUT_OF_SERVICE:
Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " out of service", Toast.LENGTH_SHORT).show();
togglebuttonGps.setChecked(false);
break;
case LocationProvider.TEMPORARILY_UNAVAILABLE:
Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " tmp. unavailable", Toast.LENGTH_SHORT).show();
+ togglebuttonGps.setChecked(false);
break;
case LocationProvider.AVAILABLE:
Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider + " available", Toast.LENGTH_SHORT).show();
togglebuttonGps.setChecked(true);
break;
}
}
}
\ No newline at end of file
|
cstim/carcomm
|
92cc473355fa1f4021002d845226bf04a4e015c6
|
Another new try for an android app.
|
diff --git a/konphidroid/.classpath b/konphidroid/.classpath
new file mode 100644
index 0000000..609aa00
--- /dev/null
+++ b/konphidroid/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="gen"/>
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/konphidroid/.gitignore b/konphidroid/.gitignore
new file mode 100644
index 0000000..479c192
--- /dev/null
+++ b/konphidroid/.gitignore
@@ -0,0 +1,4 @@
+bin
+build.xml
+local.properties
+gen
diff --git a/konphidroid/.project b/konphidroid/.project
new file mode 100644
index 0000000..c891bb0
--- /dev/null
+++ b/konphidroid/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>konphidroid</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ApkBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml
new file mode 100644
index 0000000..c3fab87
--- /dev/null
+++ b/konphidroid/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="de.cstimming.konphidroid"
+ android:versionCode="1"
+ android:versionName="1.0">
+ <application android:icon="@drawable/icon" android:label="@string/app_name">
+ <activity android:name=".KonPhiActivity"
+ android:label="@string/app_name">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+
+ </application>
+ <uses-sdk android:minSdkVersion="3" />
+
+<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
+<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
+<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"></uses-permission>
+<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
+<uses-permission android:name="android.permission.INTERNET"></uses-permission>
+</manifest>
\ No newline at end of file
diff --git a/konphidroid/default.properties b/konphidroid/default.properties
new file mode 100644
index 0000000..4513a1e
--- /dev/null
+++ b/konphidroid/default.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-3
diff --git a/konphidroid/res/drawable/icon.png b/konphidroid/res/drawable/icon.png
new file mode 100644
index 0000000..a07c69f
Binary files /dev/null and b/konphidroid/res/drawable/icon.png differ
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml
new file mode 100644
index 0000000..cfe36a8
--- /dev/null
+++ b/konphidroid/res/layout/main.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="@string/hello" />
+
+ <ToggleButton android:id="@+id/togglebutton"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:textOn="GPS switched on" android:textOff="GPS switched off" />
+
+ <TableLayout android:id="@+id/TableLayout01"
+ android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <TableRow android:id="@+id/TableRow03" android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <TextView android:text="Provider:" android:id="@+id/TextView02"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ <TextView android:text="..." android:id="@+id/TextViewGPSAge"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ </TableRow>
+ <TableRow android:id="@+id/TableRow01" android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <TextView android:text="Latitude:" android:id="@+id/TextView01"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ <TextView android:text="..." android:id="@+id/TextViewLat"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ </TableRow>
+ <TableRow android:id="@+id/TableRow02" android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <TextView android:text="Longitude:" android:id="@+id/TextView03"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ <TextView android:text="..." android:id="@+id/TextViewLon"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ </TableRow>
+ </TableLayout>
+
+</LinearLayout>
diff --git a/konphidroid/res/values/strings.xml b/konphidroid/res/values/strings.xml
new file mode 100644
index 0000000..bf4a85b
--- /dev/null
+++ b/konphidroid/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="hello">This is the initial Android test app for the KonPhiDroid game. We start by receiving the GPS positing and sending them to the server regularly.</string>
+ <string name="app_name">KonphiDroid</string>
+</resources>
diff --git a/konphidroid/src/de/cstimming/konphidroid/FollowGpsException.java b/konphidroid/src/de/cstimming/konphidroid/FollowGpsException.java
new file mode 100644
index 0000000..a833538
--- /dev/null
+++ b/konphidroid/src/de/cstimming/konphidroid/FollowGpsException.java
@@ -0,0 +1,15 @@
+package de.cstimming.konphidroid;
+
+import java.io.IOException;
+
+public class FollowGpsException extends IOException {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 7847957224049800119L;
+
+ public FollowGpsException(final String string) {
+ super(string);
+ }
+
+}
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
new file mode 100644
index 0000000..62c1657
--- /dev/null
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -0,0 +1,82 @@
+package de.cstimming.konphidroid;
+
+import android.app.Activity;
+import android.content.Context;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.location.LocationProvider;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.widget.ToggleButton;
+
+public class KonPhiActivity extends Activity implements LocationListener {
+
+ ToggleButton togglebuttonGps;
+
+ /** Called when the activity is first created. */
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.main);
+
+ togglebuttonGps = (ToggleButton) findViewById(R.id.togglebutton);
+ togglebuttonGps.setOnClickListener(new OnClickListener() {
+ public void onClick(View v) {
+ // Perform action on clicks
+ if (togglebuttonGps.isChecked()) {
+ Toast.makeText(KonPhiActivity.this, "Checked", Toast.LENGTH_SHORT).show();
+ } else {
+ Toast.makeText(KonPhiActivity.this, "Not checked", Toast.LENGTH_SHORT).show();
+ }
+ }
+ });
+
+ LocationManager locationManager = (LocationManager) getApplicationContext().getSystemService(
+ Context.LOCATION_SERVICE);
+ locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
+ 5000, 10,
+ this);
+ }
+
+ @Override
+ public void onLocationChanged(Location loc) {
+ final TextView viewgpsage = (TextView) findViewById(R.id.TextViewGPSAge);
+ final TextView viewLat = (TextView) findViewById(R.id.TextViewLat);
+ final TextView viewLon = (TextView) findViewById(R.id.TextViewLon);
+
+ viewgpsage.setText(loc.getProvider());
+ viewLat.setText(String.valueOf(loc.getLatitude()));
+ viewLon.setText(String.valueOf(loc.getLongitude()));
+ }
+
+ @Override
+ public void onProviderDisabled(String provider) {
+ Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " disabled", Toast.LENGTH_SHORT).show();
+ }
+
+ @Override
+ public void onProviderEnabled(String provider) {
+ Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider + " enabled", Toast.LENGTH_SHORT).show();
+ }
+
+ @Override
+ public void onStatusChanged(String provider, int status, Bundle extras) {
+ switch (status) {
+ case LocationProvider.OUT_OF_SERVICE:
+ Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " out of service", Toast.LENGTH_SHORT).show();
+ togglebuttonGps.setChecked(false);
+ break;
+ case LocationProvider.TEMPORARILY_UNAVAILABLE:
+ Toast.makeText(KonPhiActivity.this, "Oh: Provider " + provider + " tmp. unavailable", Toast.LENGTH_SHORT).show();
+ break;
+ case LocationProvider.AVAILABLE:
+ Toast.makeText(KonPhiActivity.this, "Good: Provider " + provider + " available", Toast.LENGTH_SHORT).show();
+ togglebuttonGps.setChecked(true);
+ break;
+ }
+ }
+}
\ No newline at end of file
diff --git a/konphidroid/src/de/cstimming/konphidroid/Tracker.java b/konphidroid/src/de/cstimming/konphidroid/Tracker.java
new file mode 100644
index 0000000..d0f5410
--- /dev/null
+++ b/konphidroid/src/de/cstimming/konphidroid/Tracker.java
@@ -0,0 +1,125 @@
+package de.cstimming.konphidroid;
+
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.os.Bundle;
+import android.util.Log;
+
+/**
+ * GPS-Tracker. Holds a {@link Track} and manages it.
+ *
+ * @author mb
+ */
+public class Tracker implements LocationListener {
+
+ /**
+ * Tag used for Android-logging.
+ */
+ private static final String DEBUG_TAG = Tracker.class.getName();
+
+ private static final float LOCATION_MIN_ACCURACY = 200f;
+
+ public static final byte STATE_START = 0;
+
+ public static final byte STATE_PAUSE = 1;
+
+ public static final byte STATE_STOP = 2;
+
+ private int trackingState = STATE_START;
+
+ private Location m_lastLocation;
+ private boolean m_lastLocationValid;
+
+ private LocationManager locationManager;
+
+ private long m_GpsInterval;
+ private float m_GpsDistance;
+
+ Tracker(final LocationManager locationManager) {
+ this.locationManager = locationManager;
+ this.m_lastLocationValid = false;
+ m_GpsInterval = 5000; // milliseconds
+ m_GpsDistance = 20; // meters
+ }
+
+ boolean setFollowGps(final boolean followGps) throws FollowGpsException {
+ if (followGps) {
+ if (m_lastLocationValid) {
+ return true;
+ } else {
+ throw new FollowGpsException("Got no current location");
+ }
+ } else {
+ return false;
+ }
+ }
+
+ void resetTrack() {
+ m_lastLocationValid = false;
+ }
+
+ public Location getLocation() throws FollowGpsException {
+ if (m_lastLocationValid) {
+ return m_lastLocation;
+ } else {
+ throw new FollowGpsException("Got no current location");
+ }
+ }
+
+ void addLocation(Location loc) {
+ // FIXME!!
+ }
+
+ void setTrackingState(int newTrackingState) {
+ //PAUSE is only a toggle-flag
+ if (newTrackingState == STATE_PAUSE && (trackingState == STATE_PAUSE || trackingState == STATE_STOP)) {
+ newTrackingState = STATE_START;
+ }
+ switch (newTrackingState) {
+ case STATE_START:
+ locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
+ m_GpsInterval, m_GpsDistance,
+ this);
+ addLocation(locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER));
+ break;
+
+ case STATE_STOP:
+ resetTrack();
+ locationManager.removeUpdates(this);
+ break;
+
+ case STATE_PAUSE:
+ locationManager.removeUpdates(this);
+ break;
+ }
+ trackingState = newTrackingState;
+ m_lastLocationValid = false;
+
+ }
+
+ /**
+ * used for disable updates but not to set a new tracking state (e.g. on exiting)
+ */
+ void removeUpdates() {
+ locationManager.removeUpdates(this);
+ }
+
+ @Override
+ public void onLocationChanged(final Location location) {
+ Log.w(DEBUG_TAG, "onLocationChanged() Got location: " + location);
+ if (!location.hasAccuracy() || location.getAccuracy() <= LOCATION_MIN_ACCURACY) {
+ addLocation(location);
+ }
+ }
+
+ @Override
+ public void onProviderDisabled(final String provider) {}
+
+ @Override
+ public void onProviderEnabled(final String provider) {}
+
+ @Override
+ public void onStatusChanged(final String provider, final int status, final Bundle extras) {}
+
+}
|
cstim/carcomm
|
353579b3befab532eea0c781a450ce77b38401bc
|
Second try: Now add the OSM view widget as a new eclipse-based project. This now runs fine.
|
diff --git a/.gitignore b/.gitignore
index f9021d8..1b32385 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
db/development.sqlite3
*~
log/development.log
+.metadata
diff --git a/konphidroid/.classpath b/konphidroid/.classpath
new file mode 100644
index 0000000..8fc01c9
--- /dev/null
+++ b/konphidroid/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="gen"/>
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+ <classpathentry kind="lib" path="lib/apache-mime4j-0.4.jar"/>
+ <classpathentry kind="lib" path="lib/httpmime-4.0-beta1.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/konphidroid/.gitignore b/konphidroid/.gitignore
new file mode 100644
index 0000000..479c192
--- /dev/null
+++ b/konphidroid/.gitignore
@@ -0,0 +1,4 @@
+bin
+build.xml
+local.properties
+gen
diff --git a/konphidroid/.project b/konphidroid/.project
new file mode 100644
index 0000000..c891bb0
--- /dev/null
+++ b/konphidroid/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>konphidroid</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ApkBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/konphidroid/.settings/org.eclipse.jdt.core.prefs b/konphidroid/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..cbe2e79
--- /dev/null
+++ b/konphidroid/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Wed Jun 30 21:00:17 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml
new file mode 100644
index 0000000..90cae78
--- /dev/null
+++ b/konphidroid/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="de.cstimming.konphidroid"
+ android:versionCode="1"
+ android:versionName="1.0">
+ <application android:icon="@drawable/icon" android:label="@string/app_name">
+ <activity android:name=".KonPhiActivity"
+ android:label="@string/app_name">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+
+ </application>
+ <uses-sdk android:minSdkVersion="4"/>
+
+
+<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
+<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
+<uses-permission android:name="android.permission.INTERNET"></uses-permission>
+<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
+
+ <!--
+ If this service exists then the view will use it to get its tiles.
+ If you remove this service then the view will use a tile provider directly.
+ -->
+ <service android:name=".services.OpenStreetMapTileProviderService"
+ android:process=":remote"
+ android:label="OpenStreetMapTileProviderService">
+ <intent-filter>
+ <action android:name="org.andnav.osm.services.IOpenStreetMapTileProviderService" />
+ </intent-filter>
+ </service>
+
+</manifest>
\ No newline at end of file
diff --git a/konphidroid/default.properties b/konphidroid/default.properties
new file mode 100644
index 0000000..19c9665
--- /dev/null
+++ b/konphidroid/default.properties
@@ -0,0 +1,13 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Indicates whether an apk should be generated for each density.
+split.density=false
+# Project target.
+target=android-4
diff --git a/konphidroid/lib/apache-mime4j-0.4.jar b/konphidroid/lib/apache-mime4j-0.4.jar
new file mode 100644
index 0000000..b5fe9bf
Binary files /dev/null and b/konphidroid/lib/apache-mime4j-0.4.jar differ
diff --git a/konphidroid/lib/httpmime-4.0-beta1.jar b/konphidroid/lib/httpmime-4.0-beta1.jar
new file mode 100644
index 0000000..2564dcf
Binary files /dev/null and b/konphidroid/lib/httpmime-4.0-beta1.jar differ
diff --git a/konphidroid/res/drawable/center.png b/konphidroid/res/drawable/center.png
new file mode 100644
index 0000000..025bdad
Binary files /dev/null and b/konphidroid/res/drawable/center.png differ
diff --git a/konphidroid/res/drawable/direction_arrow.png b/konphidroid/res/drawable/direction_arrow.png
new file mode 100644
index 0000000..e69291f
Binary files /dev/null and b/konphidroid/res/drawable/direction_arrow.png differ
diff --git a/konphidroid/res/drawable/icon.png b/konphidroid/res/drawable/icon.png
new file mode 100644
index 0000000..b74f1ea
Binary files /dev/null and b/konphidroid/res/drawable/icon.png differ
diff --git a/konphidroid/res/drawable/marker_default.png b/konphidroid/res/drawable/marker_default.png
new file mode 100644
index 0000000..e161c69
Binary files /dev/null and b/konphidroid/res/drawable/marker_default.png differ
diff --git a/konphidroid/res/drawable/marker_default_focused_base.png b/konphidroid/res/drawable/marker_default_focused_base.png
new file mode 100644
index 0000000..e9d775d
Binary files /dev/null and b/konphidroid/res/drawable/marker_default_focused_base.png differ
diff --git a/konphidroid/res/drawable/navto_small.png b/konphidroid/res/drawable/navto_small.png
new file mode 100644
index 0000000..76518bf
Binary files /dev/null and b/konphidroid/res/drawable/navto_small.png differ
diff --git a/konphidroid/res/drawable/next.png b/konphidroid/res/drawable/next.png
new file mode 100644
index 0000000..30560f2
Binary files /dev/null and b/konphidroid/res/drawable/next.png differ
diff --git a/konphidroid/res/drawable/person.png b/konphidroid/res/drawable/person.png
new file mode 100644
index 0000000..9f9db93
Binary files /dev/null and b/konphidroid/res/drawable/person.png differ
diff --git a/konphidroid/res/drawable/previous.png b/konphidroid/res/drawable/previous.png
new file mode 100644
index 0000000..0fdbc52
Binary files /dev/null and b/konphidroid/res/drawable/previous.png differ
diff --git a/konphidroid/res/drawable/zoom_in.png b/konphidroid/res/drawable/zoom_in.png
new file mode 100644
index 0000000..36845e7
Binary files /dev/null and b/konphidroid/res/drawable/zoom_in.png differ
diff --git a/konphidroid/res/drawable/zoom_out.png b/konphidroid/res/drawable/zoom_out.png
new file mode 100644
index 0000000..e327d96
Binary files /dev/null and b/konphidroid/res/drawable/zoom_out.png differ
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml
new file mode 100644
index 0000000..3a5f117
--- /dev/null
+++ b/konphidroid/res/layout/main.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ >
+<TextView
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/hello"
+ />
+</LinearLayout>
diff --git a/konphidroid/res/values-de/renderers.xml b/konphidroid/res/values-de/renderers.xml
new file mode 100644
index 0000000..2208825
--- /dev/null
+++ b/konphidroid/res/values-de/renderers.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<string name="base">OSM Basislayer</string>
+<string name="topo">Topographisch</string><string name="hills">Relief</string><string name="cyclemap">Fahrradkarte</string>
+
+
+
+</resources>
diff --git a/konphidroid/res/values-de/strings.xml b/konphidroid/res/values-de/strings.xml
new file mode 100644
index 0000000..b1e5fe5
--- /dev/null
+++ b/konphidroid/res/values-de/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="app_name">CarDroid Prototyp</string>
+<string name="hello">Hallo Welt, CarinfoActivity</string>
+
+<string name="map_mode">Kartenmodus</string>
+<string name="my_location">Standort</string>
+<string name="about">Ãber</string>
+<string name="about_message">Diese Software benutzt Kartenmaterial von OpenStreetMap.org</string></resources>
diff --git a/konphidroid/res/values/renderers.xml b/konphidroid/res/values/renderers.xml
new file mode 100644
index 0000000..cab3c47
--- /dev/null
+++ b/konphidroid/res/values/renderers.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="osmarender">OsmaRender</string>
+ <string name="mapnik">Mapnik</string>
+ <string name="cyclemap">Cycle Map</string>
+ <string name="openareal_sat">OpenArialMap</string>
+ <string name="base">OSM base layer</string>
+ <string name="topo">Topographic</string>
+ <string name="hills">Hills</string>
+ <string name="cloudmade_small">Cloudmade (small tiles)</string>
+ <string name="cloudmade_standard">Cloudmade (Standard tiles)</string>
+</resources>
diff --git a/konphidroid/res/values/strings.xml b/konphidroid/res/values/strings.xml
new file mode 100644
index 0000000..802bdc6
--- /dev/null
+++ b/konphidroid/res/values/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="app_name">CarDroid Prototype</string>
+<string name="hello">Hello World, CarinfoActivity</string>
+
+<string name="app_name_itemizedoverlay">OSMViewer ItemizedOverlay</string>
+<string name="unknown">Unknown</string>
+<string name="map_mode">Map mode</string>
+<string name="my_location">My location</string>
+<string name="samples">Samples</string>
+<string name="about">About</string>
+<string name="about_message">This software uses map data provided by <b>OpenStreetMap.org</b></string>
+</resources>
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
new file mode 100644
index 0000000..cfee4a4
--- /dev/null
+++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java
@@ -0,0 +1,13 @@
+package de.cstimming.konphidroid;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class KonPhiActivity extends Activity {
+ /** Called when the activity is first created. */
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.main);
+ }
+}
\ No newline at end of file
diff --git a/konphidroid/src/org/andnav/osm/R.java b/konphidroid/src/org/andnav/osm/R.java
new file mode 100644
index 0000000..271dbdb
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/R.java
@@ -0,0 +1,31 @@
+// Dummy R.java to redirect to a generated one
+
+package org.andnav.osm;
+
+public final class R {
+
+ public static final class drawable {
+ public static final int center = de.cstimming.konphidroid.R.drawable.center;
+ public static final int direction_arrow = de.cstimming.konphidroid.R.drawable.direction_arrow;
+ public static final int marker_default = de.cstimming.konphidroid.R.drawable.marker_default;
+ public static final int marker_default_focused_base = de.cstimming.konphidroid.R.drawable.marker_default_focused_base;
+ public static final int navto_small = de.cstimming.konphidroid.R.drawable.navto_small;
+ public static final int next = de.cstimming.konphidroid.R.drawable.next;
+ public static final int person = de.cstimming.konphidroid.R.drawable.person;
+ public static final int previous = de.cstimming.konphidroid.R.drawable.previous;
+ }
+
+ public static final class string {
+ public static final int osmarender = de.cstimming.konphidroid.R.string.osmarender;
+ public static final int mapnik = de.cstimming.konphidroid.R.string.mapnik;
+ public static final int cyclemap = de.cstimming.konphidroid.R.string.cyclemap;
+ public static final int openareal_sat = de.cstimming.konphidroid.R.string.openareal_sat;
+ public static final int hills = de.cstimming.konphidroid.R.string.hills;
+ public static final int base = de.cstimming.konphidroid.R.string.base;
+ public static final int topo = de.cstimming.konphidroid.R.string.topo;
+ public static final int unknown = de.cstimming.konphidroid.R.string.unknown;
+ public static final int cloudmade_small = de.cstimming.konphidroid.R.string.cloudmade_small;
+ public static final int cloudmade_standard = de.cstimming.konphidroid.R.string.cloudmade_standard;
+ }
+
+}
diff --git a/konphidroid/src/org/andnav/osm/contributor/GpxToPHPUploader.java b/konphidroid/src/org/andnav/osm/contributor/GpxToPHPUploader.java
new file mode 100644
index 0000000..cd15682
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/contributor/GpxToPHPUploader.java
@@ -0,0 +1,69 @@
+package org.andnav.osm.contributor;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.ArrayList;
+
+import org.andnav.osm.contributor.util.RecordedGeoPoint;
+import org.andnav.osm.contributor.util.RecordedRouteGPXFormatter;
+import org.andnav.osm.contributor.util.Util;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.mime.MultipartEntity;
+import org.apache.http.entity.mime.content.InputStreamBody;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+import android.util.Log;
+
+
+public class GpxToPHPUploader {
+
+ protected static final String UPLOADSCRIPT_URL = "http://www.PLACEYOURDOMAINHERE.com/anyfolder/gpxuploader/upload.php";
+
+ public static void uploadAsync(final ArrayList<RecordedGeoPoint> recordedGeoPoints){
+ new Thread(new Runnable(){
+ public void run() {
+ try{
+ if(!Util.isSufficienDataForUpload(recordedGeoPoints)) return;
+
+ final InputStream gpxInputStream = new ByteArrayInputStream(RecordedRouteGPXFormatter.create(recordedGeoPoints).getBytes());
+ final HttpClient httpClient = new DefaultHttpClient();
+
+ final HttpPost request = new HttpPost(UPLOADSCRIPT_URL);
+
+ // create the multipart request and add the parts to it
+ final MultipartEntity requestEntity = new MultipartEntity();
+ requestEntity.addPart("gpxfile", new InputStreamBody(gpxInputStream, "" + System.currentTimeMillis() + ".gpx"));
+
+ httpClient.getParams().setBooleanParameter("http.protocol.expect-continue", false);
+
+ request.setEntity(requestEntity);
+
+ final HttpResponse response = httpClient.execute(request);
+ final int status = response.getStatusLine().getStatusCode();
+
+ if (status != HttpStatus.SC_OK) {
+ Log.e("GPXUploader", "status != HttpStatus.SC_OK");
+ } else {
+ final Reader r = new InputStreamReader(new BufferedInputStream(response.getEntity().getContent()));
+ // see above
+ final char[] buf = new char[8 * 1024];
+ int read;
+ final StringBuilder sb = new StringBuilder();
+ while((read = r.read(buf)) != -1)
+ sb.append(buf, 0, read);
+
+ Log.d("GPXUploader", "Response: " + sb.toString());
+ }
+ }catch (Exception e){
+// Log.e(DEBUGTAG, "OSMUpload Error", e);
+ }
+ }
+ }).start();
+ }
+}
diff --git a/konphidroid/src/org/andnav/osm/contributor/OSMUploader.java b/konphidroid/src/org/andnav/osm/contributor/OSMUploader.java
new file mode 100644
index 0000000..a7a7ec2
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/contributor/OSMUploader.java
@@ -0,0 +1,222 @@
+package org.andnav.osm.contributor;
+
+/**
+ * Copyright by Christof Dallermassl
+ * This program is free software and licensed under GPL.
+ *
+ * Original JAVA-Code ported for Android compatibility by Nicolas 'plusminus' Gramlich.
+ */
+
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.GregorianCalendar;
+
+import org.andnav.osm.contributor.util.RecordedGeoPoint;
+import org.andnav.osm.contributor.util.RecordedRouteGPXFormatter;
+import org.andnav.osm.contributor.util.Util;
+import org.andnav.osm.contributor.util.constants.OpenStreetMapContributorConstants;
+import org.andnav.osm.util.constants.OpenStreetMapConstants;
+
+
+/**
+ * Small java class that allows to upload gpx files to www.openstreetmap.org via its api call.
+ *
+ * @author cdaller
+ * @author Nicolas Gramlich
+ */
+public class OSMUploader implements OpenStreetMapConstants, OpenStreetMapContributorConstants{
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ public static final String API_VERSION = "0.5";
+ private static final int BUFFER_SIZE = 65535;
+ private static final String BASE64_ENC = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ private static final String BOUNDARY = "----------------------------d10f7aa230e8";
+ private static final String LINE_END = "\r\n";
+
+ private static final String DEFAULT_DESCRIPTION = "AndNav - automatically created route.";
+ private static final String DEFAULT_TAGS = "AndNav";
+
+ public static final SimpleDateFormat pseudoFileNameFormat = new SimpleDateFormat("yyyyMMdd'_'HHmmss'_'SSS");
+ private static final SimpleDateFormat autoTagFormat = new SimpleDateFormat("MMMM yyyy");
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ /**
+ * Uses OSMConstants.OSM_USERNAME and OSMConstants.OSM_PASSWORD as username/password.
+ * Description will be <code>DEFAULT_DESCRIPTION</code>, tags will be automatically generated (i.e. "<code>October 2008</code>")
+ * NOTE: This method is not blocking!
+ * @param gpxInputStream the InputStream containing the gpx-data.
+ * @throws IOException
+ */
+ public static void uploadAsync(final ArrayList<RecordedGeoPoint> recordedGeoPoints) {
+ uploadAsync( DEFAULT_DESCRIPTION, DEFAULT_TAGS, true, recordedGeoPoints);
+ }
+
+ /**
+ * Uses OSMConstants.OSM_USERNAME and OSMConstants.OSM_PASSWORD as username/password.
+ * The 'filename' will be the current <code>timestamp.gpx</code> (i.e. "20081231_234815_912.gpx")
+ * NOTE: This method is not blocking!
+ * @param description <code>not null</code>
+ * @param tags <code>not null</code>
+ * @param addDateTags adds Date Tags to the existing Tags (i.e. "October 2008")
+ * @param gpxInputStreaman the InputStream containing the gpx-data.
+ * @throws IOException
+ */
+ public static void uploadAsync(final String description, final String tags, final boolean addDateTags, final ArrayList<RecordedGeoPoint> recordedGeoPoints) {
+ uploadAsync(OSM_USERNAME, OSM_PASSWORD, description, tags, addDateTags, recordedGeoPoints, pseudoFileNameFormat.format(new GregorianCalendar().getTime()) + "_" + OSM_USERNAME + ".gpx");
+ }
+
+
+ /**
+ * NOTE: This method is not blocking! (Code runs in thread)
+ * @param username <code>not null</code> and <code>not empty</code>. Valid OSM-username
+ * @param password <code>not null</code> and <code>not empty</code>. Valid password to the OSM-username.
+ * @param description <code>not null</code>
+ * @param tags if <code>null</code> addDateTags is treated as <code>true</code>
+ * @param addDateTags adds Date Tags to the existing Tags (i.e. "<code>October 2008</code>")
+ * @param gpxInputStream the InputStream containing the gpx-data.
+ * @param pseudoFileName ending with "<code>.gpx</code>"
+ * @throws IOException
+ */
+ public static void uploadAsync(final String username, final String password, final String description, final String tags, final boolean addDateTags, final ArrayList<RecordedGeoPoint> recordedGeoPoints, final String pseudoFileName) {
+ if(username == null || username.length() == 0) return;
+ if(password == null || password.length() == 0) return;
+ if(description == null || description.length() == 0) return;
+ if(tags == null || tags.length() == 0) return;
+ if(pseudoFileName == null || pseudoFileName.endsWith(".gpx")) return;
+
+ new Thread(new Runnable(){
+ public void run() {
+ if(!Util.isSufficienDataForUpload(recordedGeoPoints)) return;
+
+ final InputStream gpxInputStream = new ByteArrayInputStream(RecordedRouteGPXFormatter.create(recordedGeoPoints).getBytes());
+
+ String tagsToUse = tags;
+ if(addDateTags || tagsToUse == null)
+ if(tagsToUse == null)
+ tagsToUse = autoTagFormat.format(new GregorianCalendar().getTime());
+ else
+ tagsToUse = tagsToUse + " " + autoTagFormat.format(new GregorianCalendar().getTime());
+
+// Log.d(DEBUGTAG, "Uploading " + pseudoFileName + " to openstreetmap.org");
+ try {
+ //String urlGpxName = URLEncoder.encode(gpxName.replaceAll("\\.;&?,/","_"), "UTF-8");
+ final String urlDesc = (description == null) ? DEFAULT_DESCRIPTION : description.replaceAll("\\.;&?,/","_");
+ final String urlTags = (tagsToUse == null) ? DEFAULT_TAGS : tagsToUse.replaceAll("\\\\.;&?,/","_");
+ final URL url = new URL("http://www.openstreetmap.org/api/" + API_VERSION + "/gpx/create");
+// Log.d(DEBUGTAG, "Destination Url: " + url);
+ final HttpURLConnection con = (HttpURLConnection) url.openConnection();
+ con.setConnectTimeout(15000);
+ con.setRequestMethod("POST");
+ con.setDoOutput(true);
+ con.addRequestProperty("Authorization", "Basic "+encodeBase64(username+":"+password));
+ con.addRequestProperty("Content-Type", "multipart/form-data; boundary="+BOUNDARY);
+ con.addRequestProperty("Connection", "close"); // counterpart of keep-alive
+ con.addRequestProperty("Expect", "");
+
+ con.connect();
+ DataOutputStream out = new DataOutputStream(new BufferedOutputStream(con.getOutputStream()));
+ // DataOutputStream out = new DataOutputStream(System.out);
+
+ writeContentDispositionFile(out, "file", gpxInputStream, pseudoFileName);
+ writeContentDisposition(out, "description", urlDesc);
+ writeContentDisposition(out, "tags", urlTags);
+
+ writeContentDisposition(out, "public", "1");
+
+ out.writeBytes("--" + BOUNDARY + "--" + LINE_END);
+ out.flush();
+
+ final int retCode = con.getResponseCode();
+ String retMsg = con.getResponseMessage();
+// Log.d(DEBUGTAG, "\nreturn code: "+retCode + " " + retMsg);
+ if (retCode != 200) {
+ // Look for a detailed error message from the server
+ if (con.getHeaderField("Error") != null)
+ retMsg += "\n" + con.getHeaderField("Error");
+ con.disconnect();
+ throw new RuntimeException(retCode+" "+retMsg);
+ }
+ out.close();
+ con.disconnect();
+ } catch(Exception e) {
+// Log.e(DEBUGTAG, "OSMUpload Error", e);
+ }
+ }
+
+ }, "OSMUpload-Thread").start();
+ }
+
+ public static void upload(final String username, final String password, final String description, final String tags, final boolean addDateTags, final ArrayList<RecordedGeoPoint> recordedGeoPoints, final String pseudoFileName) throws IOException{
+ uploadAsync(username, password, description, tags, addDateTags, recordedGeoPoints, pseudoFileName);
+ }
+
+ /**
+ * @param out
+ * @param string
+ * @param gpxFile
+ * @throws IOException
+ */
+ private static void writeContentDispositionFile(final DataOutputStream out, final String name, final InputStream gpxInputStream, final String pseudoFileName) throws IOException {
+ out.writeBytes("--" + BOUNDARY + LINE_END);
+ out.writeBytes("Content-Disposition: form-data; name=\"" + name + "\"; filename=\"" + pseudoFileName + "\"" + LINE_END);
+ out.writeBytes("Content-Type: application/octet-stream" + LINE_END);
+ out.writeBytes(LINE_END);
+
+ final byte[] buffer = new byte[BUFFER_SIZE];
+ //int fileLen = (int)gpxFile.length();
+ int read;
+ int sumread = 0;
+ final InputStream in = new BufferedInputStream(gpxInputStream);
+// Log.d(DEBUGTAG, "Transferring data to server");
+ while((read = in.read(buffer)) >= 0) {
+ out.write(buffer, 0, read);
+ out.flush();
+ sumread += read;
+ }
+ in.close();
+ out.writeBytes(LINE_END);
+ }
+
+ /**
+ * @param string
+ * @param urlDesc
+ * @throws IOException
+ */
+ private static void writeContentDisposition(final DataOutputStream out, final String name, final String value) throws IOException {
+ out.writeBytes("--" + BOUNDARY + LINE_END);
+ out.writeBytes("Content-Disposition: form-data; name=\"" + name + "\"" + LINE_END);
+ out.writeBytes(LINE_END);
+ out.writeBytes(value + LINE_END);
+ }
+
+ private static String encodeBase64(final String s) {
+ StringBuilder out = new StringBuilder();
+ for (int i = 0; i < (s.length()+2)/3; ++i) {
+ int l = Math.min(3, s.length()-i*3);
+ final String buf = s.substring(i*3, i*3+l);
+ out.append(BASE64_ENC.charAt(buf.charAt(0)>>2));
+ out.append(BASE64_ENC.charAt((buf.charAt(0) & 0x03) << 4 | (l==1?0:(buf.charAt(1) & 0xf0) >> 4)));
+ out.append(l>1 ? BASE64_ENC.charAt((buf.charAt(1) & 0x0f) << 2 | (l==2 ? 0 : (buf.charAt(2) & 0xc0) >> 6)) : '=');
+ out.append(l>2 ? BASE64_ENC.charAt(buf.charAt(2) & 0x3f) : '=');
+ }
+ return out.toString();
+ }
+}
\ No newline at end of file
diff --git a/konphidroid/src/org/andnav/osm/contributor/RouteRecorder.java b/konphidroid/src/org/andnav/osm/contributor/RouteRecorder.java
new file mode 100644
index 0000000..0c953c3
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/contributor/RouteRecorder.java
@@ -0,0 +1,66 @@
+// Created by plusminus on 12:28:16 - 21.09.2008
+package org.andnav.osm.contributor;
+
+import java.util.ArrayList;
+
+import org.andnav.osm.contributor.util.RecordedGeoPoint;
+import org.andnav.osm.util.GeoPoint;
+
+import android.location.Location;
+
+/**
+ *
+ * @author Nicolas Gramlich
+ *
+ */
+public class RouteRecorder {
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ protected final ArrayList<RecordedGeoPoint> mRecords = new ArrayList<RecordedGeoPoint>();
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ public ArrayList<RecordedGeoPoint> getRecordedGeoPoints() {
+ return this.mRecords;
+ }
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ public void add(final Location aLocation, final int aNumSatellites){
+ this.mRecords.add(new RecordedGeoPoint(
+ (int)(aLocation.getLatitude() * 1E6),
+ (int)(aLocation.getLongitude() * 1E6),
+ System.currentTimeMillis(),
+ aNumSatellites));
+ }
+
+ public void add(final GeoPoint aGeoPoint, final int aNumSatellites){
+ this.mRecords.add(new RecordedGeoPoint(
+ aGeoPoint.getLatitudeE6(),
+ aGeoPoint.getLongitudeE6(),
+ System.currentTimeMillis(),
+ aNumSatellites));
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/contributor/util/RecordedGeoPoint.java b/konphidroid/src/org/andnav/osm/contributor/util/RecordedGeoPoint.java
new file mode 100644
index 0000000..6240adb
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/contributor/util/RecordedGeoPoint.java
@@ -0,0 +1,69 @@
+// Created by plusminus on 12:29:23 - 21.09.2008
+package org.andnav.osm.contributor.util;
+
+import org.andnav.osm.util.GeoPoint;
+import org.andnav.osm.util.constants.OpenStreetMapConstants;
+
+/**
+ * Extends the {@link GeoPoint} with a timeStamp.
+ * @author Nicolas Gramlich
+ */
+public class RecordedGeoPoint extends GeoPoint implements OpenStreetMapConstants {
+
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ protected final long mTimeStamp;
+ protected final int mNumSatellites;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public RecordedGeoPoint(final int latitudeE6, final int longitudeE6) {
+ this(latitudeE6, longitudeE6, System.currentTimeMillis(), NOT_SET);
+ }
+
+ public RecordedGeoPoint(final int latitudeE6, final int longitudeE6, final long aTimeStamp, final int aNumSatellites) {
+ super(latitudeE6, longitudeE6);
+ this.mTimeStamp = aTimeStamp;
+ this.mNumSatellites = aNumSatellites;
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ public long getTimeStamp() {
+ return this.mTimeStamp;
+ }
+
+ public double getLatitudeAsDouble(){
+ return this.getLatitudeE6() / 1E6;
+ }
+
+ public double getLongitudeAsDouble(){
+ return this.getLongitudeE6() / 1E6;
+ }
+
+ public int getNumSatellites(){
+ return this.mNumSatellites;
+ }
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/contributor/util/RecordedRouteGPXFormatter.java b/konphidroid/src/org/andnav/osm/contributor/util/RecordedRouteGPXFormatter.java
new file mode 100644
index 0000000..abb34b9
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/contributor/util/RecordedRouteGPXFormatter.java
@@ -0,0 +1,118 @@
+// Created by plusminus on 13:23:45 - 21.09.2008
+package org.andnav.osm.contributor.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Formatter;
+import java.util.List;
+
+import org.andnav.osm.contributor.util.constants.OpenStreetMapContributorConstants;
+import org.andnav.osm.util.constants.OpenStreetMapConstants;
+
+/**
+ * Class capable of formatting a List of Points to the GPX 1.1 format.
+ * @author Nicolas Gramlich
+ *
+ */
+public class RecordedRouteGPXFormatter implements OpenStreetMapContributorConstants, OpenStreetMapConstants{
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ private static final String XML_VERSION = "<?xml version=\"1.0\"?>";
+ private static final String GPX_VERSION = "1.1";
+ private static final String GPX_TAG = "<gpx version=\"" + GPX_VERSION + "\" creator=\"%s\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"http://www.topografix.com/GPX/1/1\" xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">";
+ private static final String GPX_TAG_CLOSE = "</gpx>";
+ private static final String GPX_TAG_TIME = "<time>%s</time>";
+ private static final String GPX_TAG_TRACK = "<trk>";
+ private static final String GPX_TAG_TRACK_CLOSE = "</trk>";
+ private static final String GPX_TAG_TRACK_NAME = "<name>%s</name>";
+ private static final String GPX_TAG_TRACK_SEGMENT = "<trkseg>";
+ private static final String GPX_TAG_TRACK_SEGMENT_CLOSE = "</trkseg>";
+ private static final String GPX_TAG_TRACK_SEGMENT_POINT = "<trkpt lat=\"%f\" lon=\"%f\">";
+ private static final String GPX_TAG_TRACK_SEGMENT_POINT_CLOSE = "</trkpt>";
+ private static final String GPX_TAG_TRACK_SEGMENT_POINT_TIME = "<time>%s</time>";
+ private static final String GPX_TAG_TRACK_SEGMENT_POINT_SAT = "<sat>%d</sat>";
+
+
+ private static final SimpleDateFormat formatterCompleteDateTime = new SimpleDateFormat("yyyyMMdd'_'HHmmss");
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+ /**
+ * Creates a String in the following XML format:
+ * <PRE><?xml version="1.0"?>
+ * <gpx version="1.1" creator="AndNav - http://www.andnav.org - Android Navigation System" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.topografix.com/GPX/1/1" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">
+ * <time>2008-09-22T00:46:20Z</time>
+ * <trk>
+ * <name>plusminus--yyyyMMdd_HHmmss-yyyyMMdd_HHmmss</name>
+ * <trkseg>
+ * <trkpt lat="49.472767" lon="8.654174">
+ * <time>2008-09-22T00:46:20Z</time>
+ * </trkpt>
+ * <trkpt lat="49.472797" lon="8.654102">
+ * <time>2008-09-22T00:46:35Z</time>
+ * </trkpt>
+ * <trkpt lat="49.472802" lon="8.654185">
+ * <time>2008-09-22T00:46:50Z</time>
+ * </trkpt>
+ * </trkseg>
+ * </trk>
+ * </gpx></PRE>
+ *
+ */
+ public static String create(final List<RecordedGeoPoint> someRecords) throws IllegalArgumentException {
+ if(someRecords == null)
+ throw new IllegalArgumentException("Records may not be null.");
+
+ if(someRecords.size() == 0)
+ throw new IllegalArgumentException("Records size == 0");
+
+ final StringBuilder sb = new StringBuilder();
+ final Formatter f = new Formatter(sb);
+ sb.append(XML_VERSION);
+ f.format(GPX_TAG, OSM_CREATOR_INFO);
+ f.format(GPX_TAG_TIME, Util.convertTimestampToUTCString(System.currentTimeMillis()));
+ sb.append(GPX_TAG_TRACK);
+ f.format(GPX_TAG_TRACK_NAME, OSM_USERNAME + "--"
+ + formatterCompleteDateTime.format(new Date(someRecords.get(0).getTimeStamp()).getTime())
+ + "-"
+ + formatterCompleteDateTime.format(new Date(someRecords.get(someRecords.size() - 1).getTimeStamp()).getTime()));
+ sb.append(GPX_TAG_TRACK_SEGMENT);
+
+ for (RecordedGeoPoint rgp : someRecords) {
+ f.format(GPX_TAG_TRACK_SEGMENT_POINT, rgp.getLatitudeAsDouble(), rgp.getLongitudeAsDouble());
+ f.format(GPX_TAG_TRACK_SEGMENT_POINT_TIME, Util.convertTimestampToUTCString(rgp.getTimeStamp()));
+ if(rgp.mNumSatellites != NOT_SET)
+ f.format(GPX_TAG_TRACK_SEGMENT_POINT_SAT, rgp.mNumSatellites);
+ sb.append(GPX_TAG_TRACK_SEGMENT_POINT_CLOSE);
+ }
+
+ sb.append(GPX_TAG_TRACK_SEGMENT_CLOSE)
+ .append(GPX_TAG_TRACK_CLOSE)
+ .append(GPX_TAG_CLOSE);
+
+ return sb.toString();
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/contributor/util/Util.java b/konphidroid/src/org/andnav/osm/contributor/util/Util.java
new file mode 100644
index 0000000..10dc0e1
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/contributor/util/Util.java
@@ -0,0 +1,69 @@
+// Created by plusminus on 13:24:05 - 21.09.2008
+package org.andnav.osm.contributor.util;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.TimeZone;
+
+import org.andnav.osm.contributor.util.constants.OpenStreetMapContributorConstants;
+import org.andnav.osm.util.BoundingBoxE6;
+
+/**
+ *
+ * @author Nicolas Gramlich
+ *
+ */
+public class Util implements OpenStreetMapContributorConstants{
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ public static final SimpleDateFormat UTCSimpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+ {
+ UTCSimpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+ }
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ public static final String convertTimestampToUTCString(final long aTimestamp){
+ return UTCSimpleDateFormat.format(new Date(aTimestamp));
+ }
+
+ public static boolean isSufficienDataForUpload(final ArrayList<RecordedGeoPoint> recordedGeoPoints){
+ if(recordedGeoPoints == null)
+ return false;
+
+ if(recordedGeoPoints.size() < MINGEOPOINTS_FOR_OSM_CONTRIBUTION)
+ return false;
+
+ final BoundingBoxE6 bb = BoundingBoxE6.fromGeoPoints(recordedGeoPoints);
+ final int diagMeters = bb.getDiagonalLengthInMeters();
+ if(diagMeters < MINDIAGONALMETERS_FOR_OSM_CONTRIBUTION)
+ return false;
+
+ return true;
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/contributor/util/constants/OpenStreetMapContributorConstants.java b/konphidroid/src/org/andnav/osm/contributor/util/constants/OpenStreetMapContributorConstants.java
new file mode 100644
index 0000000..016b2fb
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/contributor/util/constants/OpenStreetMapContributorConstants.java
@@ -0,0 +1,27 @@
+// Created by plusminus on 14:11:09 - 21.09.2008
+package org.andnav.osm.contributor.util.constants;
+
+/**
+ *
+ * This class contains constants used by the contributor package.
+ *
+ * @author Nicolas Gramlich
+ *
+ */
+public interface OpenStreetMapContributorConstants {
+ // ===========================================================
+ // Final Fields
+ // ===========================================================
+
+ public static final String OSM_USERNAME = "PUT_YOUR_USERNAME_HERE";
+ public static final String OSM_PASSWORD = "PUT_YOUR_PASSWORD_HERE";
+
+ public static final int MINGEOPOINTS_FOR_OSM_CONTRIBUTION = 100;
+ public static final int MINDIAGONALMETERS_FOR_OSM_CONTRIBUTION = 300;
+
+ public static final String OSM_CREATOR_INFO = "AndNav - http://www.andnav.org - Android Navigation System";
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/services/IOpenStreetMapTileProviderService.aidl b/konphidroid/src/org/andnav/osm/services/IOpenStreetMapTileProviderService.aidl
new file mode 100644
index 0000000..52502cd
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/services/IOpenStreetMapTileProviderService.aidl
@@ -0,0 +1,24 @@
+package org.andnav.osm.services;
+
+import org.andnav.osm.services.IOpenStreetMapTileProviderServiceCallback;
+
+interface IOpenStreetMapTileProviderService {
+
+/**
+ * Set the callback for tile completions.
+ * @param callback the callback to notify when the request completes
+ */
+void setCallback(in IOpenStreetMapTileProviderServiceCallback callback);
+
+/**
+ * Initiate a request for a map tile.
+ * When the request has completed it will call the callback previously set in setCallback.
+ * @param rendererID
+ * @param zoomLevel
+ * @param tileX
+ * @param tileY
+ * @param callback the callback to notify when the request completes
+ */
+void requestMapTile(in int rendererID, in int zoomLevel, in int tileX, in int tileY);
+
+}
diff --git a/konphidroid/src/org/andnav/osm/services/IOpenStreetMapTileProviderServiceCallback.aidl b/konphidroid/src/org/andnav/osm/services/IOpenStreetMapTileProviderServiceCallback.aidl
new file mode 100644
index 0000000..f465a8b
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/services/IOpenStreetMapTileProviderServiceCallback.aidl
@@ -0,0 +1,15 @@
+package org.andnav.osm.services;
+
+interface IOpenStreetMapTileProviderServiceCallback {
+
+/**
+ * The map tile request has completed.
+ * @param rendererID
+ * @param zoomLevel
+ * @param tileX
+ * @param tileY
+ * @param aTilePath the path of the requested tile, or null if request has completed without returning a tile path
+ */
+void mapTileRequestCompleted(in int rendererID, in int zoomLevel, in int tileX, in int tileY, in String aTilePath);
+
+}
diff --git a/konphidroid/src/org/andnav/osm/services/OpenStreetMapTileProviderService.java b/konphidroid/src/org/andnav/osm/services/OpenStreetMapTileProviderService.java
new file mode 100644
index 0000000..0303552
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/services/OpenStreetMapTileProviderService.java
@@ -0,0 +1,102 @@
+package org.andnav.osm.services;
+
+import org.andnav.osm.services.constants.OpenStreetMapServiceConstants;
+import org.andnav.osm.tileprovider.IOpenStreetMapTileProviderCallback;
+import org.andnav.osm.tileprovider.OpenStreetMapTile;
+import org.andnav.osm.tileprovider.OpenStreetMapTileFilesystemProvider;
+
+import android.app.Service;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Log;
+
+/**
+ * The OpenStreetMapTileProviderService can download map tiles from a server
+ * and stores them in a file system cache.
+ * @author Manuel Stahl
+ */
+public class OpenStreetMapTileProviderService extends Service implements OpenStreetMapServiceConstants, IOpenStreetMapTileProviderCallback {
+
+ private static final String DEBUGTAG = "OSM_TILE_PROVIDER_SERVICE";
+
+ private OpenStreetMapTileFilesystemProvider mFileSystemProvider;
+ private IOpenStreetMapTileProviderServiceCallback mCallback;
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ mFileSystemProvider = new OpenStreetMapTileFilesystemProvider(this);
+ }
+
+ @Override
+ public IBinder onBind(Intent intent) {
+ return mBinder;
+ }
+
+ @Override
+ public void onConfigurationChanged(Configuration pNewConfig) {
+ if(DEBUGMODE)
+ Log.d(DEBUGTAG, "onConfigurationChanged");
+ super.onConfigurationChanged(pNewConfig);
+ }
+
+ @Override
+ public void onDestroy() {
+ if(DEBUGMODE)
+ Log.d(DEBUGTAG, "onDestroy");
+ mFileSystemProvider.stopWorkers();
+ super.onDestroy();
+ }
+
+ @Override
+ public void onLowMemory() {
+ if(DEBUGMODE)
+ Log.d(DEBUGTAG, "onLowMemory");
+ super.onLowMemory();
+ }
+
+ @Override
+ public void onRebind(Intent pIntent) {
+ if(DEBUGMODE)
+ Log.d(DEBUGTAG, "onRebind");
+ super.onRebind(pIntent);
+ }
+
+ @Override
+ public void onStart(Intent pIntent, int pStartId) {
+ if(DEBUGMODE)
+ Log.d(DEBUGTAG, "onStart");
+ super.onStart(pIntent, pStartId);
+ }
+
+ @Override
+ public boolean onUnbind(Intent pIntent) {
+ if(DEBUGMODE)
+ Log.d(DEBUGTAG, "onUnbind");
+ return super.onUnbind(pIntent);
+ }
+
+ public void mapTileRequestCompleted(final OpenStreetMapTile pTile, final String pTilePath) {
+ try {
+ mCallback.mapTileRequestCompleted(pTile.getRendererId(), pTile.getZoomLevel(), pTile.getX(), pTile.getY(), pTilePath);
+ } catch (final RemoteException e) {
+ Log.e(DEBUGTAG, "Error invoking callback", e);
+ }
+ }
+
+ /**
+ * The IRemoteInterface is defined through IDL
+ */
+ private final IOpenStreetMapTileProviderService.Stub mBinder = new IOpenStreetMapTileProviderService.Stub() {
+ public void setCallback(final IOpenStreetMapTileProviderServiceCallback pCallback) throws RemoteException {
+ mCallback = pCallback;
+ }
+ public void requestMapTile(int rendererID, int zoomLevel, int tileX, int tileY) throws RemoteException {
+ OpenStreetMapTile tile = new OpenStreetMapTile(rendererID, zoomLevel, tileX, tileY);
+ mFileSystemProvider.loadMapTileAsync(tile);
+ }
+ };
+
+}
diff --git a/konphidroid/src/org/andnav/osm/services/constants/OpenStreetMapServiceConstants.java b/konphidroid/src/org/andnav/osm/services/constants/OpenStreetMapServiceConstants.java
new file mode 100644
index 0000000..07a8a47
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/services/constants/OpenStreetMapServiceConstants.java
@@ -0,0 +1,21 @@
+package org.andnav.osm.services.constants;
+
+
+/**
+ *
+ * This class contains constants used by the service.
+ *
+ * @author Neil Boyd
+ *
+ */
+public interface OpenStreetMapServiceConstants {
+ // ===========================================================
+ // Final Fields
+ // ===========================================================
+
+ public static final boolean DEBUGMODE = false;
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/tileprovider/IOpenStreetMapTileProviderCallback.java b/konphidroid/src/org/andnav/osm/tileprovider/IOpenStreetMapTileProviderCallback.java
new file mode 100644
index 0000000..0aac24e
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/tileprovider/IOpenStreetMapTileProviderCallback.java
@@ -0,0 +1,12 @@
+package org.andnav.osm.tileprovider;
+
+public interface IOpenStreetMapTileProviderCallback {
+
+ /**
+ * The map tile request has completed.
+ * @param pTile the tile request that has completed
+ * @param aTilePath the path of the requested tile, or null if request has completed without returning a tile path
+ */
+ void mapTileRequestCompleted(OpenStreetMapTile pTile, String aTilePath);
+
+}
diff --git a/konphidroid/src/org/andnav/osm/tileprovider/OpenStreetMapAsyncTileProvider.java b/konphidroid/src/org/andnav/osm/tileprovider/OpenStreetMapAsyncTileProvider.java
new file mode 100644
index 0000000..d9c2bcc
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/tileprovider/OpenStreetMapAsyncTileProvider.java
@@ -0,0 +1,169 @@
+package org.andnav.osm.tileprovider;
+
+import java.util.ConcurrentModificationException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+
+import org.andnav.osm.tileprovider.constants.OpenStreetMapTileProviderConstants;
+
+import android.util.Log;
+
+public abstract class OpenStreetMapAsyncTileProvider implements OpenStreetMapTileProviderConstants {
+
+ private final int mThreadPoolSize;
+ private final ThreadGroup mThreadPool = new ThreadGroup(debugtag());
+ private final HashMap<OpenStreetMapTile, Object> mWorking;
+ final LinkedHashMap<OpenStreetMapTile, Object> mPending;
+ private static final Object PRESENT = new Object();
+
+ protected final IOpenStreetMapTileProviderCallback mCallback;
+
+ public OpenStreetMapAsyncTileProvider(final IOpenStreetMapTileProviderCallback pCallback, final int aThreadPoolSize, final int aPendingQueueSize) {
+ mCallback = pCallback;
+ mThreadPoolSize = aThreadPoolSize;
+ mWorking = new HashMap<OpenStreetMapTile, Object>();
+ mPending = new LinkedHashMap<OpenStreetMapTile, Object>(aPendingQueueSize + 2, 0.1f, true) {
+ private static final long serialVersionUID = 6455337315681858866L;
+ @Override
+ protected boolean removeEldestEntry(Entry<OpenStreetMapTile, Object> pEldest) {
+ return size() > aPendingQueueSize;
+ }
+ };
+ }
+
+ public void loadMapTileAsync(final OpenStreetMapTile aTile) {
+
+ final int activeCount = mThreadPool.activeCount();
+
+ // sanity check
+ if (activeCount == 0 && !mPending.isEmpty()) {
+ Log.w(debugtag(), "Unexpected - no active threads but pending queue not empty");
+ clearQueue();
+ }
+
+ // this will put the tile in the queue, or move it to the front of the
+ // queue if it's already present
+ mPending.put(aTile, PRESENT);
+
+ if (DEBUGMODE)
+ Log.d(debugtag(), activeCount + " active threads");
+ if (activeCount < mThreadPoolSize) {
+ final Thread t = new Thread(mThreadPool, getTileLoader());
+ t.start();
+ }
+ }
+
+ private void clearQueue() {
+ mPending.clear();
+ mWorking.clear();
+ }
+
+ /**
+ * Stops all workers, the service is shutting down.
+ */
+ public void stopWorkers()
+ {
+ this.clearQueue();
+ this.mThreadPool.interrupt();
+ }
+
+ /**
+ * The debug tag.
+ * Because the tag of the abstract class is not so interesting.
+ * @return
+ */
+ protected abstract String debugtag();
+
+ protected abstract Runnable getTileLoader();
+
+ protected interface TileLoaderCallback {
+ /**
+ * A tile has loaded.
+ * @param aTile the tile that has loaded
+ * @param aTilePath the path of the file. May be null.
+ * @param aRefresh whether to redraw the screen so that new tiles will be used
+ */
+ void tileLoaded(OpenStreetMapTile aTile, String aTilePath, boolean aRefresh);
+ }
+
+ protected abstract class TileLoader implements Runnable, TileLoaderCallback {
+ /**
+ * Load the requested tile.
+ * @param aTile the tile to load
+ * @throws CantContinueException if it is not possible to continue with processing the queue
+ */
+ protected abstract void loadTile(OpenStreetMapTile aTile) throws CantContinueException;
+
+ private OpenStreetMapTile nextTile() {
+
+ synchronized (mPending) {
+ OpenStreetMapTile result = null;
+
+ // get the most recently accessed tile
+ // - the last item in the iterator that's not already being processed
+ Iterator<OpenStreetMapTile> iterator = mPending.keySet().iterator();
+
+ // TODO this iterates the whole list, make this faster...
+ while (iterator.hasNext()) {
+ try {
+ final OpenStreetMapTile tile = iterator.next();
+ if (!mWorking.containsKey(tile)) {
+ result = tile;
+ }
+ } catch (final ConcurrentModificationException e) {
+ if (DEBUGMODE)
+ Log.w(debugtag(), "ConcurrentModificationException break: " + (result != null));
+
+ // if we've got a result return it, otherwise try again
+ if (result != null) {
+ break;
+ } else {
+ iterator = mPending.keySet().iterator();
+ }
+ }
+ }
+
+ if (result != null)
+ {
+ mWorking.put(result, PRESENT);
+ }
+
+ return result;
+ }
+ }
+
+ public void tileLoaded(final OpenStreetMapTile aTile, final String aTilePath, final boolean aRefresh) {
+
+ mPending.remove(aTile);
+ mWorking.remove(aTile);
+
+ if (aRefresh) {
+ mCallback.mapTileRequestCompleted(aTile, aTilePath);
+ }
+ }
+
+ final public void run() {
+
+ OpenStreetMapTile tile;
+ while ((tile = nextTile()) != null) {
+ if (DEBUGMODE)
+ Log.d(debugtag(), "Next tile: " + tile);
+ try {
+ loadTile(tile);
+ } catch (final CantContinueException e) {
+ Log.i(debugtag(), "Tile loader can't continue");
+ clearQueue();
+ } catch (final Throwable e) {
+ Log.e(debugtag(), "Error downloading tile: " + tile, e);
+ }
+ }
+ if (DEBUGMODE)
+ Log.d(debugtag(), "No more tiles");
+ }
+ }
+
+ protected class CantContinueException extends Exception {
+ private static final long serialVersionUID = 146526524087765133L;
+ }
+}
diff --git a/konphidroid/src/org/andnav/osm/tileprovider/OpenStreetMapTile.java b/konphidroid/src/org/andnav/osm/tileprovider/OpenStreetMapTile.java
new file mode 100644
index 0000000..85f732a
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/tileprovider/OpenStreetMapTile.java
@@ -0,0 +1,60 @@
+package org.andnav.osm.tileprovider;
+
+public class OpenStreetMapTile {
+
+ public static final int MAPTILE_SUCCESS_ID = 0;
+ public static final int MAPTILE_FAIL_ID = MAPTILE_SUCCESS_ID + 1;
+
+ private final int rendererId;
+ private final int x;
+ private final int y;
+ private final int zoomLevel;
+
+ public OpenStreetMapTile(int rendererId, int zoomLevel, int tileX, int tileY) {
+ this.rendererId = rendererId;
+ this.zoomLevel = zoomLevel;
+ this.x = tileX;
+ this.y = tileY;
+ }
+
+ public int getRendererId() {
+ return rendererId;
+ }
+
+ public int getZoomLevel() {
+ return zoomLevel;
+ }
+
+ public int getX() {
+ return x;
+ }
+
+ public int getY() {
+ return y;
+ }
+
+ @Override
+ public String toString() {
+ return rendererId + "/" + zoomLevel + "/" + x + "/" + y;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o instanceof OpenStreetMapTile) {
+ OpenStreetMapTile t = (OpenStreetMapTile) o;
+ return zoomLevel == t.zoomLevel && x == t.x && y == t.y && rendererId == t.rendererId;
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int code = 17;
+ code *= 37 + rendererId;
+ code *= 37 + zoomLevel;
+ code *= 37 + x;
+ code *= 37 + y;
+ return code;
+ }
+
+}
diff --git a/konphidroid/src/org/andnav/osm/tileprovider/OpenStreetMapTileDownloader.java b/konphidroid/src/org/andnav/osm/tileprovider/OpenStreetMapTileDownloader.java
new file mode 100644
index 0000000..8cbc1d1
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/tileprovider/OpenStreetMapTileDownloader.java
@@ -0,0 +1,139 @@
+// Created by plusminus on 21:31:36 - 25.09.2008
+package org.andnav.osm.tileprovider;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.net.UnknownHostException;
+
+import org.andnav.osm.views.util.OpenStreetMapRendererInfo;
+
+import android.util.Log;
+
+/**
+ * The OpenStreetMapTileDownloader loads tiles from a server and passes them to
+ * a OpenStreetMapTileFilesystemProvider.
+ * @author Nicolas Gramlich
+ * @author Manuel Stahl
+ *
+ */
+public class OpenStreetMapTileDownloader extends OpenStreetMapAsyncTileProvider {
+
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ private static final String DEBUGTAG = "OSM_DOWNLOADER";
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ private final OpenStreetMapTileFilesystemProvider mMapTileFSProvider;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public OpenStreetMapTileDownloader(final IOpenStreetMapTileProviderCallback pCallback, final OpenStreetMapTileFilesystemProvider aMapTileFSProvider){
+ super(pCallback, NUMBER_OF_TILE_DOWNLOAD_THREADS, TILE_DOWNLOAD_MAXIMUM_QUEUE_SIZE);
+ this.mMapTileFSProvider = aMapTileFSProvider;
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ @Override
+ protected String debugtag() {
+ return DEBUGTAG;
+ }
+
+ @Override
+ protected Runnable getTileLoader() {
+ return new TileLoader();
+ };
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ private String buildURL(final OpenStreetMapTile tile) {
+ OpenStreetMapRendererInfo renderer = OpenStreetMapRendererInfo.values()[tile.getRendererId()];
+ return renderer.getTileURLString(tile);
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+
+ private class TileLoader extends OpenStreetMapAsyncTileProvider.TileLoader {
+
+ @Override
+ public void loadTile(final OpenStreetMapTile aTile) throws CantContinueException {
+
+ InputStream in = null;
+ OutputStream out = null;
+
+ final File outputFile = mMapTileFSProvider.getOutputFile(aTile);
+ final String tileURLString = buildURL(aTile);
+
+ try {
+ if(DEBUGMODE)
+ Log.d(DEBUGTAG, "Downloading Maptile from url: " + tileURLString);
+
+ in = new BufferedInputStream(new URL(tileURLString).openStream(), StreamUtils.IO_BUFFER_SIZE);
+
+ final ByteArrayOutputStream dataStream = new ByteArrayOutputStream();
+ out = new BufferedOutputStream(dataStream, StreamUtils.IO_BUFFER_SIZE);
+ StreamUtils.copy(in, out);
+ out.flush();
+
+ final byte[] data = dataStream.toByteArray();
+
+ // sanity check - don't save an empty file
+ if (data.length == 0) {
+ Log.i(DEBUGTAG, "Empty maptile not saved: " + aTile);
+ } else {
+ mMapTileFSProvider.saveFile(aTile, outputFile, data);
+ if(DEBUGMODE)
+ Log.d(DEBUGTAG, "Maptile saved " + data.length + " bytes : " + aTile);
+ }
+ } catch (final UnknownHostException e) {
+ // no network connection so empty the queue
+ Log.w(DEBUGTAG, "UnknownHostException downloading MapTile: " + aTile + " : " + e);
+ throw new CantContinueException();
+ } catch(final FileNotFoundException e){
+ Log.w(DEBUGTAG, "Url not found: " + aTile+ " : " + e);
+ } catch (final IOException e) {
+ Log.w(DEBUGTAG, "IOException downloading MapTile: " + aTile + " : " + e);
+ } catch(final Throwable e) {
+ Log.e(DEBUGTAG, "Error downloading MapTile: " + aTile, e);
+ } finally {
+ StreamUtils.closeStream(in);
+ StreamUtils.closeStream(out);
+ }
+
+ /* Don't immediately send the tile back.
+ * If we're moving, and the internet is a bit patchy, then by the time
+ * the download has finished we don't need this tile any more.
+ * If we still do need it then the file system provider will get it
+ * again next time it's needed.
+ * That should be immediately because the view is redrawn when it
+ * receives this completion event.
+ */
+ tileLoaded(aTile, null, true);
+ }
+ };
+
+}
diff --git a/konphidroid/src/org/andnav/osm/tileprovider/OpenStreetMapTileFilesystemProvider.java b/konphidroid/src/org/andnav/osm/tileprovider/OpenStreetMapTileFilesystemProvider.java
new file mode 100644
index 0000000..88343da
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/tileprovider/OpenStreetMapTileFilesystemProvider.java
@@ -0,0 +1,135 @@
+// Created by plusminus on 21:46:41 - 25.09.2008
+package org.andnav.osm.tileprovider;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.andnav.osm.views.util.OpenStreetMapRendererInfo;
+
+import android.util.Log;
+
+/**
+ *
+ * @author Nicolas Gramlich
+ *
+ */
+public class OpenStreetMapTileFilesystemProvider extends OpenStreetMapAsyncTileProvider {
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ final static String DEBUGTAG = "OSM_FS_PROVIDER";
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ /** online provider */
+ protected OpenStreetMapTileDownloader mTileDownloader;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ /**
+ * @param ctx
+ * @param aCache to load fs-tiles to.
+ */
+ public OpenStreetMapTileFilesystemProvider(final IOpenStreetMapTileProviderCallback pCallback) {
+ super(pCallback, NUMBER_OF_TILE_FILESYSTEM_THREADS, TILE_FILESYSTEM_MAXIMUM_QUEUE_SIZE);
+ this.mTileDownloader = new OpenStreetMapTileDownloader(pCallback, this);
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ @Override
+ protected String debugtag() {
+ return DEBUGTAG;
+ }
+
+ @Override
+ protected Runnable getTileLoader() {
+ return new TileLoader();
+ };
+
+
+ /**
+ * Stops all workers, the service is shutting down.
+ */
+ @Override
+ public void stopWorkers()
+ {
+ super.stopWorkers();
+ this.mTileDownloader.stopWorkers();
+ }
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ private String buildPath(final OpenStreetMapTile tile) {
+ final OpenStreetMapRendererInfo renderer = OpenStreetMapRendererInfo.values()[tile.getRendererId()];
+ return TILE_PATH_BASE + renderer.name() + "/" + tile.getZoomLevel() + "/"
+ + tile.getX() + "/" + tile.getY() + renderer.IMAGE_FILENAMEENDING + TILE_PATH_EXTENSION;
+ }
+
+ /**
+ * Get the file location for the tile.
+ * @param tile
+ * @return
+ * @throws CantContinueException if the directory containing the file doesn't exist
+ * and can't be created
+ */
+ File getOutputFile(final OpenStreetMapTile tile) throws CantContinueException {
+ final File file = new File(buildPath(tile));
+ final File parent = file.getParentFile();
+ if (!parent.exists() && !parent.mkdirs()) {
+ throw new CantContinueException();
+ }
+ return file;
+ }
+
+ void saveFile(final OpenStreetMapTile tile, final File outputFile, final byte[] someData) throws IOException{
+ final OutputStream bos = new BufferedOutputStream(new FileOutputStream(outputFile, false), StreamUtils.IO_BUFFER_SIZE);
+ bos.write(someData);
+ bos.flush();
+ bos.close();
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+
+ private class TileLoader extends OpenStreetMapAsyncTileProvider.TileLoader {
+
+ @Override
+ public void loadTile(final OpenStreetMapTile aTile) throws CantContinueException {
+ final File tileFile = getOutputFile(aTile);
+ try {
+ if (tileFile.exists()) {
+ if (DEBUGMODE)
+ Log.d(DEBUGTAG, "Loaded tile: " + aTile);
+ tileLoaded(aTile, tileFile.getPath(), true);
+ } else {
+ if (DEBUGMODE)
+ Log.d(DEBUGTAG, "Tile not exist, request for download: " + aTile);
+ mTileDownloader.loadMapTileAsync(aTile);
+ // don't refresh the screen because there's nothing new
+ tileLoaded(aTile, null, false);
+ }
+ } catch (final Throwable e) {
+ Log.e(DEBUGTAG, "Error loading tile", e);
+ tileLoaded(aTile, null, false);
+ }
+ }
+ }
+}
diff --git a/konphidroid/src/org/andnav/osm/tileprovider/StreamUtils.java b/konphidroid/src/org/andnav/osm/tileprovider/StreamUtils.java
new file mode 100644
index 0000000..d2c38f4
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/tileprovider/StreamUtils.java
@@ -0,0 +1,72 @@
+// Created by plusminus on 19:14:08 - 20.10.2008
+package org.andnav.osm.tileprovider;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+
+public class StreamUtils {
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ public static final int IO_BUFFER_SIZE = 8 * 1024;
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ /**
+ * Copy the content of the input stream into the output stream, using a temporary
+ * byte array buffer whose size is defined by {@link #IO_BUFFER_SIZE}.
+ *
+ * @param in The input stream to copy from.
+ * @param out The output stream to copy to.
+ *
+ * @throws IOException If any error occurs during the copy.
+ */
+ public static void copy(InputStream in, OutputStream out) throws IOException {
+ byte[] b = new byte[IO_BUFFER_SIZE];
+ int read;
+ while ((read = in.read(b)) != -1) {
+ out.write(b, 0, read);
+ }
+ }
+
+ /**
+ * Closes the specified stream.
+ *
+ * @param stream The stream to close.
+ */
+ public static void closeStream(Closeable stream) {
+ if (stream != null) {
+ try {
+ stream.close();
+ } catch (IOException e) {
+ android.util.Log.e("IO", "Could not close stream", e);
+ }
+ }
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/tileprovider/constants/OpenStreetMapTileProviderConstants.java b/konphidroid/src/org/andnav/osm/tileprovider/constants/OpenStreetMapTileProviderConstants.java
new file mode 100644
index 0000000..a5eda6f
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/tileprovider/constants/OpenStreetMapTileProviderConstants.java
@@ -0,0 +1,31 @@
+package org.andnav.osm.tileprovider.constants;
+
+import android.os.Environment;
+
+/**
+ *
+ * This class contains constants used by the service.
+ *
+ * @author Neil Boyd
+ *
+ */
+public interface OpenStreetMapTileProviderConstants {
+ // ===========================================================
+ // Final Fields
+ // ===========================================================
+
+ public static final boolean DEBUGMODE = false;
+
+ public static final String TILE_PATH_BASE = Environment.getExternalStorageDirectory() + "/andnav2/tiles/";
+ public static final String TILE_PATH_EXTENSION = ".andnav";
+
+ public static final int NUMBER_OF_TILE_DOWNLOAD_THREADS = 8;
+ public static final int NUMBER_OF_TILE_FILESYSTEM_THREADS = 8;
+
+ public static final int TILE_DOWNLOAD_MAXIMUM_QUEUE_SIZE = 40;
+ public static final int TILE_FILESYSTEM_MAXIMUM_QUEUE_SIZE = 40;
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/util/BoundingBoxE6.java b/konphidroid/src/org/andnav/osm/util/BoundingBoxE6.java
new file mode 100644
index 0000000..af18cb1
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/util/BoundingBoxE6.java
@@ -0,0 +1,190 @@
+// Created by plusminus on 19:06:38 - 25.09.2008
+package org.andnav.osm.util;
+
+import static org.andnav.osm.util.MyMath.gudermann;
+import static org.andnav.osm.util.MyMath.gudermannInverse;
+
+import java.util.ArrayList;
+
+import org.andnav.osm.util.constants.OpenStreetMapConstants;
+import org.andnav.osm.views.util.constants.OpenStreetMapViewConstants;
+
+/**
+ *
+ * @author Nicolas Gramlich
+ *
+ */
+public class BoundingBoxE6 implements OpenStreetMapViewConstants, OpenStreetMapConstants {
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ protected final int mLatNorthE6;
+ protected final int mLatSouthE6;
+ protected final int mLonEastE6;
+ protected final int mLonWestE6;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public BoundingBoxE6(final int northE6, final int eastE6, final int southE6, final int westE6){
+ this.mLatNorthE6 = northE6;
+ this.mLonEastE6 = eastE6;
+ this.mLatSouthE6 = southE6;
+ this.mLonWestE6 = westE6;
+ }
+
+ public BoundingBoxE6(final double north, final double east, final double south, final double west){
+ this.mLatNorthE6 = (int)(north * 1E6);
+ this.mLonEastE6 = (int)(east * 1E6);
+ this.mLatSouthE6 = (int)(south * 1E6);
+ this.mLonWestE6 = (int)(west * 1E6);
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ public int getDiagonalLengthInMeters() {
+ return new GeoPoint(this.mLatNorthE6, this.mLonWestE6).distanceTo(new GeoPoint(this.mLatSouthE6, this.mLonEastE6));
+ }
+
+ public int getLatNorthE6() {
+ return this.mLatNorthE6;
+ }
+
+ public int getLatSouthE6() {
+ return this.mLatSouthE6;
+ }
+
+ public int getLonEastE6() {
+ return this.mLonEastE6;
+ }
+
+ public int getLonWestE6() {
+ return this.mLonWestE6;
+ }
+
+ public int getLatitudeSpanE6() {
+ return Math.abs(this.mLatNorthE6 - this.mLatSouthE6);
+ }
+
+ public int getLongitudeSpanE6() {
+ return Math.abs(this.mLonEastE6 - this.mLonWestE6);
+ }
+ /**
+ *
+ * @param aLatitude
+ * @param aLongitude
+ * @param reuse
+ * @return relative position determined from the upper left corner.<br />
+ * {0,0} would be the upper left corner.
+ * {1,1} would be the lower right corner.
+ * {1,0} would be the lower left corner.
+ * {0,1} would be the upper right corner.
+ */
+ public float[] getRelativePositionOfGeoPointInBoundingBoxWithLinearInterpolation(final int aLatitude, final int aLongitude, final float[] reuse){
+ float[] out = (reuse != null) ? reuse : new float[2];
+ out[MAPTILE_LATITUDE_INDEX] = ((float)(this.mLatNorthE6 - aLatitude) / getLatitudeSpanE6());
+ out[MAPTILE_LONGITUDE_INDEX] = 1 - ((float)(this.mLonEastE6 - aLongitude) / getLongitudeSpanE6());
+ return out;
+ }
+
+ public float[] getRelativePositionOfGeoPointInBoundingBoxWithExactGudermannInterpolation(final int aLatitudeE6, final int aLongitudeE6, final float[] reuse){
+ float[] out = (reuse != null) ? reuse : new float[2];
+ out[MAPTILE_LATITUDE_INDEX] = (float)((gudermannInverse(this.mLatNorthE6 / 1E6) - gudermannInverse(aLatitudeE6 / 1E6)) / (gudermannInverse(this.mLatNorthE6 / 1E6) - gudermannInverse(this.mLatSouthE6 / 1E6)));
+ out[MAPTILE_LONGITUDE_INDEX] = 1 - ((float)(this.mLonEastE6 - aLongitudeE6) / getLongitudeSpanE6());
+ return out;
+ }
+
+ public GeoPoint getGeoPointOfRelativePositionWithLinearInterpolation(final float relX, final float relY) {
+
+ int lat = (int)(this.mLatNorthE6 - (this.getLatitudeSpanE6() * relY));
+
+ int lon = (int)(this.mLonWestE6 + (this.getLongitudeSpanE6() * relX));
+
+ /* Bring into bounds. */
+ while(lat > 90500000)
+ lat -= 90500000;
+ while(lat < -90500000)
+ lat += 90500000;
+
+ /* Bring into bounds. */
+ while(lon > 180000000)
+ lon -= 180000000;
+ while(lon < -180000000)
+ lon += 180000000;
+
+ return new GeoPoint(lat, lon);
+ }
+
+ public GeoPoint getGeoPointOfRelativePositionWithExactGudermannInterpolation(final float relX, final float relY) {
+
+ final double gudNorth = gudermannInverse(this.mLatNorthE6 / 1E6);
+ final double gudSouth = gudermannInverse(this.mLatSouthE6 / 1E6);
+ final double latD = gudermann((gudSouth + (1-relY) * (gudNorth - gudSouth)));
+ int lat = (int)(latD * 1E6);
+
+ int lon = (int)((this.mLonWestE6 + (this.getLongitudeSpanE6() * relX)));
+
+ /* Bring into bounds. */
+ while(lat > 90500000)
+ lat -= 90500000;
+ while(lat < -90500000)
+ lat += 90500000;
+
+ /* Bring into bounds. */
+ while(lon > 180000000)
+ lon -= 180000000;
+ while(lon < -180000000)
+ lon += 180000000;
+
+ return new GeoPoint(lat, lon);
+ }
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ @Override
+ public String toString(){
+ return new StringBuffer()
+ .append("N:").append(this.mLatNorthE6)
+ .append("; E:").append(this.mLonEastE6)
+ .append("; S:").append(this.mLatSouthE6)
+ .append("; W:").append(this.mLonWestE6)
+ .toString();
+ }
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ public static BoundingBoxE6 fromGeoPoints(final ArrayList<? extends GeoPoint> partialPolyLine) {
+ int minLat = Integer.MAX_VALUE;
+ int minLon = Integer.MAX_VALUE;
+ int maxLat = Integer.MIN_VALUE;
+ int maxLon = Integer.MIN_VALUE;
+ for (GeoPoint gp : partialPolyLine) {
+ final int latitudeE6 = gp.getLatitudeE6();
+ final int longitudeE6 = gp.getLongitudeE6();
+
+ minLat = Math.min(minLat, latitudeE6);
+ minLon = Math.min(minLon, longitudeE6);
+ maxLat = Math.max(maxLat, latitudeE6);
+ maxLon = Math.max(maxLon, longitudeE6);
+ }
+
+ return new BoundingBoxE6(minLat, minLon, maxLat, maxLon);
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
+
diff --git a/konphidroid/src/org/andnav/osm/util/GeoPoint.java b/konphidroid/src/org/andnav/osm/util/GeoPoint.java
new file mode 100644
index 0000000..383fb21
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/util/GeoPoint.java
@@ -0,0 +1,138 @@
+// Created by plusminus on 21:28:12 - 25.09.2008
+package org.andnav.osm.util;
+
+import org.andnav.osm.util.constants.GeoConstants;
+import org.andnav.osm.views.util.constants.MathConstants;
+
+import android.location.Location;
+
+/**
+ *
+ * @author Nicolas Gramlich
+ *
+ */
+public class GeoPoint implements MathConstants, GeoConstants{
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ private int mLongitudeE6;
+ private int mLatitudeE6;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public GeoPoint(final int aLatitudeE6, final int aLongitudeE6) {
+ this.mLatitudeE6 = aLatitudeE6;
+ this.mLongitudeE6 = aLongitudeE6;
+ }
+
+ public GeoPoint(final double aLatitude, final double aLongitude) {
+ this.mLatitudeE6 = (int)(aLatitude * 1E6);
+ this.mLongitudeE6 = (int)(aLongitude * 1E6);
+ }
+
+ public GeoPoint(Location aLocation) {
+ this(aLocation.getLatitude(), aLocation.getLongitude());
+ }
+
+
+ protected static GeoPoint fromDoubleString(final String s, final char spacer) {
+ final int spacerPos = s.indexOf(spacer);
+ return new GeoPoint((int) (Double.parseDouble(s.substring(0,
+ spacerPos - 1)) * 1E6), (int) (Double.parseDouble(s.substring(
+ spacerPos + 1, s.length())) * 1E6));
+ }
+
+ public static GeoPoint fromIntString(final String s){
+ final int commaPos = s.indexOf(',');
+ return new GeoPoint(Integer.parseInt(s.substring(0,commaPos-1)),
+ Integer.parseInt(s.substring(commaPos+1,s.length())));
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ public int getLongitudeE6() {
+ return this.mLongitudeE6;
+ }
+
+ public int getLatitudeE6() {
+ return this.mLatitudeE6;
+ }
+
+ public void setLongitudeE6(final int aLongitudeE6) {
+ this.mLongitudeE6 = aLongitudeE6;
+ }
+
+ public void setLatitudeE6(final int aLatitudeE6) {
+ this.mLatitudeE6 = aLatitudeE6;
+ }
+
+ public void setCoordsE6(final int aLatitudeE6, final int aLongitudeE6) {
+ this.mLatitudeE6 = aLatitudeE6;
+ this.mLongitudeE6 = aLongitudeE6;
+ }
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ @Override
+ public String toString(){
+ return new StringBuilder().append(this.mLatitudeE6).append(",").append(this.mLongitudeE6).toString();
+ }
+
+ public String toDoubleString() {
+ return new StringBuilder().append(this.mLatitudeE6 / 1E6).append(",").append(this.mLongitudeE6 / 1E6).toString();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if(!(obj instanceof GeoPoint))
+ return false;
+ GeoPoint g = (GeoPoint)obj;
+ return g.mLatitudeE6 == this.mLatitudeE6 && g.mLongitudeE6 == this.mLongitudeE6;
+ }
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ /**
+ * @see Source@ http://www.geocities.com/DrChengalva/GPSDistance.html
+ * @param gpA
+ * @param gpB
+ * @return distance in meters
+ */
+ public int distanceTo(final GeoPoint other) {
+
+ final double a1 = DEG2RAD * (this.mLatitudeE6 / 1E6);
+ final double a2 = DEG2RAD * (this.mLongitudeE6 / 1E6);
+ final double b1 = DEG2RAD * (other.mLatitudeE6 / 1E6);
+ final double b2 = DEG2RAD * (other.mLongitudeE6 / 1E6);
+
+ final double cosa1 = Math.cos(a1);
+ final double cosb1 = Math.cos(b1);
+
+ final double t1 = cosa1*Math.cos(a2)*cosb1*Math.cos(b2);
+
+ final double t2 = cosa1*Math.sin(a2)*cosb1*Math.sin(b2);
+
+ final double t3 = Math.sin(a1)*Math.sin(b1);
+
+ final double tt = Math.acos( t1 + t2 + t3 );
+
+ return (int)(RADIUS_EARTH_METERS*tt);
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/util/MyMath.java b/konphidroid/src/org/andnav/osm/util/MyMath.java
new file mode 100644
index 0000000..d54f937
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/util/MyMath.java
@@ -0,0 +1,59 @@
+// Created by plusminus on 20:36:01 - 26.09.2008
+package org.andnav.osm.util;
+
+import org.andnav.osm.views.util.constants.MathConstants;
+
+/**
+ *
+ * @author Nicolas Gramlich
+ *
+ */
+public class MyMath implements MathConstants {
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+
+ public static double gudermannInverse(double aLatitude){
+ return Math.log(Math.tan(PI_4 + (DEG2RAD * aLatitude / 2)));
+ }
+
+ public static double gudermann(double y){
+ return RAD2DEG * Math.atan(Math.sinh(y));
+ }
+
+
+ public static int mod(int number, final int modulus){
+ if(number > 0)
+ return number % modulus;
+
+ while(number < 0)
+ number += modulus;
+
+ return number;
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/util/NetworkLocationIgnorer.java b/konphidroid/src/org/andnav/osm/util/NetworkLocationIgnorer.java
new file mode 100644
index 0000000..393b90b
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/util/NetworkLocationIgnorer.java
@@ -0,0 +1,44 @@
+package org.andnav.osm.util;
+
+import android.location.LocationManager;
+
+/**
+ *
+ * A class to check whether we want to use a location.
+ * If there are multiple location providers, i.e. network and GPS,
+ * then you want to ignore network locations shortly after a GPS location
+ * because you will get another GPS location soon.
+ *
+ * @author Neil Boyd
+ *
+ */
+public class NetworkLocationIgnorer {
+
+ /**
+ * The time we wait after the last gps location before displaying
+ * a non-gps location.
+ */
+ private static final long GPS_WAIT_TIME = 20000; // 20 seconds
+
+ /** last time we got a location from the gps provider */
+ private long mLastGps = 0;
+
+ /**
+ * Whether we should ignore this location.
+ * @param pProvider the provider that provided the location
+ * @param pTime the time of the location
+ * @return true if we should ignore this location, false if not
+ */
+ public boolean shouldIgnore(final String pProvider, final long pTime) {
+
+ if (LocationManager.GPS_PROVIDER.equals(pProvider)) {
+ mLastGps = pTime;
+ } else {
+ if (pTime < mLastGps + GPS_WAIT_TIME) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+}
diff --git a/konphidroid/src/org/andnav/osm/util/constants/GeoConstants.java b/konphidroid/src/org/andnav/osm/util/constants/GeoConstants.java
new file mode 100644
index 0000000..aa701d6
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/util/constants/GeoConstants.java
@@ -0,0 +1,15 @@
+// Created by plusminus on 17:41:55 - 16.10.2008
+package org.andnav.osm.util.constants;
+
+
+public interface GeoConstants {
+ // ===========================================================
+ // Final Fields
+ // ===========================================================
+
+ public static final int RADIUS_EARTH_METERS = 6378140;
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+}
\ No newline at end of file
diff --git a/konphidroid/src/org/andnav/osm/util/constants/OpenStreetMapConstants.java b/konphidroid/src/org/andnav/osm/util/constants/OpenStreetMapConstants.java
new file mode 100644
index 0000000..0b864b4
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/util/constants/OpenStreetMapConstants.java
@@ -0,0 +1,32 @@
+// Created by plusminus on 23:11:31 - 22.09.2008
+package org.andnav.osm.util.constants;
+
+/**
+ *
+ * This class contains constants used by the sample applications.
+ *
+ * @author Nicolas Gramlich
+ *
+ */
+public interface OpenStreetMapConstants {
+ // ===========================================================
+ // Final Fields
+ // ===========================================================
+
+ public static final String DEBUGTAG = "OPENSTREETMAP";
+
+ public static final int NOT_SET = Integer.MIN_VALUE;
+
+ public static final String PREFS_NAME = "org.andnav.osm.prefs";
+ public static final String PREFS_RENDERER = "renderer";
+ public static final String PREFS_SCROLL_X = "scrollX";
+ public static final String PREFS_SCROLL_Y = "scrollY";
+ public static final String PREFS_ZOOM_LEVEL = "zoomLevel";
+ public static final String PREFS_SHOW_LOCATION = "showLocation";
+ public static final String PREFS_FOLLOW_LOCATION = "followLocation";
+
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/views/OpenStreetMapView.java b/konphidroid/src/org/andnav/osm/views/OpenStreetMapView.java
new file mode 100644
index 0000000..c4d9a0d
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/OpenStreetMapView.java
@@ -0,0 +1,1137 @@
+// Created by plusminus on 17:45:56 - 25.09.2008
+package org.andnav.osm.views;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.andnav.osm.util.BoundingBoxE6;
+import org.andnav.osm.util.GeoPoint;
+import org.andnav.osm.views.overlay.OpenStreetMapTilesOverlay;
+import org.andnav.osm.views.overlay.OpenStreetMapViewOverlay;
+import org.andnav.osm.views.overlay.OpenStreetMapViewOverlay.Snappable;
+import org.andnav.osm.views.util.Mercator;
+import org.andnav.osm.views.util.OpenStreetMapRendererInfo;
+import org.andnav.osm.views.util.OpenStreetMapTileProvider;
+import org.andnav.osm.views.util.constants.OpenStreetMapViewConstants;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.graphics.Bitmap.Config;
+import android.graphics.Paint.Style;
+import android.util.AttributeSet;
+import android.util.FloatMath;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.GestureDetector.OnGestureListener;
+import android.view.animation.AnimationUtils;
+import android.view.animation.Interpolator;
+import android.view.animation.LinearInterpolator;
+import android.widget.Scroller;
+import android.widget.ZoomButtonsController;
+import android.widget.ZoomButtonsController.OnZoomListener;
+
+public class OpenStreetMapView extends View implements OpenStreetMapViewConstants {
+
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ final static OpenStreetMapRendererInfo DEFAULTRENDERER = OpenStreetMapRendererInfo.MAPNIK;
+ final static String BUNDLE_RENDERER = "org.andnav.osm.views.OpenStreetMapView.RENDERER";
+ final static String BUNDLE_SCROLL_X = "org.andnav.osm.views.OpenStreetMapView.SCROLL_X";
+ final static String BUNDLE_SCROLL_Y = "org.andnav.osm.views.OpenStreetMapView.SCROLL_Y";
+ final static String BUNDLE_ZOOM_LEVEL = "org.andnav.osm.views.OpenStreetMapView.ZOOM";
+
+ private static final int MULTI_NONE = 0;
+ private static final int MULTI_ACTIVE = 1;
+ private static final int MULTI_HANDLED = 2;
+
+ private float mPointerDownDistance; /* distance for a ACTION_POINTER_DOWN MotionEvent */
+ private int mMultiMode = MULTI_NONE; /* if we are in after an ACTION_POINTER_DOWN */
+
+ // get API level 5 MotionEvent constants by reflection
+ // TODO can remove this stuff if we upgrade to API level 5
+ private static int ACTION_MASK = 255;
+ private static int ACTION_POINTER_DOWN = 5;
+ private static int ACTION_POINTER_UP = 6;
+ private static Method MotionEvent_getX;
+ private static Method MotionEvent_getY;
+ static {
+ final MotionEvent me = MotionEvent.obtain(0, 0, 0, 0f, 0f, 0);
+ try {
+ ACTION_MASK = MotionEvent.class.getField("ACTION_MASK").getInt(me);
+ } catch (final Exception e) {}
+ try {
+ ACTION_POINTER_DOWN = MotionEvent.class.getField("ACTION_POINTER_DOWN").getInt(me);
+ } catch (final Exception e) {}
+ try {
+ ACTION_POINTER_UP = MotionEvent.class.getField("ACTION_POINTER_UP").getInt(me);
+ } catch (final Exception e) {}
+ try {
+ MotionEvent_getX = MotionEvent.class.getMethod("getX", new Class[] { int.class });
+ } catch (final Exception e) {}
+ try {
+ MotionEvent_getY = MotionEvent.class.getMethod("getY", new Class[] { int.class });
+ } catch (final Exception e) {}
+ }
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ protected int mZoomLevel = 0; /** Current zoom level for map tiles */
+ protected final List<OpenStreetMapViewOverlay> mOverlays = new ArrayList<OpenStreetMapViewOverlay>();
+
+ protected Bitmap mBackBuffer;
+ protected Canvas mBackCanvas;
+ protected Matrix mTrans = new Matrix();
+ protected final Paint mPaint = new Paint();
+ private OpenStreetMapViewProjection mProjection;
+
+ private OpenStreetMapView mMiniMap, mMaxiMap;
+ private final OpenStreetMapTilesOverlay mMapOverlay;
+
+ private final GestureDetector mGestureDetector = new GestureDetector(new OpenStreetMapViewGestureDetectorListener());
+ final Scroller mScroller; /** Handles map scrolling */
+ final Scaler mScaler;
+ private OpenStreetMapViewController mController;
+ private int mMiniMapOverriddenVisibility = NOT_SET;
+ private int mMiniMapZoomDiff = NOT_SET;
+
+ private ZoomButtonsController mZoomController;
+ private boolean mEnableZoomController = false;
+
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ private OpenStreetMapView(final Context context, AttributeSet attrs,
+ final OpenStreetMapRendererInfo aRendererInfo,
+ final OpenStreetMapTileProvider aTileProvider) {
+ super(context, attrs);
+ this.mController = new OpenStreetMapViewController(this);
+ this.mScroller = new Scroller(context);
+ this.mScaler = new Scaler(context, new LinearInterpolator());
+ this.mMapOverlay = new OpenStreetMapTilesOverlay(this, aRendererInfo, aTileProvider);
+ mOverlays.add(this.mMapOverlay);
+ this.mZoomController = new ZoomButtonsController(this);
+ this.mZoomController.setOnZoomListener(new OpenStreetMapViewZoomListener());
+ }
+
+ /**
+ * XML Constructor (uses default Renderer)
+ */
+ public OpenStreetMapView(Context context, AttributeSet attrs) {
+ this(context, attrs, DEFAULTRENDERER, null);
+ }
+
+ /**
+ * Standard Constructor for {@link OpenStreetMapView}.
+ *
+ * @param context
+ * @param aRendererInfo
+ * pass a {@link OpenStreetMapRendererInfo} you like.
+ */
+ public OpenStreetMapView(final Context context, final OpenStreetMapRendererInfo aRendererInfo) {
+ this(context, null, aRendererInfo, null);
+ }
+
+ /**
+ *
+ * @param context
+ * @param aRendererInfo
+ * pass a {@link OpenStreetMapRendererInfo} you like.
+ * @param osmv
+ * another {@link OpenStreetMapView}, to share the TileProvider
+ * with.<br/>
+ * May significantly improve the render speed, when using the
+ * same {@link OpenStreetMapRendererInfo}.
+ */
+ public OpenStreetMapView(final Context context,
+ final OpenStreetMapRendererInfo aRendererInfo,
+ final OpenStreetMapView aMapToShareTheTileProviderWith) {
+ this(context, null, aRendererInfo, /* TODO aMapToShareTheTileProviderWith.mTileProvider */ null);
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ /**
+ * This MapView takes control of the {@link OpenStreetMapView} passed as
+ * parameter.<br />
+ * I.e. it zoomes it to x levels less than itself and centers it the same
+ * coords.<br />
+ * Its pretty usefull when the MiniMap uses the same TileProvider.
+ *
+ * @see OpenStreetMapView.OpenStreetMapView(
+ * @param aOsmvMinimap
+ * @param aZoomDiff
+ * 3 is a good Value. Pass {@link OpenStreetMapViewConstants}
+ * .NOT_SET to disable autozooming of the minimap.
+ */
+ public void setMiniMap(final OpenStreetMapView aOsmvMinimap, final int aZoomDiff) {
+ this.mMiniMapZoomDiff = aZoomDiff;
+ this.mMiniMap = aOsmvMinimap;
+ aOsmvMinimap.setMaxiMap(this);
+
+ // TODO Synchronize the Views.
+// this.setMapCenter(this.mLatitudeE6, this.mLongitudeE6);
+// this.setZoomLevel(this.getZoomLevel());
+ }
+
+ public boolean hasMiniMap() {
+ return this.mMiniMap != null;
+ }
+
+ /**
+ * @return {@link View}.GONE or {@link View}.VISIBLE or {@link View}
+ * .INVISIBLE or {@link OpenStreetMapViewConstants}.NOT_SET
+ * */
+ public int getOverrideMiniMapVisiblity() {
+ return this.mMiniMapOverriddenVisibility;
+ }
+
+ /**
+ * Use this method if you want to make the MiniMap visible i.e.: always or
+ * never. Use {@link View}.GONE , {@link View}.VISIBLE, {@link View}
+ * .INVISIBLE. Use {@link OpenStreetMapViewConstants}.NOT_SET to reset this
+ * feature.
+ *
+ * @param aVisiblity
+ */
+ public void setOverrideMiniMapVisiblity(final int aVisiblity) {
+ switch (aVisiblity) {
+ case View.GONE:
+ case View.VISIBLE:
+ case View.INVISIBLE:
+ if (this.mMiniMap != null)
+ this.mMiniMap.setVisibility(aVisiblity);
+ case NOT_SET:
+ this.setZoomLevel(this.mZoomLevel);
+ break;
+ default:
+ throw new IllegalArgumentException("See javadoc of this method !!!");
+ }
+ this.mMiniMapOverriddenVisibility = aVisiblity;
+ }
+
+ protected void setMaxiMap(final OpenStreetMapView aOsmvMaxiMap) {
+ this.mMaxiMap = aOsmvMaxiMap;
+ }
+
+ public OpenStreetMapViewController getController() {
+ return this.mController;
+ }
+
+ /**
+ * You can add/remove/reorder your Overlays using the List of
+ * {@link OpenStreetMapViewOverlay}. The first (index 0) Overlay gets drawn
+ * first, the one with the highest as the last one.
+ */
+ public List<OpenStreetMapViewOverlay> getOverlays() {
+ return this.mOverlays;
+ }
+
+ public double getLatitudeSpan() {
+ return this.getDrawnBoundingBoxE6().getLongitudeSpanE6() / 1E6;
+ }
+
+ public int getLatitudeSpanE6() {
+ return this.getDrawnBoundingBoxE6().getLatitudeSpanE6();
+ }
+
+ public double getLongitudeSpan() {
+ return this.getDrawnBoundingBoxE6().getLongitudeSpanE6() / 1E6;
+ }
+
+ public int getLongitudeSpanE6() {
+ return this.getDrawnBoundingBoxE6().getLatitudeSpanE6();
+ }
+
+ public BoundingBoxE6 getDrawnBoundingBoxE6() {
+ return getBoundingBox(this.getWidth(), this.getHeight());
+ }
+
+ public BoundingBoxE6 getVisibleBoundingBoxE6() {
+// final ViewParent parent = this.getParent();
+// if(parent instanceof RotateView){
+// final RotateView par = (RotateView)parent;
+// return getBoundingBox(par.getMeasuredWidth(), par.getMeasuredHeight());
+// }else{
+ return getBoundingBox(this.getWidth(), this.getHeight());
+// }
+ }
+
+ private BoundingBoxE6 getBoundingBox(final int pViewWidth, final int pViewHeight){
+ final int mapTileZoom = mMapOverlay.getRendererInfo().MAPTILE_ZOOM;
+ final int world_2 = (1 << mZoomLevel + mapTileZoom - 1);
+ final int north = world_2 + getScrollY() - getHeight()/2;
+ final int south = world_2 + getScrollY() + getHeight()/2;
+ final int west = world_2 + getScrollX() - getWidth()/2;
+ final int east = world_2 + getScrollX() + getWidth()/2;
+
+ return Mercator.getBoundingBoxFromCoords(west, north, east, south, mZoomLevel + mapTileZoom);
+ }
+
+ /**
+ * This class is only meant to be used during on call of onDraw(). Otherwise
+ * it may produce strange results.
+ *
+ * @return
+ */
+ public OpenStreetMapViewProjection getProjection() {
+ return mProjection;
+ }
+
+ public void setMapCenter(final GeoPoint aCenter) {
+ this.setMapCenter(aCenter.getLatitudeE6(), aCenter.getLongitudeE6());
+ }
+//
+// public void setMapCenter(final double aLatitude, final double aLongitude) {
+// this.setMapCenter((int) (aLatitude * 1E6), (int) (aLongitude * 1E6));
+// }
+//
+ public void setMapCenter(final int aLatitudeE6, final int aLongitudeE6) {
+ this.setMapCenter(aLatitudeE6, aLongitudeE6, true);
+ }
+
+ protected void setMapCenter(final int aLatitudeE6, final int aLongitudeE6,
+ final boolean doPassFurther) {
+ if (doPassFurther && this.mMiniMap != null)
+ this.mMiniMap.setMapCenter(aLatitudeE6, aLongitudeE6, false);
+ else if (this.mMaxiMap != null)
+ this.mMaxiMap.setMapCenter(aLatitudeE6, aLongitudeE6, false);
+
+ final int[] coords = Mercator.projectGeoPoint(aLatitudeE6, aLongitudeE6, getPixelZoomLevel(), null);
+ final int worldSize_2 = getWorldSizePx()/2;
+ if (getAnimation() == null || getAnimation().hasEnded()) {
+ mScroller.startScroll(getScrollX(), getScrollY(),
+ coords[MAPTILE_LONGITUDE_INDEX] - worldSize_2 - getScrollX(),
+ coords[MAPTILE_LATITUDE_INDEX] - worldSize_2 - getScrollY(), 500);
+ postInvalidate();
+ }
+ }
+
+ public OpenStreetMapRendererInfo getRenderer() {
+ return this.mMapOverlay.getRendererInfo();
+ }
+
+ public void setRenderer(final OpenStreetMapRendererInfo aRenderer) {
+ this.mMapOverlay.setRendererInfo(aRenderer);
+ this.checkZoomButtons();
+ postInvalidate();
+ }
+
+ /**
+ * @param aZoomLevel
+ * between 0 (equator) and 18/19(closest), depending on the
+ * Renderer chosen.
+ */
+ protected int setZoomLevel(final int aZoomLevel) {
+ final int minZoomLevel = this.mMapOverlay.getRendererInfo().ZOOM_MINLEVEL;
+ final int maxZoomLevel = this.mMapOverlay.getRendererInfo().ZOOM_MAXLEVEL;
+ final int newZoomLevel = Math.max(minZoomLevel, Math.min(maxZoomLevel, aZoomLevel));
+ final int curZoomLevel = this.mZoomLevel;
+
+ if (this.mMiniMap != null) {
+ if (this.mZoomLevel < this.mMiniMapZoomDiff) {
+ if (this.mMiniMapOverriddenVisibility == NOT_SET)
+ this.mMiniMap.setVisibility(View.INVISIBLE);
+ } else {
+ if (this.mMiniMapOverriddenVisibility == NOT_SET
+ && this.mMiniMap.getVisibility() != View.VISIBLE) {
+ this.mMiniMap.setVisibility(View.VISIBLE);
+ }
+ if (this.mMiniMapZoomDiff != NOT_SET)
+ this.mMiniMap.setZoomLevel(this.mZoomLevel - this.mMiniMapZoomDiff);
+ }
+ }
+
+ this.mZoomLevel = newZoomLevel;
+ this.checkZoomButtons();
+
+ if(newZoomLevel > curZoomLevel)
+ scrollTo(getScrollX()<<(newZoomLevel-curZoomLevel), getScrollY()<<(newZoomLevel-curZoomLevel));
+ else if(newZoomLevel < curZoomLevel)
+ scrollTo(getScrollX()>>(curZoomLevel-newZoomLevel), getScrollY()>>(curZoomLevel-newZoomLevel));
+
+ // TODO snap for all snappables
+ Point snapPoint = new Point();
+ mProjection = new OpenStreetMapViewProjection();
+ for (OpenStreetMapViewOverlay osmvo : this.mOverlays) {
+ if (osmvo instanceof Snappable &&
+ ((Snappable)osmvo).onSnapToItem(getScrollX(), getScrollY(), snapPoint, this)) {
+ scrollTo(snapPoint.x, snapPoint.y);
+ }
+ }
+ return this.mZoomLevel;
+ }
+
+ /**
+ * Get the current ZoomLevel for the map tiles.
+ * @return the current ZoomLevel between 0 (equator) and 18/19(closest),
+ * depending on the Renderer chosen.
+ */
+ public int getZoomLevel() {
+ return this.mZoomLevel;
+ }
+
+ /*
+ * Returns the maximum zoom level for the point currently at the center.
+ * @return The maximum zoom level for the map's current center.
+ */
+ public int getMaxZoomLevel() {
+ return getRenderer().ZOOM_MAXLEVEL;
+ }
+
+ public GeoPoint getMapCenter() {
+ return new GeoPoint(getMapCenterLatitudeE6(), getMapCenterLongitudeE6());
+ }
+
+ public int getMapCenterLatitudeE6() {
+ return (int)(Mercator.tile2lat(getScrollY() + getWorldSizePx()/2, getPixelZoomLevel()) * 1E6);
+ }
+
+ public int getMapCenterLongitudeE6() {
+ return (int)(Mercator.tile2lon(getScrollX() + getWorldSizePx()/2, getPixelZoomLevel()) * 1E6);
+ }
+
+ public void onSaveInstanceState(android.os.Bundle state) {
+ state.putInt(BUNDLE_RENDERER, getRenderer().ordinal());
+ state.putInt(BUNDLE_SCROLL_X, getScrollX());
+ state.putInt(BUNDLE_SCROLL_Y, getScrollY());
+ state.putInt(BUNDLE_ZOOM_LEVEL, getZoomLevel());
+ }
+
+ public void onRestoreInstanceState(android.os.Bundle state) {
+ setRenderer(OpenStreetMapRendererInfo.values()[state.getInt(BUNDLE_RENDERER, 0)]);
+ setZoomLevel(state.getInt(BUNDLE_ZOOM_LEVEL, 1));
+ scrollTo(state.getInt(BUNDLE_SCROLL_X, 0), state.getInt(BUNDLE_SCROLL_Y, 0));
+ }
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ public void onLongPress(MotionEvent e) {
+ for (OpenStreetMapViewOverlay osmvo : this.mOverlays)
+ if (osmvo.onLongPress(e, this))
+ return;
+ }
+
+ public boolean onSingleTapUp(MotionEvent e) {
+ for (OpenStreetMapViewOverlay osmvo : this.mOverlays)
+ if (osmvo.onSingleTapUp(e, this)) {
+ postInvalidate();
+ return true;
+ }
+
+ return false;
+ }
+
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
+ for (OpenStreetMapViewOverlay osmvo : this.mOverlays)
+ if (osmvo.onKeyDown(keyCode, event, this))
+ return true;
+
+ return super.onKeyDown(keyCode, event);
+ }
+
+ @Override
+ public boolean onKeyUp(int keyCode, KeyEvent event) {
+ for (OpenStreetMapViewOverlay osmvo : this.mOverlays)
+ if (osmvo.onKeyUp(keyCode, event, this))
+ return true;
+
+ return super.onKeyUp(keyCode, event);
+ }
+
+ @Override
+ public boolean onTrackballEvent(MotionEvent event) {
+ for (OpenStreetMapViewOverlay osmvo : this.mOverlays)
+ if (osmvo.onTrackballEvent(event, this))
+ return true;
+
+ scrollBy((int)(event.getX() * 25), (int)(event.getY() * 25));
+
+ return super.onTrackballEvent(event);
+ }
+
+ @Override
+ public boolean onTouchEvent(final MotionEvent event) {
+
+ Log.d(DEBUGTAG, "onTouchEvent(" + event + ")");
+
+ /*
+ * handle multi touch events:
+ * 1. mask out the action with the ACTION_MASK
+ * 2. measure the spreading
+ * 3. on ACTION_POINTER_DOWN remember the spreading in the
+ * pointerDownDistance and set multiDown mode to ACTIVE
+ * 4. on first move changing the spreading by a
+ * factor of 2 or a factor of 0.5 increase or
+ * decrease the zoom level
+ * switch off multiDown mode and set it to HANDLED
+ * 5. on ACTION_POINTER_UP also switch off the multiDown mode
+ * 6. in any of these cases: claim the event handled and
+ * return true
+ */
+ final int action = event.getAction() & ACTION_MASK;
+
+ if (action == ACTION_POINTER_DOWN) {
+ mPointerDownDistance = spreading(event);
+ mMultiMode = MULTI_ACTIVE;
+ return true;
+ } else if (action == ACTION_POINTER_UP) {
+ mMultiMode = MULTI_NONE;
+ return true;
+ } else if (mMultiMode != MULTI_NONE) {
+ if (mMultiMode == MULTI_ACTIVE && action == MotionEvent.ACTION_MOVE) {
+ final float pointerUpDistance = spreading(event);
+
+ if (pointerUpDistance > 2 * mPointerDownDistance) {
+ mMultiMode = MULTI_HANDLED;
+ setZoomLevel(mZoomLevel + 1);
+ } else if (pointerUpDistance < 0.5 * mPointerDownDistance) {
+ setZoomLevel(mZoomLevel - 1);
+ mMultiMode = MULTI_HANDLED;
+ }
+ }
+ return true;
+ }
+
+ for (OpenStreetMapViewOverlay osmvo : this.mOverlays)
+ if (osmvo.onTouchEvent(event, this))
+ return true;
+
+ if (this.mGestureDetector.onTouchEvent(event))
+ return true;
+
+ return super.onTouchEvent(event);
+ }
+
+ @Override
+ public void computeScroll() {
+ if (mScroller.computeScrollOffset()) {
+// int oldX = getScrollX();
+// int oldY = getScrollY();
+// int x = mScroller.getCurrX();
+// int y = mScroller.getCurrY();
+// if (x != oldX || y != oldY)
+ if (mScroller.isFinished())
+ mController.onScrollingFinished();
+ else
+ scrollTo(mScroller.getCurrX(), mScroller.getCurrY());
+ postInvalidate(); // Keep on drawing until the animation has finished.
+ }
+ }
+
+ private float spreading(final MotionEvent event) {
+ // TODO can do this directly if we upgrade to API level 5
+ try {
+ final float x0 = Float.valueOf(MotionEvent_getX.invoke(event, 0).toString());
+ final float x1 = Float.valueOf(MotionEvent_getX.invoke(event, 1).toString());
+ final float y0 = Float.valueOf(MotionEvent_getY.invoke(event, 0).toString());
+ final float y1 = Float.valueOf(MotionEvent_getY.invoke(event, 1).toString());
+ final float x = x0 - x1;
+ final float y = y0 - y1;
+ return FloatMath.sqrt(x * x + y * y);
+ } catch(final Exception e) {
+ return 1;
+ }
+ }
+
+ private void computeScale() {
+ if (mScaler.computeScale()) {
+ if (mScaler.isFinished())
+ mController.onScalingFinished();
+ else
+ postInvalidate();
+ }
+ }
+
+ @Override
+ public void scrollTo(int x, int y) {
+ final int worldSize = getWorldSizePx();
+ x %= worldSize;
+ y %= worldSize;
+ super.scrollTo(x, y);
+ }
+
+ @Override
+ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+ if(this.mBackBuffer != null) {
+ this.mBackBuffer.recycle();
+ this.mBackBuffer = null;
+ }
+ this.mBackBuffer = Bitmap.createBitmap(w, h, Config.ARGB_8888);
+ this.mBackCanvas = new Canvas(this.mBackBuffer);
+ super.onSizeChanged(w, h, oldw, oldh);
+ }
+
+ @Override
+ public void onDraw(final Canvas c) {
+ final long startMs = System.currentTimeMillis();
+
+ mProjection = new OpenStreetMapViewProjection();
+
+ c.translate(getWidth()/2, getHeight()/2);
+ if (!mScaler.isFinished()) {
+ Matrix m = c.getMatrix();
+ m.preScale(mScaler.mCurrScale, mScaler.mCurrScale, getScrollX(), getScrollY());
+ c.setMatrix(m);
+ }
+
+ /* Draw background */
+ c.drawColor(Color.LTGRAY);
+// This is to slow:
+// final Rect r = c.getClipBounds();
+// mPaint.setColor(Color.GRAY);
+// mPaint.setPathEffect(new DashPathEffect(new float[] {1, 1}, 0));
+// for (int x = r.left; x < r.right; x += 20)
+// c.drawLine(x, r.top, x, r.bottom, mPaint);
+// for (int y = r.top; y < r.bottom; y += 20)
+// c.drawLine(r.left, y, r.right, y, mPaint);
+
+ /* Draw all Overlays. */
+ for (OpenStreetMapViewOverlay osmvo : this.mOverlays)
+ osmvo.onManagedDraw(c, this);
+
+ if (this.mMaxiMap != null) { // If this is a MiniMap
+ this.mPaint.setColor(Color.RED);
+ this.mPaint.setStyle(Style.STROKE);
+ final int viewWidth = this.getWidth();
+ final int viewHeight = this.getHeight();
+ c.drawRect(0, 0, viewWidth, viewHeight, this.mPaint);
+ }
+
+ final long endMs = System.currentTimeMillis();
+ if (DEBUGMODE)
+ Log.d(DEBUGTAG, "Rendering overall: " + (endMs - startMs) + "ms");
+ computeScale();
+ }
+
+ @Override
+ protected void onDetachedFromWindow() {
+ this.mZoomController.setVisible(false);
+ this.mMapOverlay.detach();
+ super.onDetachedFromWindow();
+ }
+
+ // ===========================================================
+ // Package Methods
+ // ===========================================================
+
+ /**
+ * Get the world size in pixels.
+ */
+ int getWorldSizePx() {
+ return (1 << getPixelZoomLevel());
+ }
+
+ /**
+ * Get the equivalent zoom level on pixel scale
+ */
+ int getPixelZoomLevel() {
+ return this.mZoomLevel + this.mMapOverlay.getRendererInfo().MAPTILE_ZOOM;
+ }
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ private void checkZoomButtons() {
+ final int maxZoomLevel = this.mMapOverlay.getRendererInfo().ZOOM_MAXLEVEL;
+ this.mZoomController.setZoomInEnabled(mZoomLevel < maxZoomLevel);
+ this.mZoomController.setZoomOutEnabled(mZoomLevel > 0);
+ }
+
+ private int[] getCenterMapTileCoords() {
+ final int mapTileZoom = this.mMapOverlay.getRendererInfo().MAPTILE_ZOOM;
+ final int worldTiles_2 = 1 << (mZoomLevel-1);
+ // convert to tile coordinate and make positive
+ return new int[] { (getScrollY() >> mapTileZoom) + worldTiles_2,
+ (getScrollX() >> mapTileZoom) + worldTiles_2 };
+ }
+
+ /**
+ * @param centerMapTileCoords
+ * @param tileSizePx
+ * @param reuse
+ * just pass null if you do not have a Point to be 'recycled'.
+ */
+ private Point getUpperLeftCornerOfCenterMapTileInScreen(final int[] centerMapTileCoords,
+ final int tileSizePx, final Point reuse) {
+ final Point out = (reuse != null) ? reuse : new Point();
+
+ final int worldTiles_2 = 1 << (mZoomLevel-1);
+ final int centerMapTileScreenLeft = (centerMapTileCoords[MAPTILE_LONGITUDE_INDEX] - worldTiles_2) * tileSizePx - tileSizePx/2;
+ final int centerMapTileScreenTop = (centerMapTileCoords[MAPTILE_LATITUDE_INDEX] - worldTiles_2) * tileSizePx - tileSizePx/2;
+
+ out.set(centerMapTileScreenLeft, centerMapTileScreenTop);
+ return out;
+ }
+
+ public void setBuiltInZoomControls(boolean on) {
+ this.mEnableZoomController = on;
+ this.checkZoomButtons();
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+
+ /**
+ * This class may return valid results until the underlying
+ * {@link OpenStreetMapView} gets modified in any way (i.e. new center).
+ *
+ * @author Nicolas Gramlich
+ * @author Manuel Stahl
+ */
+ public class OpenStreetMapViewProjection {
+
+ private final int viewWidth_2 = getWidth() / 2;
+ private final int viewHeight_2 = getHeight() / 2;
+ private final int worldSize_2 = getWorldSizePx()/2;
+ private final int offsetX = - worldSize_2;
+ private final int offsetY = - worldSize_2;
+
+ private final BoundingBoxE6 bb;
+ private final int zoomLevel;
+ private final int tileSizePx;
+ private final int[] centerMapTileCoords;
+ private final Point upperLeftCornerOfCenterMapTile;
+
+ private final int[] reuseInt2 = new int[2];
+
+ public OpenStreetMapViewProjection() {
+
+ /*
+ * Do some calculations and drag attributes to local variables to
+ * save some performance.
+ */
+ zoomLevel = OpenStreetMapView.this.mZoomLevel; // TODO Draw to
+ // attributes and so
+ // make it only
+ // 'valid' for a
+ // short time.
+ tileSizePx = getRenderer().MAPTILE_SIZEPX;
+
+ /*
+ * Get the center MapTile which is above this.mLatitudeE6 and
+ * this.mLongitudeE6 .
+ */
+ centerMapTileCoords = getCenterMapTileCoords();
+ upperLeftCornerOfCenterMapTile = getUpperLeftCornerOfCenterMapTileInScreen(
+ centerMapTileCoords, tileSizePx, null);
+
+ bb = OpenStreetMapView.this.getDrawnBoundingBoxE6();
+ }
+
+ /**
+ * Converts x/y ScreenCoordinates to the underlying GeoPoint.
+ *
+ * @param x
+ * @param y
+ * @return GeoPoint under x/y.
+ */
+ public GeoPoint fromPixels(float x, float y) {
+ return bb.getGeoPointOfRelativePositionWithLinearInterpolation(x / viewWidth_2, y
+ / viewHeight_2);
+ }
+
+ public Point fromMapPixels(int x, int y, Point reuse) {
+ final Point out = (reuse != null) ? reuse : new Point();
+ out.set(x - viewWidth_2, y - viewHeight_2);
+ out.offset(getScrollX(), getScrollY());
+ return out;
+ }
+
+ private static final int EQUATORCIRCUMFENCE = 40075004;
+
+ public float metersToEquatorPixels(final float aMeters) {
+ return aMeters / EQUATORCIRCUMFENCE * getWorldSizePx();
+ }
+
+ /**
+ * Converts a GeoPoint to its ScreenCoordinates. <br/>
+ * <br/>
+ * <b>CAUTION</b> ! Conversion currently has a large error on
+ * <code>zoomLevels <= 7</code>.<br/>
+ * The Error on ZoomLevels higher than 7, the error is below
+ * <code>1px</code>.<br/>
+ * TODO: Add a linear interpolation to minimize this error.
+ *
+ * <PRE>
+ * Zoom Error(m) Error(px)
+ * 11 6m 1/12px
+ * 10 24m 1/6px
+ * 8 384m 1/2px
+ * 6 6144m 3px
+ * 4 98304m 10px
+ * </PRE>
+ *
+ * @param in
+ * the GeoPoint you want the onScreenCoordinates of.
+ * @param reuse
+ * just pass null if you do not have a Point to be
+ * 'recycled'.
+ * @return the Point containing the approximated ScreenCoordinates of
+ * the GeoPoint passed.
+ */
+ public Point toMapPixels(final GeoPoint in, final Point reuse) {
+ final Point out = (reuse != null) ? reuse : new Point();
+
+ final int[] coords = Mercator.projectGeoPoint(in.getLatitudeE6(), in.getLongitudeE6(), getPixelZoomLevel(), null);
+ out.set(coords[MAPTILE_LONGITUDE_INDEX], coords[MAPTILE_LATITUDE_INDEX]);
+ out.offset(offsetX, offsetY);
+ return out;
+ }
+
+ /**
+ * Performs only the first computationally heavy part of the projection, needToCall toMapPixelsTranslated to get final position.
+ * @param latituteE6
+ * the latitute of the point
+ * @param longitudeE6
+ * the longitude of the point
+ * @param reuse
+ * just pass null if you do not have a Point to be
+ * 'recycled'.
+ * @return intermediate value to be stored and passed to toMapPixelsTranslated on paint.
+ */
+ public Point toMapPixelsProjected(final int latituteE6, final int longitudeE6, final Point reuse) {
+ final Point out = (reuse != null) ? reuse : new Point();
+
+ //26 is the biggest zoomlevel we can project
+ final int[] coords = Mercator.projectGeoPoint(latituteE6, longitudeE6, 28, this.reuseInt2);
+ out.set(coords[MAPTILE_LONGITUDE_INDEX], coords[MAPTILE_LATITUDE_INDEX]);
+ return out;
+ }
+
+ /**
+ * Performs the second computationally light part of the projection.
+ * @param in
+ * the Point calculated by the toMapPixelsProjected
+ * @param reuse
+ * just pass null if you do not have a Point to be
+ * 'recycled'.
+ * @return the Point containing the approximated ScreenCoordinates of
+ * the initial GeoPoint passed to the toMapPixelsProjected.
+ */
+ public Point toMapPixelsTranslated(final Point in, final Point reuse) {
+ final Point out = (reuse != null) ? reuse : new Point();
+
+ //26 is the biggest zoomlevel we can project
+ int zoomDifference = 28 - getPixelZoomLevel();
+ out.set((in.x >> zoomDifference) + offsetX , (in.y >> zoomDifference) + offsetY );
+ return out;
+ }
+
+
+ /**
+ * Translates a rectangle from screen coordinates to intermediate coordinates.
+ * @param in the rectangle in screen coordinates
+ * @return a rectangle in intermediate coords.
+ */
+ public Rect fromPixelsToProjected(final Rect in)
+ {
+ Rect result = new Rect();
+
+ //26 is the biggest zoomlevel we can project
+ int zoomDifference = 28 - getPixelZoomLevel();
+
+ int x0 = (in.left - offsetX) << zoomDifference;
+ int x1 = (in.right - offsetX) << zoomDifference;
+ int y0 = (in.bottom - offsetX) << zoomDifference;
+ int y1 = (in.top - offsetX) << zoomDifference;
+
+ result.set(Math.min(x0,x1), Math.min(y0,y1), Math.max(x0,x1), Math.max(y0,y1));
+ return result;
+ }
+
+ public Point toPixels(final int[] tileCoords, final Point reuse) {
+ return toPixels(tileCoords[MAPTILE_LONGITUDE_INDEX], tileCoords[MAPTILE_LATITUDE_INDEX], reuse);
+ }
+
+ public Point toPixels(int tileX, int tileY, final Point reuse) {
+ final Point out = (reuse != null) ? reuse : new Point();
+
+ out.set(tileX * tileSizePx, tileY * tileSizePx);
+ out.offset(offsetX, offsetY);
+
+ return out;
+ }
+
+ public Path toPixels(final List<? extends GeoPoint> in, final Path reuse) {
+ return toPixels(in, reuse, true);
+ }
+
+ protected Path toPixels(final List<? extends GeoPoint> in, final Path reuse, final boolean doGudermann)
+ throws IllegalArgumentException {
+ if (in.size() < 2)
+ throw new IllegalArgumentException("List of GeoPoints needs to be at least 2.");
+
+ final Path out = (reuse != null) ? reuse : new Path();
+ out.incReserve(in.size());
+
+ boolean first = true;
+ for (GeoPoint gp : in) {
+ final int[] underGeopointTileCoords = Mercator.projectGeoPoint(gp
+ .getLatitudeE6(), gp.getLongitudeE6(), zoomLevel, null);
+
+ /*
+ * Calculate the Latitude/Longitude on the left-upper
+ * ScreenCoords of the MapTile.
+ */
+ final BoundingBoxE6 bb = Mercator.getBoundingBoxFromMapTile(underGeopointTileCoords,
+ zoomLevel);
+
+ final float[] relativePositionInCenterMapTile;
+ if (doGudermann && zoomLevel < 7)
+ relativePositionInCenterMapTile = bb
+ .getRelativePositionOfGeoPointInBoundingBoxWithExactGudermannInterpolation(
+ gp.getLatitudeE6(), gp.getLongitudeE6(), null);
+ else
+ relativePositionInCenterMapTile = bb
+ .getRelativePositionOfGeoPointInBoundingBoxWithLinearInterpolation(gp
+ .getLatitudeE6(), gp.getLongitudeE6(), null);
+
+ final int tileDiffX = centerMapTileCoords[MAPTILE_LONGITUDE_INDEX]
+ - underGeopointTileCoords[MAPTILE_LONGITUDE_INDEX];
+ final int tileDiffY = centerMapTileCoords[MAPTILE_LATITUDE_INDEX]
+ - underGeopointTileCoords[MAPTILE_LATITUDE_INDEX];
+ final int underGeopointTileScreenLeft = upperLeftCornerOfCenterMapTile.x
+ - (tileSizePx * tileDiffX);
+ final int underGeopointTileScreenTop = upperLeftCornerOfCenterMapTile.y
+ - (tileSizePx * tileDiffY);
+
+ final int x = underGeopointTileScreenLeft
+ + (int) (relativePositionInCenterMapTile[MAPTILE_LONGITUDE_INDEX] * tileSizePx);
+ final int y = underGeopointTileScreenTop
+ + (int) (relativePositionInCenterMapTile[MAPTILE_LATITUDE_INDEX] * tileSizePx);
+
+ /* Add up the offset caused by touch. */
+ if (first)
+ out.moveTo(x, y);
+// out.moveTo(x + OpenStreetMapView.this.mTouchMapOffsetX, y
+// + OpenStreetMapView.this.mTouchMapOffsetY);
+ else
+ out.lineTo(x, y);
+ first = false;
+ }
+
+ return out;
+ }
+ }
+
+ private class OpenStreetMapViewGestureDetectorListener implements OnGestureListener {
+
+ public boolean onDown(MotionEvent e) {
+ mZoomController.setVisible(mEnableZoomController);
+ return true;
+ }
+
+ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+ final int worldSize = getWorldSizePx();
+ mScroller.fling(getScrollX(), getScrollY(), (int)-velocityX, (int)-velocityY, -worldSize, worldSize, -worldSize, worldSize);
+ return true;
+ }
+
+ public void onLongPress(MotionEvent e) {
+ OpenStreetMapView.this.onLongPress(e);
+ }
+
+ public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+ scrollBy((int)distanceX, (int)distanceY);
+ return true;
+ }
+
+ public void onShowPress(MotionEvent e) {
+ }
+
+ public boolean onSingleTapUp(MotionEvent e) {
+ return OpenStreetMapView.this.onSingleTapUp(e);
+ }
+
+ }
+
+ private class OpenStreetMapViewZoomListener implements OnZoomListener {
+ public void onZoom(boolean zoomIn) {
+ if(zoomIn)
+ getController().zoomIn();
+ else
+ getController().zoomOut();
+ }
+ public void onVisibilityChanged(boolean visible) {}
+ }
+
+ class Scaler {
+
+ private float mStartScale;
+ private float mFinalScale;
+ private float mCurrScale;
+
+ private long mStartTime;
+ private int mDuration;
+ private float mDurationReciprocal;
+ private float mDeltaScale;
+ private boolean mFinished;
+ private Interpolator mInterpolator;
+
+ /**
+ * Create a Scaler with the specified interpolator.
+ */
+ public Scaler(Context context, Interpolator interpolator) {
+ mFinished = true;
+ mInterpolator = interpolator;
+ }
+
+ /**
+ *
+ * Returns whether the scaler has finished scaling.
+ *
+ * @return True if the scaler has finished scaling, false otherwise.
+ */
+ public final boolean isFinished() {
+ return mFinished;
+ }
+
+ /**
+ * Force the finished field to a particular value.
+ *
+ * @param finished The new finished value.
+ */
+ public final void forceFinished(boolean finished) {
+ mFinished = finished;
+ }
+
+ /**
+ * Returns how long the scale event will take, in milliseconds.
+ *
+ * @return The duration of the scale in milliseconds.
+ */
+ public final int getDuration() {
+ return mDuration;
+ }
+
+ /**
+ * Returns the current scale factor.
+ *
+ * @return The new scale factor.
+ */
+ public final float getCurrScale() {
+ return mCurrScale;
+ }
+
+ /**
+ * Returns the start scale factor.
+ *
+ * @return The start scale factor.
+ */
+ public final float getStartScale() {
+ return mStartScale;
+ }
+
+ /**
+ * Returns where the scale will end.
+ *
+ * @return The final scale factor.
+ */
+ public final float getFinalScale() {
+ return mFinalScale;
+ }
+
+ /**
+ * Sets the final scale for this scaler.
+ *
+ * @param newScale The new scale factor.
+ */
+ public void setFinalScale(float newScale) {
+ mFinalScale = newScale;
+ mDeltaScale = mFinalScale - mStartScale;
+ mFinished = false;
+ }
+
+
+ /**
+ * Call this when you want to know the new scale. If it returns true,
+ * the animation is not yet finished.
+ */
+ public boolean computeScale() {
+ if (mFinished) {
+ mCurrScale = 1.0f;
+ return false;
+ }
+
+ int timePassed = (int)(AnimationUtils.currentAnimationTimeMillis() - mStartTime);
+
+ if (timePassed < mDuration) {
+ float x = (float)timePassed * mDurationReciprocal;
+
+ x = mInterpolator.getInterpolation(x);
+
+ mCurrScale = mStartScale + x * mDeltaScale;
+ if (mCurrScale == mFinalScale)
+ mFinished = true;
+
+ } else {
+ mCurrScale = mFinalScale;
+ mFinished = true;
+ }
+ return true;
+ }
+
+ /**
+ * Start scaling by providing the starting scale and the final scale.
+ *
+ * @param startX Starting horizontal scroll offset in pixels. Positive
+ * numbers will scroll the content to the left.
+ * @param startY Starting vertical scroll offset in pixels. Positive numbers
+ * will scroll the content up.
+ * @param dx Horizontal distance to travel. Positive numbers will scroll the
+ * content to the left.
+ * @param dy Vertical distance to travel. Positive numbers will scroll the
+ * content up.
+ * @param duration Duration of the scroll in milliseconds.
+ */
+ public void startScale(float startScale, float finalScale, int duration) {
+ mFinished = false;
+ mDuration = duration;
+ mStartTime = AnimationUtils.currentAnimationTimeMillis();
+ mStartScale = startScale;
+ mFinalScale = finalScale;
+ mDeltaScale = finalScale - startScale;
+ mDurationReciprocal = 1.0f / (float) mDuration;
+ }
+
+ /**
+ * Extend the scale animation. This allows a running animation to scale
+ * further and longer, when used with {@link #setFinalScale(float)}.
+ *
+ * @param extend Additional time to scale in milliseconds.
+ * @see #setFinalScale(float)
+ */
+ public void extendDuration(int extend) {
+ int passed = (int)(AnimationUtils.currentAnimationTimeMillis() - mStartTime);
+ mDuration = passed + extend;
+ mDurationReciprocal = 1.0f / (float)mDuration;
+ mFinished = false;
+ }
+
+ }
+
+}
diff --git a/konphidroid/src/org/andnav/osm/views/OpenStreetMapViewController.java b/konphidroid/src/org/andnav/osm/views/OpenStreetMapViewController.java
new file mode 100644
index 0000000..f20b836
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/OpenStreetMapViewController.java
@@ -0,0 +1,629 @@
+// Created by plusminus on 21:37:08 - 27.09.2008
+package org.andnav.osm.views;
+
+import org.andnav.osm.util.BoundingBoxE6;
+import org.andnav.osm.util.GeoPoint;
+import org.andnav.osm.views.OpenStreetMapView.Scaler;
+import org.andnav.osm.views.util.MyMath;
+import org.andnav.osm.views.util.Mercator;
+import org.andnav.osm.views.util.constants.MathConstants;
+
+import android.graphics.Point;
+
+/**
+ *
+ * @author Nicolas Gramlich
+ * TODO use same interface as google maps controller
+ */
+public class OpenStreetMapViewController {
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ public static final int ANIMATION_SMOOTHNESS_LOW = 4;
+ public static final int ANIMATION_SMOOTHNESS_DEFAULT = 10;
+ public static final int ANIMATION_SMOOTHNESS_HIGH = 20;
+
+ public static final int ANIMATION_DURATION_SHORT = 500;
+ public static final int ANIMATION_DURATION_DEFAULT = 1000;
+ public static final int ANIMATION_DURATION_LONG = 2000;
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ private int mZoomLevel;
+ private final OpenStreetMapView mOsmv;
+ private AbstractAnimationRunner mCurrentAnimationRunner;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public OpenStreetMapViewController(final OpenStreetMapView osmv) {
+ this.mOsmv = osmv;
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ public void zoomToSpan(BoundingBoxE6 bb) {
+ zoomToSpan(bb.getLatitudeSpanE6(), bb.getLongitudeSpanE6());
+ }
+
+ // TODO rework zoomToSpan
+ public void zoomToSpan(final int reqLatSpan, final int reqLonSpan) {
+ if(reqLatSpan <= 0 || reqLonSpan <= 0 )
+ return;
+
+ final BoundingBoxE6 bb = this.mOsmv.getVisibleBoundingBoxE6();
+ final int curZoomLevel = this.mOsmv.getZoomLevel();
+
+ final int curLatSpan = bb.getLatitudeSpanE6();
+ final int curLonSpan = bb.getLongitudeSpanE6();
+
+ final float diffNeededLat = (float)reqLatSpan / curLatSpan; // i.e. 600/500 = 1,2
+ final float diffNeededLon = (float)reqLonSpan / curLonSpan; // i.e. 300/400 = 0,75
+
+ final float diffNeeded = Math.max(diffNeededLat, diffNeededLon); // i.e. 1,2
+
+ if(diffNeeded > 1){ // Zoom Out
+ this.mOsmv.setZoomLevel(curZoomLevel - MyMath.getNextSquareNumberAbove(diffNeeded));
+ }else if(diffNeeded < 0.5){ // Can Zoom in
+ this.mOsmv.setZoomLevel(curZoomLevel + MyMath.getNextSquareNumberAbove(1 / diffNeeded) - 1);
+ }
+ }
+
+ /**
+ * Start animating the map towards the given point.
+ */
+ public void animateTo(final GeoPoint point) {
+ final int x = mOsmv.getScrollX();
+ final int y = mOsmv.getScrollY();
+ final Point p = Mercator.projectGeoPoint(point, this.mOsmv.getPixelZoomLevel(), null);
+ final int worldSize_2 = this.mOsmv.getWorldSizePx()/2;
+ mOsmv.mScroller.startScroll(x, y, p.x - worldSize_2 - x, p.y - worldSize_2 - y, ANIMATION_DURATION_DEFAULT);
+ mOsmv.postInvalidate();
+ }
+
+ /**
+ * Animates the underlying {@link OpenStreetMapView} that it centers the passed {@link GeoPoint} in the end.
+ * Uses: {@link OpenStreetMapViewController.ANIMATION_SMOOTHNESS_DEFAULT} and {@link OpenStreetMapViewController.ANIMATION_DURATION_DEFAULT}.
+ * @param gp
+ */
+ public void animateTo(final GeoPoint gp, final AnimationType aAnimationType){
+ animateTo(gp.getLatitudeE6(), gp.getLongitudeE6(), aAnimationType, ANIMATION_DURATION_DEFAULT, ANIMATION_SMOOTHNESS_DEFAULT);
+ }
+
+ /**
+ * Animates the underlying {@link OpenStreetMapView} that it centers the passed {@link GeoPoint} in the end.
+ * @param gp GeoPoint to be centered in the end.
+ * @param aSmoothness steps made during animation. I.e.: {@link OpenStreetMapViewController.ANIMATION_SMOOTHNESS_LOW}, {@link OpenStreetMapViewController.ANIMATION_SMOOTHNESS_DEFAULT}, {@link OpenStreetMapViewController.ANIMATION_SMOOTHNESS_HIGH}
+ * @param aDuration in Milliseconds. I.e.: {@link OpenStreetMapViewController.ANIMATION_DURATION_SHORT}, {@link OpenStreetMapViewController.ANIMATION_DURATION_DEFAULT}, {@link OpenStreetMapViewController.ANIMATION_DURATION_LONG}
+ */
+ public void animateTo(final GeoPoint gp, final AnimationType aAnimationType, final int aSmoothness, final int aDuration){
+ animateTo(gp.getLatitudeE6(), gp.getLongitudeE6(), aAnimationType, aSmoothness, aDuration);
+ }
+
+ /**
+ * Animates the underlying {@link OpenStreetMapView} that it centers the passed coordinates in the end.
+ * Uses: {@link OpenStreetMapViewController.ANIMATION_SMOOTHNESS_DEFAULT} and {@link OpenStreetMapViewController.ANIMATION_DURATION_DEFAULT}.
+ * @param aLatitudeE6
+ * @param aLongitudeE6
+ */
+ public void animateTo(final int aLatitudeE6, final int aLongitudeE6, final AnimationType aAnimationType){
+ animateTo(aLatitudeE6, aLongitudeE6, aAnimationType, ANIMATION_SMOOTHNESS_DEFAULT, ANIMATION_DURATION_DEFAULT);
+ }
+
+ /**
+ * Animates the underlying {@link OpenStreetMapView} that it centers the passed coordinates in the end.
+ * @param aLatitudeE6
+ * @param aLongitudeE6
+ * @param aSmoothness steps made during animation. I.e.: {@link OpenStreetMapViewController.ANIMATION_SMOOTHNESS_LOW}, {@link OpenStreetMapViewController.ANIMATION_SMOOTHNESS_DEFAULT}, {@link OpenStreetMapViewController.ANIMATION_SMOOTHNESS_HIGH}
+ * @param aDuration in Milliseconds. I.e.: {@link OpenStreetMapViewController.ANIMATION_DURATION_SHORT}, {@link OpenStreetMapViewController.ANIMATION_DURATION_DEFAULT}, {@link OpenStreetMapViewController.ANIMATION_DURATION_LONG}
+ */
+ public void animateTo(final int aLatitudeE6, final int aLongitudeE6, final AnimationType aAnimationType, final int aSmoothness, final int aDuration){
+ this.stopAnimation(false);
+
+ switch(aAnimationType){
+ case LINEAR:
+ this.mCurrentAnimationRunner = new LinearAnimationRunner(aLatitudeE6, aLongitudeE6, aSmoothness, aDuration);
+ break;
+ case EXPONENTIALDECELERATING:
+ this.mCurrentAnimationRunner = new ExponentialDeceleratingAnimationRunner(aLatitudeE6, aLongitudeE6, aSmoothness, aDuration);
+ break;
+ case QUARTERCOSINUSALDECELERATING:
+ this.mCurrentAnimationRunner = new QuarterCosinusalDeceleratingAnimationRunner(aLatitudeE6, aLongitudeE6, aSmoothness, aDuration);
+ break;
+ case HALFCOSINUSALDECELERATING:
+ this.mCurrentAnimationRunner = new HalfCosinusalDeceleratingAnimationRunner(aLatitudeE6, aLongitudeE6, aSmoothness, aDuration);
+ break;
+ case MIDDLEPEAKSPEED:
+ this.mCurrentAnimationRunner = new MiddlePeakSpeedAnimationRunner(aLatitudeE6, aLongitudeE6, aSmoothness, aDuration);
+ break;
+ }
+
+ this.mCurrentAnimationRunner.start();
+ }
+
+ public void scrollBy(int x, int y) {
+ this.mOsmv.scrollBy(x, y);
+ }
+
+ /**
+ * Set the map view to the given center. There will be no animation.
+ */
+ public void setCenter(final GeoPoint point) {
+ final Point p = Mercator.projectGeoPoint(point, this.mOsmv.getPixelZoomLevel(), null);
+ final int worldSize_2 = this.mOsmv.getWorldSizePx()/2;
+ this.mOsmv.scrollTo(p.x - worldSize_2, p.y - worldSize_2);
+ }
+
+ /**
+ * Stops a running animation.
+ * @param jumpToTarget
+ */
+ public void stopAnimation(final boolean jumpToTarget) {
+ final AbstractAnimationRunner currentAnimationRunner = this.mCurrentAnimationRunner;
+
+ if(currentAnimationRunner != null && !currentAnimationRunner.isDone()){
+ currentAnimationRunner.interrupt();
+ if(jumpToTarget)
+ setCenter(new GeoPoint(currentAnimationRunner.mTargetLatitudeE6, currentAnimationRunner.mTargetLongitudeE6));
+ }
+ }
+
+
+
+ public int setZoom(int zoomlevel) {
+ this.mZoomLevel = zoomlevel;
+ return mOsmv.setZoomLevel(zoomlevel);
+ }
+
+ /**
+ * Zoom in by one zoom level.
+ */
+ public boolean zoomIn() {
+
+ if (mZoomLevel >= mOsmv.getMaxZoomLevel()) {
+ mZoomLevel = mOsmv.getMaxZoomLevel();
+ return false;
+ }
+
+ mZoomLevel++;
+ final Scaler scaler = mOsmv.mScaler;
+ if (scaler.isFinished()) {
+ scaler.startScale(1.0f, 2.0f, ANIMATION_DURATION_SHORT);
+ mOsmv.postInvalidate();
+ } else {
+ scaler.extendDuration(ANIMATION_DURATION_SHORT);
+ scaler.setFinalScale(scaler.getFinalScale() * 2.0f);
+ }
+
+ return true;
+ }
+
+ public boolean zoomInFixing(int xPixel, int yPixel) {
+ // TODO implement
+ return zoomIn();
+ }
+
+ /**
+ * Zoom out by one zoom level.
+ */
+ public boolean zoomOut() {
+
+ if (mZoomLevel <= 0) {
+ mZoomLevel = 0;
+ return false;
+ }
+
+ mZoomLevel--;
+ final Scaler scaler = mOsmv.mScaler;
+ if (scaler.isFinished()) {
+ scaler.startScale(1.0f, 0.5f, ANIMATION_DURATION_SHORT);
+ mOsmv.postInvalidate();
+ } else {
+ scaler.extendDuration(ANIMATION_DURATION_SHORT);
+ scaler.setFinalScale(scaler.getFinalScale() * 0.5f);
+ }
+
+ return true;
+ }
+
+ public boolean zoomOutFixing(int xPixel, int yPixel) {
+ // TODO implement
+ return zoomOut();
+ }
+
+ void onScalingFinished() {
+ mOsmv.setZoomLevel(mZoomLevel);
+ }
+
+ void onScrollingFinished() {
+
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+
+ /**
+ * Choose on of the Styles of approacing the target Coordinates.
+ * <ul>
+ * <li><code>LINEAR</code>
+ * <ul>
+ * <li>Uses ses linear interpolation </li>
+ * <li>Values produced: 10%, 20%, 30%, 40%, 50%, ...</li>
+ * <li>Style: Always average speed.</li>
+ * </ul>
+ * </li>
+ * <li><code>EXPONENTIALDECELERATING</code>
+ * <ul>
+ * <li>Uses a exponential interpolation/li>
+ * <li>Values produced: 50%, 75%, 87.5%, 93.5%, ...</li>
+ * <li>Style: Starts very fast, really slow in the end.</li>
+ * </ul>
+ * </li>
+ * <li><code>QUARTERCOSINUSALDECELERATING</code>
+ * <ul>
+ * <li>Uses the first quarter of the cos curve (from zero to PI/2) for interpolation. </li>
+ * <li>Values produced: See cos curve :)</li>
+ * <li>Style: Average speed, slows out medium.</li>
+ * </ul>
+ * </li>
+ * <li><code>HALFCOSINUSALDECELERATING</code>
+ * <ul>
+ * <li>Uses the first half of the cos curve (from zero to PI) for interpolation</li>
+ * <li>Values produced: See cos curve :)</li>
+ * <li>Style: Average speed, slows out smoothly.</li>
+ * </ul>
+ * </li>
+ * <li><code>MIDDLEPEAKSPEED</code>
+ * <ul>
+ * <li>Uses the values of cos around the 0 (from -PI/2 to +PI/2) for interpolation</li>
+ * <li>Values produced: See cos curve :)</li>
+ * <li>Style: Starts medium, speeds high in middle, slows out medium.</li>
+ * </ul>
+ * </li>
+ * </ul>
+ */
+ public static enum AnimationType {
+ /**
+ * <ul>
+ * <li><code>LINEAR</code>
+ * <ul>
+ * <li>Uses ses linear interpolation </li>
+ * <li>Values produced: 10%, 20%, 30%, 40%, 50%, ...</li>
+ * <li>Style: Always average speed.</li>
+ * </ul>
+ * </li>
+ * </ul>
+ */
+ LINEAR,
+ /**
+ * <ul>
+ * <li><code>EXPONENTIALDECELERATING</code>
+ * <ul>
+ * <li>Uses a exponential interpolation/li>
+ * <li>Values produced: 50%, 75%, 87.5%, 93.5%, ...</li>
+ * <li>Style: Starts very fast, really slow in the end.</li>
+ * </ul>
+ * </li>
+ * </ul>
+ */
+ EXPONENTIALDECELERATING,
+ /**
+ * <ul>
+ * <li><code>QUARTERCOSINUSALDECELERATING</code>
+ * <ul>
+ * <li>Uses the first quarter of the cos curve (from zero to PI/2) for interpolation. </li>
+ * <li>Values produced: See cos curve :)</li>
+ * <li>Style: Average speed, slows out medium.</li>
+ * </ul>
+ * </li>
+ * </ul>
+ */
+ QUARTERCOSINUSALDECELERATING,
+ /** <ul>
+ * <li><code>HALFCOSINUSALDECELERATING</code>
+ * <ul>
+ * <li>Uses the first half of the cos curve (from zero to PI) for interpolation</li>
+ * <li>Values produced: See cos curve :)</li>
+ * <li>Style: Average speed, slows out smoothly.</li>
+ * </ul>
+ * </li>
+ * </ul>
+ */
+ HALFCOSINUSALDECELERATING,
+ /** <ul>
+ * <li><code>MIDDLEPEAKSPEED</code>
+ * <ul>
+ * <li>Uses the values of cos around the 0 (from -PI/2 to +PI/2) for interpolation</li>
+ * <li>Values produced: See cos curve :)</li>
+ * <li>Style: Starts medium, speeds high in middle, slows out medium.</li>
+ * </ul>
+ * </li>
+ * </ul>
+ */
+ MIDDLEPEAKSPEED;
+ }
+
+ private abstract class AbstractAnimationRunner extends Thread{
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ protected final int mSmoothness, mDuration;
+ protected final int mTargetLatitudeE6, mTargetLongitudeE6;
+ protected boolean mDone = false;
+
+ protected final int mStepDuration;
+
+ protected final int mPanTotalLatitudeE6, mPanTotalLongitudeE6;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public AbstractAnimationRunner(OpenStreetMapViewController openStreetMapViewController, final int aTargetLatitudeE6, final int aTargetLongitudeE6){
+ this(aTargetLatitudeE6, aTargetLongitudeE6, OpenStreetMapViewController.ANIMATION_SMOOTHNESS_DEFAULT, OpenStreetMapViewController.ANIMATION_DURATION_DEFAULT);
+ }
+
+ public AbstractAnimationRunner(final int aTargetLatitudeE6, final int aTargetLongitudeE6, final int aSmoothness, final int aDuration){
+ this.mTargetLatitudeE6 = aTargetLatitudeE6;
+ this.mTargetLongitudeE6 = aTargetLongitudeE6;
+ this.mSmoothness = aSmoothness;
+ this.mDuration = aDuration;
+
+ this.mStepDuration = aDuration / aSmoothness;
+
+
+ /* Get the current mapview-center. */
+ final OpenStreetMapView mapview = OpenStreetMapViewController.this.mOsmv;
+ int mapCenterLatE6 = mapview.getMapCenterLatitudeE6();
+ int mapCenterLonE6 = mapview.getMapCenterLongitudeE6();
+
+ this.mPanTotalLatitudeE6 = (mapCenterLatE6 - aTargetLatitudeE6);
+ this.mPanTotalLongitudeE6 = (mapCenterLonE6 - aTargetLongitudeE6);
+ }
+
+ public void run(){
+ onRunAnimation();
+ this.mDone = true;
+ }
+
+ public boolean isDone(){
+ return this.mDone;
+ }
+
+ public abstract void onRunAnimation();
+ }
+
+ private class LinearAnimationRunner extends AbstractAnimationRunner{
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ protected final int mPanPerStepLatitudeE6, mPanPerStepLongitudeE6;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public LinearAnimationRunner(final int aTargetLatitudeE6, final int aTargetLongitudeE6){
+ this(aTargetLatitudeE6, aTargetLongitudeE6, ANIMATION_SMOOTHNESS_DEFAULT, ANIMATION_DURATION_DEFAULT);
+ }
+
+ public LinearAnimationRunner(final int aTargetLatitudeE6, final int aTargetLongitudeE6, final int aSmoothness, final int aDuration){
+ super(aTargetLatitudeE6, aTargetLongitudeE6, aSmoothness, aDuration);
+
+ /* Get the current mapview-center. */
+ final OpenStreetMapView mapview = OpenStreetMapViewController.this.mOsmv;
+ int mapCenterLatE6 = mapview.getMapCenterLatitudeE6();
+ int mapCenterLonE6 = mapview.getMapCenterLongitudeE6();
+
+ this.mPanPerStepLatitudeE6 = (mapCenterLatE6 - aTargetLatitudeE6) / aSmoothness;
+ this.mPanPerStepLongitudeE6 = (mapCenterLonE6 - aTargetLongitudeE6) / aSmoothness;
+
+ this.setName("LinearAnimationRunner");
+ }
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ @Override
+ public void onRunAnimation(){
+ final OpenStreetMapView mapview = OpenStreetMapViewController.this.mOsmv;
+ final int panPerStepLatitudeE6 = this.mPanPerStepLatitudeE6;
+ final int panPerStepLongitudeE6 = this.mPanPerStepLongitudeE6;
+ final int stepDuration = this.mStepDuration;
+ try {
+ int newMapCenterLatE6;
+ int newMapCenterLonE6;
+
+ for(int i = this.mSmoothness; i > 0 ; i--){
+
+ newMapCenterLatE6 = mapview.getMapCenterLatitudeE6() - panPerStepLatitudeE6;
+ newMapCenterLonE6 = mapview.getMapCenterLongitudeE6() - panPerStepLongitudeE6;
+ mapview.setMapCenter(newMapCenterLatE6, newMapCenterLonE6);
+
+ Thread.sleep(stepDuration);
+ }
+ } catch (Exception e) {
+ this.interrupt();
+ }
+ }
+ }
+
+ private class ExponentialDeceleratingAnimationRunner extends AbstractAnimationRunner{
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public ExponentialDeceleratingAnimationRunner(final int aTargetLatitudeE6, final int aTargetLongitudeE6){
+ this(aTargetLatitudeE6, aTargetLongitudeE6, ANIMATION_SMOOTHNESS_DEFAULT, ANIMATION_DURATION_DEFAULT);
+ }
+
+ public ExponentialDeceleratingAnimationRunner(final int aTargetLatitudeE6, final int aTargetLongitudeE6, final int aSmoothness, final int aDuration){
+ super(aTargetLatitudeE6, aTargetLongitudeE6, aSmoothness, aDuration);
+
+ this.setName("ExponentialDeceleratingAnimationRunner");
+ }
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ @Override
+ public void onRunAnimation(){
+ final OpenStreetMapView mapview = OpenStreetMapViewController.this.mOsmv;
+ final int stepDuration = this.mStepDuration;
+ try {
+ int newMapCenterLatE6;
+ int newMapCenterLonE6;
+
+ for(int i = 0; i < this.mSmoothness; i++){
+
+ final double delta = Math.pow(0.5, i + 1);
+ final int deltaLatitudeE6 = (int)(this.mPanTotalLatitudeE6 * delta);
+ final int detlaLongitudeE6 = (int)(this.mPanTotalLongitudeE6 * delta);
+
+ newMapCenterLatE6 = mapview.getMapCenterLatitudeE6() - deltaLatitudeE6;
+ newMapCenterLonE6 = mapview.getMapCenterLongitudeE6() - detlaLongitudeE6;
+ mapview.setMapCenter(newMapCenterLatE6, newMapCenterLonE6);
+
+ Thread.sleep(stepDuration);
+ }
+ mapview.setMapCenter(super.mTargetLatitudeE6, super.mTargetLongitudeE6);
+ } catch (Exception e) {
+ this.interrupt();
+ }
+ }
+ }
+
+ private class CosinusalBasedAnimationRunner extends AbstractAnimationRunner implements MathConstants{
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ protected final float mStepIncrement, mAmountStretch;
+ protected final float mYOffset, mRange, mStart;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public CosinusalBasedAnimationRunner(final int aTargetLatitudeE6, final int aTargetLongitudeE6, final float aStart, final float aRange, final float aYOffset){
+ this(aTargetLatitudeE6, aTargetLongitudeE6, ANIMATION_SMOOTHNESS_DEFAULT, ANIMATION_DURATION_DEFAULT, aStart, aRange, aYOffset);
+ }
+
+ public CosinusalBasedAnimationRunner(final int aTargetLatitudeE6, final int aTargetLongitudeE6, final int aSmoothness, final int aDuration, final float aStart, final float aRange, final float aYOffset){
+ super(aTargetLatitudeE6, aTargetLongitudeE6, aSmoothness, aDuration);
+ this.mYOffset = aYOffset;
+ this.mRange = aRange;
+ this.mStart = aStart;
+
+ this.mStepIncrement = aRange / aSmoothness;
+
+ /* We need to normalize the amount in the end, so wee need the the: sum^(-1) . */
+ float amountSum = 0;
+ for(int i = 0; i < aSmoothness; i++)
+ amountSum += aYOffset + Math.cos(this.mStepIncrement * i + aStart);
+
+ this.mAmountStretch = 1 / amountSum;
+
+ this.setName("QuarterCosinusalDeceleratingAnimationRunner");
+ }
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ @Override
+ public void onRunAnimation(){
+ final OpenStreetMapView mapview = OpenStreetMapViewController.this.mOsmv;
+ final int stepDuration = this.mStepDuration;
+ final float amountStretch = this.mAmountStretch;
+ try {
+ int newMapCenterLatE6;
+ int newMapCenterLonE6;
+
+ for(int i = 0; i < this.mSmoothness; i++){
+
+ final double delta = (this.mYOffset + Math.cos(this.mStepIncrement * i + this.mStart)) * amountStretch;
+ final int deltaLatitudeE6 = (int)(this.mPanTotalLatitudeE6 * delta);
+ final int deltaLongitudeE6 = (int)(this.mPanTotalLongitudeE6 * delta);
+
+ newMapCenterLatE6 = mapview.getMapCenterLatitudeE6() - deltaLatitudeE6;
+ newMapCenterLonE6 = mapview.getMapCenterLongitudeE6() - deltaLongitudeE6;
+ mapview.setMapCenter(newMapCenterLatE6, newMapCenterLonE6);
+
+ Thread.sleep(stepDuration);
+ }
+ mapview.setMapCenter(super.mTargetLatitudeE6, super.mTargetLongitudeE6);
+ } catch (Exception e) {
+ this.interrupt();
+ }
+ }
+ }
+
+ protected class QuarterCosinusalDeceleratingAnimationRunner extends CosinusalBasedAnimationRunner implements MathConstants{
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ protected QuarterCosinusalDeceleratingAnimationRunner(final int aTargetLatitudeE6, final int aTargetLongitudeE6){
+ this(aTargetLatitudeE6, aTargetLongitudeE6, ANIMATION_SMOOTHNESS_DEFAULT, ANIMATION_DURATION_DEFAULT);
+ }
+
+ protected QuarterCosinusalDeceleratingAnimationRunner(final int aTargetLatitudeE6, final int aTargetLongitudeE6, final int aSmoothness, final int aDuration){
+ super(aTargetLatitudeE6, aTargetLongitudeE6, aSmoothness, aDuration, 0, PI_2, 0);
+ }
+ }
+
+ protected class HalfCosinusalDeceleratingAnimationRunner extends CosinusalBasedAnimationRunner implements MathConstants{
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ protected HalfCosinusalDeceleratingAnimationRunner(final int aTargetLatitudeE6, final int aTargetLongitudeE6){
+ this(aTargetLatitudeE6, aTargetLongitudeE6, ANIMATION_SMOOTHNESS_DEFAULT, ANIMATION_DURATION_DEFAULT);
+ }
+
+ protected HalfCosinusalDeceleratingAnimationRunner(final int aTargetLatitudeE6, final int aTargetLongitudeE6, final int aSmoothness, final int aDuration){
+ super(aTargetLatitudeE6, aTargetLongitudeE6, aSmoothness, aDuration, 0, PI, 1);
+ }
+ }
+
+ protected class MiddlePeakSpeedAnimationRunner extends CosinusalBasedAnimationRunner implements MathConstants{
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ protected MiddlePeakSpeedAnimationRunner(final int aTargetLatitudeE6, final int aTargetLongitudeE6){
+ this(aTargetLatitudeE6, aTargetLongitudeE6, ANIMATION_SMOOTHNESS_DEFAULT, ANIMATION_DURATION_DEFAULT);
+ }
+
+ protected MiddlePeakSpeedAnimationRunner(final int aTargetLatitudeE6, final int aTargetLongitudeE6, final int aSmoothness, final int aDuration){
+ super(aTargetLatitudeE6, aTargetLongitudeE6, aSmoothness, aDuration, -PI_2, PI, 0);
+ }
+ }
+}
diff --git a/konphidroid/src/org/andnav/osm/views/overlay/MyLocationOverlay.java b/konphidroid/src/org/andnav/osm/views/overlay/MyLocationOverlay.java
new file mode 100644
index 0000000..0205ef2
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/overlay/MyLocationOverlay.java
@@ -0,0 +1,263 @@
+// Created by plusminus on 22:01:11 - 29.09.2008
+package org.andnav.osm.views.overlay;
+
+import java.util.LinkedList;
+
+import org.andnav.osm.R;
+import org.andnav.osm.util.GeoPoint;
+import org.andnav.osm.util.NetworkLocationIgnorer;
+import org.andnav.osm.views.OpenStreetMapView;
+import org.andnav.osm.views.OpenStreetMapViewController;
+import org.andnav.osm.views.OpenStreetMapView.OpenStreetMapViewProjection;
+import org.andnav.osm.views.overlay.OpenStreetMapViewOverlay.Snappable;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.graphics.Paint.Style;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.location.LocationProvider;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.MotionEvent;
+
+/**
+ *
+ * @author Manuel Stahl
+ *
+ */
+public class MyLocationOverlay extends OpenStreetMapViewOverlay implements LocationListener, Snappable {
+
+ public static final String DEBUGTAG = "OPENSTREETMAP";
+
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ protected final Paint mPaint = new Paint();
+ protected final Paint mCirclePaint = new Paint();
+
+ protected final Bitmap PERSON_ICON;
+ protected final Bitmap DIRECTION_ARROW;
+
+ private final OpenStreetMapView mMapView;
+ private final OpenStreetMapViewController mMapController;
+ private final LocationManager mLocationManager;
+ private boolean mMyLocationEnabled = false;
+ private LinkedList<Runnable> mRunOnFirstFix = new LinkedList<Runnable>();
+ private final Point mMapCoords = new Point();
+
+ private Location mLocation;
+ protected boolean mFollow = false; // follow location updates
+ private NetworkLocationIgnorer mIgnorer = new NetworkLocationIgnorer();
+
+ private final Matrix directionRotater = new Matrix();
+
+ /** Coordinates the feet of the person are located. */
+ protected final android.graphics.Point PERSON_HOTSPOT = new android.graphics.Point(24,39);
+
+ private final float DIRECTION_ARROW_CENTER_X;
+ private final float DIRECTION_ARROW_CENTER_Y;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public MyLocationOverlay(final Context ctx, final OpenStreetMapView mapView) {
+ mMapView = mapView;
+ mLocationManager = (LocationManager) ctx.getSystemService(Context.LOCATION_SERVICE);
+ mMapController = mapView.getController();
+ mCirclePaint.setARGB(0, 100, 100, 255);
+ mCirclePaint.setAntiAlias(true);
+
+ PERSON_ICON = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.person);
+ DIRECTION_ARROW = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.direction_arrow);
+
+ DIRECTION_ARROW_CENTER_X = DIRECTION_ARROW.getWidth() / 2 - 0.5f;
+ DIRECTION_ARROW_CENTER_Y = DIRECTION_ARROW.getHeight() / 2 - 0.5f;
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ public Location getLastFix() {
+ return mLocation;
+ }
+
+ /**
+ * Return a GeoPoint of the last known location, or null if not known.
+ */
+ public GeoPoint getMyLocation() {
+ if (mLocation == null) {
+ return null;
+ } else {
+ return new GeoPoint(mLocation);
+ }
+ }
+
+ public boolean isMyLocationEnabled() {
+ return mMyLocationEnabled;
+ }
+
+ public boolean isLocationFollowEnabled() {
+ return mFollow;
+ }
+
+ public void followLocation(boolean enable) {
+ mFollow = enable;
+ }
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ @Override
+ protected void onDrawFinished(Canvas c, OpenStreetMapView osmv) {}
+
+ @Override
+ public void onDraw(final Canvas c, final OpenStreetMapView osmv) {
+ if(this.mLocation != null) {
+ final OpenStreetMapViewProjection pj = osmv.getProjection();
+ pj.toMapPixels(new GeoPoint(mLocation), mMapCoords);
+ final float radius = pj.metersToEquatorPixels(this.mLocation.getAccuracy());
+
+ this.mCirclePaint.setAlpha(50);
+ this.mCirclePaint.setStyle(Style.FILL);
+ c.drawCircle(mMapCoords.x, mMapCoords.y, radius, this.mCirclePaint);
+
+ this.mCirclePaint.setAlpha(150);
+ this.mCirclePaint.setStyle(Style.STROKE);
+ c.drawCircle(mMapCoords.x, mMapCoords.y, radius, this.mCirclePaint);
+
+ float[] mtx = new float[9];
+ c.getMatrix().getValues(mtx);
+
+ if (DEBUGMODE) {
+ float tx = (-mtx[Matrix.MTRANS_X]+20)/mtx[Matrix.MSCALE_X];
+ float ty = (-mtx[Matrix.MTRANS_Y]+90)/mtx[Matrix.MSCALE_Y];
+ c.drawText("Lat: " + mLocation.getLatitude(), tx, ty + 5, this.mPaint);
+ c.drawText("Lon: " + mLocation.getLongitude(), tx, ty + 20, this.mPaint);
+ c.drawText("Alt: " + mLocation.getAltitude(), tx, ty + 35, this.mPaint);
+ c.drawText("Acc: " + mLocation.getAccuracy(), tx, ty + 50, this.mPaint);
+ }
+
+ if (mLocation.hasSpeed() && mLocation.getSpeed() > 1) {
+ /* Rotate the direction-Arrow according to the bearing we are driving. And draw it to the canvas. */
+ this.directionRotater.setRotate(this.mLocation.getBearing(), DIRECTION_ARROW_CENTER_X , DIRECTION_ARROW_CENTER_Y);
+ this.directionRotater.postTranslate(-DIRECTION_ARROW_CENTER_X, -DIRECTION_ARROW_CENTER_Y);
+ this.directionRotater.postScale(1/mtx[Matrix.MSCALE_X], 1/mtx[Matrix.MSCALE_Y]);
+ this.directionRotater.postTranslate(mMapCoords.x, mMapCoords.y);
+ c.drawBitmap(DIRECTION_ARROW, this.directionRotater, this.mPaint);
+ } else {
+ this.directionRotater.setTranslate(-PERSON_HOTSPOT.x, -PERSON_HOTSPOT.y);
+ this.directionRotater.postScale(1/mtx[Matrix.MSCALE_X], 1/mtx[Matrix.MSCALE_Y]);
+ this.directionRotater.postTranslate(mMapCoords.x, mMapCoords.y);
+ c.drawBitmap(PERSON_ICON, this.directionRotater, this.mPaint);
+ }
+ }
+ }
+
+ public void onLocationChanged(final Location location) {
+ if (DEBUGMODE) {
+ Log.d(DEBUGTAG, "onLocationChanged(" + location + ")");
+ }
+
+ // ignore temporary non-gps fix
+ if (mIgnorer.shouldIgnore(location.getProvider(), System.currentTimeMillis())) {
+ Log.d(DEBUGTAG, "Ignore temporary non-gps location");
+ return;
+ }
+
+ mLocation = location;
+ if (mFollow) {
+ mMapController.animateTo(new GeoPoint(location));
+ } else {
+ mMapView.invalidate(); // redraw the my location icon
+ }
+ }
+
+ public void onProviderDisabled(String provider) {
+ }
+
+ public void onProviderEnabled(String provider) {
+ }
+
+ public void onStatusChanged(String provider, int status, Bundle extras) {
+ if(status == LocationProvider.AVAILABLE) {
+ final Thread t = new Thread(new Runnable() {
+ public void run() {
+ for(Runnable runnable: mRunOnFirstFix) {
+ runnable.run();
+ }
+ mRunOnFirstFix.clear();
+ }
+ });
+ t.run();
+ }
+ }
+
+ public boolean onSnapToItem(int x, int y, Point snapPoint, OpenStreetMapView mapView) {
+ if(this.mLocation != null) {
+ final OpenStreetMapViewProjection pj = mapView.getProjection();
+ pj.toMapPixels(new GeoPoint(mLocation), mMapCoords);
+ snapPoint.x = mMapCoords.x;
+ snapPoint.y = mMapCoords.y;
+
+ boolean snap = (x - mMapCoords.x)*(x - mMapCoords.x) + (y - mMapCoords.y)*(y - mMapCoords.y) < 64;
+ return snap;
+ } else {
+ return false;
+ }
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent event, OpenStreetMapView mapView) {
+ if (event.getAction() == MotionEvent.ACTION_MOVE)
+ mFollow = false;
+
+ return super.onTouchEvent(event, mapView);
+ }
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ public void disableMyLocation() {
+ mLocationManager.removeUpdates(this);
+ mMyLocationEnabled = false;
+ }
+
+ public boolean enableMyLocation() {
+ if (!mMyLocationEnabled) {
+ for (final String provider : mLocationManager.getAllProviders()) {
+ mLocationManager.requestLocationUpdates(provider, 0, 0, this);
+ }
+ }
+ return mMyLocationEnabled = true;
+ }
+
+ public boolean runOnFirstFix(Runnable runnable) {
+ if(mMyLocationEnabled) {
+ runnable.run();
+ return true;
+ } else {
+ mRunOnFirstFix.addLast(runnable);
+ return false;
+ }
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapTilesOverlay.java b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapTilesOverlay.java
new file mode 100644
index 0000000..21baae9
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapTilesOverlay.java
@@ -0,0 +1,141 @@
+package org.andnav.osm.views.overlay;
+
+import org.andnav.osm.tileprovider.OpenStreetMapTile;
+import org.andnav.osm.util.GeoPoint;
+import org.andnav.osm.util.MyMath;
+import org.andnav.osm.views.OpenStreetMapView;
+import org.andnav.osm.views.OpenStreetMapView.OpenStreetMapViewProjection;
+import org.andnav.osm.views.util.OpenStreetMapRendererInfo;
+import org.andnav.osm.views.util.OpenStreetMapTileProvider;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+
+public class OpenStreetMapTilesOverlay extends OpenStreetMapViewOverlay {
+
+ protected OpenStreetMapView mOsmv;
+ protected OpenStreetMapRendererInfo mRendererInfo;
+
+ /** Current renderer */
+ protected final OpenStreetMapTileProvider mTileProvider;
+ protected final Paint mPaint = new Paint();
+
+ public OpenStreetMapTilesOverlay(final OpenStreetMapView aOsmv,
+ final OpenStreetMapRendererInfo aRendererInfo,
+ final OpenStreetMapTileProvider aTileProvider) {
+ this.mOsmv = aOsmv;
+ this.mRendererInfo = aRendererInfo;
+ if(aTileProvider == null)
+ mTileProvider = OpenStreetMapTileProvider.getInstance(mOsmv.getContext(), new SimpleInvalidationHandler());
+ else
+ this.mTileProvider = aTileProvider;
+ }
+
+ public void detach()
+ {
+ this.mTileProvider.detach();
+ }
+
+ public OpenStreetMapRendererInfo getRendererInfo() {
+ return mRendererInfo;
+ }
+
+ public void setRendererInfo(final OpenStreetMapRendererInfo aRendererInfo) {
+ this.mRendererInfo = aRendererInfo;
+ // XXX perhaps we should set the cache capacity back to default here
+ }
+
+ public void setAlpha(int a) {
+ this.mPaint.setAlpha(a);
+ }
+
+ @Override
+ protected void onDraw(Canvas c, OpenStreetMapView osmv) {
+
+ if(DEBUGMODE)
+ Log.v(DEBUGTAG, "onDraw");
+
+ /*
+ * Do some calculations and drag attributes to local variables to save
+ * some performance.
+ */
+ final OpenStreetMapViewProjection pj = osmv.getProjection();
+ final int zoomLevel = osmv.getZoomLevel();
+ final Rect viewPort = c.getClipBounds();
+ final int tileSizePx = this.mRendererInfo.MAPTILE_SIZEPX;
+ final int tileZoom = this.mRendererInfo.MAPTILE_ZOOM;
+ final int worldSize_2 = 1 << (zoomLevel + this.mRendererInfo.MAPTILE_ZOOM - 1);
+ final int rendererId = this.mRendererInfo.ordinal(); // TODO get from service
+
+ /*
+ * Calculate the amount of tiles needed for each side around the center
+ * one.
+ */
+ viewPort.offset(worldSize_2, worldSize_2);
+ final int tileNeededToLeftOfCenter = (viewPort.left >> tileZoom) - 1;
+ final int tileNeededToRightOfCenter = viewPort.right >> tileZoom;
+ final int tileNeededToTopOfCenter = (viewPort.top >> tileZoom) - 1;
+ final int tileNeededToBottomOfCenter = viewPort.bottom >> tileZoom;
+
+ final int mapTileUpperBound = 1 << zoomLevel;
+ final Point tilePos = new Point();
+
+ // make sure the cache is big enough for all the tiles
+ final int numNeeded = (tileNeededToBottomOfCenter - tileNeededToTopOfCenter + 1)
+ * (tileNeededToRightOfCenter - tileNeededToLeftOfCenter + 1);
+ mTileProvider.ensureCapacity(numNeeded);
+
+ /* Draw all the MapTiles (from the upper left to the lower right). */
+ for (int y = tileNeededToTopOfCenter; y <= tileNeededToBottomOfCenter; y++) {
+ for (int x = tileNeededToLeftOfCenter; x <= tileNeededToRightOfCenter; x++) {
+ /* Construct a URLString, which represents the MapTile. */
+ final int tileY = MyMath.mod(y, mapTileUpperBound);
+ final int tileX = MyMath.mod(x, mapTileUpperBound);
+ final OpenStreetMapTile tile = new OpenStreetMapTile(rendererId, zoomLevel, tileX, tileY);
+
+ pj.toPixels(x, y, tilePos);
+ final Bitmap currentMapTile = mTileProvider.getMapTile(tile);
+ if (currentMapTile != null) {
+ c.drawBitmap(currentMapTile, tilePos.x, tilePos.y, mPaint);
+ }
+
+ if (DEBUGMODE) {
+ c.drawText(tile.toString(), tilePos.x + 1, tilePos.y + mPaint.getTextSize(), mPaint);
+ c.drawLine(tilePos.x, tilePos.y, tilePos.x + tileSizePx, tilePos.y, mPaint);
+ c.drawLine(tilePos.x, tilePos.y, tilePos.x, tilePos.y + tileSizePx, mPaint);
+ }
+ }
+ }
+
+ // draw a cross at center in debug mode
+ if (DEBUGMODE) {
+ final GeoPoint center = osmv.getMapCenter();
+ final Point centerPoint = pj.toMapPixels(center, null);
+ c.drawLine(centerPoint.x, centerPoint.y - 9, centerPoint.x, centerPoint.y + 9, mPaint);
+ c.drawLine(centerPoint.x - 9, centerPoint.y, centerPoint.x + 9, centerPoint.y, mPaint);
+ }
+
+ }
+
+ @Override
+ protected void onDrawFinished(Canvas c, OpenStreetMapView osmv) {
+ }
+
+ private class SimpleInvalidationHandler extends Handler {
+
+ @Override
+ public void handleMessage(final Message msg) {
+ switch (msg.what) {
+ case OpenStreetMapTile.MAPTILE_SUCCESS_ID:
+ mOsmv.invalidate();
+ break;
+ }
+ }
+ }
+}
diff --git a/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewDirectedLocationOverlay.java b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewDirectedLocationOverlay.java
new file mode 100644
index 0000000..d00143c
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewDirectedLocationOverlay.java
@@ -0,0 +1,101 @@
+// Created by plusminus on 22:01:11 - 29.09.2008
+package org.andnav.osm.views.overlay;
+
+import org.andnav.osm.R;
+import org.andnav.osm.util.GeoPoint;
+import org.andnav.osm.views.OpenStreetMapView;
+import org.andnav.osm.views.OpenStreetMapView.OpenStreetMapViewProjection;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Point;
+
+/**
+ *
+ * @author Nicolas Gramlich
+ *
+ */
+public class OpenStreetMapViewDirectedLocationOverlay extends OpenStreetMapViewOverlay {
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ protected final Paint mPaint = new Paint();
+
+ protected final Bitmap DIRECTION_ARROW;
+
+ protected GeoPoint mLocation;
+ protected float mBearing;
+
+ private final Matrix directionRotater = new Matrix();
+
+ private final float DIRECTION_ARROW_CENTER_X;
+ private final float DIRECTION_ARROW_CENTER_Y;
+ private final int DIRECTION_ARROW_WIDTH;
+ private final int DIRECTION_ARROW_HEIGHT;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public OpenStreetMapViewDirectedLocationOverlay(final Context ctx){
+ this.DIRECTION_ARROW = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.direction_arrow);
+
+ this.DIRECTION_ARROW_CENTER_X = this.DIRECTION_ARROW.getWidth() / 2 - 0.5f;
+ this.DIRECTION_ARROW_CENTER_Y = this.DIRECTION_ARROW.getHeight() / 2 - 0.5f;
+ this.DIRECTION_ARROW_HEIGHT = this.DIRECTION_ARROW.getHeight();
+ this.DIRECTION_ARROW_WIDTH = this.DIRECTION_ARROW.getWidth();
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ public void setLocation(final GeoPoint mp){
+ this.mLocation = mp;
+ }
+
+ public void setBearing(final float aHeading){
+ this.mBearing = aHeading;
+ }
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ @Override
+ protected void onDrawFinished(Canvas c, OpenStreetMapView osmv) {
+ return;
+ }
+
+ @Override
+ public void onDraw(final Canvas c, final OpenStreetMapView osmv) {
+ if(this.mLocation != null){
+ final OpenStreetMapViewProjection pj = osmv.getProjection();
+ final Point screenCoords = new Point();
+ pj.toMapPixels(this.mLocation, screenCoords);
+
+
+ /* Rotate the direction-Arrow according to the bearing we are driving. And draw it to the canvas. */
+ this.directionRotater.setRotate(this.mBearing, DIRECTION_ARROW_CENTER_X , DIRECTION_ARROW_CENTER_Y);
+ Bitmap rotatedDirection = Bitmap.createBitmap(DIRECTION_ARROW, 0, 0, DIRECTION_ARROW_WIDTH, DIRECTION_ARROW_HEIGHT, this.directionRotater, false);
+ c.drawBitmap(rotatedDirection, screenCoords.x - rotatedDirection.getWidth() / 2, screenCoords.y - rotatedDirection.getHeight() / 2, this.mPaint);
+ }
+ }
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewItemizedOverlay.java b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewItemizedOverlay.java
new file mode 100644
index 0000000..49b6d06
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewItemizedOverlay.java
@@ -0,0 +1,158 @@
+// Created by plusminus on 23:18:23 - 02.10.2008
+package org.andnav.osm.views.overlay;
+
+import java.util.List;
+
+import org.andnav.osm.R;
+import org.andnav.osm.views.OpenStreetMapView;
+import org.andnav.osm.views.OpenStreetMapView.OpenStreetMapViewProjection;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.view.MotionEvent;
+
+/**
+ * Draws a list of {@link OpenStreetMapViewOverlayItem} as markers to a map.
+ * The item with the lowest index is drawn as last and therefore the 'topmost' marker. It also gets checked for onTap first.
+ * This class is generic, because you then you get your custom item-class passed back in onTap().
+ * @author Nicolas Gramlich
+ *
+ * @param <T>
+ */
+public class OpenStreetMapViewItemizedOverlay<T extends OpenStreetMapViewOverlayItem> extends OpenStreetMapViewOverlay {
+
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ protected static final Point DEFAULTMARKER_HOTSPOT = new Point(13, 47);
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ protected OnItemTapListener<T> mOnItemTapListener;
+ protected final List<T> mItemList;
+ protected final Point mMarkerHotSpot;
+ protected final Drawable mMarker;
+ protected final int mMarkerWidth, mMarkerHeight;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public OpenStreetMapViewItemizedOverlay(final Context ctx, final List<T> aList, final OnItemTapListener<T> aOnItemTapListener) {
+ this(ctx, aList, null, null, aOnItemTapListener);
+ }
+
+ public OpenStreetMapViewItemizedOverlay(final Context ctx, final List<T> aList, final Drawable pMarker, final Point pMarkerHotspot, final OnItemTapListener<T> aOnItemTapListener) {
+ assert(ctx != null);
+ assert(aList != null);
+
+ this.mMarker = (pMarker != null) ? pMarker : ctx.getResources().getDrawable(R.drawable.marker_default);
+
+ this.mMarkerHotSpot = (pMarkerHotspot != null) ? pMarkerHotspot : DEFAULTMARKER_HOTSPOT;
+
+ this.mOnItemTapListener = aOnItemTapListener;
+
+ this.mMarkerWidth = this.mMarker.getIntrinsicWidth();
+ this.mMarkerHeight = this.mMarker.getIntrinsicHeight();
+
+ // Add one sample item.
+ this.mItemList = aList;
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ @Override
+ protected void onDrawFinished(Canvas c, OpenStreetMapView osmv) {
+ return;
+ }
+
+ @Override
+ public void onDraw(final Canvas c, final OpenStreetMapView mapView) {
+ final OpenStreetMapViewProjection pj = mapView.getProjection();
+
+ final Point curScreenCoords = new Point();
+
+ /* Draw in backward cycle, so the items with the least index are on the front. */
+ for(int i = this.mItemList.size() - 1; i >= 0; i--){
+ T item = this.mItemList.get(i);
+ pj.toMapPixels(item.mGeoPoint, curScreenCoords);
+
+ onDrawItem(c, i, curScreenCoords);
+ }
+ }
+
+ protected void onDrawItem(final Canvas c, final int index, final Point curScreenCoords) {
+ final int left = curScreenCoords.x - this.mMarkerHotSpot.x;
+ final int right = left + this.mMarkerWidth;
+ final int top = curScreenCoords.y - this.mMarkerHotSpot.y;
+ final int bottom = top + this.mMarkerHeight;
+
+ this.mMarker.setBounds(left, top, right, bottom);
+
+ this.mMarker.draw(c);
+ }
+
+ @Override
+ public boolean onSingleTapUp(final MotionEvent event, final OpenStreetMapView mapView) {
+ final OpenStreetMapViewProjection pj = mapView.getProjection();
+ final int eventX = (int) event.getX();
+ final int eventY = (int) event.getY();
+ final int markerWidth = this.mMarker.getIntrinsicWidth();
+ final int markerHeight = this.mMarker.getIntrinsicHeight();
+
+ /* These objects are created to avoid construct new ones every cycle. */
+ final Rect curMarkerBounds = new Rect();
+ final Point curScreenCoords = new Point();
+ final Point curScreenCoords2 = new Point();
+
+ for(int i = 0; i < this.mItemList.size(); i++){
+ final T item = this.mItemList.get(i);
+
+ pj.toMapPixels(item.mGeoPoint, curScreenCoords);
+
+ final int left = (curScreenCoords.x - this.mMarkerHotSpot.x);
+ final int right = left + markerWidth;
+ final int top = (curScreenCoords.y - this.mMarkerHotSpot.y);
+ final int bottom = top + markerHeight;
+ curMarkerBounds.set(left, top, right, bottom);
+
+ pj.fromMapPixels(eventX, eventY, curScreenCoords2);
+ if (curMarkerBounds.contains(curScreenCoords2.x, curScreenCoords2.y)) {
+ if (onTap(i)) {
+ return true;
+ }
+ }
+ }
+ return super.onSingleTapUp(event, mapView);
+ }
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ protected boolean onTap(int pIndex) {
+ if(this.mOnItemTapListener != null)
+ return this.mOnItemTapListener.onItemTap(pIndex, this.mItemList.get(pIndex));
+ else
+ return false;
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+ public static interface OnItemTapListener<T>{
+ public boolean onItemTap(final int aIndex, final T aItem);
+ }
+}
diff --git a/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewItemizedOverlayControlView.java b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewItemizedOverlayControlView.java
new file mode 100644
index 0000000..6c373db
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewItemizedOverlayControlView.java
@@ -0,0 +1,123 @@
+// Created by plusminus on 22:59:38 - 12.09.2008
+package org.andnav.osm.views.overlay;
+
+import org.andnav.osm.R;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+
+public class OpenStreetMapViewItemizedOverlayControlView extends LinearLayout{
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ protected ImageButton mPreviousButton;
+ protected ImageButton mNextButton;
+ protected ImageButton mCenterToButton;
+ protected ImageButton mNavToButton;
+
+ protected ItemizedOverlayControlViewListener mLis;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public OpenStreetMapViewItemizedOverlayControlView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+
+ this.mPreviousButton = new ImageButton(context);
+ this.mPreviousButton.setImageDrawable(context.getResources().getDrawable(R.drawable.previous));
+
+ this.mNextButton = new ImageButton(context);
+ this.mNextButton.setImageDrawable(context.getResources().getDrawable(R.drawable.next));
+
+ this.mCenterToButton = new ImageButton(context);
+ this.mCenterToButton.setImageDrawable(context.getResources().getDrawable(R.drawable.center));
+
+ this.mNavToButton = new ImageButton(context);
+ this.mNavToButton.setImageDrawable(context.getResources().getDrawable(R.drawable.navto_small));
+
+ this.addView(mPreviousButton, new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+ this.addView(mCenterToButton, new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+ this.addView(mNavToButton, new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+ this.addView(mNextButton, new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+
+ initViewListeners();
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ public void setItemizedOverlayControlViewListener(final ItemizedOverlayControlViewListener lis) {
+ this.mLis = lis;
+ }
+
+ public void setNextEnabled(final boolean pEnabled){
+ this.mNextButton.setEnabled(pEnabled);
+ }
+
+ public void setPreviousEnabled(final boolean pEnabled){
+ this.mPreviousButton.setEnabled(pEnabled);
+ }
+
+ public void setNavToVisible(final int pVisibility){
+ this.mNavToButton.setVisibility(pVisibility);
+ }
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ private void initViewListeners(){
+ this.mNextButton.setOnClickListener(new OnClickListener(){
+ public void onClick(View v) {
+ if(OpenStreetMapViewItemizedOverlayControlView.this.mLis != null)
+ OpenStreetMapViewItemizedOverlayControlView.this.mLis.onNext();
+ }
+ });
+
+ this.mPreviousButton.setOnClickListener(new OnClickListener(){
+ public void onClick(View v) {
+ if(OpenStreetMapViewItemizedOverlayControlView.this.mLis != null)
+ OpenStreetMapViewItemizedOverlayControlView.this.mLis.onPrevious();
+ }
+ });
+
+ this.mCenterToButton.setOnClickListener(new OnClickListener(){
+ public void onClick(View v) {
+ if(OpenStreetMapViewItemizedOverlayControlView.this.mLis != null)
+ OpenStreetMapViewItemizedOverlayControlView.this.mLis.onCenter();
+ }
+ });
+
+ this.mNavToButton.setOnClickListener(new OnClickListener(){
+ public void onClick(View v) {
+ if(OpenStreetMapViewItemizedOverlayControlView.this.mLis != null)
+ OpenStreetMapViewItemizedOverlayControlView.this.mLis.onNavTo();
+ }
+ });
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+
+ public interface ItemizedOverlayControlViewListener{
+ public void onPrevious();
+ public void onNext();
+ public void onCenter();
+ public void onNavTo();
+ }
+}
diff --git a/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewItemizedOverlayWithFocus.java b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewItemizedOverlayWithFocus.java
new file mode 100644
index 0000000..0eb2de4
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewItemizedOverlayWithFocus.java
@@ -0,0 +1,243 @@
+// Created by plusminus on 20:50:06 - 03.10.2008
+package org.andnav.osm.views.overlay;
+
+import java.util.List;
+
+import org.andnav.osm.R;
+import org.andnav.osm.views.OpenStreetMapView;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+
+
+public class OpenStreetMapViewItemizedOverlayWithFocus<T extends OpenStreetMapViewOverlayItem> extends OpenStreetMapViewItemizedOverlay<T> {
+
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ public static final int DESCRIPTION_BOX_PADDING = 3;
+ public static final int DESCRIPTION_BOX_CORNERWIDTH = 3;
+
+ public static final int DESCRIPTION_LINE_HEIGHT = 12;
+ /** Additional to <code>DESCRIPTION_LINE_HEIGHT</code>. */
+ public static final int DESCRIPTION_TITLE_EXTRA_LINE_HEIGHT = 2;
+
+
+ protected static final Point DEFAULTMARKER_FOCUSED_HOTSPOT = new Point(10, 19);
+ protected static final int DEFAULTMARKER_BACKGROUNDCOLOR = Color.rgb(101, 185, 74);
+
+ protected static final int DESCRIPTION_MAXWIDTH = 200;
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ protected final Point mMarkerFocusedHotSpot;
+ protected final Drawable mMarkerFocusedBase;
+ protected final int mMarkerFocusedBackgroundColor;
+ protected final int mMarkerFocusedWidth, mMarkerFocusedHeight;
+ protected final Paint mMarkerBackgroundPaint, mDescriptionPaint, mTitlePaint;
+
+ protected int mFocusedItemIndex;
+ protected boolean mFocusItemsOnTap;
+ private Point mFocusedScreenCoords = new Point();
+
+ private final String UNKNOWN;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public OpenStreetMapViewItemizedOverlayWithFocus(final Context ctx, final List<T> aList, final OnItemTapListener<T> aOnItemTapListener) {
+ this(ctx, aList, null, null, null, null, NOT_SET, aOnItemTapListener);
+ }
+
+ public OpenStreetMapViewItemizedOverlayWithFocus(final Context ctx, final List<T> aList, final Drawable pMarker, final Point pMarkerHotspot, final Drawable pMarkerFocusedBase, final Point pMarkerFocusedHotSpot, final int pFocusedBackgroundColor, final OnItemTapListener<T> aOnItemTapListener) {
+ super(ctx, aList, pMarkerFocusedBase, pMarkerHotspot, aOnItemTapListener);
+
+ UNKNOWN = ctx.getString(R.string.unknown);
+
+ this.mMarkerFocusedBase = (pMarkerFocusedBase != null) ? pMarkerFocusedBase : ctx.getResources().getDrawable(R.drawable.marker_default_focused_base);
+
+ this.mMarkerFocusedHotSpot = (pMarkerFocusedHotSpot != null) ? pMarkerFocusedHotSpot : DEFAULTMARKER_FOCUSED_HOTSPOT;
+
+ if(pFocusedBackgroundColor != NOT_SET)
+ this.mMarkerFocusedBackgroundColor = pFocusedBackgroundColor;
+ else
+ this.mMarkerFocusedBackgroundColor = DEFAULTMARKER_BACKGROUNDCOLOR;
+
+ this.mMarkerBackgroundPaint = new Paint(); // Color is set in onDraw(...)
+
+ this.mDescriptionPaint = new Paint();
+ this.mDescriptionPaint.setAntiAlias(true);
+ this.mTitlePaint = new Paint();
+ this.mTitlePaint.setFakeBoldText(true);
+ this.mTitlePaint.setAntiAlias(true);
+
+ this.mMarkerFocusedWidth = this.mMarkerFocusedBase.getIntrinsicWidth();
+ this.mMarkerFocusedHeight = this.mMarkerFocusedBase.getIntrinsicHeight();
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ public void setFocusedItem(final int pIndex){
+ this.mFocusedItemIndex = pIndex;
+ }
+
+ public void unSetFocusedItem(){
+ this.mFocusedItemIndex = NOT_SET;
+ }
+
+ public void setFocusedItem(final T pItem){
+ final int indexFound = super.mItemList.indexOf(pItem);
+ if(indexFound < 0)
+ throw new IllegalArgumentException();
+
+ this.setFocusedItem(indexFound);
+ }
+
+ public void setFocusItemsOnTap(final boolean doit) {
+ this.mFocusItemsOnTap = doit;
+ }
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ @Override
+ protected boolean onTap(int pIndex) {
+ if(this.mFocusItemsOnTap)
+ this.mFocusedItemIndex = pIndex;
+
+ return super.onTap(pIndex);
+ }
+
+ @Override
+ protected void onDrawFinished(Canvas c, OpenStreetMapView osmv) {
+ if(this.mFocusedItemIndex != NOT_SET){
+ /* Calculate and set the bounds of the marker. */
+ final int left = this.mFocusedScreenCoords.x - this.mMarkerFocusedHotSpot.x;
+ final int right = left + this.mMarkerFocusedWidth;
+ final int top = this.mFocusedScreenCoords.y - this.mMarkerFocusedHotSpot.y;
+ final int bottom = top + this.mMarkerFocusedHeight;
+ this.mMarkerFocusedBase.setBounds(left, top, right, bottom);
+
+ /* Strings of the OverlayItem, we need. */
+ final T focusedItem = super.mItemList.get(this.mFocusedItemIndex);
+ final String itemTitle = (focusedItem.mTitle == null) ? UNKNOWN : focusedItem.mTitle;
+ final String itemDescription = (focusedItem.mDescription == null) ? UNKNOWN : focusedItem.mDescription;
+
+ /* Store the width needed for each char in the description to a float array. This is pretty efficient. */
+ final float[] widths = new float[itemDescription.length()];
+ this.mDescriptionPaint.getTextWidths(itemDescription, widths);
+
+ final StringBuilder sb = new StringBuilder();
+ int maxWidth = 0;
+ int curLineWidth = 0;
+ int lastStop = 0;
+ int i;
+ int lastwhitespace = 0;
+ /* Loop through the charwidth array and harshly insert a linebreak,
+ * when the width gets bigger than DESCRIPTION_MAXWIDTH. */
+ for (i = 0; i < widths.length; i++) {
+ if(!Character.isLetter(itemDescription.charAt(i)))
+ lastwhitespace = i;
+
+ float charwidth = widths[i];
+
+ if(curLineWidth + charwidth> DESCRIPTION_MAXWIDTH){
+ if(lastStop == lastwhitespace)
+ i--;
+ else
+ i = lastwhitespace;
+
+
+ sb.append(itemDescription.subSequence(lastStop, i));
+ sb.append('\n');
+
+ lastStop = i;
+ maxWidth = Math.max(maxWidth, curLineWidth);
+ curLineWidth = 0;
+ }
+
+ curLineWidth += charwidth;
+ }
+ /* Add the last line to the rest to the buffer. */
+ if(i != lastStop){
+ final String rest = itemDescription.substring(lastStop, i);
+
+ maxWidth = Math.max(maxWidth, (int)this.mDescriptionPaint.measureText(rest));
+
+ sb.append(rest);
+ }
+ final String[] lines = sb.toString().split("\n");
+
+ /* The title also needs to be taken into consideration for the width calculation. */
+ final int titleWidth = (int)this.mDescriptionPaint.measureText(itemTitle);
+
+ maxWidth = Math.max(maxWidth, titleWidth);
+ final int descWidth = Math.min(maxWidth, DESCRIPTION_MAXWIDTH);
+
+ /* Calculate the bounds of the Description box that needs to be drawn. */
+ final int descBoxLeft = left - descWidth / 2 - DESCRIPTION_BOX_PADDING + this.mMarkerFocusedWidth / 2;
+ final int descBoxRight = descBoxLeft + descWidth + 2 * DESCRIPTION_BOX_PADDING;
+ final int descBoxBottom = top;
+ final int descBoxTop = descBoxBottom
+ - DESCRIPTION_TITLE_EXTRA_LINE_HEIGHT
+ - (lines.length + 1) * DESCRIPTION_LINE_HEIGHT /* +1 because of the title. */
+ - 2 * DESCRIPTION_BOX_PADDING;
+
+ /* Twice draw a RoundRect, once in black with 1px as a small border. */
+ this.mMarkerBackgroundPaint.setColor(Color.BLACK);
+ c.drawRoundRect(new RectF(descBoxLeft - 1, descBoxTop - 1, descBoxRight + 1, descBoxBottom + 1),
+ DESCRIPTION_BOX_CORNERWIDTH, DESCRIPTION_BOX_CORNERWIDTH,
+ this.mDescriptionPaint);
+ this.mMarkerBackgroundPaint.setColor(this.mMarkerFocusedBackgroundColor);
+ c.drawRoundRect(new RectF(descBoxLeft, descBoxTop, descBoxRight, descBoxBottom),
+ DESCRIPTION_BOX_CORNERWIDTH, DESCRIPTION_BOX_CORNERWIDTH,
+ this.mMarkerBackgroundPaint);
+
+ final int descLeft = descBoxLeft + DESCRIPTION_BOX_PADDING;
+ int descTextLineBottom = descBoxBottom - DESCRIPTION_BOX_PADDING;
+
+ /* Draw all the lines of the description. */
+ for(int j = lines.length - 1; j >= 0; j--){
+ c.drawText(lines[j].trim(), descLeft, descTextLineBottom, this.mDescriptionPaint);
+ descTextLineBottom -= DESCRIPTION_LINE_HEIGHT;
+ }
+ /* Draw the title. */
+ c.drawText(itemTitle, descLeft, descTextLineBottom - DESCRIPTION_TITLE_EXTRA_LINE_HEIGHT, this.mTitlePaint);
+ c.drawLine(descBoxLeft, descTextLineBottom, descBoxRight, descTextLineBottom, mDescriptionPaint);
+
+ /* Finally draw the marker base. This is done in the end to make it look better. */
+ this.mMarkerFocusedBase.draw(c);
+ }
+ }
+
+ @Override
+ protected void onDrawItem(final Canvas c, final int index, final Point screenCoords) {
+ if(this.mFocusedItemIndex != NOT_SET && index == this.mFocusedItemIndex){
+ /* Actual draw will take place in onDrawFinished. */
+ /* Because we are reusing the screencoords apssed here, we cannot simply store the reference. */
+ this.mFocusedScreenCoords.set(screenCoords.x, screenCoords.y);
+ }else{
+ super.onDrawItem(c, index, screenCoords);
+ }
+ }
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewOverlay.java b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewOverlay.java
new file mode 100644
index 0000000..a5830ac
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewOverlay.java
@@ -0,0 +1,150 @@
+// Created by plusminus on 20:32:01 - 27.09.2008
+package org.andnav.osm.views.overlay;
+
+import org.andnav.osm.views.OpenStreetMapView;
+import org.andnav.osm.views.util.constants.OpenStreetMapViewConstants;
+
+import android.graphics.Canvas;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+
+/**
+ * Base class representing an overlay which may be displayed on top of a
+ * {@link OpenStreetMapView}. To add an overlay, subclass this class, create an
+ * instance, and add it to the list obtained from getOverlays() of
+ * {@link OpenStreetMapView}.
+ *
+ * @author Nicolas Gramlich
+ */
+public abstract class OpenStreetMapViewOverlay implements OpenStreetMapViewConstants {
+
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ // ===========================================================
+ // Methods for SuperClass/Interfaces
+ // ===========================================================
+
+ /**
+ * Managed Draw calls gives Overlays the possibility to first draw manually
+ * and after that do a final draw. This is very useful, i sth. to be drawn
+ * needs to be <b>topmost</b>.
+ */
+ public void onManagedDraw(final Canvas c, final OpenStreetMapView osmv) {
+ onDraw(c, osmv);
+ onDrawFinished(c, osmv);
+ }
+
+ protected abstract void onDraw(final Canvas c, final OpenStreetMapView osmv);
+
+ protected abstract void onDrawFinished(final Canvas c,
+ final OpenStreetMapView osmv);
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ /**
+ * By default does nothing (<code>return false</code>). If you handled the
+ * Event, return <code>true</code>, otherwise return <code>false</code>. If
+ * you returned <code>true</code> none of the following Overlays or the
+ * underlying {@link OpenStreetMapView} has the chance to handle this event.
+ */
+ public boolean onKeyDown(final int keyCode, KeyEvent event,
+ final OpenStreetMapView mapView) {
+ return false;
+ }
+
+ /**
+ * By default does nothing (<code>return false</code>). If you handled the
+ * Event, return <code>true</code>, otherwise return <code>false</code>. If
+ * you returned <code>true</code> none of the following Overlays or the
+ * underlying {@link OpenStreetMapView} has the chance to handle this event.
+ */
+ public boolean onKeyUp(final int keyCode, KeyEvent event,
+ final OpenStreetMapView mapView) {
+ return false;
+ }
+
+ /**
+ * <b>You can prevent all(!) other Touch-related events from happening!</b><br />
+ * By default does nothing (<code>return false</code>). If you handled the
+ * Event, return <code>true</code>, otherwise return <code>false</code>. If
+ * you returned <code>true</code> none of the following Overlays or the
+ * underlying {@link OpenStreetMapView} has the chance to handle this event.
+ */
+ public boolean onTouchEvent(final MotionEvent event,
+ final OpenStreetMapView mapView) {
+ return false;
+ }
+
+ /**
+ * By default does nothing (<code>return false</code>). If you handled the
+ * Event, return <code>true</code>, otherwise return <code>false</code>. If
+ * you returned <code>true</code> none of the following Overlays or the
+ * underlying {@link OpenStreetMapView} has the chance to handle this event.
+ */
+ public boolean onTrackballEvent(final MotionEvent event,
+ final OpenStreetMapView mapView) {
+ return false;
+ }
+
+ /**
+ * By default does nothing (<code>return false</code>). If you handled the
+ * Event, return <code>true</code>, otherwise return <code>false</code>. If
+ * you returned <code>true</code> none of the following Overlays or the
+ * underlying {@link OpenStreetMapView} has the chance to handle this event.
+ */
+ public boolean onSingleTapUp(MotionEvent e,
+ OpenStreetMapView openStreetMapView) {
+ return false;
+ }
+
+ /**
+ * By default does nothing (<code>return false</code>). If you handled the
+ * Event, return <code>true</code>, otherwise return <code>false</code>. If
+ * you returned <code>true</code> none of the following Overlays or the
+ * underlying {@link OpenStreetMapView} has the chance to handle this event.
+ */
+ public boolean onLongPress(MotionEvent e,
+ OpenStreetMapView openStreetMapView) {
+ return false;
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+
+ /**
+ * Interface definition for overlays that contain items that can be snapped
+ * to (for example, when the user invokes a zoom, this could be called
+ * allowing the user to snap the zoom to an interesting point.)
+ */
+ public interface Snappable {
+
+ /**
+ * Checks to see if the given x and y are close enough to an item resulting in snapping the current action (e.g. zoom) to the item.
+ * @param x The x in screen coordinates.
+ * @param y The y in screen coordinates.
+ * @param snapPoint To be filled with the the interesting point (in screen coordinates) that is closest to the given x and y. Can be untouched if not snapping.
+ * @param mapView The OpenStreetMapView that is requesting the snap. Use MapView.getProjection() to convert between on-screen pixels and latitude/longitude pairs.
+ * @return Whether or not to snap to the interesting point.
+ */
+ boolean onSnapToItem(int x, int y, android.graphics.Point snapPoint,
+ OpenStreetMapView mapView);
+ }
+
+}
diff --git a/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewOverlayItem.java b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewOverlayItem.java
new file mode 100644
index 0000000..d48d3f9
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewOverlayItem.java
@@ -0,0 +1,54 @@
+// Created by plusminus on 00:02:58 - 03.10.2008
+package org.andnav.osm.views.overlay;
+
+import org.andnav.osm.util.GeoPoint;
+
+/**
+ * Immutable class describing a GeoPoint with a Title and a Description.
+ * @author Nicolas Gramlich
+ *
+ */
+public class OpenStreetMapViewOverlayItem {
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ public final String mTitle;
+ public final String mDescription;
+ public final GeoPoint mGeoPoint;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ /**
+ * @param aTitle this should be <b>singleLine</b> (no <code>'\n'</code> )
+ * @param aDescription a <b>multiLine</b> description ( <code>'\n'</code> possible)
+ * @param aGeoPoint
+ */
+ public OpenStreetMapViewOverlayItem(final String aTitle, final String aDescription, final GeoPoint aGeoPoint) {
+ this.mTitle = aTitle;
+ this.mDescription = aDescription;
+ this.mGeoPoint = aGeoPoint;
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewPathOverlay.java b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewPathOverlay.java
new file mode 100644
index 0000000..6d045b9
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewPathOverlay.java
@@ -0,0 +1,203 @@
+package org.andnav.osm.views.overlay;
+
+import java.util.ArrayList;
+
+import org.andnav.osm.views.OpenStreetMapView;
+import org.andnav.osm.views.OpenStreetMapView.OpenStreetMapViewProjection;
+import org.andnav.osm.util.GeoPoint;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.graphics.Rect;
+
+
+/**
+ *
+ * @author Viesturs Zarins
+ *
+ * This class draws a path line in given color.
+ */
+public class OpenStreetMapViewPathOverlay extends OpenStreetMapViewOverlay
+{
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ /**
+ * Stores points, converted to the map projection.
+ */
+ private ArrayList<Point> mPoints;
+
+ /**
+ * Number of points that have precomputed values.
+ */
+ private int mPointsPrecomputed;
+
+ /**
+ * Paint settings.
+ */
+ protected final Paint mPaint = new Paint();
+
+
+ /**
+ * Point cache for Canvas.drawLines.
+ */
+ static final int POINT_BUFFER_SIZE = 256; //should be a multiple of 4
+ private float[] mPointBuffer = new float[POINT_BUFFER_SIZE];
+
+ private final Point mTempPoint1 = new Point();
+ private final Point mTempPoint2 = new Point();
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+
+ public OpenStreetMapViewPathOverlay(int color)
+ {
+ this.mPaint.setColor(color);
+ this.mPaint.setStrokeWidth(2.0f);
+
+ this.clearPath();
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ public void setColor(int color)
+ {
+ this.mPaint.setColor(color);
+ }
+
+ public void setAlpha(int a)
+ {
+ this.mPaint.setAlpha(a);
+ }
+
+ public void clearPath()
+ {
+ this.mPoints = new ArrayList<Point>();
+ this.mPointsPrecomputed = 0;
+ }
+
+ public void addPoint(GeoPoint pt)
+ {
+ this.addPoint(pt.getLatitudeE6(), pt.getLongitudeE6());
+ }
+
+ public void addPoint(int latitudeE6, int longitudeE6)
+ {
+ this.mPoints.add(new Point(latitudeE6, longitudeE6));
+ }
+
+ public int getNumberOfPoints() {
+ return this.mPoints.size();
+ }
+
+
+ /**
+ * This method draws the line.
+ * Note - highly optimized to handle long paths, proceed with care. Should be fine up to 10K points.
+ */
+ @Override
+ protected void onDraw(Canvas canvas, OpenStreetMapView mapView)
+ {
+ if (this.mPoints.size() < 2)
+ {
+ //nothing to paint
+ return;
+ }
+
+ final OpenStreetMapViewProjection pj = mapView.getProjection();
+
+ //precompute new points to the intermediate projection.
+ int size = this.mPoints.size();
+
+ while (this.mPointsPrecomputed < size)
+ {
+ Point pt = this.mPoints.get(this.mPointsPrecomputed);
+ pj.toMapPixelsProjected(pt.x, pt.y, pt);
+
+ this.mPointsPrecomputed ++;
+ }
+
+ Point screenPoint0 = null; //points on screen
+ Point screenPoint1 = null;
+ Point projectedPoint0; //points from the points list
+ Point projectedPoint1;
+
+ float [] buffer = this.mPointBuffer;
+ int bufferCount = 0;
+ Rect clipBounds = pj.fromPixelsToProjected(canvas.getClipBounds()); // clipping rectangle in the intermediate projection, to avoid performing projection.
+ Rect lineBounds = new Rect(); // bounding rectangle for the current line segment.
+
+ projectedPoint0 = this.mPoints.get(size - 1);
+ lineBounds.set(projectedPoint0.x, projectedPoint0.y, projectedPoint0.x, projectedPoint0.y);
+
+ for(int i = size - 2; i >= 0; i--)
+ {
+ //compute next points
+ projectedPoint1 = this.mPoints.get(i);
+ lineBounds.union(projectedPoint1.x, projectedPoint1.y);
+
+ if (!Rect.intersects(clipBounds, lineBounds))
+ {
+ //skip this line, move to next point
+ projectedPoint0 = projectedPoint1;
+ screenPoint0 = null;
+ continue;
+ }
+
+ // the starting point may be not calculated, because previous segment was out of clip bounds
+ if (screenPoint0 == null)
+ {
+ screenPoint0 = pj.toMapPixelsTranslated(projectedPoint0, this.mTempPoint1);
+ }
+
+ screenPoint1 = pj.toMapPixelsTranslated(projectedPoint1, this.mTempPoint2);
+
+ //skip this point, too close to previous point
+ if (Math.abs(screenPoint1.x - screenPoint0.x) + Math.abs(screenPoint1.y - screenPoint0.y) <= 1)
+ {
+ continue;
+ }
+
+ //add new line to buffer
+ buffer[bufferCount] = screenPoint0.x;
+ buffer[bufferCount + 1] = screenPoint0.y;
+ buffer[bufferCount + 2] = screenPoint1.x;
+ buffer[bufferCount + 3] = screenPoint1.y;
+ bufferCount += 4;
+
+ if (bufferCount == POINT_BUFFER_SIZE)
+ {
+ canvas.drawLines(buffer, this.mPaint);
+ bufferCount = 0;
+ }
+
+ //update starting point to next position
+ projectedPoint0 = projectedPoint1;
+ screenPoint0.x = screenPoint1.x;
+ screenPoint0.y = screenPoint1.y;
+ lineBounds.set(projectedPoint0.x, projectedPoint0.y, projectedPoint0.x, projectedPoint0.y);
+ }
+
+ if (bufferCount >0 )
+ {
+ canvas.drawLines(buffer, 0, bufferCount, this.mPaint);
+ }
+ }
+
+ @Override
+ protected void onDrawFinished(Canvas c, OpenStreetMapView osmv)
+ {
+ //nothing here
+ }
+
+}
diff --git a/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewSimpleLocationOverlay.java b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewSimpleLocationOverlay.java
new file mode 100644
index 0000000..c6cfd20
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/overlay/OpenStreetMapViewSimpleLocationOverlay.java
@@ -0,0 +1,81 @@
+// Created by plusminus on 22:01:11 - 29.09.2008
+package org.andnav.osm.views.overlay;
+
+import org.andnav.osm.R;
+import org.andnav.osm.util.GeoPoint;
+import org.andnav.osm.views.OpenStreetMapView;
+import org.andnav.osm.views.OpenStreetMapView.OpenStreetMapViewProjection;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Point;
+
+/**
+ *
+ * @author Nicolas Gramlich
+ *
+ */
+public class OpenStreetMapViewSimpleLocationOverlay extends OpenStreetMapViewOverlay {
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ protected final Paint mPaint = new Paint();
+
+ protected final Bitmap PERSON_ICON;
+ /** Coordinates the feet of the person are located. */
+ protected final android.graphics.Point PERSON_HOTSPOT = new android.graphics.Point(24,39);
+
+ protected GeoPoint mLocation;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public OpenStreetMapViewSimpleLocationOverlay(final Context ctx){
+ this.PERSON_ICON = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.person);
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ public void setLocation(final GeoPoint mp){
+ this.mLocation = mp;
+ }
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ @Override
+ protected void onDrawFinished(Canvas c, OpenStreetMapView osmv) {
+ return;
+ }
+
+ @Override
+ public void onDraw(final Canvas c, final OpenStreetMapView osmv) {
+ if(this.mLocation != null){
+ final OpenStreetMapViewProjection pj = osmv.getProjection();
+ final Point screenCoords = new Point();
+ pj.toMapPixels(this.mLocation, screenCoords);
+
+ c.drawBitmap(PERSON_ICON, screenCoords.x - PERSON_HOTSPOT.x, screenCoords.y - PERSON_HOTSPOT.y, this.mPaint);
+ }
+ }
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/views/util/LRUMapTileCache.java b/konphidroid/src/org/andnav/osm/views/util/LRUMapTileCache.java
new file mode 100644
index 0000000..bc7ea8a
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/util/LRUMapTileCache.java
@@ -0,0 +1,58 @@
+package org.andnav.osm.views.util;
+
+import java.util.ConcurrentModificationException;
+import java.util.LinkedHashMap;
+
+import org.andnav.osm.tileprovider.OpenStreetMapTile;
+import org.andnav.osm.views.util.constants.OpenStreetMapViewConstants;
+
+import android.graphics.Bitmap;
+import android.util.Log;
+
+public class LRUMapTileCache extends LinkedHashMap<OpenStreetMapTile, Bitmap> implements OpenStreetMapViewConstants {
+
+ private static final long serialVersionUID = -541142277575493335L;
+
+ private int mCapacity;
+
+ public LRUMapTileCache(final int aCapacity) {
+ super(aCapacity + 2, 0.1f, true);
+ mCapacity = aCapacity;
+ }
+
+ public void ensureCapacity(final int aCapacity) {
+ if (aCapacity > mCapacity) {
+ mCapacity = aCapacity;
+ }
+ }
+
+ @Override
+ public Bitmap remove(final Object aKey) {
+ final Bitmap bm = super.remove(aKey);
+ if (bm != null) {
+ bm.recycle();
+ }
+ return bm;
+ }
+
+ @Override
+ public void clear() {
+ // remove them all individually so that they get recycled
+ try {
+ for (final OpenStreetMapTile key : keySet()) {
+ remove(key);
+ }
+ } catch (final ConcurrentModificationException ignore) {
+ Log.i(DEBUGTAG, "ConcurrentModificationException clearing tile cache");
+ }
+
+ // and then clear
+ super.clear();
+ }
+
+ @Override
+ protected boolean removeEldestEntry(final Entry<OpenStreetMapTile, Bitmap> aEldest) {
+ return size() > mCapacity;
+ }
+
+}
diff --git a/konphidroid/src/org/andnav/osm/views/util/Mercator.java b/konphidroid/src/org/andnav/osm/views/util/Mercator.java
new file mode 100644
index 0000000..1ebe12f
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/util/Mercator.java
@@ -0,0 +1,134 @@
+// Created by plusminus on 17:53:07 - 25.09.2008
+package org.andnav.osm.views.util;
+
+import org.andnav.osm.util.BoundingBoxE6;
+import org.andnav.osm.util.GeoPoint;
+import org.andnav.osm.views.util.constants.OpenStreetMapViewConstants;
+
+import android.graphics.Point;
+
+/**
+ * http://wiki.openstreetmap.org/index.php/Mercator
+ * @author Nicolas Gramlich
+ *
+ */
+public class Mercator implements OpenStreetMapViewConstants {
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ final static double DEG2RAD = Math.PI / 180;
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ /**
+ * Mercator projection of GeoPoint at given zoom level
+ * @param aLat latitude in degrees [-89000000 to 89000000]
+ * @param aLon longitude in degrees [-180000000 to 180000000]
+ * @param zoom zoom level
+ * @param aUseAsReturnValue
+ * @return Point with x,y in the range [-2^(zoom-1) to 2^(zoom-1)]
+ */
+ public static int[] projectGeoPoint(final int aLatE6, final int aLonE6, final int aZoom, final int[] reuse) {
+ return projectGeoPoint(aLatE6 * 1E-6, aLonE6 * 1E-6, aZoom, reuse);
+ }
+
+ /**
+ * Mercator projection of GeoPoint at given zoom level
+ * @param aLat latitude in degrees [-89 to 89]
+ * @param aLon longitude in degrees [-180 to 180]
+ * @param zoom zoom level
+ * @param aUseAsReturnValue
+ * @return Point with x,y in the range [-2^(zoom-1) to 2^(zoom-1)]
+ */
+ public static int[] projectGeoPoint(final double aLat, final double aLon, final int aZoom, final int[] aUseAsReturnValue) {
+ final int[] out = (aUseAsReturnValue != null) ? aUseAsReturnValue : new int[2];
+
+ out[MAPTILE_LONGITUDE_INDEX] = (int) Math.floor((aLon + 180) / 360 * (1 << aZoom));
+ out[MAPTILE_LATITUDE_INDEX] = (int) Math.floor((1 - Math.log(Math.tan(aLat * DEG2RAD) + 1 / Math.cos(aLat * DEG2RAD)) / Math.PI) / 2 * (1 << aZoom));
+
+ return out;
+ }
+
+ /**
+ * Mercator projection of GeoPoint at given zoom level
+ * @param aGeoPoint
+ * @param zoom zoom level
+ * @param aUseAsReturnValue
+ * @return Point with x,y in the range [-2^(zoom-1) to 2^(zoom-1)]
+ */
+ public static Point projectGeoPoint(final GeoPoint aGeoPoint, final int aZoom, final Point aUseAsReturnValue) {
+ final Point p = (aUseAsReturnValue != null) ? aUseAsReturnValue : new Point();
+
+ final double aLon = aGeoPoint.getLongitudeE6()*1E-6;
+ final double aLat = aGeoPoint.getLatitudeE6()*1E-6;
+ p.x = (int) Math.floor((aLon + 180) / 360 * (1 << aZoom));
+ p.y = (int) Math.floor((1 - Math.log(Math.tan(aLat * DEG2RAD) + 1 / Math.cos(aLat * DEG2RAD)) / Math.PI) / 2 * (1 << aZoom));
+
+ return p;
+ }
+
+ /**
+ * Get bounding box from reverse Mercator projection.
+ * @param left
+ * @param top
+ * @param right
+ * @param bottom
+ * @param zoom
+ * @return
+ */
+ public static BoundingBoxE6 getBoundingBoxFromCoords(final int left, final int top, final int right, final int bottom, final int zoom) {
+ return new BoundingBoxE6(tile2lat(top, zoom), tile2lon(right, zoom), tile2lat(bottom, zoom), tile2lon(left, zoom));
+ }
+
+ /**
+ * Get bounding box from reverse Mercator projection.
+ * @param aMapTile
+ * @param aZoom
+ * @return
+ */
+ public static BoundingBoxE6 getBoundingBoxFromMapTile(final int[] aMapTile, final int aZoom) {
+ final int y = aMapTile[MAPTILE_LATITUDE_INDEX];
+ final int x = aMapTile[MAPTILE_LONGITUDE_INDEX];
+ return new BoundingBoxE6(tile2lat(y, aZoom), tile2lon(x + 1, aZoom), tile2lat(y + 1, aZoom), tile2lon(x, aZoom));
+ }
+
+ /**
+ * Reverse Mercator projection of Point at given zoom level
+ *
+ */
+ public static GeoPoint projectPoint(int x, int y, int aZoom) {
+ return new GeoPoint((int)(tile2lat(y, aZoom)*1E6), (int)(tile2lon(x, aZoom)*1E6));
+ }
+
+ public static double tile2lon(int x, int aZoom) {
+ return ((double)x / (1 << aZoom) * 360.0) - 180;
+ }
+
+ public static double tile2lat(int y, int aZoom) {
+ final double n = Math.PI - ((2.0 * Math.PI * y) / (1 << aZoom));
+ return 180.0 / Math.PI * Math.atan(0.5 * (Math.exp(n) - Math.exp(-n)));
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/views/util/MyMath.java b/konphidroid/src/org/andnav/osm/views/util/MyMath.java
new file mode 100644
index 0000000..408bf9b
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/util/MyMath.java
@@ -0,0 +1,70 @@
+// Created by plusminus on 20:36:01 - 26.09.2008
+package org.andnav.osm.views.util;
+
+import org.andnav.osm.views.util.constants.MathConstants;
+
+/**
+ *
+ * @author Nicolas Gramlich
+ *
+ */
+public class MyMath implements MathConstants {
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ /**
+ * Calculates i.e. the increase of zoomlevel needed when the visible latitude needs to be bigger by <code>factor</code>.
+ *
+ * Assert.assertEquals(1, getNextSquareNumberAbove(1.1f));
+ * Assert.assertEquals(2, getNextSquareNumberAbove(2.1f));
+ * Assert.assertEquals(2, getNextSquareNumberAbove(3.9f));
+ * Assert.assertEquals(3, getNextSquareNumberAbove(4.1f));
+ * Assert.assertEquals(3, getNextSquareNumberAbove(7.9f));
+ * Assert.assertEquals(4, getNextSquareNumberAbove(8.1f));
+ * Assert.assertEquals(5, getNextSquareNumberAbove(16.1f));
+ *
+ * Assert.assertEquals(-1, - getNextSquareNumberAbove(1 / 0.4f) + 1);
+ * Assert.assertEquals(-2, - getNextSquareNumberAbove(1 / 0.24f) + 1);
+ *
+ * @param factor
+ * @return
+ */
+ public static int getNextSquareNumberAbove(final float factor){
+ int out = 0;
+ int cur = 1;
+ int i = 1;
+ while(true){
+ if(cur > factor)
+ return out;
+
+ out = i;
+ cur *= 2;
+ i++;
+ }
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/views/util/OpenStreetMapRendererInfo.java b/konphidroid/src/org/andnav/osm/views/util/OpenStreetMapRendererInfo.java
new file mode 100644
index 0000000..bec8c98
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/util/OpenStreetMapRendererInfo.java
@@ -0,0 +1,96 @@
+// Created by plusminus on 18:23:16 - 25.09.2008
+package org.andnav.osm.views.util;
+
+import java.util.Random;
+
+import org.andnav.osm.R;
+import org.andnav.osm.tileprovider.OpenStreetMapTile;
+
+/**
+ * The OpenStreetMapRendererInfo stores information about available tile servers.
+ * @author Nicolas Gramlich
+ *
+ */
+public enum OpenStreetMapRendererInfo {
+ OSMARENDER(R.string.osmarender, ".png", 0, 17, 8, CodeScheme.X_Y,"http://tah.openstreetmap.org/Tiles/tile/"),
+ MAPNIK(R.string.mapnik, ".png", 0, 18, 8, CodeScheme.X_Y,"http://tile.openstreetmap.org/"),
+ CYCLEMAP(R.string.cyclemap, ".png", 0, 17, 8, CodeScheme.X_Y,
+ "http://a.andy.sandbox.cloudmade.com/tiles/cycle/",
+ "http://b.andy.sandbox.cloudmade.com/tiles/cycle/",
+ "http://c.andy.sandbox.cloudmade.com/tiles/cycle/"),
+ OPENARIELMAP( R.string.openareal_sat, ".jpg", 0, 13, 8, CodeScheme.X_Y,"http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/"),
+ BASE( R.string.base, ".png", 4, 17, 8, CodeScheme.X_Y,"http://topo.openstreetmap.de/base/"),
+ TOPO(R.string.topo, ".png", 4, 17, 8, CodeScheme.X_Y,"http://topo.openstreetmap.de/topo/"),
+ HILLS(R.string.hills, ".png", 8, 17, 8, CodeScheme.X_Y,"http://topo.geofabrik.de/hills/"),
+ CLOUDMADESMALLTILES(R.string.cloudmade_small, ".png", 0, 13, 6, CodeScheme.X_Y,"http://tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/2/64/"),
+ CLOUDMADESTANDARDTILES(R.string.cloudmade_standard, ".png", 0, 18, 8, CodeScheme.X_Y,"http://tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/2/256/");
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ public enum CodeScheme { X_Y, QUAD_TREE };
+
+ public final String BASEURLS[], IMAGE_FILENAMEENDING;
+ public final int NAME, ZOOM_MINLEVEL, ZOOM_MAXLEVEL, MAPTILE_ZOOM, MAPTILE_SIZEPX;
+ public final CodeScheme CODE_SCHEME;
+ private final Random random;
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ private OpenStreetMapRendererInfo(final int aName,
+ final String aImageFilenameEnding, final int aZoomMin,
+ final int aZoomMax, final int aTileZoom, final CodeScheme aCodeScheme,final String ...aBaseUrl) {
+ this.BASEURLS = aBaseUrl;
+ this.NAME = aName;
+ this.ZOOM_MINLEVEL = aZoomMin;
+ this.ZOOM_MAXLEVEL = aZoomMax;
+ this.IMAGE_FILENAMEENDING = aImageFilenameEnding;
+ this.MAPTILE_ZOOM = aTileZoom;
+ this.MAPTILE_SIZEPX = 1<<aTileZoom;
+ this.CODE_SCHEME = aCodeScheme;
+ this.random = new Random();
+ }
+
+ public static OpenStreetMapRendererInfo getDefault() {
+ return MAPNIK;
+ }
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ public String getTileURLString(final OpenStreetMapTile aTile) {
+ final CodeScheme cs = this.CODE_SCHEME;
+ final String baseurl = BASEURLS[random.nextInt()%BASEURLS.length];
+ switch (cs) {
+ case QUAD_TREE:
+ return String.format("%s%s%s", baseurl, quadTree(aTile), this.IMAGE_FILENAMEENDING);
+ case X_Y:
+ default:
+ return String.format("%s%d/%d/%d%s", baseurl, aTile.getZoomLevel(), aTile.getX(), aTile.getY(), this.IMAGE_FILENAMEENDING);
+ }
+ }
+
+ /**
+ * Converts TMS tile coordinates to QuadTree
+ * @param aTile The tile coordinates to convert
+ * @return The QuadTree as String.
+ */
+ private String quadTree(final OpenStreetMapTile aTile) {
+ final StringBuilder quadKey = new StringBuilder();
+ for (int i = aTile.getZoomLevel(); i > 0; i--) {
+ int digit = 0;
+ int mask = 1 << (i - 1);
+ if ((aTile.getX() & mask) != 0)
+ digit += 1;
+ if ((aTile.getY() & mask) != 0)
+ digit += 2;
+ quadKey.append("" + digit);
+ }
+
+ return quadKey.toString();
+ }
+
+}
diff --git a/konphidroid/src/org/andnav/osm/views/util/OpenStreetMapTileCache.java b/konphidroid/src/org/andnav/osm/views/util/OpenStreetMapTileCache.java
new file mode 100644
index 0000000..7c426e4
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/util/OpenStreetMapTileCache.java
@@ -0,0 +1,77 @@
+// Created by plusminus on 17:58:57 - 25.09.2008
+package org.andnav.osm.views.util;
+
+import org.andnav.osm.tileprovider.OpenStreetMapTile;
+import org.andnav.osm.views.util.constants.OpenStreetMapViewConstants;
+
+import android.graphics.Bitmap;
+
+/**
+ *
+ * @author Nicolas Gramlich
+ *
+ */
+public class OpenStreetMapTileCache implements OpenStreetMapViewConstants {
+ // ===========================================================
+ // Constants
+ // ===========================================================
+
+ // ===========================================================
+ // Fields
+ // ===========================================================
+
+ protected LRUMapTileCache mCachedTiles;
+
+ // ===========================================================
+ // Constructors
+ // ===========================================================
+
+ public OpenStreetMapTileCache() {
+ this(CACHE_MAPTILECOUNT_DEFAULT);
+ }
+
+ /**
+ * @param aMaximumCacheSize Maximum amount of MapTiles to be hold within.
+ */
+ public OpenStreetMapTileCache(final int aMaximumCacheSize){
+ this.mCachedTiles = new LRUMapTileCache(aMaximumCacheSize);
+ }
+
+ // ===========================================================
+ // Getter & Setter
+ // ===========================================================
+
+ public void ensureCapacity(final int aCapacity) {
+ mCachedTiles.ensureCapacity(aCapacity);
+ }
+
+ public synchronized Bitmap getMapTile(final OpenStreetMapTile aTile) {
+ return this.mCachedTiles.get(aTile);
+ }
+
+ public synchronized void putTile(final OpenStreetMapTile aTile, final Bitmap aImage) {
+ if (aImage != null) {
+ this.mCachedTiles.put(aTile, aImage);
+ }
+ }
+
+ // ===========================================================
+ // Methods from SuperClass/Interfaces
+ // ===========================================================
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+
+ public boolean containsTile(final OpenStreetMapTile aTile) {
+ return this.mCachedTiles.containsKey(aTile);
+ }
+
+ public void clear() {
+ this.mCachedTiles.clear();
+ }
+
+ // ===========================================================
+ // Inner and Anonymous Classes
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/views/util/OpenStreetMapTileProvider.java b/konphidroid/src/org/andnav/osm/views/util/OpenStreetMapTileProvider.java
new file mode 100644
index 0000000..498af84
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/util/OpenStreetMapTileProvider.java
@@ -0,0 +1,95 @@
+// Created by plusminus on 21:46:22 - 25.09.2008
+package org.andnav.osm.views.util;
+
+import java.io.File;
+
+import org.andnav.osm.services.IOpenStreetMapTileProviderService;
+import org.andnav.osm.tileprovider.OpenStreetMapTile;
+import org.andnav.osm.views.util.constants.OpenStreetMapViewConstants;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Handler;
+import android.util.Log;
+
+/**
+ *
+ * @author Nicolas Gramlich
+ *
+ */
+public abstract class OpenStreetMapTileProvider implements OpenStreetMapViewConstants {
+
+ protected final OpenStreetMapTileCache mTileCache;
+ protected final Handler mDownloadFinishedHandler;
+
+ public OpenStreetMapTileProvider(final Handler pDownloadFinishedListener) {
+ mTileCache = new OpenStreetMapTileCache();
+ mDownloadFinishedHandler = pDownloadFinishedListener;
+ }
+
+ /**
+ * Get a tile provider.
+ * If a tile provider service exists then it will use the service,
+ * otherwise it'll use a direct tile provider that doesn't use a service
+ * @param pContext
+ * @param pDownloadFinishedListener
+ * @return
+ */
+ public static OpenStreetMapTileProvider getInstance(final Context pContext,
+ final Handler pDownloadFinishedListener) {
+ final Intent intent = new Intent(IOpenStreetMapTileProviderService.class.getName());
+ final ResolveInfo ri = pContext.getPackageManager().resolveService(intent, 0);
+ if (ri == null) {
+ Log.i(DEBUGTAG, "Service not found - using direct tile provider");
+ return new OpenStreetMapTileProviderDirect(pDownloadFinishedListener);
+ } else {
+ Log.i(DEBUGTAG, "Using tile provider service");
+ return new OpenStreetMapTileProviderService(pContext, pDownloadFinishedListener);
+ // XXX Perhaps we should pass the Intent or the class name (action) into
+ // this constructor since we do the same again in there.
+ // That will also give the option of specifying something else.
+ }
+ }
+
+ public void mapTileRequestCompleted(final OpenStreetMapTile pTile, final String pTilePath) {
+
+ // if the tile path has been returned, add the tile to the cache
+ if (pTilePath != null) {
+ try {
+ final Bitmap bitmap = BitmapFactory.decodeFile(pTilePath);
+ if (bitmap != null) {
+ mTileCache.putTile(pTile, bitmap);
+ } else {
+ // if we couldn't load it then it's invalid - delete it
+ try {
+ new File(pTilePath).delete();
+ } catch (Throwable e) {
+ Log.e(DEBUGTAG, "Error deleting invalid file: " + pTilePath, e);
+ }
+ }
+ } catch (final OutOfMemoryError e) {
+ Log.e(DEBUGTAG, "OutOfMemoryError putting tile in cache: " + pTile);
+ mTileCache.clear();
+ System.gc();
+ }
+ }
+
+ // tell our caller we've finished and it should update its view
+ mDownloadFinishedHandler.sendEmptyMessage(OpenStreetMapTile.MAPTILE_SUCCESS_ID);
+
+ if (DEBUGMODE)
+ Log.d(DEBUGTAG, "MapTile request complete: " + pTile);
+ }
+
+ public void ensureCapacity(final int aCapacity) {
+ mTileCache.ensureCapacity(aCapacity);
+ }
+
+ public abstract Bitmap getMapTile(OpenStreetMapTile pTile);
+
+ public abstract void detach();
+
+}
diff --git a/konphidroid/src/org/andnav/osm/views/util/OpenStreetMapTileProviderDirect.java b/konphidroid/src/org/andnav/osm/views/util/OpenStreetMapTileProviderDirect.java
new file mode 100644
index 0000000..53a7e42
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/util/OpenStreetMapTileProviderDirect.java
@@ -0,0 +1,37 @@
+package org.andnav.osm.views.util;
+
+import org.andnav.osm.tileprovider.IOpenStreetMapTileProviderCallback;
+import org.andnav.osm.tileprovider.OpenStreetMapTile;
+import org.andnav.osm.tileprovider.OpenStreetMapTileFilesystemProvider;
+
+import android.graphics.Bitmap;
+import android.os.Handler;
+import android.util.Log;
+
+public class OpenStreetMapTileProviderDirect extends OpenStreetMapTileProvider implements IOpenStreetMapTileProviderCallback {
+
+ private final OpenStreetMapTileFilesystemProvider mFileSystemProvider;
+
+ public OpenStreetMapTileProviderDirect(final Handler pDownloadFinishedListener) {
+ super(pDownloadFinishedListener);
+ mFileSystemProvider = new OpenStreetMapTileFilesystemProvider(this);
+ }
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Bitmap getMapTile(final OpenStreetMapTile pTile) {
+ if (mTileCache.containsTile(pTile)) {
+ if (DEBUGMODE)
+ Log.d(DEBUGTAG, "MapTileCache succeeded for: " + pTile);
+ return mTileCache.getMapTile(pTile);
+ } else {
+ if (DEBUGMODE)
+ Log.d(DEBUGTAG, "Cache failed, trying from FS: " + pTile);
+ mFileSystemProvider.loadMapTileAsync(pTile);
+ return null;
+ }
+ }
+}
diff --git a/konphidroid/src/org/andnav/osm/views/util/OpenStreetMapTileProviderService.java b/konphidroid/src/org/andnav/osm/views/util/OpenStreetMapTileProviderService.java
new file mode 100644
index 0000000..c7330a9
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/util/OpenStreetMapTileProviderService.java
@@ -0,0 +1,141 @@
+package org.andnav.osm.views.util;
+
+import org.andnav.osm.services.IOpenStreetMapTileProviderService;
+import org.andnav.osm.services.IOpenStreetMapTileProviderServiceCallback;
+import org.andnav.osm.tileprovider.OpenStreetMapTile;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.graphics.Bitmap;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Log;
+
+public class OpenStreetMapTileProviderService extends OpenStreetMapTileProvider implements ServiceConnection {
+
+ private final Context mContext;
+
+ private IOpenStreetMapTileProviderService mTileService;
+
+ /**
+ * Service is bound, but maybe not still connected.
+ */
+ private boolean mServiceBound;
+
+ public OpenStreetMapTileProviderService(final Context pContext, final Handler pDownloadFinishedListener) {
+ super(pDownloadFinishedListener);
+ mContext = pContext;
+ bindToService();
+ }
+
+ public void onServiceConnected(final ComponentName name, final IBinder service) {
+ Log.d(DEBUGTAG, "onServiceConnected(" + name + ")");
+
+ mTileService = IOpenStreetMapTileProviderService.Stub.asInterface(service);
+
+ try {
+ mTileService.setCallback(mServiceCallback);
+ } catch (RemoteException e) {
+ Log.e(DEBUGTAG, "Error setting callback", e);
+ }
+
+ try {
+ mDownloadFinishedHandler.sendEmptyMessage(OpenStreetMapTile.MAPTILE_SUCCESS_ID);
+ } catch(Exception e) {
+ Log.e(DEBUGTAG, "Error sending success message on connect", e);
+ }
+ };
+
+ public void onServiceDisconnected(final ComponentName name) {
+ onDisconnect();
+ Log.d(DEBUGTAG, "disconnected");
+ }
+
+ /**
+ * Get the tile from the cache.
+ * If it's in the cache then it will be returned.
+ * If not it will return null and request it from the service.
+ * In turn, the service will request it from the file system.
+ * If it's found in the file system it will notify the callback.
+ * If not it will initiate a download.
+ * When the download has finished it will notify the callback.
+ * @param aTile the tile being requested
+ * @return the tile bitmap if found in the cache, null otherwise
+ */
+ @Override
+ public Bitmap getMapTile(final OpenStreetMapTile aTile) {
+ if (mTileCache.containsTile(aTile)) { // from cache
+ if (DEBUGMODE)
+ Log.d(DEBUGTAG, "MapTileCache succeeded for: " + aTile);
+ return mTileCache.getMapTile(aTile);
+ } else { // from service
+ if (mTileService != null) {
+ if (DEBUGMODE)
+ Log.d(DEBUGTAG, "Cache failed, trying from FS: " + aTile);
+ try {
+ mTileService.requestMapTile(aTile.getRendererId(), aTile.getZoomLevel(), aTile.getX(), aTile.getY());
+ } catch (Throwable e) {
+ Log.e(DEBUGTAG, "Error getting map tile from tile service: " + aTile, e);
+ }
+ } else {
+ // try to reconnect, but the connection will take time.
+ if (!bindToService()) {
+ if (DEBUGMODE)
+ Log.d(DEBUGTAG, "Cache failed, can't get from FS because no tile service: " + aTile);
+ } else {
+ if (DEBUGMODE)
+ Log.d(DEBUGTAG, "Cache failed, tile service still not woken up: " + aTile);
+ }
+ }
+
+ return null;
+ }
+ }
+
+ /***
+ * Disconnects from the tile downloader service.
+ */
+ @Override
+ public void detach()
+ {
+ if (mServiceBound)
+ {
+ if (DEBUGMODE)
+ Log.d(DEBUGTAG, "Unbinding service");
+ mContext.unbindService(this);
+ onDisconnect();
+ }
+ }
+
+ private boolean bindToService()
+ {
+ if (mServiceBound)
+ return true;
+
+ boolean success = mContext.bindService(new Intent(IOpenStreetMapTileProviderService.class.getName()), this, Context.BIND_AUTO_CREATE);
+
+ if (!success)
+ Log.e(DEBUGTAG, "Could not bind to " + IOpenStreetMapTileProviderService.class.getName());
+
+ mServiceBound = success;
+
+ return success;
+ }
+
+ private void onDisconnect()
+ {
+ mServiceBound = false;
+ mTileService = null;
+ }
+
+ IOpenStreetMapTileProviderServiceCallback mServiceCallback = new IOpenStreetMapTileProviderServiceCallback.Stub() {
+ public void mapTileRequestCompleted(final int aRendererID, final int aZoomLevel, final int aTileX, final int aTileY, final String aTilePath) throws RemoteException {
+ final OpenStreetMapTile tile = new OpenStreetMapTile(aRendererID, aZoomLevel, aTileX, aTileY);
+ OpenStreetMapTileProviderService.this.mapTileRequestCompleted(tile, aTilePath);
+ }
+ };
+
+}
diff --git a/konphidroid/src/org/andnav/osm/views/util/constants/MathConstants.java b/konphidroid/src/org/andnav/osm/views/util/constants/MathConstants.java
new file mode 100644
index 0000000..8e235d5
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/util/constants/MathConstants.java
@@ -0,0 +1,24 @@
+// Created by plusminus on 17:27:54 - 30.09.2008
+package org.andnav.osm.views.util.constants;
+
+/**
+ *
+ * @author Nicolas Gramlich
+ *
+ */
+public interface MathConstants {
+ // ===========================================================
+ // Final Fields
+ // ===========================================================
+
+ public static final float DEG2RAD = (float)(Math.PI / 180.0);
+ public static final float RAD2DEG = (float)(180.0 / Math.PI);
+
+ public static final float PI = (float)Math.PI;
+ public static final float PI_2 = PI / 2.0f;
+ public static final float PI_4 = PI / 4.0f;
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+}
diff --git a/konphidroid/src/org/andnav/osm/views/util/constants/OpenStreetMapViewConstants.java b/konphidroid/src/org/andnav/osm/views/util/constants/OpenStreetMapViewConstants.java
new file mode 100644
index 0000000..ce3aeea
--- /dev/null
+++ b/konphidroid/src/org/andnav/osm/views/util/constants/OpenStreetMapViewConstants.java
@@ -0,0 +1,30 @@
+// Created by plusminus on 18:00:24 - 25.09.2008
+package org.andnav.osm.views.util.constants;
+
+/**
+ *
+ * This class contains constants used by the map view.
+ *
+ * @author Nicolas Gramlich
+ *
+ */
+public interface OpenStreetMapViewConstants {
+ // ===========================================================
+ // Final Fields
+ // ===========================================================
+
+ public static final boolean DEBUGMODE = false;
+
+ public static final String DEBUGTAG = "OPENSTREETMAP_VIEW";
+
+ public static final int NOT_SET = Integer.MIN_VALUE;
+
+ public static final int CACHE_MAPTILECOUNT_DEFAULT = 40;
+
+ public static final int MAPTILE_LATITUDE_INDEX = 0;
+ public static final int MAPTILE_LONGITUDE_INDEX = 1;
+
+ // ===========================================================
+ // Methods
+ // ===========================================================
+}
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.