hypembot 0.0.1 → 0.0.2

data/README.md

@@ -20,5 +20,5 @@ Works on Mac OSX Lion. Uses kqueue by default.
 
 ## Copyright
 
-`hypembot` is Copyright (c) 2011 [Kirk Scheibelhut](http://scheibo.com/about) and distributed under the MIT license.<br />
+`hypembot` is Copyright (c) 2012 [Kirk Scheibelhut](http://scheibo.com/about) and distributed under the MIT license.<br />
 See the `LICENSE` file for further details regarding licensing and distribution.

data/lib/hypembot/version.rb

@@ -1,3 +1,3 @@
 module Hypembot
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/hypembot.rb

@@ -17,7 +17,7 @@ class Hypembot::Bot
                                :scanner => :em,
                                :pre_load => true,
                                :glob => 'f_*',
-                               :stable => 30,
+                               :stable => 18,
                                :interval => 10)
   end
 
@@ -51,10 +51,12 @@ class Hypembot::Bot
   end
 
   def process(file, mp3)
-    info = {}
-    info[:title] = mp3.tag.title.strip.empty? ? "Untitled" : mp3.tag.title.strip
-    info[:artist] = mp3.tag.artist.strip
-    info[:album] = mp3.tag.album.strip
+    info = Hash.new("")
+    if mp3.tag
+      info[:title] = clean(mp3.tag.title).empty? ? "Untitled" : clean(mp3.tag.title)
+      info[:artist] = clean(mp3.tag.artist).empty? ? "Unknown Artist" : clean(mp3.tag.artist)
+      info[:album] = clean(mp3.tag.album)
+    end
     info[:length] = format_time(mp3.length)
     info[:bitrate] = "#{mp3.bitrate} kbps" + (mp3.vbr ? "" : " (VBR)")
 
@@ -63,14 +65,9 @@ class Hypembot::Bot
   end
 
   def growl(info)
-    message = ""
-    if !info[:artist].empty? and !info[:album].empty?
-      message << "#{info[:artist]}\n#{info[:album]}\n"
-    elsif info[:album].empty?
-      message << "#{info[:artist]}\n"
-    # if we have album but no artist, don't show anything
-    end
-    message << "(#{info[:length]}) - #{info[:bitrate]}"
+    message = "#{info[:artist]}"
+    message << "- #{info[:album]}" unless info[:album].empty?
+    message << "\n(#{info[:length]}) - #{info[:bitrate]}"
 
     Growl.notify do |n|
       n.title = info[:title]
@@ -78,6 +75,10 @@ class Hypembot::Bot
     end
   end
 
+  def clean(tag)
+    tag ? tag.strip : ""
+  end
+
   def format_time(s)
     mins = s.to_i / 60
     secs = s.to_i % 60
@@ -87,6 +88,8 @@ class Hypembot::Bot
   def filename(info)
     title = info[:title].split.join("_")
     artist = info[:artist].split.join("_")
-    File.expand_path("#{title}-#{artist}.mp3", @dir)
+    name = "#{title}-#{artist}"
+    name << "-#{Time.now.to_i}" if title == "Untitled" and artist == "Unknown_Artist"
+    File.expand_path("#{name}.mp3", @dir)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hypembot
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-22 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: directory_watcher
-  requirement: &70255151078220 !ruby/object:Gem::Requirement
+  requirement: &70280120056800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70255151078220
+  version_requirements: *70280120056800
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70255151077800 !ruby/object:Gem::Requirement
+  requirement: &70280120056380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70255151077800
+  version_requirements: *70280120056380
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70255151077380 !ruby/object:Gem::Requirement
+  requirement: &70280120055960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70255151077380
+  version_requirements: *70280120055960
 - !ruby/object:Gem::Dependency
   name: mp3info
-  requirement: &70255151076960 !ruby/object:Gem::Requirement
+  requirement: &70280120055540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70255151076960
+  version_requirements: *70280120055540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70255151076540 !ruby/object:Gem::Requirement
+  requirement: &70280120055120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255151076540
+  version_requirements: *70280120055120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70255151076040 !ruby/object:Gem::Requirement
+  requirement: &70280120054620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70255151076040
+  version_requirements: *70280120054620
 description: Play music while browsing - have it appear in your Music folder.
 email:
 - kjs@scheibo.com