make.rb in saber-1.2.0

- old
+ new

@@ -6,12 +6,10 @@
     #
     # Usage
     # -----
     #
     #    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"
       def make(tracker_name, *files)
         Saber.ui.error! "You need set #{tracker_name}.announce_url in ~/.saberrc first" unless 
@@ -27,16 +25,30 @@
               Saber.ui.say "Skip make: #{file} (torrent alreay exists. use -f to overwrite it.)"
               next
             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
     end
   end