shroom 0.0.3 → 0.0.4

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'shroom'
-  s.version = '0.0.3'
+  s.version = '0.0.4'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Shroom is a music player and organizer'

data/lib/sh_album.rb

@@ -0,0 +1,20 @@
+module Sh
+  class Album
+    attr_writer :artist
+    attr_accessor :title, :mbid, :image_path, :info, :date
+    attr_accessor :db_id
+
+    def initialize
+      @songs = []
+    end
+
+    def artist
+      #@artist = $db.artists(:id => @artist.db_id).first if @artist and @artist.db_id
+      return @artist
+    end
+
+    def to_s
+      return self.title
+    end
+  end
+end

data/lib/sh_artist.rb

@@ -0,0 +1,14 @@
+module Sh
+  class Artist
+    attr_accessor :name, :mbid, :image_path, :info
+    attr_accessor :db_id
+
+    def initialize
+      @albums = []
+    end
+
+    def to_s
+      return self.name
+    end
+  end
+end

data/lib/sh_browse.rb

@@ -9,13 +9,14 @@ module Sh
       col_artist.set_cell_data_func(ren_artist) do |tvc, cell, model, iter|
         cell.text = ''
         data = iter[0]
-        cell.text = data if data.is_a? String
         if data.is_a? Sh::Song
           if data.title
             cell.text = sprintf("%.2d\t%s", data.track_num, data.title)
           else
             cell.text = data.path.split('/').last
           end
+        else
+          cell.text = data.to_s
         end
       end
       @tree.append_column col_artist
@@ -104,8 +105,8 @@ module Sh
     def fill_model
       artist_node = album_node = track_node = nil
       $db.songs.sort_by {|a| a.to_s}.each do |song|
-        artist = song.artist || '!Unknown Artist!'
-        if not artist_node or artist_node[0] != artist
+        artist = song.artist
+        if not artist_node or artist_node[0].db_id != artist.db_id
           artist_node = @model.append nil
           artist_node[0] = artist
           # Required for proper handling of multiple artists with on album
@@ -113,9 +114,9 @@ module Sh
         end
         artist_node[1] ||= []
         artist_node[1] << song
-        
-        album = song.album || '!Unknown Album!'
-        if not album_node or album_node[0] != album
+
+        album = song.album
+        if not album_node or album_node[0].db_id != album.db_id
           album_node = @model.append artist_node
           album_node[0] = album
         end

data/lib/sh_cover_art.rb

@@ -6,7 +6,7 @@ module Sh
   class CoverArt
     def CoverArt.get_cover song
       if $prefs[:cover_art]
-        artist, album = song.artist, song.album
+        artist, album = song.artist.name, song.album.title
         path = "#{$cover_dir}/#{artist} - #{album}"
         return path if File.exists? path
         doc = lastfm("album.getInfo", {:artist => artist, :album => album})

data/lib/sh_database.rb

@@ -1,59 +1,150 @@
 require 'rubygems'
 require 'sequel'
 require 'sh_song'
+require 'sh_album'
+require 'sh_artist'
 
 module Sh
   class Database
     def initialize
       @db = Sequel.sqlite("#{$config_dir}/songs.db")
 
+      @db.create_table :artists do
+        primary_key :id
+        String :mbid
+        String :name
+        String :image_path
+        String :info
+      end unless @db.table_exists? :artists
+
+      @db.create_table :albums do
+        primary_key :id
+        String :mbid
+        String :title
+        String :image_path
+        String :info
+        String :date
+      end unless @db.table_exists? :albums
+
       @db.create_table :songs do
         primary_key :id
+        String :mbid
         String :path
         String :title
         String :lyrics
-        String :image
-        String :year
-        String :album
-        String :artist
+        String :image_path
         String :track_num
+        foreign_key :album_id, :albums
+        foreign_key :artist_id, :artists
       end unless @db.table_exists? :songs
     end
 
     def save_song song
-      hash = {
+      # Get artist info
+      artist = song.artist
+      artist_hash = {
+        :mbid => artist.mbid,
+        :name => artist.name,
+        :image_path => artist.image_path,
+        :info => artist.info
+      }
+
+      # Insert/update artist in database
+      artist_id = nil
+      row_artist = @db[:artists][:name => artist.name]
+      if row_artist
+        artist_hash.each do |k, v|
+          if artist_hash[k] != v
+            @db[:artists].filter(:name => artist.name).update(k => v)
+          end
+        end
+        artist_id = row_artist[:id]
+      else
+        artist_id = @db[:artists].insert(artist_hash)
+      end
+      artist.db_id = artist_id
+
+      # Get album info
+      album = song.album
+      album_hash = {
+        :mbid => album.mbid,
+        :title => album.title,
+        :image_path => album.image_path,
+        :date => album.date,
+        :info => album.info,
+      }
+
+      # Insert/update artist in database
+      album_id = nil
+      row_album = @db[:albums][:title => album.title]
+      if row_album
+        album_hash.each do |k, v|
+          if album_hash[k] != v
+            @db[:albums].filter(:title => album.title).update(k => v)
+          end
+        end
+        album_id = row_album[:id]
+      else
+        album_id = @db[:albums].insert(album_hash)
+      end
+      album.db_id = album_id
+
+      song_hash = {
         :path => song.path,
+        :mbid => song.mbid,
         :title => song.title,
         :lyrics => song.lyrics,
-        :image => song.image,
-        :year => song.year,
-        :album => song.album,
-        :artist => song.artist,
-        :track_num => song.track_num
+        :track_num => song.track_num,
+        :album_id => album_id,
+        :artist_id => artist_id
       }
 
       song_id = nil
       row_song = @db[:songs][:path => song.path]
       if row_song
-        hash.each do |k, v|
+        song_hash.each do |k, v|
           if row_song[k] != v
             @db[:songs].filter(:path => song.path).update(k => v)
           end
         end
         song_id = row_song[:id]
       else
-        # Create row in db for song
-        song_id = @db[:songs].insert(hash)
-        # Retrieve row to return
+        song_id = @db[:songs].insert(song_hash)
         row_song = @db[:songs][:id => song_id]
       end
+      song.db_id = song_id
 
       return row_song
     end
 
-    def songs
+    def artists(params={})
+      artists = []
+      params ||= {}
+      rows = @db[:artists]
+      rows = rows.filter(params) unless params == {}
+      rows.each do |hash|
+        artists << hash_to_artist(hash)
+      end
+      return artists
+    end
+
+    def albums(params={})
+      albums = []
+      params ||= {}
+      rows = @db[:albums]
+      rows = rows.filter(params) unless params == {}
+      rows.each do |hash|
+        albums << hash_to_album(hash)
+      end
+      return albums
+    end
+
+    def songs(params={})
       songs = []
-      @db[:songs].each do |hash|
+      params ||= {}
+      rows = @db[:songs]
+      rows = rows.filter(params) unless params == {}
+      rows.each do |hash|
         songs << hash_to_song(hash)
       end
       return songs
@@ -80,7 +171,32 @@ module Sh
         assign = (k.to_s + '=').to_sym
         song.send assign, v if song.respond_to? assign
       end
+      song.db_id = hash[:id]
+      song.album = hash_to_album(@db[:albums][:id => hash[:album_id]])
+      song.artist = hash_to_artist(@db[:artists][:id => hash[:artist_id]])
       return song
     end
+
+    def hash_to_album hash
+      album = Sh::Album.new
+      return album unless hash
+      hash.each do |k, v|
+        assign = (k.to_s + '=').to_sym
+        album.send assign, v if album.respond_to? assign
+      end
+      album.db_id = hash[:id]
+      return album
+    end
+
+    def hash_to_artist hash
+      artist = Sh::Artist.new
+      return artist unless hash
+      hash.each do |k, v|
+        assign = (k.to_s + '=').to_sym
+        artist.send assign, v if artist.respond_to? assign
+      end
+      artist.db_id = hash[:id]
+      return artist
+    end
   end
 end

data/lib/sh_lyrics.rb

@@ -5,7 +5,7 @@ require 'cgi'
 module Sh
   class Lyrics
     def Lyrics.get_lyrics song
-      artist, title = song.artist, song.title
+      artist, title = song.artist.name, song.title
       return "" unless artist and title
       LyricsWiki.get_lyrics(artist, title)
     end

data/lib/sh_player.rb

@@ -90,9 +90,9 @@ module Sh
         @@scrobble_queue << Scrobbler::Scrobble.new(
           :session_id => auth.session_id,
           :submission_url => auth.submission_url,
-          :artist => song.artist,
+          :artist => song.artist.name,
           :track => song.title,
-          :album => song.album,
+          :album => song.album.title,
           :time => Time.new,
           :length => duration,
           :track_number => song.track_num)

data/lib/sh_queue.rb

@@ -0,0 +1,51 @@
+module Sh
+  class Queue
+    def initialize view
+      @view = view
+      sw = ScrolledWindow.new(nil, nil)
+      @widget = sw
+      sw.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
+      @sto_tabs = ListStore.new(String, Song)
+      lst_tabs = TreeView.new @sto_tabs
+      renderer = CellRendererText.new
+      column = TreeViewColumn.new('Artist',
+        renderer,
+        'text' => 0)
+      lst_tabs.append_column column
+      renderer = CellRendererText.new
+      column = TreeViewColumn.new('Songs', renderer)
+      column.set_cell_data_func(renderer) do |tvc, cell, model, iter|
+        cell.text = ''
+        data = iter[1]
+        if data.title
+          cell.text = sprintf("%.2d\t%s", data.track_num, data.title)
+        else
+          cell.text = data.path.split('/').last
+        end
+      end
+      lst_tabs.append_column column
+      sw.add lst_tabs
+
+      lst_tabs.signal_connect('row_activated') do |widget, path, col|
+        iter = lst_tabs.model.get_iter(path)
+        song = iter[1]
+        view.stop
+        view.queue_pos = path.indices.first
+        view.play
+      end
+    end
+
+    def update
+      @sto_tabs.clear
+      @view.queue.each do |song|
+        iter = @sto_tabs.append
+        iter[0] = song.artist.name
+        iter[1] = song
+      end if @view.queue
+    end
+
+    def widget
+      return @widget
+    end
+  end
+end

data/lib/sh_song.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
 require 'sh_tagreader'
+require 'sh_album'
+require 'sh_artist'
 require 'earworm'
 require 'rbrainz'
 include MusicBrainz
@@ -7,17 +9,30 @@ include MusicBrainz
 module Sh
   class Song
     attr_reader :path, :mime, :matches
-    attr_accessor :title, :artist, :album, :image, :lyrics, :track_num, :year
+    attr_writer :album, :artist
+    attr_accessor :title, :mbid, :lyrics, :track_num
+    attr_accessor :db_id
 
     def initialize path
       @path = File.expand_path path
+      self.artist = Sh::Artist.new
+      self.album = Sh::Album.new
+    end
+
+    def album
+      #@album = $db.albums(:id => @album.db_id).first if @album and @album.db_id
+      return @album
+    end
+
+    def artist
+      #@artist = $db.artists(:id => @artist.db_id).first if @artist and @artist.db_id
+      return @artist
     end
 
     def duration
       @duration ||= Sh::TagReader.read(path)[:duration]
     end
 
-
     def lookup!
       track = lookup_multiple.first
       if track
@@ -25,14 +40,14 @@ module Sh
         track.artist.disambiguation = false
         # Pull data from response
         self.title = track.title
-        self.artist = track.artist.to_s
-        artistid = track.artist.id.to_mbid.uuid
+        artist.name = track.artist.to_s
+        artist.mbid = track.artist.id.to_mbid.uuid
         rel = track.releases.to_a.first
-        self.album = rel.title
-        releaseid = rel.id.to_mbid.uuid
+        album.title = rel.title
+        album.mbid = rel.id.to_mbid.uuid
         # Determine track number
         query = Webservice::Query.new
-        filter = Webservice::TrackFilter.new(:artistid => artistid, :releaseid => releaseid)
+        filter = Webservice::TrackFilter.new(:artistid => artist.mbid, :releaseid => album.mbid)
         tracks = query.get_tracks(filter).entities
         tracks.to_a.each_with_index do |t, i|
           self.track_num = i + 1 if t.title == track.title and t.duration == track.duration
@@ -52,12 +67,12 @@ module Sh
       end
       puids = info.puid_list
       self.title = info.title
-      self.artist = info.artist_name
+      self.artist.name = info.artist_name
       # Return if no matches are found
-      return if not title or not artist
+      return if not title or not artist.name
       # Get more information from MusicBrainz
       query = Webservice::Query.new
-      filter = Webservice::TrackFilter.new(:artist => artist, :title => title, :puid => puids.first)
+      filter = Webservice::TrackFilter.new(:artist => artist.name, :title => title, :puid => puids.first)
       tracks = query.get_tracks(filter).entities
       @matches = tracks || []
     end
@@ -67,16 +82,16 @@ module Sh
       Sh::TagReader.read(path) do |data|
         if overwrite
           @title = data[:title]
-          @artist = data[:artist]
-          @album = data[:album]
-          @year = data[:year]
+          artist.name = data[:artist]
+          album.title = data[:album]
+          album.date = data[:year]
           @track_num = data[:track_num]
           @duration = data[:duration]
         else
           @title ||= data[:title]
-          @artist ||= data[:artist]
-          @album ||= data[:album]
-          @year ||= data[:year]
+          artist.name ||= data[:artist]
+          album.title ||= data[:album]
+          album.date ||= data[:year]
           @track_num ||= data[:track_num]
           @duration ||= data[:duration]
         end
@@ -92,10 +107,10 @@ module Sh
       t = title
       t = "Unknown" if not t or t.is_binary_data?
       t.gsub!("<", "&lt;")
-      ar = artist
+      ar = artist.name
       ar = "Unknown" if not ar or ar.is_binary_data?
       ar.gsub!("<", "&lt;")
-      al = album
+      al = album.title
       al = "Unknown" if not al or al.is_binary_data?
       al.gsub!("<", "&lt;")
       return "<b>#{t}</b> by <i>#{ar}</i> from <i>#{al}</i>".gsub("&", "&amp;")

data/lib/sh_util.rb

@@ -37,7 +37,7 @@ module Kelp
     end
 
     def message=(msg)
-      @lbl_message.set_markup(msg)
+      @lbl_message.text = msg
     end
 
     def message

data/lib/sh_view.rb

@@ -1,4 +1,5 @@
 require 'sh_browse'
+require 'sh_queue'
 require 'sh_lyrics'
 require 'sh_cover_art'
 require 'libglade2'
@@ -198,7 +199,7 @@ module Sh
       event_box = EventBox.new
       event_box.add @img_cover
       event_box.signal_connect("button-press-event") do |w, event|
-        Kelp::ImageDialog.new(@pixbuf, @player.song.album).show if @pixbuf and @player
+        Kelp::ImageDialog.new(@pixbuf, @player.song.album.title).show if @pixbuf and @player
       end
       @img_cover.height_request = 150
       sidebar.pack_start event_box, false, false, 0
@@ -210,11 +211,13 @@ module Sh
       scr_lyrics.add @txt_lyrics
       # Browse area
       browse = Sh::Browse.new self
+      queue = Sh::Queue.new self
       lst_tabs.selection.signal_connect('changed') do |selection|
         frm_content.remove frm_content.child if frm_content.child
         case selection.selected.path.indices[0]
         when TAB_QUEUE
-          frm_content.child = Label.new 'Queue'
+          frm_content.child = queue.widget
+          queue.update
         when TAB_BROWSE
           frm_content.child = browse.widget
         when TAB_LYRICS
@@ -337,25 +340,25 @@ module Sh
         @note = nil
         if @rnotify
           # Prepare notification
-          msg = "by <i>#{song.artist}</i> from <i>#{song.album}</i>"
+          msg = "by <i>#{song.artist.name}</i> from <i>#{song.album.title}</i>"
           @note = Notify::Notification.new(song.title || 'Unknown track', msg, nil, @status_icon)
         end
         # Cover art
         if $prefs[:cover_art]
           @pixbuf = nil
-          (@pixbuf = Gdk::Pixbuf.new(song.image)) rescue Exception
+          (@pixbuf = Gdk::Pixbuf.new(song.album.image_path)) rescue Exception
           if @pixbuf
             @note.pixbuf_icon = @pixbuf.scale(48, 48) if @rnotify
             @img_cover.pixbuf = @pixbuf.scale(132, 132)
           else
             @img_cover.pixbuf = nil
             Thread.new do
-              song.image = Sh::CoverArt.get_cover(song)
+              song.album.image_path = Sh::CoverArt.get_cover(song)
               $db.save_song song
               # Show cover unless requests have been shuffled
               if song == @player.song
                 @pixbuf = nil
-                (@pixbuf = Gdk::Pixbuf.new(song.image)) rescue Exception
+                (@pixbuf = Gdk::Pixbuf.new(song.album.image_path)) rescue Exception
                 if @pixbuf
                   if @rnotify
                     @note.close
@@ -391,6 +394,10 @@ module Sh
     end
 
     public
+    def queue
+      return @queue
+    end
+
     def queue=(queue)
       @queue_pos = 0
       @queue = queue

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shroom
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Aiden Nibali
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-23 00:00:00 +10:00
+date: 2009-07-26 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,7 +129,10 @@ files:
 - lib/sh_global.rb
 - lib/sh_browse.rb
 - lib/sh_main.rb
+- lib/sh_queue.rb
+- lib/sh_album.rb
 - lib/sh_song.rb
+- lib/sh_artist.rb
 - lib/sh_cover_art.rb
 - lib/sh_tagreader.rb
 - lib/sh_lyrics.rb