saber 1.1.1 → 1.2.0

data/lib/saber/task/make.rb

@@ -8,8 +8,6 @@ module Saber
     # -----
     #
     #    Task["make"].invoke(:make, ["bib", "a.epub", "b.epub"])
-    #    > create a.epub.torrent and send it to local and remote watch directory.
-    #    > create b.epub.torrent ..
     #
     class Make < Base
       desc "make", "make"
@@ -29,13 +27,27 @@ module Saber
             end
           end
 
-          system "mktorrent -p -a #{Rc[tracker_name].announce_url} #{file.shellescape}", show_cmd: true
-          # cp tororent file to watch directory.
-          Pa.cp_f torrent_file, Rc.p.watch, show_cmd: true if Rc.p._has_key?(:watch) 
-          if Rc.p._has_key?(:remote_watch)
-            require "saber/task/send"
-            Task["send"].invoke(:send, [torrent_file, Rc.p.remote_watch]) 
+          if not Pa.exists?(file)
+            Saber.ui.error "SKIP: can't find file to make -- #{file}"
+            next
           end
+
+          system "mktorrent -p -a #{Rc[tracker_name].announce_url} #{file.shellescape} #{options['option']}", show_cmd: true
+
+          # cp tororent file
+          if Rc._has_key?("make.watch")
+            Pa.cp_f torrent_file, Rc.make.watch, show_cmd: "$"
+          end
+
+          if Rc._has_key?("make.remote_watch")
+            Task["send"].invoke(:send1, [torrent_file, Rc.make.remote_watch]) 
+          end
+
+          # move torrent file
+          if Rc._has_key?("make.dir")
+            Pa.mv_f torrent_file, Rc.make.dir, show_cmd: "$"
+          end
+
           Saber.ui.say ""
         }
       end

data/lib/saber/task/send.rb

@@ -14,7 +14,7 @@ module Saber
         end
 
         *files, dest = args
-        system "rsync -Phr #{files.shelljoin} #{Rc.server.user}@#{Rc.server.host}:#{dest}", show_cmd: true 
+        system "rsync -ahP #{files.shelljoin} #{Rc.server.user}@#{Rc.server.host}:#{dest}", show_cmd: "$" 
       end
     end
   end

data/lib/saber/task/upload.rb

@@ -2,35 +2,45 @@ module Saber
   module Task
     # Usage
     #
-    #   Task["upload"].invoke(:upload, ["site", "Hello.epub"])             # make hello.epub.torrent
-    #   Task["upload"].invoke(:upload, ["site", "Hello.epub.torrent"])
+    #   Task["upload"].invoke(:upload, ["site", "Hello.epub"])
     #
     class Upload < Base
       desc "upload", "upload"
       # @param [String] tracker_name
-      # @param [String] file/torrent_file  "foo" or "foo.torrent"
-      def upload(tracker_name, *torrent_files)
-        require "saber/tracker/#{tracker_name}"
+      # @param [String] file
+      def upload(tracker_name, format, *files)
+        filemap = {}    # {file => torrent_file}
 
-        torrent_files.map!{|v| Pa.add_ext2(v, ".torrent")}
+        files.each{|file|
+          torrent_file = [
+            "#{file}.#{format}.torrent", 
+            "#{tracker_name}/#{file}.#{format}.torrent", 
+            "#{file}.torrent", 
+            "#{tracker_name}/#{file}.torrent"
+          ].find {|v| Pa.exists?(v)}
 
-        ensure_torrent_file(tracker_name, *torrent_files)
-
-        tracker = Tracker[tracker_name].new
-        tracker.login
-        tracker.upload(*torrent_files)
-      end
-
-    private
+          torrent_file ||= Pa.directory?(file) ? "#{file}.torrent" : "#{file}.#{format}.torrent"
+          filemap[file] = torrent_file
+        }
 
-      def ensure_torrent_file(tracker_name, *torrent_files)
-        require "saber/task/make"
+        # make torrent if torrent_file not exists.
+        filemap.each { |file, torrent_file|
+          if not Pa.exists?(torrent_file)
 
-        torrent_files.each { |torrent_file|
-          next if Pa.exists?(torrent_file)
+            if not Pa.exists?(file)
+              Saber.ui.error "SKIP: Can't find torrent_file nor file -- #{file}" 
+              filemap.delete(file)
+              next
+            end
 
-          Task["make"].invoke(:make, [tracker_name, Pa.delete_ext2(torrent_file, ".torrent")])
+            Saber.ui.say "Can't find torrent_file, begin to make it. -- #{torrent_file}"
+            Task["make"].invoke(:make, [tracker_name, file])
+          end
         }
+
+        tracker = Tracker2[tracker_name].new(options)
+        #tracker.login
+        tracker.upload(format, filemap, {add: options["add"]})
       end
     end
   end

data/lib/saber/tracker.rb

@@ -12,17 +12,21 @@ module Saber
   #  bib.upload("Hello.epub.torrent")
   #
   module Tracker
-    autoload :Base, "saber/tracker/base"
-    autoload :What, "saber/tracker/what"
-    autoload :BIB, "saber/tracker/bib"
-
     @@trackers = {}
     mattr_reader :trackers
 
     class << self
       def [](name)
+        require "saber/tracker/#{name}"
+
         trackers[name]
       end
     end
   end
 end
+
+require "saber/tracker/base"
+require "saber/tracker/what"
+require "saber/tracker/bib"
+require "saber/tracker/stp"
+

data/lib/saber/tracker/base.rb

@@ -3,32 +3,45 @@ require "active_support/core_ext/string/inflections"
 module Saber
   module Tracker
     class Base
+      DELEGATE_METHODS = [:get]
+
       def self.inherited(child)
         Tracker.trackers[child.name.demodulize.underscore] = child
       end
 
+      class << self
+        attr_reader :tracker_name
+
+        def tracker_name
+          @tracker_name ||= self.name.demodulize.underscore
+        end
+      end
+
       # implement
-      @@POPULATE_TYPES = []
+      POPULATE_TYPES = []
 
       def self.can_populate?(type)
-        @@POPULATE_TYPES.include?(type.to_s)
+        self::POPULATE_TYPES.include?(type.to_s)
       end
 
       # implement
-      @@BASE_URL = ""
-      @@LOGIN_CHECK_PATH = ""
+      BASE_URL = ""
+      LOGIN_CHECK_PATH = ""
 
       attr_reader :agent
-      attr_reader :site_name
-      
+      attr_reader :name
+
       def initialize
-        @site_name = self.class.name.demodulize.underscore
         @agent = Mechanize.new 
+      end
 
-        @agent.get(@@BASE_URL)
+      def name
+        self.class.tracker_name
       end
 
       def login
+        @agent.get(self.class::BASE_URL)
+
         if login_with_cookie
           return
         end
@@ -69,6 +82,14 @@ module Saber
         end
       end
 
+      DELEGATE_METHODS.each {|mth|
+        eval <<-EOF
+          def #{mth}(*args, &blk)
+            agent.#{mth}(*args, &blk)
+          end
+        EOF
+      }
+
     protected
 
       # Implement
@@ -86,14 +107,14 @@ module Saber
       end
 
       def login_with_cookie
-        if Pa.exists?("#{Rc.p.home}/#{site_name}.cookies") then
-          open("#{Rc.p.home}/#{site_name}.cookies") { |io|
+        if Pa.exists?("#{Rc.p.home}/#{name}.cookies") then
+          open("#{Rc.p.home}/#{name}.cookies") { |io|
             agent.cookie_jar.load_cookiestxt(io)
           }
 
-          ret = agent.get(@@LOGIN_CHECK_PATH)
+          ret = agent.get(self.class::LOGIN_CHECK_PATH)
 
-          if ret.uri.path == @@LOGIN_CHECK_PATH
+          if ret.uri.path == self.class::LOGIN_CHECK_PATH
             true 
           else
             Saber.ui.say "Login with cookie failed."
@@ -103,13 +124,13 @@ module Saber
       end
 
       def login_with_username
-        username = Rc._fetch(["#{site_name}.username", "username"], nil)
+        username = Rc._fetch(["#{name}.username", "username"], nil)
 
-        Saber.ui.say "Begin to login manually."
+        Saber.ui.say "Begin to login #{name} manually."
         Saber.ui.say "Username: #{username}" if username
         loop do
           if do_login_with_username(username)
-            open("#{Rc.p.home}/#{site_name}.cookies", "w") { |f|
+            open("#{Rc.p.home}/#{name}.cookies", "w") { |f|
               agent.cookie_jar.dump_cookiestxt(f)
             }
             return true

data/lib/saber/tracker/bb.rb

@@ -2,9 +2,8 @@ module Saber
   module Tracker
     # DOESN'T WORK for mechanize does not support javascript.
     class BB < Base
-      @@BASE_URL = "https://baconbits.org"
-
-      @@LOGIN_CHECK_PATH = "/inbox.php"
+      BASE_URL = "https://baconbits.org"
+      LOGIN_CHECK_PATH = "/inbox.php"
 
       FIELDS = { 
         "Musics" => {
@@ -180,11 +179,6 @@ module Saber
         },
       }
       
-      # We have below attributes:
-      #
-      #  * agent: a Mechanize object
-      #  * site_name: "bib" 
-
       # Upload one torrent file to the site.
       #
       # @param [String] file a filename
@@ -202,8 +196,8 @@ module Saber
           }.submit
 
           if ret.uri.path == "/upload.php"
-            msg = ReverseMarkdown.parse(ret.at("//*[@id='content']/div[2]/p[2]")
-            Saber.ui.error "ERROR:\n#{msg}"
+            msg = ReverseMarkdown.parse(ret.at("//*[@id='content']/div[2]/p[2]"))
+            Saber.ui.error "ERROR: #{msg.to_s.strip}\n"
             return false
           else
             return true

data/lib/saber/tracker/bib.rb

@@ -1,12 +1,11 @@
+require "active_support/core_ext/object/try"
+
 module Saber
   module Tracker
     class BIB < Base
-      @@POPULATE_TYPES = %w[ebook audiobook]
-
-      @@BASE_URL = "http://bibliotik.org"
-
-      # used by login-with-cookie to check if it's succeed.
-      @@LOGIN_CHECK_PATH = "/conversations"
+      POPULATE_TYPES = %w[ebook audiobook]
+      BASE_URL = "http://bibliotik.org"
+      LOGIN_CHECK_PATH = "/conversations"
 
       FIELDS = { 
         "applications" => {
@@ -128,11 +127,6 @@ module Saber
         }
       }
       
-      # We have below attributes:
-      #
-      #  * agent: a Mechanize object
-      #  * site_name: "bib" 
-
       # Upload one torrent file to the site.
       #
       # @param [String] file a filename
@@ -166,6 +160,28 @@ module Saber
         }
       end
 
+      def browse(page, &blk)
+        ret = []
+        path = "/torrents/advanced/?search=&cat[0]=5&y1=&y2=&p1=&p2=&size1=&size2=&for[0]=15&orderby=added&order=desc&page=#{page}"
+
+        p = agent.get(path) 
+        p.search("//td[contains(string(), '[Retail]')]/span[@class='title']/a").each {|a|
+          page = agent.get(a["href"])
+
+          title = page.at("//*[@id='title']").inner_text.strip
+          tags = page.search("//*[@class='taglist']/a").map{|n| n.inner_text}
+          isbn = page.at("//*[@id='details_content_info']").inner_text.match(/\((\d+)\)/).try(:[], 1) || ""
+          download_link = page.at("//*[@id='details_links']/a[@title='Download']")["href"]
+          filenames = page.search("//*[@id='files']//td[1]").map{|n| n.inner_text}
+
+          torrent = {title: title, tags: tags, isbn: isbn, download_link: download_link, filenames: filenames}
+          blk.call(torrent) if blk
+          ret << torrent
+        }
+
+        ret
+      end
+
     protected
 
       # Attpened to login the site with username and password. this happens 

data/lib/saber/tracker/chd.rb

@@ -1,9 +1,9 @@
 module Saber
   module Tracker
     class CHD < Base
-      @@BASE_URL = "https://chdbits.org"
-      @@LOGIN_CHECK_PATH = "/messages.php"
-      CACHE_FILE = "#{ENV['HOME']}/.cache/saber.chd"
+      BASE_URL = "https://chdbits.org"
+      LOGIN_CHECK_PATH = "/messages.php"
+      CACHE_FILE = "#{ENV['HOME']}/.saber/chd.cache"
 
       # cache {id: is_download}
       attr_accessor :cache
@@ -22,7 +22,7 @@ module Saber
           File.write(CACHE_FILE, Marshal.dump(cache))
         }
 
-        agent.pluggable_parser["application/x-bittorrent"] = Mechanize::DirectorySaver.save_to(Rc.p.watch.p)
+        agent.pluggable_parser["application/x-bittorrent"] = Mechanize::DirectorySaver.save_to(Rc.chd.dir)
       end
 
       def add_torrents

data/lib/saber/tracker/gazelle.rb

@@ -0,0 +1,7 @@
+module Saber
+  module Tracker
+    class Gazelle
+
+    end
+  end
+end

data/lib/saber/tracker/ptp.rb

@@ -3,8 +3,8 @@ require "active_support/core_ext/object/try"
 module Saber
   module Tracker
     class PTP < Base
-      @@BASE_URL = "https://tls.passthepopcorn.me"
-      @@LOGIN_CHECK_PATH = "/inbox.php"
+      BASE_URL = "https://tls.passthepopcorn.me"
+      LOGIN_CHECK_PATH = "/inbox.php"
 
       FIELDS = { 
         "new" => {

data/lib/saber/tracker/stp.rb

@@ -0,0 +1,53 @@
+module Saber
+  module Tracker
+    class STP < Base
+      BASE_URL = "https://stopthepress.es"
+      LOGIN_CHECK_PATH = "/inbox.php"
+
+      TAG_MAP = {
+        "nonfiction" => "non.fiction"
+      }
+
+      def exists?(o={})
+        url = "/torrents.php?cataloguenumber=#{o[:isbn]}"
+        page = agent.get(url)
+
+        not page.at("//*[@id='content']/div[2]/h2[contains(text(), 'Your search did not match anything.')]")
+      end
+
+      def convert_tags(*tags)
+        tags.map{|tag|
+          tag = tag.downcase.gsub(/&/, "and").gsub(/\s+/, ".").gsub(/'/, "")
+
+          TAG_MAP.fetch(tag, tag)
+        }
+      end
+
+    protected
+
+      def do_login_with_username(username)
+        agent.get("/login.php") {|p|
+          ret = p.form_with(action: "login.php" ) {|f|
+            # error
+            unless f 
+              Saber.ui.error! p.at("//body").inner_text
+            end
+
+            f.username = username || ask("Username: ")
+            f.password = ask("Password: "){|q| q.echo = false}
+            f.checkbox(name: "keeplogged").check
+          }.submit
+
+          # error
+          if ret.uri.path == "/login.php"
+            msg = ret.at("//*[@id='loginform']/span[2]").inner_text
+            Saber.ui.error "Failed. You have #{msg} attempts remaining."
+            return false
+          else
+            return true
+          end
+        }
+      end
+    end
+  end
+end

data/lib/saber/tracker/what.rb

@@ -2,8 +2,8 @@ module Saber
   module Tracker
     # DON'T WORK for mechanize does not support javascript. 
     class What < Base
-      @@BASE_URL = "https://what.cd"
-      @@LOGIN_CHECK_PATH = "/inbox.php"
+      BASE_URL = "https://what.cd"
+      LOGIN_CHECK_PATH = "/inbox.php"
 
       FIELDS = { 
         "E-Books" => {