saber 1.2.3 → 1.2.4

data/CHANGELOG.md

@@ -1,4 +1,17 @@
-## 1.2.0 (xx)
+## 1.2.4 (Nov 4, 2012)
+
+**Improvements**
+
+  - better book description for bB.
+	- auto generate tags from goodreads.
+  - add per-tracker mktorrent options.
+	- configration add '<tracker>.mktorrent_options', 'api_url'.
+
+**Changes**
+
+  - configuration changes from 'upload.move_yml, upload.move_torrent' to 'upload.archive'
+
+## 1.2.0 (Nov 1, 2012)
 
 **Improvements**
 

data/Gemfile

@@ -1,9 +1,9 @@
 source "https://rubygems.org"
 
 gem "pd"
-gem "tagen", "~>2.0.1"
+gem "tagen", "~>2.0.2"
 gem "optimism", "~>3.3.1"
-gem "pa", "~>1.3.3"
+gem "pa", "~>1.4.0"
 gem "retort", "~>0.0.6"
 gem "thor", "~>0.16.0"
 gem "net-ssh", "~>2.5.2"
@@ -24,7 +24,6 @@ group :development do
   gem "guard"
   gem "guard-rspec"
   gem "rb-inotify"
-	#gem "rag", path: "/home/guten/dev/one/rag"
 end
 
 # gemspec

data/Gemfile.lock

@@ -66,7 +66,7 @@ GEM
     optimism (3.3.1)
       json
       pd
-    pa (1.3.3)
+    pa (1.4.0)
       pd
     pd (1.1.0)
     pry (0.9.10)
@@ -95,7 +95,7 @@ GEM
     slop (3.3.3)
     sys-filesystem (1.0.0)
       ffi (>= 1.0.0)
-    tagen (2.0.1)
+    tagen (2.0.2)
       activesupport
       pd
     thor (0.16.0)
@@ -127,14 +127,14 @@ DEPENDENCIES
   mechanize (~> 2.5.1)
   net-ssh (~> 2.5.2)
   optimism (~> 3.3.1)
-  pa (~> 1.3.3)
+  pa (~> 1.4.0)
   pd
   rb-inotify
   retort (~> 0.0.6)
   reverse_markdown (~> 0.3.0)
   rspec
   sys-filesystem (~> 1.0.0)
-  tagen (~> 2.0.1)
+  tagen (~> 2.0.2)
   thor (~> 0.16.0)
   vcr
   watir (~> 4.0.1)

data/extconf.rb

@@ -13,8 +13,6 @@ gem_home = if Gem.dir.match(%~/(\.rvm|\.rbenv)/~)
   end
 dist_bindir = ENV["GEM_BINDIR"] || Gem.bindir(gem_home)
 
-p Gem.dir, Gem.user_dir
-
 FileUtils.install File.join(bindir, "saber-drb_add"), dist_bindir
 FileUtils.install File.join(bindir, "saber.bib"), dist_bindir
 FileUtils.install File.join(bindir, "saber.bb"), dist_bindir

data/lib/saber/task/find_uploads.rb

@@ -42,7 +42,7 @@ module Saber
     private
 
       def convert_bibtags(tags)
-        tags.map{|v| 
+        tags.map {|v| 
           v.gsub(/ \(programming\)/i, '')
         }.sort_by {|v| 
           %w[fiction nonfiction].include?(v) ? -1 : tags.index(v)

data/lib/saber/task/make.rb

@@ -22,7 +22,7 @@ module Saber
             if options["force"]
               Pa.rm torrent_file
             else
-              Saber.ui.say "Skip make: #{file} (torrent alreay exists. use -f to overwrite it.)"
+              Saber.ui.say "SKIP make: #{torrent_file} (torrent alreay exists. use --force to overwrite it.)"
               next
             end
           end
@@ -32,7 +32,9 @@ module Saber
             next
           end
 
-          system "mktorrent -p -a #{Rc[tracker_name].announce_url} #{file.shellescape} #{options['option']}", show_cmd: true
+          extra_options = Rc._fetch(["#{tracker_name}.mktorrent_options", "mktorrent_options"], "")
+          cmd = "mktorrent -p #{extra_options} -a #{Rc[tracker_name].announce_url} #{file.shellescape} #{options['option']}"
+          system cmd, show_cmd: "$"
 
           # cp tororent file
           if Rc._has_key?("make.watch")

data/lib/saber/task/upload.rb

@@ -26,7 +26,6 @@ module Saber
         # make torrent if torrent_file not exists.
         filemap.each { |file, torrent_file|
           if not Pa.exists?(torrent_file)
-
             if not Pa.exists?(file)
               Saber.ui.error "SKIP: Can't find torrent_file nor file -- #{file}" 
               filemap.delete(file)

data/lib/saber/tracker.rb

@@ -18,8 +18,6 @@ module Saber
 
     class << self
       def [](name)
-        require "saber/tracker/#{name}"
-
         trackers[name]
       end
     end
@@ -27,7 +25,10 @@ module Saber
 end
 
 require "saber/tracker/base"
+require "saber/tracker/gazelle"
 require "saber/tracker/what"
+require "saber/tracker/bb"
 require "saber/tracker/bib"
 require "saber/tracker/stp"
 
+

data/lib/saber/tracker/base.rb

@@ -6,6 +6,8 @@ module Saber
       DELEGATE_METHODS = [:get]
 
       def self.inherited(child)
+        return if [Gazelle].include?(child)
+
         Tracker.trackers[child.name.demodulize.underscore] = child
       end
 
@@ -28,10 +30,10 @@ module Saber
       BASE_URL = ""
       LOGIN_CHECK_PATH = ""
 
-      attr_reader :agent
-      attr_reader :name
+      attr_reader :agent, :name, :options
 
-      def initialize
+      def initialize(options={})
+        @options = options
         @agent = Mechanize.new 
       end
 

data/lib/saber/tracker/bb.rb

@@ -1,7 +1,6 @@
 module Saber
   module Tracker
-    # DOESN'T WORK for mechanize does not support javascript.
-    class BB < Base
+    class BB < Gazelle
       BASE_URL = "https://baconbits.org"
       LOGIN_CHECK_PATH = "/inbox.php"
 
@@ -179,32 +178,6 @@ module Saber
         },
       }
       
-      # Upload one torrent file to the site.
-      #
-      # @param [String] file a filename
-      # @param [Optimism] info comes from <file>.yml data file.
-      #
-      # @return [Boolean] result-code
-      def do_upload(file, info)
-        info["file_input"] = "#{file}.torrent"
-
-        agent.get("/upload.php") {|p|
-          ret = p.form_with(action: "") {|f|
-            FIELDS[info.type].each {|k,t|
-              f.set(t, k, info[k])
-            }
-          }.submit
-
-          if ret.uri.path == "/upload.php"
-            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
-          end
-        }
-      end
-
     protected
 
       # Attpened to login the site with username and password. this happens 

data/lib/saber/tracker/bib.rb

@@ -182,6 +182,10 @@ module Saber
         ret
       end
 
+      def convert_tags(*tags)
+        tags
+      end
+
     protected
 
       # Attpened to login the site with username and password. this happens 

data/lib/saber/tracker/gazelle.rb

@@ -1,7 +1,16 @@
 module Saber
   module Tracker
-    class Gazelle
+    class Gazelle < Base
+      TAG_MAP = {
+        "nonfiction" => "non.fiction"
+      }
 
+      def convert_tags(*tags)
+        tags.map {|tag|
+          tag = tag.downcase.gsub(/&/, "and").gsub(/ +/, ".").gsub(/'/, "")
+          self.class::TAG_MAP[tag] || tag
+        }
+      end
     end
   end
 end

data/lib/saber/tracker/stp.rb

@@ -1,13 +1,9 @@
 module Saber
   module Tracker
-    class STP < Base
+    class STP < Gazelle
       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)
@@ -15,14 +11,6 @@ module Saber
         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)

data/lib/saber/tracker/what.rb

@@ -1,7 +1,6 @@
 module Saber
   module Tracker
-    # DON'T WORK for mechanize does not support javascript. 
-    class What < Base
+    class What < Gazelle
       BASE_URL = "https://what.cd"
       LOGIN_CHECK_PATH = "/inbox.php"
 
@@ -16,28 +15,6 @@ module Saber
         }
       }
       
-      def do_upload(file, info)
-        info["file_input"] = "#{file}.torrent"
-        path = info["group_id"] ? "/upload.php?group_id=#{info['group_id']}" : "/upload.php"
-
-        agent.get(path) {|p|
-          ret = p.form_with(action: "") {|f|
-            FIELDS[info.type].each {|k,t|
-              f.set(t, k, info[k])
-            }
-          }.submit
-
-          # error
-          if ret.uri.path =~ %r~^/upload.php~
-            msg = ReverseMarkdown.parse(ret.at("//*[@id='content']/div[2]/p[2]"))
-            Saber.ui.error "ERROR:\n#{msg}"
-            return false
-          else
-            return true
-          end
-        }
-      end
-
     protected
 
       def do_login_with_username(username)

data/lib/saber/tracker2.rb

@@ -1,5 +1,5 @@
 require "watir"
-require "saber/watir_ext"
+require "tagen/watir"
 require "reverse_markdown"
 require "active_support/core_ext/module/attribute_accessors"
 
@@ -15,8 +15,6 @@ module Saber
 
     class << self
       def [](name)
-        require "saber/tracker2/#{name}"
-
         trackers[name]
       end
     end
@@ -27,5 +25,5 @@ require "saber/tracker2/base"
 require "saber/tracker2/gazelle"
 require "saber/tracker2/what"
 require "saber/tracker2/bib"
+require "saber/tracker2/bb"
 require "saber/tracker2/stp"
-

data/lib/saber/tracker2/base.rb

@@ -4,6 +4,8 @@ module Saber
   module Tracker2
     class Base
       def self.inherited(child)
+        return if [Gazelle].include?(child)
+
         Tracker2.trackers[child.name.demodulize.underscore] = child
       end
 
@@ -15,23 +17,18 @@ module Saber
       
       def initialize(options={})
         @name = self.class.name.demodulize.underscore
-        @agent = Watir::Browser.new *Rc.browser 
         @options = options
-        #@agent.load_cookies("#{Rc.p.home}/#{name}.cookies")
-
-        # share cookies
-        launcher = agent.driver.instance_variable_get("@bridge").instance_variable_get("@launcher")
-        origin_profile_dir = launcher.instance_variable_get("@profile").instance_variable_get("@model")
-        profile_dir = launcher.instance_variable_get("@profile_dir")
-
-        Pa.symln_f "#{origin_profile_dir}/cookies.sqlite", "#{profile_dir}/cookies.sqlite"
+        @agent = Watir::Browser.new(*Rc.browser)
+        @agent.keep_cookies!
       end
 
       def upload(format, filemap, o={})
         failed_counts = 0
 
         filemap.each {|file, torrent_file|
-          info0 = YAML.load_file("#{file}.yml")
+          yaml_file = "#{file}.yml"
+          info0 = YAML.load_file(yaml_file)
+          is_archived = torrent_file.to_s.start_with?("#{name}/")
 
           # current release only support ebook type.
           Saber.ui.error "Current doesn't support this upload_type -- #{info0['upload_type']}." unless 
@@ -60,7 +57,7 @@ module Saber
           
           # skip empty description.
           if info[:description].empty?
-            Saber.ui.error "SKIP: Empty description -- #{file}.yml"
+            Saber.ui.error "SKIP: Empty description -- yaml_file"
             next
           end
 
@@ -74,12 +71,24 @@ module Saber
             end
           end
 
+          process_info!(info)
           upload_method = o[:add] ? :add_format : :new_upload
           if send(upload_method, info)
             Saber.ui.say "Upload Complete: #{file}"
 
-            Pa.mv "#{file}.yml", Rc.upload.move_yml if Rc._has_key?("upload.move_yml")
-            Pa.mv torrent_file, Rc.upload.move_torrent if Rc._has_key?("upload.move_torrent")
+            # archive
+            if !is_archived and Rc._has_key?("upload.archive")
+              archive = case (archive=Rc.upload.archive)
+              when Proc
+                archive.call(info[:upload_type])
+              else
+                archive
+              end
+
+              Pa.mv yaml_file, archive, mkdir: true
+              Pa.mv torrent_file, "#{archive}/#{name}", mkdir: true
+            end
+
           else
             failed_counts += 1
             Saber.ui.error "SKIP: Upload failed -- #{file}"
@@ -119,6 +128,10 @@ module Saber
       def add_format(info)
         raise NotImplementedError
       end
+
+      def process_info!(info)
+        info
+      end
     end
   end
 end

data/lib/saber/tracker2/bb.rb

@@ -194,7 +194,7 @@ module Saber
         sleep 0.1
 
         FIELDS[info[:upload_type]].each {|key, selector|
-          form.quick_set(selector, info[key])
+          form.set2(selector, info[key])
         }
 
         # comic
@@ -204,6 +204,19 @@ module Saber
           }
         end
       end
+
+      def process_info!(info)
+        info[:description] = <<-EOF
+
+[size=3][b][color=#FF3300]Book Details:[/color][/b][/size]
+[size=2][quote]
+#{info[:release_description].strip}
+[/quote][/size]
+[size=3][b][color=#FF3300]Book Description:[/color][/b][/size]
+[quote][size=2]#{info[:description].strip}
+[/size][/quote]
+        EOF
+      end
     end
   end
 end

data/lib/saber/tracker2/bib.rb

@@ -133,15 +133,13 @@ module Saber
       }
       
       def new_upload(info)
-        info[:complete] = (info[:type] == "Pack")
-
         agent.goto "#{BASE_URL}/upload/#{info[:upload_type2]}"
         check_login %r~/upload/#{info[:upload_type2]}~ 
 
         form = agent.form(action: "")
 
         FIELDS[info[:upload_type]].each {|key, selector|
-          form.quick_set(selector, info[key])
+          form.set2(selector, info[key])
         }
 
         form.submit()
@@ -155,6 +153,11 @@ module Saber
           return true
         end
       end
+
+      def process_info!(info)
+        info[:complete] = (info[:type] == "Pack")
+        info[:description] = "#{info[:release_description].strip}\n\n#{info[:description]}"
+      end
     end
   end
 end

data/lib/saber/tracker2/stp.rb

@@ -95,7 +95,7 @@ module Saber
         end
 
         ADD_FIELDS[info[:upload_type]].each {|key, selector|
-          form.quick_set(selector, check_value!(info[key]))
+          form.set2(selector, check_value!(info[key]))
         }
       end
 
@@ -119,7 +119,7 @@ module Saber
         end
 
         FIELDS[info[:upload_type]].each {|key, selector|
-          form.quick_set(selector, info[key])
+          form.set2(selector, info[key])
         }
 
         # authors

data/lib/saber/tracker2/what.rb

@@ -35,7 +35,7 @@ module Saber
         sleep 0.1
 
         FIELDS[info[:type]].each {|key, selector|
-          form.quick_set(selector, info[key])
+          form.set2(selector, info[key])
         }
 
         form.submit()

data/lib/saber/version.rb

@@ -1,3 +1,3 @@
 module Saber
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/templates/_saberrc

@@ -1,4 +1,5 @@
 browser = [:firefox, {profile: "default"}]
+#api_url = "http://saberapi.heroku.com"
 
 make:
   #dir = Pa(".")                      # move to directory.
@@ -9,8 +10,8 @@ find_uploads:
   #dir = Pa("~/bt/watch")
 
 upload:
-  #move_yml = Pa("done")
-  #move_torrent = Pa("done")
+  archive = proc {|upload_type| upload_type}
+  #archive = "archive"
 
 fetch:
   dir = Pa("~/downloads")   # aria2 download directory.
@@ -23,11 +24,13 @@ server:
   user = "x"               # seedbox login name
   host = "seedbox"         # set seedbox ip address in /etc/hosts
 
-# [saber-upload]
-username = "foo"           # default username for login into site.
+# [saber-upload] [saber-make]
+username = "foo"           # global username for login into site.
+#mktorrent_options = ""    # global mktorrent options.
 
 bib:
-  #username = "bar"        # per-site username. use default username if not set.
+  #username = "bar"              # per-tracker username. use default username if not set.
+  #mktorrent_options = "-l 17"   # per-tracker mktorrent options.
   announce_url = "x"
 
 chd:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saber
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pd
@@ -335,7 +335,6 @@ files:
 - lib/saber/tracker2/what.rb
 - lib/saber/ui.rb
 - lib/saber/version.rb
-- lib/saber/watir_ext.rb
 - rutorrent/init.js
 - rutorrent/init.php
 - rutorrent/plugin.info

data/lib/saber/watir_ext.rb

@@ -1,95 +0,0 @@
-# Cookies
-module Watir
-  class Browser
-    # Read cookies from Mozilla cookies.txt-style IO stream
-    #
-    # @param file [IO,String]
-    #
-    def load_cookies(file)
-      now = ::Time.now
-
-      io = case file
-      when String
-        open(file)
-      else
-        file
-      end
-
-      io.each_line do |line|
-        line.chomp!
-        line.gsub!(/#.+/, '')
-        fields = line.split("\t")
-
-        next if fields.length != 7
-
-        name, value, domain, for_domain, path, secure, version = fields[5], fields[6], 
-          fields[0], (fields[1] == "TRUE"), fields[2], (fields[3] == "TRUE"), 0
-
-        expires_seconds = fields[4].to_i
-        expires = (expires_seconds == 0) ? nil : ::Time.at(expires_seconds)
-        next if expires and (expires < now)
-
-        cookies.add(name, value, domain: domain, path: path, expires: expires, secure: secure)
-      end
-
-      io.close if String === file
-
-      self
-    end
-
-    # Write cookies to Mozilla cookies.txt-style IO stream
-    #
-    # @param file [IO,String]
-    def dump_cookies(file)
-      io = case file
-      when String
-        open(file, "w")
-      else
-        file
-      end
-
-      cookies.to_a.each do |cookie|
-        io.puts([
-          cookie[:domain],
-          "FALSE", # for_domain
-          cookie[:path],
-          cookie[:secure] ? "TRUE" : "FALSE",
-          cookie[:expires].to_i.to_s,
-          cookie[:name],
-          cookie[:value]
-        ].join("\t"))
-      end
-
-      io.close if String === file
-
-      self
-    end
-  end
-end
-
-# Element
-module Watir
-  class Element
-    # quick set value.
-    #
-    # @example
-    #
-    #  form = browser.form
-    #  form.quick_set("//input[@name='value']", "hello")
-    #  form.quick_set("//input[@name='check']", true)
-    #  form.quick_set("//select[@name='foo']", "Bar")
-    #  form.quick_set("//textarea[@name='foo']", "bar")
-    #
-    def quick_set(selector, value)
-      elem = element(xpath: selector).to_subtype
-      case elem.tag_name
-      when "input"
-        elem.set value
-      when "select"
-        elem.select value
-      when "textarea"
-        elem.set value
-      end
-    end
-  end
-end