lib/rack/musicindex.rb in rack-musicindex-0.0.2 vs lib/rack/musicindex.rb in rack-musicindex-0.1.0

@@ -1,6 +1,8 @@
 require 'builder'
+require 'id3lib'
+require 'kconv'
 
 module Rack
   class MusicIndex
     def initialize(app, options = {})
       @app = app
@@ -11,41 +13,52 @@
     def init(options)
       @dirs = options
     end
 
     def call(env)
-      status, headers, response = @app.call(env)
-
       path_info = env['PATH_INFO']
 
       update_files
 
       if dirs[path_info]
-        headers['Content-Type'] = 'application/xml;charset=utf-8'
-        body = podcast(env)
-        headers["Content-Length"] = body.length.to_s
-        response = [body]
-        status = 200
+        serve_podcast(env)
       elsif static_paths.include?(path_info)
-        body = open(static_paths[path_info], 'rb').read
-        headers["Content-Type"] = 'audio/mpeg'
-        headers["Content-Length"] = body.length.to_s
-        response = [body]
-        status = 200
+        serve_mp3(env)
+      else
+        status, headers, response = @app.call(env)
       end
-
-      [status, headers, response]
     end
 
     private
 
+    def serve_podcast(env)
+      status, headers, response = @app.call(env)
+
+      body = podcast(env)
+      headers['Content-Type'] = 'application/xml;charset=utf-8'
+      headers["Content-Length"] = body.bytesize.to_s
+
+      [200, headers, [body]]
+    end
+
+    def serve_mp3(env)
+      status, headers, response = @app.call(env)
+      path_info = env['PATH_INFO']
+
+      body = open(static_paths[path_info], 'rb').read
+      headers["Content-Type"] = 'audio/mpeg'
+      headers["Content-Length"] = body.bytesize.to_s
+
+      [200, headers, [body]]
+    end
+
     def dirs
       @dirs
     end
 
-    def files(media_dir)
-      @files[media_dir]
+    def files(path)
+      @files[path]
     end
 
     def static_paths
       @static_paths
     end
@@ -60,10 +73,33 @@
           @static_paths[path + '/' + ::File.basename(filename)] = filename
         end
       end
     end
 
+    def id3(filename)
+      value = {}
+      tag = ID3Lib::Tag.new(filename)
+      {
+        :TIT2 => :name,
+        :TPE1 => :artist,
+      }.each do |id, key|
+        frame = tag.frame(id)
+
+        if frame
+          if frame[:textenc] == 1
+            v = Kconv.kconv(frame[:text] , Kconv::UTF8, Kconv::UTF16)
+          else
+            v = frame[:text]
+          end
+        end
+
+        value[key] = v
+      end
+
+      value
+    end
+
     def podcast(env)
       path  = env['PATH_INFO']
       req   = Rack::Request.new(env)
       url   = req.url
       files = files(path)
@@ -75,17 +111,26 @@
           xml.title path
           xml.description 'Generated by Rack::MusicIndex'
           xml.link url
 
           files.each do |file|
+            tag = id3(file)
+            author = tag[:artist]
             name = ::File.basename(file)
             item_link = url + '/' + name
+
             xml.item do
-              xml.title name
+              xml.title tag[:name] || name
               xml.description name
               xml.link item_link
               xml.guid item_link
               xml.enclosure :url => item_link
+
+              if author
+                xml.author author
+                xml.itunes :author, author
+                xml.itunes :summary, author
+              end
             end
           end
         end
       end
     end