paradiso 0.3.1 → 0.4.0

data/README.rdoc

@@ -20,6 +20,12 @@ To play a playlist and remove the items that has been already played
 
   paradiso -pd playlist
   
+== RAR-archives
+
+It's possible to stream rar-archives, it works exactly like other parameters, but will remove "duplicates", i.e. if there's a filename.rar, filename.r00 and filename.r01 then we'll just keep the first occurrence.
+
+Note: There seems to be a problem with the unrar installed from the package manager port[http://www.macports.org/] for Mac OS X, but everything seems to work fine for the version installed through homebrew[http://github.com/mxcl/homebrew].
+  
 == Config file
 
 Paradiso has some basic support for a config file 
@@ -30,10 +36,23 @@ Sample config file, in YAML
 
   fullscreen : true
   aspectratio : "16:10"
+  
+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
+
+Same goes for unrar:
+  
+  unrar: /usr/local/bin/unrar
+
+Ignore file endings:
+
+  ignore_endings: ["nfo", "sfv", "txt"] # default
+  ignore_endings: ["avi"]
 
 == TODO
 
-* Handling rar-archives
 * Better playlist support
 * Other mediums then just avi et al(DVD, Bluray and so on)
 * Handle meta-data

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/paradiso/base.rb

@@ -13,17 +13,26 @@ module Paradiso
       @pid = nil
       @amount_played = 0
 
+      if args.empty?
+        puts "Error: needs atleast one argument"
+        exit 1
+      end
+
       if @options[:playlist] and not @options[:path]
         args.each do |pl|
           unless File.exist? pl
             puts "Warning: playlist %s does not exist" % [pl]
             next
           end
-          
-          @playlist << Playlist.create_from_file(pl)
+
+          begin
+            @playlist << Playlist.create_from_file(pl, @options[:ignore_endings])
+          rescue ArgumentError => e
+            puts "Warning: #{e}"
+          end
         end
       else
-        @playlist << Playlist.new(args, @options[:path])
+        @playlist << Playlist.new(args, @options[:path], @options[:ignore_endings])
       end
     end
     
@@ -36,12 +45,12 @@ module Paradiso
       puts "Exiting..."
     ensure
       @playlist.each do |pl|
-        if @options[:delete] and pl.empty?
-          pl.delete
-        end
-
-        if ((@options[:path] or @options[:delete]) and @options[:playlist]) and not pl.empty?
-          pl.create @options[:delete]
+        if (@options[:path] or @options[:delete]) and @options[:playlist]
+          if pl.started? and not pl.empty?
+            pl.create @options[:delete]
+          elsif pl.empty?
+            pl.delete
+          end
         end
       end
     end
@@ -73,8 +82,11 @@ module Paradiso
         end
 
         puts "Playing #{item}"
-
-        cmd = "mplayer #{options_str} \"#{item}\""
+        
+        play_command = player item
+        item = "-" if item =~ /(rar|r\d{2})$/
+        
+        cmd = "#{play_command} #{options_str} \"#{item}\""
         POpen4::popen4(cmd) do |stdout, stderr, stdin, pid|
           @pid = pid
         end
@@ -82,6 +94,11 @@ module Paradiso
       
       true
     end
+    
+    def player file
+      return @options[:player] unless file =~ /(rar|r\d{2})$/
+      return "#{@options[:unrar]} p -inul #{file} | #{@options[:player]}"
+    end
   end
 end
 

data/lib/paradiso/playlist.rb

@@ -11,18 +11,22 @@ module Paradiso
     include Enumerable
 
     class << self
-      def create_from_file file
+      def create_from_file file, ignore_endings=[]
         items = []
         
         f = File.open(file, 'r').each_line do |line|
           items << line.sub(/[\r\n]+/, '')
         end
         
-        new items, file
+        if items.empty?
+          raise ArgumentError, "no files in playlist #{file}"
+        end
+        
+        new items, file, ignore_endings=[]
       end
     end
     
-    def initialize files, path=nil
+    def initialize files, path=nil, ignore_endings=[]
       @files = []
       @path = path
       @current_idx = -1
@@ -30,9 +34,24 @@ module Paradiso
       files.each do |file|
         begin 
           tmp = []
+          rars = []
           
           Find.find(file) do |f|
-            tmp << File.expand_path(f) unless File.directory? f
+            next if File.directory? f
+            next if ignore_endings.include? f.split('.')[-1]
+            
+            if f =~ /(rar|r\d{2})$/
+              rar = File.expand_path(f).dup
+              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)  
+            end
           end
           
           @files += tmp.sort
@@ -55,7 +74,7 @@ module Paradiso
     end
 
     def create delete=false 
-      sp = delete ? start_point : 0
+      sp = delete ? @current_idx : 0
       
       File.open(@path, 'w') do |f|
         @files[sp..-1].each { |line| f.puts line }
@@ -68,24 +87,17 @@ module Paradiso
     
     def each
       @files.each_index do |idx| 
-        yield @files[idx]
         @current_idx = idx
+        yield @files[idx]
       end
     end
     
     def empty?
-      start_point >= @files.size
+      @current_idx >= @files.size
     end
     
-    private 
-    
-    def start_point
-      # can this be made in a nicer way?
-      case @current_idx
-        when -1 then 0
-        when 0 then 1
-        else @current_idx + 1
-      end
+    def started?
+      @current_idx > -1
     end
   end
 end

data/lib/paradiso.rb

@@ -21,6 +21,10 @@ module Paradiso
     :amount => nil,
     :path => nil,
     :aspectratio => '16:9',
+    :player => 'mplayer',
+    :unrar => 'unrar',
+    :archive => false,
+    :ignore_endings => ['nfo', 'sfv', 'txt']
   }
   
   class << self

data/paradiso.gemspec

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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Victor Bergoo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 +02:00
+date: 2010-10-31 00:00:00 +02:00
 default_executable: paradiso
 dependencies: 
 - !ruby/object:Gem::Dependency