georgboe-ucli 0.2.2 → 0.2.3

data/README.md

@@ -46,7 +46,7 @@ add the label "MISC" all of them.
 
 #### Remove torrents
 
-You can remove torrents with the `ucli -r` command.
+You can remove torrents with the `ucli -r` or `ucli --remove` command.
 You can specify a name or regex to match.   
 It will show you all the matches along with their shareratio and will not delete anything before you have confirmed it.
 
@@ -59,6 +59,20 @@ It will show you all the matches along with their shareratio and will not delete
 
 In this case there was only on matching torrent, but you can remove large amount of torrents using regexes.
 
+#### Remove torrents and downloaded data
+
+This action removes the specified torrent job(s) from the torrent jobs list and removes the corresponding torrent contents (data) from disk.
+You can remove torrents and the downloaded data with the `ucli -e` or `ucli --removedata` command. You can specify a name or regex to match.
+It will show you all the matches along with their shareratio and will not delete anything before you have confirmed it.
+
+    % ucli -e server
+    Found the following torrents
+    ============================
+    ubuntu-8.10-server-i386.iso (0.06)
+
+    THIS ACTION WILL REMOVE ALL THE DOWNLOADED DATA!
+    Are you sure you want to remove these torrents? (y or n):
+
 #### Removing old tv episodes
 
 `ucli --oldepisodes` looks for torrents of the same tv show. If you have two episode of the same show, it will suggest remove the oldest.
@@ -80,6 +94,20 @@ Now we try to run the command.
 
     Do you want to remove them? (y or n):
 
+#### Removing torrents based on ratio
+
+`ucli --ratioremove` will let you remove all torrents with a higher ratio than the value you specify.
+
+    ~% ucli --ratioremove 13.4
+    Found the following torrents with ratio above 13.4
+    ==================================================
+    ubuntu-8.10-desktop-i386.iso (16.64)
+    ubuntu-8.10-server-i386.iso (19.16)
+
+    Are you sure you want to remove these torrents? (y or n): 
+
+
+
 #### Listing files in torrents
 
 `ucli --ls` command will show you all the files with filesizes in the torrents matching you input.

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake'
 require 'rake/gempackagetask'
  
 GEM = "ucli"
-GEM_VERSION = "0.2.2"
+GEM_VERSION = "0.2.3"
 SUMMARY = "Commandline interface to uTorrent WebUI 0.361"
 AUTHOR = "Georg Alexander Bøe"
 EMAIL = "georg.boe@gmail.com"

data/bin/ucli

@@ -10,7 +10,7 @@ require 'lsfile.rb'
 require 'torrent.rb'
 require 'utilities.rb'
 
-PROGRAM_VERSION = '0.2.2'
+PROGRAM_VERSION = '0.2.3'
 
 begin
   
@@ -37,11 +37,12 @@ opts = Trollop::options do
   opt :category, "Category for uploaded file", :type => :string, :default => nil
   opt :oldepisodes, "Show and remove old tv episodes"
   opt :remove, "Remove torrents by name", :type => :strings
-  opt :ratioremove, "Removes torrent with ratio high than input", :type => :float
+  opt :removedata, "Remove torrents and downloaded data", :type => :strings
+  opt :ratioremove, "Remove torrents with ratio high than input", :type => :float
   opt :ls, "Show files for a given torrent", :type => :string
 end
 
-has_selected_options = [:list, :upload, :oldepisodes, :remove, :ratioremove, :ls].inject(false) { |result, x| opts[x] ? true : result }
+has_selected_options = [:list, :upload, :oldepisodes, :remove, :removedata, :ratioremove, :ls].inject(false) { |result, x| opts[x] ? true : result }
 Trollop.die("No option selected") unless has_selected_options
 Trollop.die("Category is required for uploaded torrent") if opts[:upload] and !opts[:category]
 
@@ -126,7 +127,27 @@ elsif opts[:remove]
     end
   end
   
+elsif opts[:removedata]
+  torrents = opts[:removedata].inject([]) { |sum, x| sum += Torrent.find_by_name(x) }
   
+  if torrents.length == 0
+    puts "No torrents mached #{opts[:removedata]}"
+    exit 1
+  end
+
+  puts "Found the following torrents"
+  puts "============================"
+  torrents.each { |torrent| puts "#{torrent.name} (#{torrent.ratio})" }
+  puts
+  puts "THIS ACTION WILL REMOVE ALL THE DOWNLOADED DATA!"
+  should_remove = Utilities.agree?("Are you sure you want to remove these torrents?")
+
+  if should_remove
+    torrents.each do |torrent|
+      torrent.removedata
+      puts "#{torrent.name} removed."
+    end
+  end
 
 elsif opts[:ratioremove]
   torrents = Torrent.all.reject { |torrent| torrent.ratio.to_f < opts[:ratioremove] }

data/lib/torrent.rb

@@ -20,6 +20,11 @@ class Torrent
     open(template % @hash, :http_basic_authentication => [@@settings.username, @@settings.password]) {|f| f.read }
   end
   
+  def removedata
+    template = "http://#{@@settings.host}:#{@@settings.port}/gui/?action=removedata&hash=%s"
+    open(template % @hash, :http_basic_authentication => [@@settings.username, @@settings.password]) {|f| f.read }
+  end
+
   def self.all
     json = JSON.parse(open("http://#{@@settings.host}:#{@@settings.port}/gui/?list=1", :http_basic_authentication => [@@settings.username, @@settings.password]).read)
     torrents = Array.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: georgboe-ucli
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - "Georg Alexander B\xC3\xB8e"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-25 00:00:00 -07:00
+date: 2009-06-12 00:00:00 -07:00
 default_executable: ucli
 dependencies: 
 - !ruby/object:Gem::Dependency