Album has_pic fix, production gems fix
This commit is contained in:
parent
13a233ac72
commit
31a1cb88e2
11
Gemfile
11
Gemfile
|
@ -3,11 +3,6 @@ source 'http://rubygems.org'
|
||||||
gem 'rails', '3.0.9'
|
gem 'rails', '3.0.9'
|
||||||
|
|
||||||
gem 'json'
|
gem 'json'
|
||||||
gem 'sass'
|
|
||||||
gem 'coffee-script'
|
|
||||||
|
|
||||||
gem 'therubyracer', :require => false
|
|
||||||
gem 'barista'
|
|
||||||
|
|
||||||
gem 'awesome_print', :require => 'ap'
|
gem 'awesome_print', :require => 'ap'
|
||||||
gem 'delayed_job'
|
gem 'delayed_job'
|
||||||
|
@ -16,6 +11,12 @@ gem 'musicbrainz-ruby', :git => 'git://github.com/magnolia-fan/musicbrainz-ruby.
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
gem 'sqlite3'
|
gem 'sqlite3'
|
||||||
|
|
||||||
|
gem 'sass'
|
||||||
|
gem 'coffee-script'
|
||||||
|
|
||||||
|
gem 'therubyracer', :require => false
|
||||||
|
gem 'barista'
|
||||||
end
|
end
|
||||||
|
|
||||||
group :production do
|
group :production do
|
||||||
|
|
|
@ -121,6 +121,7 @@ class ImportController < ApplicationController
|
||||||
album.mbid = mb_album['id']
|
album.mbid = mb_album['id']
|
||||||
album.album_type = mb_album['type']
|
album.album_type = mb_album['type']
|
||||||
album.pic_url = album_image
|
album.pic_url = album_image
|
||||||
|
album.has_pic = (album_image != '' and not album_image.nil?)
|
||||||
album.save unless dry_run
|
album.save unless dry_run
|
||||||
ap album if dry_run
|
ap album if dry_run
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
class Artist < ActiveRecord::Base
|
class Artist < ActiveRecord::Base
|
||||||
has_many :albums, :order => '(pic_url!="" AND pic_url IS NOT NULL) DESC, year ASC, id ASC', :dependent => :destroy
|
has_many :albums, :order => 'has_pic DESC, year ASC, id ASC', :dependent => :destroy
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
class AddHasPicToAlbum < ActiveRecord::Migration
|
||||||
|
def self.up
|
||||||
|
add_column :albums, :has_pic, :integer
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.down
|
||||||
|
remove_column :albums, :has_pic
|
||||||
|
end
|
||||||
|
end
|
|
@ -10,7 +10,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended to check this file into your version control system.
|
# It's strongly recommended to check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(:version => 20110630035132) do
|
ActiveRecord::Schema.define(:version => 20110630052149) do
|
||||||
|
|
||||||
create_table "albums", :force => true do |t|
|
create_table "albums", :force => true do |t|
|
||||||
t.string "name"
|
t.string "name"
|
||||||
|
@ -21,6 +21,7 @@ ActiveRecord::Schema.define(:version => 20110630035132) do
|
||||||
t.datetime "updated_at"
|
t.datetime "updated_at"
|
||||||
t.string "album_type"
|
t.string "album_type"
|
||||||
t.string "mbid"
|
t.string "mbid"
|
||||||
|
t.integer "has_pic"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "artists", :force => true do |t|
|
create_table "artists", :force => true do |t|
|
||||||
|
|
Loading…
Reference in New Issue