saber 1.1.0 → 1.1.1

data/CONTRIBUTING.md

@@ -0,0 +1,17 @@
+We love pull requests. Here's a quick guide:
+
+1. Fork the repo.
+
+2. Create a topic branch from where you want to base your work. 
+
+3. Add a test for your change. Only refactoring and documentation changes
+require no new tests. If you are adding functionality or fixing a bug, we need
+a test!
+
+4. Make the test pass with `rake test`.
+
+5. Push to your fork and submit a pull request.
+
+6. Coding Style Guide: https://gist.github.com/1105334
+
+And in case we didn't emphasize it enough: we love tests!

data/README.md

@@ -1,78 +1,35 @@
-Saber, a complete solution for PT users. [![Build Status](https://secure.travis-ci.org/GutenYe/saber.png)](http://travis-ci.org/GutenYe/saber)
+Saber, a complete solution for PT users. [![Build Status](https://secure.travis-ci.org/SaberSalv/saber.png)](http://travis-ci.org/SaberSalv/saber)
 ==========================================
 
 |                |                                         |
 |----------------|-----------------------------------------|
-| Homepage:      | https://github.com/GutenYe/saber        |
-| Author:	       | Guten                                   |
+| Homepage:      | https://github.com/SaberSalv/saber        |
+| Author:	       | Saber                                   |
 | License:       | MIT-LICENSE                             |
-| Documentation: | https://github.com/GutenYe/saber/wiki   |
-| Issue Tracker: | https://github.com/GutenYe/saber/issues |
+| Documentation: | https://github.com/SaberSalv/saber/wiki   |
+| Issue Tracker: | https://github.com/SaberSalv/saber/issues |
 
 **Features:**
 
 * Add Torrent: send a torrent file from website to rutorrent.
-* Upload: upload a torrent file from command line to the site.
 * Fetch: automatically/manually fetch files from seedbox to home-laptop.
+* Upload: upload a torrent file from command line to the site.
 * Other Tasks:
 	- Make: make a torrent file and copy it to local and remote watch directory.
 	- Send: send files from home-laptop to seedbox.
 	- Clean: remove files which are not seeded in rtorrent.
 
-you can find more tools at [here](https://github.com/GutenYe/saber/wiki/Tools).
+you can find more tools at [here](https://github.com/SaberSalv/saber/wiki/Tools).
 
 Getting Started
 ----------------
 
-Create ~/.saberrc configuration file from [template](https://github.com/GutenYe/saber/blob/master/templates/_saberrc). More detail will be explained below.
+Create ~/.saberrc configuration file from [template](https://github.com/SaberSalv/saber/blob/master/templates/_saberrc). More detail will be explained below.
 
 ### Add Torrent
 
-See [saber-addtorrent](https://github.com/GutenYe/saber-addtorrent) project.
-
-### Upload
-
-Because of lacking APIs in major PT sites, so I write this small script to help uploading a torrent from cmdline. Good news is BTN v2.0 will include API. And BTN already has an official autobot which grabs scene releases. :)
-
-> Support sites: BIB
-
-Configure ~/.saberrc
-
-	p:
-		watch = Pa("~/bt/watch")
-		remote_watch = Pa("bt/watch") 
-
-	username = "foo"
-	bib:
-		username = "bar"
-		announce_url = "x"
-
-	server:
-		user = "x"
-		host = "y"
-
-Fill \<info-data>.yml file and upload it.
-
-	$ saber.bib g magazine hello.pdf
-	> create hello.pdf.yml
-	$ vim hello.pdf.yml
-
-		type: magazines
-		Title: Hello
-		Description: Hello World
-		...
-
-	$ saber.bib upload hello.pdf.torrent
-	> Upload Complete
-
-	$ saber.bib upload hello.pdf    # short cut
-	> make hello.pdf.torrent
-	> Upload Complete
+See [saber-addtorrent](https://github.com/SaberSalv/saber-addtorrent) project.
 
-Auto fill \<info-data>.yml file from isbn.
-
-	$ saber.bib g ebook hello.epub 1781100055
-	> create hello.epub.yml 
 
 ### Fetch
 
@@ -115,7 +72,7 @@ Start saber-client at client side.
 
 Test if it works
 
-	(server) $ saber drb_add <rtorrent_file_hash_id> saber
+	(server) $ saber drb_add <rtorrent_file_hash_id> saber -V
 	(client) > aria2 should begin download file from ftp://seedbox/bt/<file>
 
 Automatically fetch: when a file is finished download in rutorrent with label 'saber', then it'll add to aria2.
@@ -142,8 +99,52 @@ Configure ~/.saberrc
 Begin fetch a file from seedbox
 
 	$ saber fetch foo
-	> download ftp://seedbox/bt/foo/a.epub
-	> download ftp://seedbox/bt/foo/b.epub
+	> begin to download ftp://seedbox/bt/foo/a.epub via aria2
+	> begin to download ftp://seedbox/bt/foo/b.epub via aria2
+
+### Upload
+
+Because of lacking APIs in major PT sites, so I write this small script to help uploading a torrent from cmdline. Good news is BTN v2.0 will include API. And BTN already has an official autobot which grabs scene releases. :)
+
+> Support sites: BIB
+
+Configure ~/.saberrc
+
+	p:
+		watch = Pa("~/bt/watch")
+		remote_watch = Pa("bt/watch") 
+
+	username = "foo"
+	bib:
+		username = "bar"
+		announce_url = "x"
+
+	server:
+		user = "x"
+		host = "y"
+
+Fill \<info-data>.yml file and upload it.
+
+	$ saber.bib g magazine hello.pdf
+	> create hello.pdf.yml
+	$ vim hello.pdf.yml
+
+		type: magazines
+		Title: Hello
+		Description: Hello World
+		...
+
+	$ saber.bib upload hello.pdf.torrent
+	> Upload Complete
+
+	$ saber.bib upload hello.pdf    # short cut
+	> make hello.pdf.torrent
+	> Upload Complete
+
+Auto fill \<info-data>.yml file from isbn.
+
+	$ saber.bib g ebook hello.epub 1781100055
+	> create hello.epub.yml 
 
 ### Tasks
 
@@ -198,45 +199,36 @@ use `saber help` to list all tasks.
 Install
 -------
 
-_Main article_: [Install Saber](https://github.com/GutenYe/saber/wiki/Install)
+_Main article_: [Install Saber](https://github.com/SaberSalv/saber/wiki/Install)
 
 	$ gem install saber
 	$ install it's dependencies 
 
-	Archlinux: pacaur -S saber
-
-Resources
----------
-
-* [Archlinux](http://www.archlinux.org): A simple, lightweight linux distribution.
-* [pacaur](https://github.com/Spyhawk/pacaur): An AUR helper for ArchLinux.
-* [YAAW](https://github.com/binux/yaaw): Yet Another Aria2 Web Frontend in pure HTML/CSS/Javascirpt.
-
-Development [![Dependency Status](https://gemnasium.com/GutenYe/saber.png?branch=master)](https://gemnasium.com/GutenYe/saber) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/GutenYe/saber)
+Development [![Dependency Status](https://gemnasium.com/SaberSalv/saber.png?branch=master)](https://gemnasium.com/SaberSalv/saber) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/SaberSalv/saber)
 ===========
 
 Contributing
--------------
+------------
 
 * Submit any bugs/features/ideas to github issue tracker.
 
-Pull requests are very welcome! Please try to follow these simple rules if applicable:
+Please see [Contibution Documentation](https://github.com/SaberSalv/saber/blob/master/CONTRIBUTING.md).
 
-* Please create a topic branch for every separate change you make.
-* Make sure your patches are well tested.
-* Coding Style Guide: https://gist.github.com/1105334
+A list of [Contributors](https://github.com/SaberSalv/saber/contributors).
 
-Contributors
-------------
+Resources
+---------
 
-[https://github.com/GutenYe/saber/contributors](https://github.com/GutenYe/saber/contributors)
+* [Archlinux](http://www.archlinux.org): A simple, lightweight linux distribution.
+* [pacaur](https://github.com/Spyhawk/pacaur): An AUR helper for ArchLinux.
+* [YAAW](https://github.com/binux/yaaw): Yet Another Aria2 Web Frontend in pure HTML/CSS/Javascirpt.
 
 Copyright
 ---------
 
 (the MIT License)
 
-Copyright (c) 2011-2012 Guten
+Copyright (c) 2011-2012 Saber
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/bin/saber

@@ -3,15 +3,12 @@ require_relative "../lib/saber"
 
 begin
   Saber::CLI.start
-rescue Saber::Error => e
-  Saber.ui.error e.message
-  Saber.ui.debug e.backtrace.join("\n")
-  exit 1
 rescue Interrupt => e
   Saber.ui.error "\nQuitting..."
   Saber.ui.debug e.backtrace.join("\n")
   exit 1
 rescue Exception => e
-  raise e
+  Saber.ui.error "#{e.class.name}: #{e.message}"
+  Saber.ui.debug e.backtrace.join("\n")
   exit 1
 end

data/lib/saber/autofetcher/client.rb

@@ -55,7 +55,7 @@ module Saber
       def initialize
         DRb.start_service
         @server = DRbObject.new_with_uri(Rc.drb_uri)
-        Saber.ui.say ">> DRbClient connected to #{Rc.drb_uri}"
+        Saber.ui.debug ">> DRbClient connected to #{Rc.drb_uri}"
       end
 
       def add(*names)

data/lib/saber/autofetcher/server.rb

@@ -56,6 +56,9 @@ module Saber
       def add(*names)
         files = build_files(*names) 
         saber_server.send(files)
+      rescue => e
+        Saber.ui.error "#{e.class.name}: #{e.message}"
+        Saber.ui.error e.backtrace.join("\n")
       end
 
     private

data/lib/saber/cli.rb

@@ -95,5 +95,12 @@ module Saber
 
       Task["make"].invoke(:make, [options["tracker"] || ENV["SABER_TRACKER"], *files], o)
     end
+
+    desc "chd", "chd"
+    def chd
+      require "saber/task/chd"
+
+      Task["chd"].invoke(:chd, o)
+    end
   end
 end

data/lib/saber/task/chd.rb

@@ -0,0 +1,27 @@
+module Saber
+  module Task
+    class CHD < Base
+
+      desc "chd", "chd"
+      def chd(o={})
+        require "saber/tracker/chd"
+        t = Tracker["chd"].new
+
+        begin
+          t.login
+          Saber.ui.say "Begin to watch."
+          # mark all loaded.
+          t.update_cache(true)
+
+          while true
+            t.add_torrents
+            sleep Rc.chd.update_interval
+          end
+        rescue Errno::ETIMEDOUT, Mechanize::ResponseCodeError, SocketError
+          sleep 60
+          retry
+        end
+      end
+    end
+  end
+end

data/lib/saber/tracker/base.rb

@@ -34,6 +34,8 @@ module Saber
         end
 
         login_with_username
+
+        Saber.ui.say "Login succesfully."
       end
 
       def upload(*torrent_files)

data/lib/saber/tracker/chd.rb

@@ -0,0 +1,88 @@
+module Saber
+  module Tracker
+    class CHD < Base
+      @@BASE_URL = "https://chdbits.org"
+      @@LOGIN_CHECK_PATH = "/messages.php"
+      CACHE_FILE = "#{ENV['HOME']}/.cache/saber.chd"
+
+      # cache {id: is_download}
+      attr_accessor :cache
+
+      def initialize
+        super
+
+        if Pa.exists?(CACHE_FILE)
+          @cache = Marshal.load(File.read(CACHE_FILE))
+        else
+          @cache = {}
+        end
+
+        at_exit { 
+          Saber.ui.debug "Exit."
+          File.write(CACHE_FILE, Marshal.dump(cache))
+        }
+
+        agent.pluggable_parser["application/x-bittorrent"] = Mechanize::DirectorySaver.save_to(Rc.p.watch.p)
+      end
+
+      def add_torrents
+        update_cache
+
+        cache.each {|k,v|
+          next if v 
+
+          file = agent.get(build_download_link(k))
+          Saber.ui.debug "Download #{Time.now.strftime("%H:%M:%S")} #{file.filename}"
+          cache[k] = true
+        }
+
+        # limit to 60 counts
+        self.cache = Hash[cache.to_a[-60..-1]] if cache.length > 60 
+      end
+
+      def update_cache(loaded=false)
+        agent.get("/torrents.php") {|p|
+          links = p.search("//*[@id='torrenttbale']//img[@class='pro_free']/preceding-sibling::a")
+          #links = p.search("//*[@id='torrenttbale']//img[@class='pro_free' or @class='pro_50pctdown']/preceding-sibling::a")
+          links.each {|link|
+            id = link["href"].match(/id=(\d+)/)[1].to_i
+
+            cache[id] = loaded unless cache.has_key?(id)
+          }
+        }
+      end
+
+    protected
+
+      def build_download_link(id, passkey=nil)
+        "http://chdbits.org/download.php?id=#{id}&passkey=#{passkey || Rc.chd.passkey}" 
+      end
+
+      def do_login_with_username(username)
+        agent.get("/login.php") {|p|
+          ret = p.form_with(action: "takelogin.php" ) {|f|
+            # error. e.g. temporary disabled for failed logining exceed maxmium count.
+            unless f 
+              # print error in red color and exit the program.
+              Saber.ui.error! p.at("//body").inner_text
+            end
+
+            f.username = username || ask("Username: ")
+            f.password = ask("Password: "){|q| q.echo = false}
+          }.submit
+
+          # error
+          if ret.uri.path == "/login"
+            msg = ret.at("//*[@id='nav_block']/form[2]/p[2]/b/font").inner_text
+            Saber.ui.error "Failed. You have #{msg} attempts remaining."
+            return false
+          else
+            return true
+          end
+        }
+      end
+    end
+  end
+end
+
+# vim: fdn=4

data/lib/saber/version.rb

@@ -1,3 +1,3 @@
 module Saber
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/rutorrent/plugin.info

@@ -1,4 +1,4 @@
 plugin.description: a rutorrent plugin to auto download files into home laptop.
-plugin.author: Guten
+plugin.author: Saber
 plugin.version: 0.1
-plugin.help: https://github.com/GutenYe/saber
+plugin.help: https://github.com/SaberSalv/saber

data/saber.gemspec

@@ -8,9 +8,9 @@ spec = Gem::Specification.new do |s|
 A complete solution for PT users.
 	EOF
 
-	s.author = "GutenYe"
-	s.email = "ywzhaifei@gmail.com"
-	s.homepage = "http://github.com/GutenYe/saber"
+	s.author = "SaberSalv"
+	s.email = "sabersalv@gmail.com"
+	s.homepage = "http://github.com/SaberSalv/saber"
 	s.rubyforge_project = "xx"
 
 	s.files = `git ls-files`.split("\n")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: saber
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
-- GutenYe
+- SaberSalv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pd
@@ -190,7 +190,7 @@ dependencies:
 description: ! 'A complete solution for PT users.
 
 '
-email: ywzhaifei@gmail.com
+email: sabersalv@gmail.com
 executables:
 - saber
 extensions:
@@ -202,6 +202,7 @@ files:
 - .rspec
 - .travis.yml
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -224,6 +225,7 @@ files:
 - lib/saber/rc.rb
 - lib/saber/task.rb
 - lib/saber/task/base.rb
+- lib/saber/task/chd.rb
 - lib/saber/task/clean.rb
 - lib/saber/task/generate.rb
 - lib/saber/task/make.rb
@@ -233,11 +235,11 @@ files:
 - lib/saber/tracker/base.rb
 - lib/saber/tracker/bb.rb
 - lib/saber/tracker/bib.rb
+- lib/saber/tracker/chd.rb
 - lib/saber/tracker/ptp.rb
 - lib/saber/tracker/what.rb
 - lib/saber/ui.rb
 - lib/saber/version.rb
-- rutorrent/README.md
 - rutorrent/init.js
 - rutorrent/init.php
 - rutorrent/plugin.info
@@ -285,7 +287,7 @@ files:
 - templates/what/ebook.yml
 - templates/what/music.yml
 - templates/what/music_add.yml
-homepage: http://github.com/GutenYe/saber
+homepage: http://github.com/SaberSalv/saber
 licenses: []
 post_install_message: 
 rdoc_options: []

data/rutorrent/README.md

@@ -1,34 +0,0 @@
-rutorrent-saber-download, a rutorrent plugin to auto download files into home laptop.
-==========================================================================
-
-| Homepage:      |  https://github.com/GutenYe/rutorrent-saber-download       |
-|----------------|------------------------------------------------------       |
-| Author:	       | Guten                                                 |
-| License:       | MIT-LICENSE                                                |
-| Issue Tracker: | https://github.com/GutenYe/saber-download/issues |
-
-This is a part of the [Saber](https://github.com/GutenYe/saber) project.
-
-Install
--------
-
-  gem install saber-download
-
-
-Resources
----------
-
-	some related resources to help each other.
-
-Copyright
----------
-
-(the MIT License)
-
-Copyright (c) 2011 Guten
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.