ongaku_ryoho_server 0.1.1 → 0.2

data/bin/ongaku_ryoho_server

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require_relative '../lib/ongaku_ryoho_server.rb'
+require_relative "../lib/ongaku_ryoho_server.rb"
 
 #
 # Look for some of the Sinatra options and pass them along
@@ -7,16 +7,23 @@ require_relative '../lib/ongaku_ryoho_server.rb'
 options = {}
 
 if ARGV.any?
-  require 'optparse'
+  require "optparse"
   OptionParser.new { |op|
-    op.on('-p port',   'set the port (default is 4567)')            { |val| options[:port] = Integer(val) }
-    op.on('-o addr',   'set the host (default is 0.0.0.0)')         { |val| options[:bind] = val }
-    op.on('-x',        'turn on the mutex lock (default is off)')   {       options[:lock] = true }
+    op.on("-p port",   "set the port (default is 4567)")            { |val| options[:port] = Integer(val) }
+    op.on("-o addr",   "set the host (default is 0.0.0.0)")         { |val| options[:bind] = val }
+    op.on("-x",        "turn on the mutex lock (default is off)")   {       options[:lock] = true }
   }.parse!(ARGV.dup)
 end
 
 
+#
+# Build list
+
+OngakuRyohoServer::List.save
+puts "Collection saved at #{OngakuRyohoServer::List.config_file_path}\n\n"
+
+
 #
 # Run the server
 
-OngakuRyohoServer.run(options)
+OngakuRyohoServer.run(options)

data/lib/ongaku_ryoho_server/application.rb

@@ -1,176 +1,52 @@
-require 'json'
-require 'mp3info'
-require 'sinatra'
-require 'puma'
-require 'uri'
-
 module OngakuRyohoServer
   #
   # { Application }
   #
   # === Info
   #
-  # Sinatra application which basicly takes care of everything
-  # More info inside
+  # Sinatra application to handle the incoming
+  # http requests or whatever
 
   class Application < Sinatra::Base
     set :environment, :production
     set :server, :puma
 
+    FILE_FORMATS = %w{ mp3 mp4 ogg flac wav wma }
 
     # root
-    get '/' do
+    get "/" do
       content_type :json
-      process_this_directory.to_json
+
+      OngakuRyohoServer::List.get
     end
 
 
     # availability
-    get '/available?' do
+    get "/available?" do
       "As it happens, I am."
     end
 
 
     # compare filelists
-    post '/check' do
+    post "/check" do
       content_type :json
-      check_files(params[:file_list]).to_json
+
+      collection = params[:file_list]
+      OngakuRyohoServer::Process.check_files(collection).to_json
     end
 
 
     # music file
-    get %r{.(mp3)$}i do
+    get %r{.(#{FILE_FORMATS.join("|")})$}i do
       requested_item = URI.unescape(request.path_info[1..-1])
       File.exists?(requested_item) ? send_file(requested_item) : 404
     end
 
 
-    # crossdomain.xml
-    get '/crossdomain.xml' do
-      content_type :xml
-      %{<?xml version="1.0"?>
-        <!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
-        <cross-domain-policy>
-           <allow-access-from domain="*" />
-        </cross-domain-policy>
-      }
-    end
-
-
     # everything else
     get %r{.+} do
       403
     end
 
-
-    #
-    # Read directory
-    #
-    # => find music in the current directory
-    #
-    # [output]
-    #   file list
-    #
-    def read_directory
-      Dir.glob('**/*.{mp3}')
-    end
-
-
-    #
-    # Check files
-    #
-    # => compares a given file list to the file list from the current directory
-    #    show which files are missing and scan the ones that are new
-    #
-    # [params]
-    #   file_list_from_client
-    #
-    # [output]
-    #   object containing missing_files and new_tracks array
-    #
-    def check_files(file_list_from_client)
-      file_list_from_client = JSON.parse(file_list_from_client)
-      file_list_from_server = read_directory
-
-      missing_files = file_list_from_client - file_list_from_server
-      new_files = file_list_from_server - file_list_from_client
-
-      new_tracks = process_music(new_files, { last_modified: Time.now })
-
-      return {
-        missing_files: missing_files,
-        new_tracks: new_tracks
-      }
-    end
-
-
-    #
-    # Process this directory
-    #
-    # => read directory and process its contents
-    #
-    # [output]
-    #   processed contents (see method below)
-    #
-    def process_this_directory
-      music_collection = read_directory
-      return process_music(music_collection)
-    end
-
-
-    #
-    # Process music
-    #
-    # => open each music track, get its tags and return all of them
-    #
-    # [params]
-    #   music_collection : array of files to process (i.e. filepaths)
-    #   extra_properties : properties to include in each track object/hash
-    #
-    # [output]
-    #   tracks : collection of all the tracks their tags
-    #
-    def process_music(music_collection, extra_properties = {})
-      tracks = []
-
-      # loop over every track
-      music_collection.each do |location|
-        rpartition = location.rpartition('/')
-        filename   = rpartition[2]
-
-        track = {}
-
-        case File.extname(filename)
-        when '.mp3'
-          Mp3Info.open(location) do |mp3|
-            tags = {
-              title:    mp3.tag.title,
-              artist:   mp3.tag.artist,
-              album:    mp3.tag.album,
-              year:     mp3.tag.year,
-              tracknr:  mp3.tag.tracknum,
-              genres:   mp3.tag.genre_s
-            }
-
-            tags.each do |key, value|
-              tags[key] = 'Unknown' if value.nil? or (value.respond_to?(:empty) and value.empty?)
-            end
-
-            tags.merge!({ filename: filename, location: location })
-
-            track = tags.clone
-          end
-        end
-
-        unless track.empty?
-          track.merge!(extra_properties)
-          tracks << track
-        end
-      end
-
-      # return all tracks
-      return tracks
-    end
-
   end
-end
+end

data/lib/ongaku_ryoho_server/list.rb

@@ -0,0 +1,65 @@
+module OngakuRyohoServer
+  #
+  # { List }
+  #
+  # === Info
+  #
+  # Module for handling the lists,
+  # tracks data saved in json files
+
+  module List
+
+    CONFIG_PATH = File.expand_path("~/.ongaku_ryoho/server")
+
+    #
+    # Get digest
+    #
+    # => Creates a digest from the path of the current directory
+    #
+    def self.get_digest
+      digested_path = Digest::SHA1.hexdigest(Dir.pwd)
+    end
+
+
+    #
+    # Configuration file path
+    #
+    # => Build path to config file
+    #
+    def self.config_file_path
+      "#{CONFIG_PATH}/#{self.get_digest}.json"
+    end
+
+
+    #
+    # Get
+    #
+    # => Get the list for the current directory
+    #
+    def self.get
+      path = self.config_file_path
+      File.open(path, "r") if File.file?(path)
+    end
+
+
+    #
+    # Save
+    #
+    # => Save the list for the current directory
+    #
+    def self.save
+      path = self.config_file_path
+      file_list = OngakuRyohoServer::Process.directory
+      collection = OngakuRyohoServer::Process.files(file_list).to_json
+
+      # make path
+      FileUtils.mkpath(CONFIG_PATH)
+
+      # make file
+      File.open(path, "w") do |f|
+        f.write collection
+      end
+    end
+
+  end
+end

data/lib/ongaku_ryoho_server/process.rb

@@ -0,0 +1,111 @@
+module OngakuRyohoServer
+  #
+  # { Process }
+  #
+  # === Info
+  #
+  # Module for processing the current directory
+  # and music files
+
+  module Process
+
+    #
+    # Read directory
+    #
+    # => find music in the current directory
+    #
+    # [output]
+    #   file list
+    #
+    def self.directory
+      file_formats = OngakuRyohoServer::Application::FILE_FORMATS.join(",")
+      Dir.glob("**/*.{#{file_formats}}")
+    end
+
+
+    #
+    # Check files
+    #
+    # => compares a given file list to the file list from the current directory
+    #    show which files are missing and scan the ones that are new
+    #
+    # [params]
+    #   file_list
+    #
+    # [output]
+    #   object containing missing_files and new_tracks array
+    #
+    def self.check_files(file_list)
+      file_list = JSON.parse(file_list)
+      file_list_from_current_directory = OngakuRyohoServer::Process.directory
+
+      missing_files = file_list - file_list_from_current_directory
+      new_files = file_list_from_current_directory - file_list
+
+      new_tracks = OngakuRyohoServer::Process.files(
+        new_files, { last_modified: Time.now }
+      )
+
+      return {
+        missing_files: missing_files,
+        new_tracks: new_tracks
+      }
+    end
+
+
+    #
+    # Process files
+    #
+    # => open each music track, get its tags and return all of them
+    #
+    # [params]
+    #   file_list : array of files (paths) to process
+    #   extra_properties : properties to include in each track object/hash
+    #
+    # [output]
+    #   tracks list : collection of all the tracks their tags
+    #                 and the extra information
+    #
+    def self.files(file_list, extra_properties = {})
+      tracks = []
+
+      # loop over every track
+      file_list.each do |location|
+        rpartition = location.rpartition("/")
+        filename   = rpartition[2]
+
+        track = {}
+
+        TagLib::FileRef.open(location) do |fileref|
+          tag = fileref.tag
+
+          tags = {
+            title:   tag.title,
+            artist:  tag.artist,
+            album:   tag.album,
+            year:    tag.year,
+            track:   tag.track,
+            genre:   tag.genre
+          }
+
+          tags.each do |key, value|
+            tags[key] = "Unknown" if value.nil? or (value.respond_to?(:empty) and value.empty?)
+          end
+
+          tags.merge!({ filename: filename, location: location })
+
+          track = tags.clone
+        end
+
+        unless track.empty?
+          track.merge!(extra_properties)
+          tracks << track
+        end
+      end
+
+      # return all tracks
+      return tracks
+    end
+
+  end
+end

data/lib/ongaku_ryoho_server/version.rb

@@ -2,5 +2,5 @@ module OngakuRyohoServer
   #
   # { VERSION }
 
-  VERSION = "0.1.1"
+  VERSION = "0.2"
 end

data/lib/ongaku_ryoho_server.rb

@@ -1,10 +1,16 @@
+require "json"
+require "uri"
+require "digest/sha1"
+require "puma"
+require "sinatra"
+require "taglib"
+
 require_relative "ongaku_ryoho_server/version"
+require_relative "ongaku_ryoho_server/process"
+require_relative "ongaku_ryoho_server/list"
 require_relative "ongaku_ryoho_server/application"
 
 module OngakuRyohoServer
-  #
-  # { Class methods }
-
   def self.run(options)
     OngakuRyohoServer::Application.run!(options)
   end

data/ongaku_ryoho_server.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = OngakuRyohoServer::VERSION
 
-  gem.add_dependency 'json', '~> 1.6.6'
-  gem.add_dependency 'ruby-mp3info', '~> 0.7.1'
-  gem.add_dependency 'sinatra', '~> 1.3.2'
+  gem.add_dependency 'json', '~> 1.7.5'
+  gem.add_dependency 'taglib-ruby', '~> 0.5.2'
+  gem.add_dependency 'sinatra', '~> 1.3.3'
   gem.add_dependency 'puma'
 
   gem.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ongaku_ryoho_server
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,44 +9,59 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-21 00:00:00.000000000Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70247102081420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: 1.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *70247102081420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.5
 - !ruby/object:Gem::Dependency
-  name: ruby-mp3info
-  requirement: &70247102080920 !ruby/object:Gem::Requirement
+  name: taglib-ruby
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70247102080920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70247102080460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70247102080460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: puma
-  requirement: &70247102080080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247102080080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70247102079620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247102079620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Serves music to Ongaku Ryoho clients
 email:
 - icid.asset@gmail.com
@@ -82,6 +107,8 @@ files:
 - bin/ongaku_ryoho_server
 - lib/ongaku_ryoho_server.rb
 - lib/ongaku_ryoho_server/application.rb
+- lib/ongaku_ryoho_server/list.rb
+- lib/ongaku_ryoho_server/process.rb
 - lib/ongaku_ryoho_server/version.rb
 - ongaku_ryoho_server.gemspec
 homepage: https://github.com/icidasset/ongaku_ryoho_server
@@ -96,15 +123,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 819011088545897320
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 819011088545897320
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Serves music to Ongaku Ryoho clients