paradiso 0.4.0 → 0.4.1

data/README.rdoc

@@ -41,6 +41,7 @@ It's also possible to tell where mplayer is located or specify another name
 of mplayer by adding this to the config file:
 
   player: /usr/local/bin/mplayer
+  player: mplayer32
 
 Same goes for unrar:
   
@@ -51,6 +52,10 @@ Ignore file endings:
   ignore_endings: ["nfo", "sfv", "txt"] # default
   ignore_endings: ["avi"]
 
+Show a timestamp for each started item:
+  
+  timestamp: true # defaults to false
+
 == TODO
 
 * Better playlist support

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/paradiso/base.rb

@@ -32,6 +32,7 @@ module Paradiso
           end
         end
       else
+        raise ArgumentError.new "the playlist '#{@options[:path]}' does already exists" if File.exists? @options[:path]
         @playlist << Playlist.new(args, @options[:path], @options[:ignore_endings])
       end
     end
@@ -81,7 +82,7 @@ module Paradiso
           @amount_played += 1
         end
 
-        puts "Playing #{item}"
+        puts "#{timestamp}Playing #{item}"
         
         play_command = player item
         item = "-" if item =~ /(rar|r\d{2})$/
@@ -99,6 +100,11 @@ module Paradiso
       return @options[:player] unless file =~ /(rar|r\d{2})$/
       return "#{@options[:unrar]} p -inul #{file} | #{@options[:player]}"
     end
+    
+    def timestamp
+      return "" unless @options[:timestamp]
+      Time.now.strftime("%Y-%m-%d %H:%M - ")
+    end
   end
 end
 

data/lib/paradiso/playlist.rb

@@ -22,7 +22,7 @@ module Paradiso
           raise ArgumentError, "no files in playlist #{file}"
         end
         
-        new items, file, ignore_endings=[]
+        new items, file, ignore_endings
       end
     end
     
@@ -30,6 +30,7 @@ module Paradiso
       @files = []
       @path = path
       @current_idx = -1
+      @done = false
             
       files.each do |file|
         begin 
@@ -45,13 +46,11 @@ module Paradiso
               rar.gsub! /r\d{2}$/i, "rar"
               rar.gsub! /part\d{2}/i, ""
               
-              unless rars.include? rar
-                rars << rar
-                tmp << File.expand_path(f)
-              end
-            else 
-              tmp << File.expand_path(f)  
+              next if rars.include? rar
+              rars << rar
             end
+            
+            tmp << File.expand_path(f)
           end
           
           @files += tmp.sort
@@ -86,14 +85,16 @@ module Paradiso
     end
     
     def each
-      @files.each_index do |idx| 
+      @files.each_with_index do |file, idx| 
         @current_idx = idx
-        yield @files[idx]
+        yield file
       end
+      
+      @done = true
     end
     
     def empty?
-      @current_idx >= @files.size
+      @done
     end
     
     def started?

data/lib/paradiso.rb

@@ -24,7 +24,8 @@ module Paradiso
     :player => 'mplayer',
     :unrar => 'unrar',
     :archive => false,
-    :ignore_endings => ['nfo', 'sfv', 'txt']
+    :ignore_endings => ['nfo', 'sfv', 'txt'],
+    :timestamp => false,
   }
   
   class << self
@@ -34,6 +35,9 @@ module Paradiso
       
       para = Paradiso.new options, args
       para.run
+    rescue ArgumentError => e
+      puts "Error: #{e}"
+      exit 1
     end
     
     def config_file 
@@ -42,9 +46,7 @@ module Paradiso
       config_file = File.expand_path('~/.paradiso')
       if File.exist? config_file
         yaml = YAML::load(File.open(config_file, 'r').read())
-        yaml.each_pair do |key, value|
-          options[key.to_sym] = value
-        end
+        yaml.inject(options) { |memo, o| memo[o.first.to_sym] = o.last; memo }
       end
 
       return options

data/paradiso.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{paradiso}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Bergoo"]
-  s.date = %q{2010-10-31}
+  s.date = %q{2011-02-26}
   s.default_executable = %q{paradiso}
   s.description = %q{A simplified mplayer command line interface}
   s.email = %q{victor.bergoo@gmail.com}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Victor Bergoo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 +02:00
+date: 2011-02-26 00:00:00 +01:00
 default_executable: paradiso
 dependencies: 
 - !ruby/object:Gem::Dependency