paradiso 0.1.5 → 0.3.0

data/.gitignore

@@ -0,0 +1 @@
+pkg/*

data/README.rdoc

@@ -0,0 +1,46 @@
+= Paradiso
+
+A small lightweight command line interface for mplayer.
+
+== Install
+
+  sudo gem install paradiso
+
+== Usage
+
+To play files
+
+  paradiso file1 file2
+
+To create a playlist
+
+  paradiso -pn playlist file1 file2 dir1
+  
+To play a playlist and remove the items that has been already played
+
+  paradiso -pd playlist
+  
+== Config file
+
+Paradiso has some basic support for a config file 
+
+  touch ~/.paradiso
+  
+Sample config file, in YAML
+
+  fullscreen : true
+  aspectratio : "16:10"
+
+== TODO
+
+* Handling rar-archives
+* Better playlist support
+* Other mediums then just avi et al(DVD, Bluray and so on)
+* Handle meta-data
+* Config stuff, file ratios and such.
+
+== Copyright
+
+Copyright (c) 2010 Victor Bergöö. See LICENSE for details.
+
+

data/Rakefile

@@ -11,7 +11,6 @@ begin
     gem.homepage = "http://github.com/netfeed/paradiso"
     gem.authors = ["Victor Bergoo"]
     gem.add_dependency "popen4"
-    gem.add_dependency "json"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.3.0

data/lib/paradiso/base.rb

@@ -8,47 +8,41 @@ require 'paradiso/playlist'
 module Paradiso
   class Paradiso
     def initialize options, args
+      @playlist = []
       @options = options
-      @pl_file = nil
       @pid = nil
+      @amount_played = 0
 
-      if @options[:playlist] and args.size > 1 and not @options[:path]
-        puts "Error: Can only handle one playlist"
-        exit 1
-      end
-      
       if @options[:playlist] and not @options[:path]
-        @pl_file = args.pop
-        @playlist = Playlist.create_from_file @pl_file
+        args.each do |pl|
+          unless File.exist? pl
+            puts "Warning: playlist %s does not exist" % [pl]
+            next
+          end
+          
+          @playlist << Playlist.create_from_file(pl)
+        end
       else
-        @playlist = Playlist.new args
+        @playlist << Playlist.new(args, @options[:path])
       end
     end
     
     def run
-      options_str = handle_options
-      amount = 0
-      
-      @playlist.each do |item|
-        if @options[:amount]
-          break if amount == @options[:amount]
-          amount += 1
-        end
-
-        puts "Playing #{item}"
-        
-        cmd = "mplayer #{options_str} \"#{item}\""
-        POpen4::popen4(cmd) do |stdout, stderr, stdin, pid|
-          @pid = pid
-        end
+      @playlist.each do |pl|
+        break unless play? pl
       end
     rescue Interrupt
       Process.kill(9, @pid) if @pid
       puts "Exiting..."
     ensure
-      if (@options[:path] or @options[:delete]) and @options[:playlist]
-        file = @options[:path] ? @options[:path] : @pl_file
-        @playlist.create file, @options[:delete]
+      @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]
+        end
       end
     end
     
@@ -59,9 +53,7 @@ module Paradiso
       ratio = @options[:aspectratio]
       
       str += ['-monitoraspect', ratio, '-aspect', ratio]
-      if @options[:fullscreen]
-        str << "-fs"
-      end
+      str << "-fs" if @options[:fullscreen]
       
       # more platforms needs to be added
       if RUBY_PLATFORM =~ /darwin10/
@@ -70,6 +62,26 @@ module Paradiso
       
       str.join " "
     end
+    
+    def play? playlist
+      options_str = handle_options
+      
+      playlist.each do |item|
+        unless @options[:amount].nil?
+          return false if @amount_played == @options[:amount]
+          @amount_played += 1
+        end
+
+        puts "Playing #{item}"
+
+        cmd = "mplayer #{options_str} \"#{item}\""
+        POpen4::popen4(cmd) do |stdout, stderr, stdin, pid|
+          @pid = pid
+        end
+      end
+      
+      true
+    end
   end
 end
 

data/lib/paradiso/playlist.rb

@@ -18,12 +18,13 @@ module Paradiso
           items << line.sub(/[\r\n]+/, '')
         end
         
-        new items
+        new items, file
       end
     end
     
-    def initialize files
+    def initialize files, path=nil
       @files = []
+      @path = path
       @current_idx = -1
             
       files.each do |file|
@@ -52,31 +53,39 @@ module Paradiso
       
       @files << other.files
     end
-    
-    def create path, delete=false 
-      # can this be made in a nicer way?
-      start_point = case @current_idx
-        when -1 then 0
-        when 0 then 1
-        else @current_idx + 1
-      end
-      start_point = 0 unless delete
-      
-      if (start_point >= @files.size) and delete
-        File.delete path
-        return
-      end
+
+    def create delete=false 
+      sp = delete ? start_point : 0
       
-      File.open(path, 'w') do |f|
-        @files[start_point..-1].each { |line| f.puts line }
+      File.open(@path, 'w') do |f|
+        @files[sp..-1].each { |line| f.puts line }
       end
     end
     
+    def delete
+      File.delete(@path) unless @path.nil?
+    end
+    
     def each
       @files.each_index do |idx| 
         yield @files[idx]
         @current_idx = idx
       end
     end
+    
+    def empty?
+      start_point >= @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
+    end
   end
 end

data/lib/paradiso.rb

@@ -5,8 +5,9 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include? dir
 
-require 'json'
 require 'optparse'
+require 'yaml'
+
 require 'paradiso/base'
 
 module Paradiso
@@ -36,13 +37,9 @@ module Paradiso
       
       config_file = File.expand_path('~/.paradiso')
       if File.exist? config_file
-        begin
-          json = JSON.parse(File.open(config_file, 'r').read())
-          json.each_pair do |key, value|
-            options[key.to_sym] = value
-          end
-        rescue JSON::ParserError => e
-          puts "Error: Parsing the config file failed, please check it"
+        yaml = YAML::load(File.open(config_file, 'r').read())
+        yaml.each_pair do |key, value|
+          options[key.to_sym] = value
         end
       end
 
@@ -53,7 +50,7 @@ module Paradiso
       args.options do |o|
         o.set_summary_indent '  '
         o.banner = "Usage: #{File.basename $0} [Options]"
-        o.define_head "A simple mplayer CLI"
+        o.define_head "Paradiso #{VERSION}: A simple mplayer CLI"
 
         o.on_tail("-h", "--help", "Show this help message.") { puts o; exit }
         o.on_tail("-v", "--version", "Show version number") { puts "Paradiso %s" % [VERSION]; exit}
@@ -78,7 +75,7 @@ module Paradiso
           options[:path] = path
         }
 
-        o.on("-p", "--playlist", "The argument is a playlist") { 
+        o.on("-p", "--playlist", "The arguments is playlists") { 
           options[:playlist] = true
         }
 

data/paradiso.gemspec

@@ -5,22 +5,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{paradiso}
-  s.version = "0.1.5"
+  s.version = "0.3.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-04}
+  s.date = %q{2010-10-08}
   s.default_executable = %q{paradiso}
   s.description = %q{A simplified mplayer command line interface}
   s.email = %q{victor.bergoo@gmail.com}
   s.executables = ["paradiso"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rst"
+     "README.rdoc"
   ]
   s.files = [
-    "LICENSE",
-     "README.rst",
+    ".gitignore",
+     "LICENSE",
+     "README.rdoc",
      "Rakefile",
      "VERSION",
      "bin/paradiso",
@@ -41,14 +42,11 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<popen4>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
     else
       s.add_dependency(%q<popen4>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
     end
   else
     s.add_dependency(%q<popen4>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paradiso
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Victor Bergoo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +02:00
+date: 2010-10-08 00:00:00 +02:00
 default_executable: paradiso
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,20 +32,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 description: A simplified mplayer command line interface
 email: victor.bergoo@gmail.com
 executables: 
@@ -54,10 +40,11 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rst
+- README.rdoc
 files: 
+- .gitignore
 - LICENSE
-- README.rst
+- README.rdoc
 - Rakefile
 - VERSION
 - bin/paradiso

data/README.rst

@@ -1,15 +0,0 @@
-Paradiso
-========
-
-A small lightweight command line interface for mplayer_.
-
-TODO
-----
-
-* Handling rar-archives(code already exists but doesn't work that great with OS X unrar)
-* Better playlist support
-* Other mediums then just avi et al(DVD, Bluray and so on)
-* Proper ID3 et al parsing
-* Config stuff, file ratios and such.
-
-.. _mplayer: http://www.mplayerhq.hu