jeeves-pvr 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGFhNzgzNDg1Y2ZhMDFmMjhhMGNiMTkzNzNkY2I0NTFhZGJhMDc5Nw==
+  data.tar.gz: !binary |-
+    YWFlMTgxMmYyYTgwYTU0MzMyNzIzMGViMTY5MmJjMjgwYzljNDRjZg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NGMyOTAyNGQ2YzBlOTk5ZTk5NjI1MjE1NjgxYjFjYWJkNjk3NGZkN2EyMzdh
+    ODBhYjkwY2FlMWI3NjFhYTJhMWJmNjQxZTBmNDExZDc2NmMxMWNhZjk3Njg1
+    MDFiYWM5ODdhYTdjYjY4ZjJjNDc4ZmVmYmJmMTk1MjQwZWJiYzQ=
+  data.tar.gz: !binary |-
+    MzAzYjliMDNiNGYzYjQ1ZTFlZTY2NjM0OTgyMzZiZWUzMzk2YzcxMGI5Yjg1
+    OGU3Yzg1MjVmOWY1MjRhN2VlNWQyODE0NzIwMGZjZTQwMjVjZWM3NWUzZjY4
+    ZjlkNjk3NzNmOGVkYmY4ODJhYjI0MzgwZjk1ZTQyMGI2ZWMzNGU=

data/Bugs.rdoc

@@ -0,0 +1,6 @@
+== Bugs and Change Requests for Jeeves
+
+[14-Feb-2014] Features and Changes Required
+		Use optplus for cli interface
+		Extend timeout when updating listings
+		*BUG* Make multiple disks work for allocating files!

data/History.txt

@@ -0,0 +1,49 @@
+== History
+
+[jeeves-0.2.0 25-Mar-2014]
+
+  Update to optplus version of the command line, with a tidy up
+
+[jeeves-0.1.6 22-Aug-2013]
+
+  Update to make it ruby 1.9/2.0 ready
+
+[jeeves-0.1.5 19-Aug-2013]
+
+  Add a show command for videos to display tag info.
+
+[jeeves-0.1.4 15-Aug-2013]
+
+  Removed extra dependencies from Gemfile
+
+[jeeves-0.1.3 15-Aug-2013]
+
+  Added wrapper script to fix gem load issues
+
+[jeeves-0.1.2 15-Aug-2013]
+
+  Change bin/jeeves to remove LOAD_PATH!
+
+[jeeves-0.1.1 15-Aug-2013]
+
+  Correct copy error in jeni install script
+
+[jeeves-0.1.0 15-Aug-2013]
+
+  New integrated jeeves first release (testing only)
+
+[jeeves-0.0.3 15-Dec-2012]
+
+  Remove reference to install command
+
+[jeeves-0.0.2 16-Oct-2012]
+
+  Update wrangle to create a proxy and delete it after loading
+
+[jeeves-0.0.1 06-Sep-2012]
+
+  Basic gem that provides the jeeves command and pulls in all the other jeeves gems
+
+[jeeves-0.0.0 24-Sep-2011]
+
+  Application generated.

data/LICENCE.rdoc

@@ -0,0 +1,159 @@
+Copyright (c) 2011 Robert Sharp
+
+This software is licensed for use under the Open Software Licence v. 3.0
+The terms of this licence can be found at http://www.opensource.org/licenses/osl-3.0.php
+and below. Under the terms of this licence, all derivative works
+must themselves be licensed under the Open Software Licence v. 3.0
+
+Open Source Initiative OSI - The Open Software Licence 3.0:Licensing
+[OSI Approved Licence]
+Open Software Licence ("OSL") v. 3.0
+
+This Open Software Licence (the "Licence") applies to any original work of authorship
+(the "Original Work") whose owner (the "Licensor") has placed the following licensing
+notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software Licence version 3.0
+
+1) Grant of Copyright Licence. Licensor grants You a worldwide, royalty-free, non-exclusive,
+sublicensable license, for the duration of the copyright, to do the following:
+
+a) to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+b) to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby
+creating derivative works ("Derivative Works") based upon the Original Work;
+
+c) to distribute or communicate copies of the Original Work and Derivative Works to
+the public, with the proviso that copies of Original Work or Derivative Works that
+You distribute or communicate shall be licensed under this Open Software Licence;
+
+d) to perform the Original Work publicly; and
+
+e) to display the Original Work publicly.
+
+2) Grant of Patent Licence. Licensor grants You a worldwide, royalty-free, non-exclusive,
+sublicensable license, under patent claims owned or controlled by the Licensor that are
+embodied in the Original Work as furnished by the Licensor, for the duration of the
+patents, to make, use, sell, offer for sale, have made, and import the Original Work
+and Derivative Works.
+
+3) Grant of Source Code Licence. The term "Source Code" means the preferred form of
+the Original Work for making modifications to it and all available documentation
+describing how to modify the Original Work. Licensor agrees to provide a machine-readable
+copy of the Source Code of the Original Work along with each copy of the Original Work
+that Licensor distributes. Licensor reserves the right to satisfy this obligation by
+placing a machine-readable copy of the Source Code in an information repository reasonably
+calculated to permit inexpensive and convenient access by You for as long as Licensor
+continues to distribute the Original Work.
+
+4) Exclusions From Licence Grant. Neither the names of Licensor, nor the names of
+any contributors to the Original Work, nor any of their trademarks or service marks,
+may be used to endorse or promote products derived from this Original Work without
+express prior permission of the Licensor. Except as expressly stated herein, nothing
+in this Licence grants any license to Licensor's trademarks, copyrights, patents,
+trade secrets or any other intellectual property. No patent license is granted to
+make, use, sell, offer for sale, have made, or import embodiments of any patent claims
+other than the licensed claims defined in Section 2. No license is granted to the
+trademarks of Licensor even if such marks are included in the Original Work. Nothing
+in this Licence shall be interpreted to prohibit Licensor from licensing under terms
+different from this Licence any Original Work that Licensor otherwise would have a
+right to license.
+
+5) External Deployment. The term "External Deployment" means the use, distribution,
+or communication of the Original Work or Derivative Works in any way such that the
+Original Work or Derivative Works may be used by anyone other than You, whether those
+works are distributed or communicated to those persons or made available as an application
+intended for use over a network. As an express condition for the grants of license hereunder,
+You must treat any External Deployment by You of the Original Work or a Derivative Work
+as a distribution under section 1(c).
+
+6) Attribution Rights. You must retain, in the Source Code of any Derivative Works
+that You create, all copyright, patent, or trademark notices from the Source Code of
+the Original Work, as well as any notices of licensing and any descriptive text identified
+therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works
+that You create to carry a prominent Attribution Notice reasonably calculated to inform
+recipients that You have modified the Original Work.
+
+7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright
+in and to the Original Work and the patent rights granted herein by Licensor are owned by
+the Licensor or are sublicensed to You under the terms of this Licence with the permission
+of the contributor(s) of those copyrights and patent rights. Except as expressly stated in
+the immediately preceding sentence, the Original Work is provided under this Licence on an
+"AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation,
+the warranties of non-infringement, merchantability or fitness for a particular purpose.
+THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY
+constitutes an essential part of this Licence. No license to the Original Work is granted
+by this Licence except under this disclaimer.
+
+8) Limitation of Liability. Under no circumstances and under no legal theory, whether
+in tort (including negligence), contract, or otherwise, shall the Licensor be liable
+to anyone for any indirect, special, incidental, or consequential damages of any character
+arising as a result of this Licence or the use of the Original Work including, without
+limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction,
+or any and all other commercial damages or losses. This limitation of liability shall not
+apply to the extent applicable law prohibits such limitation.
+
+9) Acceptance and Termination. If, at any time, You expressly assented to this Licence,
+that assent indicates your clear and irrevocable acceptance of this Licence and all of its
+terms and conditions. If You distribute or communicate copies of the Original Work or a
+Derivative Work, You must make a reasonable effort under the circumstances to obtain the
+express assent of recipients to the terms of this Licence. This Licence conditions your
+rights to undertake the activities listed in Section 1, including your right to create
+Derivative Works based upon the Original Work, and doing so without honoring these
+terms and conditions is prohibited by copyright law and international treaty. Nothing
+in this Licence is intended to affect copyright exceptions and limitations (including
+"fair use" or "fair dealing"). This Licence shall terminate immediately and You may no
+longer exercise any of the rights granted to You by this Licence upon your failure to
+honor the conditions in Section 1(c).
+
+10) Termination for Patent Action. This Licence shall terminate automatically and
+You may no longer exercise any of the rights granted to You by this Licence as of
+the date You commence an action, including a cross-claim or counterclaim, against
+Licensor or any licensee alleging that the Original Work infringes a patent. This
+termination provision shall not apply for an action alleging patent infringement
+by combinations of the Original Work with other software or hardware.
+
+11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this Licence
+may be brought only in the courts of a jurisdiction wherein the Licensor resides or
+in which Licensor conducts its primary business, and under the laws of that jurisdiction
+excluding its conflict-of-law provisions. The application of the United Nations Convention
+on Contracts for the International Sale of Goods is expressly excluded. Any use of
+the Original Work outside the scope of this Licence or after its termination shall be
+subject to the requirements and penalties of copyright or patent law in the appropriate
+jurisdiction. This section shall survive the termination of this Licence.
+
+12) Attorneys' Fees. In any action to enforce the terms of this Licence or seeking
+damages relating thereto, the prevailing party shall be entitled to recover its costs
+and expenses, including, without limitation, reasonable attorneys' fees and costs
+incurred in connection with such action, including any appeal of such action. This
+section shall survive the termination of this Licence.
+
+13) Miscellaneous. If any provision of this Licence is held to be unenforceable,
+such provision shall be reformed only to the extent necessary to make it enforceable.
+
+14) Definition of "You" in This Licence. "You" throughout this Licence, whether in
+upper or lower case, means an individual or a legal entity exercising rights under,
+and complying with all of the terms of, this Licence. For legal entities, "You" includes
+any entity that controls, is controlled by, or is under common control with you. For
+purposes of this definition, "control" means (i) the power, direct or indirect, to cause
+the direction or management of such entity, whether by contract or otherwise, or (ii)
+ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial
+ownership of such entity.
+
+15) Right to Use. You may use the Original Work in all ways not otherwise restricted or
+conditioned by this Licence or by law, and Licensor promises not to interfere with or be
+responsible for such uses by You.
+
+16) Modification of This Licence. This Licence is Copyright © 2005 Lawrence Rosen.
+Permission is granted to copy, distribute, or communicate this Licence without modification.
+Nothing in this Licence permits You to modify this Licence as applied to the Original Work
+or to Derivative Works. However, You may modify the text of this Licence and copy, distribute
+or communicate your modified version (the "Modified Licence") and apply it to other original
+works of authorship subject to the following conditions: (i) You may not indicate in any way
+that your Modified Licence is the "Open Software Licence" or "OSL" and you may not use those
+names in the name of your Modified Licence; (ii) You must replace the notice specified in the
+first paragraph above with the notice "Licensed under <insert your license name here>" or
+with a notice of your own that is not confusingly similar to the notice in this Licence;
+and (iii) You may not claim that your original works are open source software unless your
+Modified Licence has been approved by Open Source Initiative (OSI) and You comply with
+its license review and certification process.

data/README.md

@@ -0,0 +1,60 @@
+= JEEVES
+
+== [Subtitle]
+
+[Summary of what the project/gem does]
+
+== Usage
+
+[Describe how to use it]
+
+== Examples
+
+[And provide some examples of usage]
+
+  [This will be highlighted as a code box]
+
+== Installation
+
+[How to]
+
+=== Dependencies
+
+[This list should include:]
+
+ruby - ruby 1.8.7 (2011-02-18 patchlevel 334) [i686-linux]
+jeckyl - used to parse configuration files into a convenient options hash
+jelly - a logger with syslog knobs on
+jevoom - makes it easier to keep version info and git commit messages in harmony
+git - to manage versioning
+rdoc - to manage documentation
+
+== Documentation
+
+Documentation is available via rdoc. All files, including this one and the text files
+in the project root should use rdoc markup.
+{Details on rdoc markup are available here}[http://rdoc.rubyforge.org/RDoc/Markup.html]
+
+== Testing/Modifying
+
+[Describe the rspec tests that can be used to check the code]
+
+== Bugs
+
+Details of any unresolved bugs and change requests are in Bugs.txt.
+
+== Changelog
+
+This can be found in the History.txt file. This file is used by Jevoom to manage the
+version info and create git commits.
+
+== Copyright
+
+See individual files and the LICENCE file.
+The author may be contacted by email: robert(a)osburn-sharp.ath.cx
+
+== Warranty
+
+This software is provided "as is" and without any express or implied
+warranties, including, without limitation, the implied warranties of
+merchantibility and fitness for a particular purpose.

data/bin/jeeves

@@ -0,0 +1,122 @@
+#!/usr/bin/env ruby
+#
+#
+# = Jeeves CLI
+#
+# == Using optplus
+#
+# Author:: Robert Sharp
+# Copyright:: Copyright (c) 2014 Robert Sharp
+# License:: Open Software Licence v3.0
+#
+# This software is licensed for use under the Open Software Licence v. 3.0
+# The terms of this licence can be found at http://www.opensource.org/licenses/osl-3.0.php
+# and in the file copyright.txt. Under the terms of this licence, all derivative works
+# must themselves be licensed under the Open Software Licence v. 3.0
+#
+# 
+#
+
+require 'optplus'
+
+require 'jeeves'
+require 'jeeves/config'
+require 'jeeves/store'
+require 'jeeves/partition'
+require 'jeeves/video'
+require 'jeckyl/errors'
+require 'jellog/proxy'
+
+require 'jeni/io'
+
+require 'jeeves/parser/listings'
+require 'jeeves/parser/store'
+require 'jeeves/parser/videos'
+
+class JeevesCLI < Optplus::Parser
+  
+  usage "Usage: jeeves [actions] [options]"
+  
+  description "support utilities for the Jeeves PVR system"
+  
+  def options(opts)
+    
+    opts.on('-c', '--config [FILE]', String, 'use the given config file') do |c|
+      set_option :config_file, c
+    end
+    
+    opts.on('-f', '--force', 'force an init regardless of existing keys') do |c|
+      set_option :force_init, c
+    end
+    
+    opts.on('-a', '--all', 'clean all files in the list regardless of status') do |c|
+      set_option :clean_all, c
+    end
+    
+    opts.on('-d', '--delete', 'delete all possible file list data - use with care') do |c|
+      set_option :delete, c
+    end
+    
+    opts.on('-T', '--timeout [VALUE]', Integer, 'set timeout for waiting on Jeeves applications') do |c|
+      set_option :timeout, c
+    end
+    
+    opts.on('-E', '--errors [TYPE]', [:ignore, :warn, :fatal], 'set the way store errors are treated') do |c|
+      set_option :store_errors, c
+    end
+    
+    opts.on('-u', '--update', 'update listings data regardless of when it was last downloaded') do |c|
+      set_option :update_listings, c
+    end
+    
+    opts.on('-R', '--reset', 'reset listings data, clearing out all old listings') do |c|
+      set_option :reset_listings, c
+    end
+    
+    debug_option(opts)
+    
+    verbose_option(opts)
+      
+  end
+  
+  describe :info, 'Show information about Jeeves PVR'
+  
+  help :info, "Show information about the current configured Jeeves"
+  
+  def before_actions
+    
+    jconfig = get_option(:config_file)
+    
+    @jeeves_config = Jeeves.get_config(jconfig)
+    
+    show_log = get_option(:debug) || get_option(:verbose)
+        
+    @logger = Jellog::ProxyLogger.new("Jeeves", :suppress=>!show_log)
+    
+    if get_option :debug then
+      @logger.log_level = :debug
+      @logger.debug "Setting logger to debug"
+    end
+    if get_option :verbose then
+      @logger.log_level = :verbose
+      @logger.verbose "Setting logger to verbose"
+    end    
+  end
+  
+  attr_reader :jeeves_config
+  attr_reader :logger
+  
+  def info
+    puts "Hello World"
+    
+    puts "Jeeves URL: #{@jeeves_config[:jeeves_url]}"
+  end
+  
+  nest_parser :listings, ListingCLI, 'manage TV listings'
+  nest_parser :store, StoreCLI, 'manage Jeeves stores'
+  nest_parser :videos, VideosCLI, 'manage Jeeves videos'
+  
+  
+end
+
+JeevesCLI.run!

data/bin/jeeves-install

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+#
+# Author:: R.J.Sharp
+# Email:: robert(a)osburn-sharp.ath.cx
+# Copyright:: Copyright (c) 2012 
+# License:: Open Software Licence v3.0
+#
+# This software is licensed for use under the Open Software Licence v. 3.0
+# The terms of this licence can be found at http://www.opensource.org/licenses/osl-3.0.php
+# and in the file LICENCE. Under the terms of this licence, all derivative works
+# must themselves be licensed under the Open Software Licence v. 3.0
+#
+# 
+require 'rubygems'
+
+# a general client for the jemplayer service
+
+require 'jeni'
+
+
+Jeni::Installer.new_from_gem('jeeves-pvr') do |jenny|
+  jenny.optparse(ARGV)
+  
+  jenny.file('etc/jerbil/jeeves.rb', '/etc/jerbil/jeeves.rb')   
+  #jenny.file('bin/jeeves.wrapper', '/usr/bin/jeeves', :chmod=>0755)    
+
+end.run!

data/bin/jeeves-old

@@ -0,0 +1,375 @@
+#!/usr/bin/env ruby
+#
+#
+# = Jeeves CLI
+#
+# == Command Line Interpreter for various Jeeves tasks
+#
+# Author:: Robert Sharp
+# Copyright:: Copyright (c) 2013 Robert Sharp
+# License:: Open Software Licence v3.0
+#
+# This software is licensed for use under the Open Software Licence v. 3.0
+# The terms of this licence can be found at http://www.opensource.org/licenses/osl-3.0.php
+# and in the file copyright.txt. Under the terms of this licence, all derivative works
+# must themselves be licensed under the Open Software Licence v. 3.0
+#
+# Based on Optparse
+#
+
+require 'rubygems'
+require 'optparse'
+require 'jeeves'
+require 'jeeves/config'
+require 'jeeves/store'
+require 'jeeves/partition'
+require 'jeeves/video'
+require 'jeckyl/errors'
+require 'jellog/proxy'
+require 'jeni/io'
+require 'colored'
+
+include Jeni::IO
+
+local_options = Hash.new
+debug = false
+verbose = false
+config_file = nil
+suppress = true
+
+
+commands = Hash.new
+# define global options
+actions = OptionParser.new do |opts|
+  
+  opts.banner = "Usage: jeeves [actions] [options]"
+
+  opts.separator ""
+  opts.separator "where actions are listed below"
+  opts.separator "and options can be global or specific to actions as shown below"
+  opts.separator ""
+  opts.separator "Actions can be one of the following:"
+  opts.separator ""
+  opts.separator "  store - manage where jeeves stores videos"
+  opts.separator "  listings - manage programme listings"
+  opts.separator "  videos - do things with specific videos"
+  opts.separator ""
+  opts.separator "Global Options"
+  opts.separator ""
+  
+  opts.on('-c', '--config [FILE]', String, 'use the given config file') do |c|
+    config_file = c
+  end
+  
+  
+  opts.separator ""
+  opts.separator "Actions for 'jeeves store':"
+  opts.separator ""
+  opts.separator "  init - create a key file to initialise a store"
+  opts.separator "  status - list specified stores and their status"
+  opts.separator "  clean - clean up the file list"
+  opts.separator ""
+  opts.separator "Options for 'store init' command"
+  opts.separator ""
+  
+  opts.on('-f', '--force', 'force an init regardless of existing keys') do |c|
+    local_options[:force_init] = c
+  end
+  
+  opts.on('-a', '--all', 'clean all files in the list regardless of status') do |c|
+    local_options[:clean_all] = c
+  end
+  
+  opts.on('-d', '--delete', 'delete all possible file list data - use with care') do |c|
+    local_options[:delete] = c
+  end
+  
+  opts.on('-E', '--errors [TYPE]', [:ignore, :warn, :fatal], 'set the way store errors are treated') do |c|
+    local_options[:store_errors] = c
+  end
+  
+  opts.separator ""
+  opts.separator "Actions for 'jeeves listings':"
+  opts.separator ""
+  opts.separator "  update - download the lastest listings info and update Jeeves TV"
+  opts.separator "  clean - clean out old listings"
+  opts.separator ""
+  opts.separator "Options for 'listings' command"
+  opts.separator ""
+  
+  opts.on('-u', '--update', 'update listings data regardless of when it was last downloaded') do |c|
+    local_options[:update_listings] = c
+  end
+  
+  opts.on('-R', '--reset', 'reset listings data, clearing out all old listings') do |c|
+    local_options[:reset_listings] = c
+  end
+
+  opts.separator ""
+  opts.separator "General options"
+  opts.separator ""
+  
+  opts.on_tail('-D', '--debug', 'show debug information') do
+    debug = true
+    verbose = false
+    suppress = false
+  end
+  
+  opts.on_tail('-V', '--verbose', 'show verbose information') do
+    verbose = true
+    debug = false
+    suppress = false
+  end
+  
+  opts.on_tail('-h', '--help', 'you are looking at it') do
+    puts opts
+    #show_help(commands)
+    exit 0
+  end
+  
+end.permute(ARGV)
+
+# start a logger
+logger = Jellog::ProxyLogger.new("Jeeves", :suppress=>suppress)
+
+if debug then
+  logger.log_level = :debug
+  logger.debug "Setting logger to debug"
+end
+if verbose then
+  logger.log_level = :verbose
+  logger.verbose "Setting logger to verbose"
+  puts "Running under ruby #{RUBY_VERSION}"
+end
+
+
+begin
+  options = Jeeves.get_config(config_file)
+rescue Jeckyl::ConfigFileMissing
+  logger.error "No config file #{config_file ? config_file : '/etc/jerbil/jeeves.rb'}"
+  exit 1
+end
+
+options = options.merge(local_options)
+
+begin
+  raise ArgumentError, "You must specify an action" unless actions.length > 0
+  case act = actions.shift.to_sym
+  when :store
+    actions.unshift('status') unless actions.length > 0
+    case act = actions.shift.to_sym
+    when :init
+      # jeeves store init path/to/store
+      #
+      # expect next argument to be a file
+      if actions.length > 0 then
+        new_store = actions.shift
+      else
+        logger.error "need to provide a path to initialise"
+        exit 1
+      end
+      unless FileTest.exists?(new_store)
+        logger.error "Error: path #{new_store} does not exist"
+        exit 1
+      end
+      forced = options[:force_init] # fudge due to bug in jeckyl(?)
+      force = options[:force_init]
+      part = Jeeves::Partition.new(new_store)
+      puts "Forcing a new key" if force
+      key = part.create_key(force)
+      puts "# add this line to your config file"
+      puts "add_store :path=>'#{part.path}', :key=>'#{key}'"
+    when :status
+      parts = Array.new
+      devices = Array.new
+      options[:add_partition].each_pair do |path, params|
+        part = Jeeves::Partition.new(path, params)
+        # if mounted = FileTest.exists?(path) ? 'OK' : 'No'then
+        #   key_ok = Jeeves::Store.key_ok?(path, params[:key]) ? 'OK' : 'Error'
+        # end
+        if part.ready? then
+          if devices.include?(part.device) then
+            part.duplicate = true
+          else
+            devices << part.device
+          end
+          
+        end
+        parts << part.to_a
+      end
+      Jeeves.tabulate(%w{* 4c 4c 4c 8r 8r},
+          %w{Path Mnt Rdy Dup Total Free},
+          parts
+        )
+    when :list
+      # jeeves store list
+      jestore = Jeeves::Store.new(logger, options)
+      if jestore.files <= 0 then
+        puts "There are no files to show"
+      else
+        entries = Array.new
+        jestore.each_file do |path, params|
+          entries << [path, Jeeves.human_size(params[:space]), params[:date].strftime("%Y-%b-%d %H:%M")]
+        end
+        
+        Jeeves.tabulate(%w{* *r *c},
+          %w{Path Space Date},
+          entries)
+      end
+    when :clean
+      jestore = Jeeves::Store.new(logger, options)
+      if local_options[:delete] then
+        # going to get rid of all file lists
+        if ask('Delete all file lists?', :no, 'yn') == :yes then
+          
+          jestore.each_partition do |part|
+            if FileTest.exists?(part.file_list) then
+              puts "Deleting #{part.file_list}"
+              FileUtils.rm_f(part.file_list)
+            end
+          end
+          
+        else
+          
+          puts "OK, no files have been deleted"
+          
+        end
+        exit 0
+      end
+      
+      # jeeves store clear
+      if jestore.files == 0 then
+        puts "The file list is already empty, nothing to clean"
+        exit 0
+      end
+      if local_options[:clean_all] then
+        if ask('Clean all files from the list?', :no, 'yn') != :no then
+          jestore.clean(true)
+          puts "The file list is now empty"
+        end
+      else
+        if ask('Clean files from the list?', :no, 'yn') != :no then
+          jestore.clean
+          puts "Cleaned file list"
+        end
+      end
+    else #case
+      raise ArgumentError, "Unknown action for store: #{act}"
+    end # case store actions
+    
+  #
+  # listings actions
+  #
+    
+  when :listings
+    # update
+    actions.unshift('status') unless actions.length > 0
+    case act = actions.shift.to_sym
+    when :update
+      begin
+        Jeeves.update_listings(options)
+      rescue Jeeves::ListingError => e
+        puts "Error while updating listings: #{e}"
+        exit 1
+      end
+      
+    else
+      raise ArgumentError, "Unknown action for listings: #{act}"
+    end # case
+    
+  #
+  # video actions
+  #
+    
+  when :videos
+    # load, cleanup etc
+    actions.unshift('status') unless actions.length > 0
+    case act = actions.shift.to_sym
+    when :wrangle
+      begin
+        unless file = actions.shift
+          logger.error "Need to provide a file to wrangle"
+          exit 1
+        end
+        unless FileTest.exists?(file)
+          logger.error "File does not exist: #{file}"
+          exit 1
+        end
+        unless pid = actions.shift
+          logger.error "Need to provide a programme id to wrangle"
+          exit 1
+        end
+        vid = Jeeves::Video.new(file, logger, options)
+        vid.tag_from_prog_id(pid)
+        response = vid.upload_to_jeeves
+        vid.clean_up
+        if response.to_i == 0 then
+          puts "Jeeves OK"
+          
+        else
+          logger.error "Jeeves returned unexpected response: #{response}"
+        end
+      rescue Jeeves::JeevesError => e
+        puts "Error while wrangling video: #{e}"
+      end
+    when :load
+      begin
+        unless file = actions.shift
+          logger.error "Need to provide a file to load"
+          exit 1
+        end
+        unless FileTest.exists?(file)
+          logger.error "File does not exist: #{file}"
+          exit 1
+        end
+        vid = Jeeves::Video.new(file, logger, options)
+        response = vid.upload_to_jeeves
+        vid.clean_up
+        if response.to_i == 0 then
+          puts "Jeeves OK"
+          
+        else
+          logger.error "Jeeves returned unexpected response: #{response}"
+        end
+      rescue Jeeves::JeevesError => e
+        puts "Error while wrangling video: #{e}"
+      end
+      
+    when :show
+      unless file = actions.shift
+        logger.error "Need to provide a file to load"
+        exit 1
+      end
+      unless FileTest.exists?(file)
+        logger.error "File does not exist: #{file}"
+        exit 1
+      end
+      vid = Jeeves::Video.new(file, logger, options)
+      tags = vid.get_tags
+      tags.each_tag do |key, value|
+        puts "#{key}:   #{value}"
+      end
+      
+    end # case for video subcommands
+      
+  else
+    puts "Error: Unknown action #{act}"
+    exit 1
+  end # first level action
+rescue ArgumentError => err
+  logger.error err
+  if debug then
+    err.backtrace.each do |bt|
+      puts bt
+    end
+  end
+rescue Jeeves::JeevesError => err
+  logger.error "#{err}"
+  if debug then
+    err.backtrace.each do |bt|
+      puts bt
+    end
+  end
+ensure
+  puts options if debug
+end