my-local-putio 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4005143ce3e0837e492efd136f86a336405acea364d122d6fb098c974426d59
-  data.tar.gz: 47f70d5c48b9a5b0cf31b03cb6059dd3f21b3870077ce2804e3e490f4fc21892
+  metadata.gz: 1f91c9ff297300ac8c7da30e3949fe7053e1da07ea0d7bba109000aa097a5323
+  data.tar.gz: bef0b5f1fca0e7bc6bb8f3b0a4efcb86285ed3d7bc60b14da685fd188c0bcd6e
 SHA512:
-  metadata.gz: 9e795b28fe462b56e2378b2bf5f13834eaac9f6c549fc066634fe621e2994490350c81eb922da4fe8522404beb617ab07f1ed1543aea16c83e676c4a023cee23
-  data.tar.gz: 964b90d324ea09b609ce55db1eb6f30e22f95dafadbf45b1808909ca96151abe588ddd9ba41919c1eb210fc9d010cb40377506d0a0345c1a838a0fe86847b37a
+  metadata.gz: 33e606fdb602ff6c1a1f8ce7bfb087d6f358cfd86ba8da42f15249d4253c05a92f0d3a8d5b21035086b826311716471c489645a166044330204e7823e3bcc6df
+  data.tar.gz: f1886e6ac88f4e1f7405388a6a85ead14082e2c81e47dd39b82c97f3aa70a6ba9d419ac9d36b965e2b23b9c1ebafff3eb66ad51fcea096b8ee4baba014fc8ad7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v4.2.0
+
+- Introducing temporary destination
+  - By default the temporary destination for files will be your local destination + "incomplete_downloads"
+  - You can overwrite the temporary directory with the option --temp-destination
+
 # v4.1.0
 
 - Change download order from put.io:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    my-local-putio (4.1.0)
+    my-local-putio (4.2.0)
       socksify (= 1.7.1)
 
 GEM

data/README.md

@@ -38,10 +38,11 @@ To update your installed version:
 
     Usage: my-local-putio [options]
       -t, --token TOKEN                Put.io access token [REQUIRED]
-      -l, --local-destination PATH     Local destination path [REQUIRED]
+      -l, --local-destination FULLPATH Local destination path [REQUIRED]
       -d, --delete-remote              Delete remote file/folder after the download
       -s, --with-subtitles             Fetch subtitles from Put.io api
       -v, --version                    Print my-local-putio version
+          --temp-destination FULLPATH  Temporary destination for the incomplete downloads (Default: 'local_destination'/incomplete_downloads)
           --silent                     Hide all messages and progress bar
           --debug                      Debug mode [Developer mode]
           --socks5-proxy hostname:port SOCKS5 hostname and port for proxy. Format: 127.0.0.1:1234
@@ -68,6 +69,7 @@ With Token variable (inline or exporting):
 * **-s** or **--with-subtitles**: Download subtitles from Put.io API if available. (Remember to set your preferred subtitle language on Put.io Settings website, otherwise no subtitle will be available for download.)
 * **-h**: Print the help usage message
 * **-v** or **--version**: Print the version of the application
+* **--temp-destination**: Overwrite the default path (incomplete_downloads folder) of the temporary download files. After the download the complete file is moved to the selected local destination.
 * **--silent**: Hide all messages and progress bar. Recommended for Cronjob tasks.
 * **--debug**: Developer mode: Prints everything and expose URLs with tokens for debug purposes.
 * **--socks5-proxy**: Enable the SOCKS5 proxy. If enabled, all the connections for PUT.IO API and the downloads will be performed using this proxy. If the socks connection became unavailable, the application will raise an error and will stop.
@@ -77,17 +79,19 @@ Examples:
     my-local-putio -h
     my-local-putio -t 123 -l Downloads --silent -d -s
     my-local-putio -t 123 -l Downloads --silent
+    my-local-putio -l Downloads -t 123 --temp-destination /tmp --with-subtitles
     my-local-putio --local-destination Downloads -t 123 --debug --with-subtitles
     my-local-putio --local-destination Downloads -t 123 --socks5-proxy 127.0.0.1:3333
 
 Verbose output example:
 
-    my-local-putio -t 123 -l Downloads -d -s --socks5-proxy 127.0.0.1:3333
+    my-local-putio -t 123 -l Downloads -d -s --socks5-proxy 127.0.0.1:3333 --temp-destination /tmp
 
     Starting My Local Put.io - version 3.0.0
     https://github.com/rafaelbiriba/my-local-putio
     =============================================
     Full path of the local destination: /Users/user/Downloads
+    Full path of the temporary destination: /tmp
     >>> Delete remote files enabled!
     >>> With subtitles enabled!
     >>> SOCKS5 enabled with 127.0.0.1:3333
@@ -97,6 +101,7 @@ Verbose output example:
     [LOG][2019-07-18 11:11:31] Downloading: /ubuntu/ubuntu-18.04.2-desktop-amd64.iso
     ######################################################################## 100.0%
     [LOG][2019-07-18 11:11:33] Deleting remote file: /ubuntu/ubuntu-18.04.2-desktop-amd64.iso
+    [LOG][2019-07-18 11:11:34] Finishing the download...
 
 #### Troubleshooting
 

data/bin/my-local-putio

@@ -4,7 +4,7 @@ require "bundler/setup"
 require "my-local-putio"
 
 unless open(__FILE__).flock(File::LOCK_EX | File::LOCK_NB)
-  puts "Script already running..."
+  puts "my-local-putio is already running..."
   exit
 end
 

data/lib/my-local-putio.rb

@@ -19,6 +19,7 @@ require "openssl"
 require "ostruct"
 require "yaml"
 require "optparse"
+require "fileutils"
 require "my-local-putio/version"
 require "my-local-putio/configuration"
 require "my-local-putio/logger"
@@ -34,6 +35,7 @@ module MyLocalPutio
     puts "https://github.com/rafaelbiriba/my-local-putio"
     puts "============================================="
     puts "Full path of the local destination: #{File.realdirpath(configuration.local_destination)}"
+    puts "Full path of the temporary destination: #{File.realdirpath(configuration.temp_destination)}"
     puts ">>> Delete remote files enabled!" if configuration.delete_remote
     puts ">>> With subtitles enabled!" if configuration.with_subtitles
     puts ">>> SOCKS5 enabled with #{configuration.socks_host}:#{configuration.socks_port}" if configuration.socks_enabled?

data/lib/my-local-putio/configuration.rb

@@ -1,9 +1,11 @@
 module MyLocalPutio
   class Configuration
-    attr_reader :token, :local_destination, :silent, :debug, :socks_host, :socks_port, :delete_remote, :with_subtitles
+    attr_reader :token, :local_destination, :temp_destination,
+                :silent, :debug, :socks_host, :socks_port, :delete_remote, :with_subtitles
     def initialize
       read_args_from_envs!
       parse_args!
+      set_defaults!
       validate_args!
     end
 
@@ -19,7 +21,7 @@ module MyLocalPutio
     def parse_args!
       OptionParser.new do |opt|
         opt.on("-t", "--token TOKEN", "Put.io access token [REQUIRED]") { |v| @token = v }
-        opt.on("-l", "--local-destination PATH", "Local destination path [REQUIRED]") { |v| @local_destination = v }
+        opt.on("-l", "--local-destination FULLPATH", "Local destination path [REQUIRED]") { |v| @local_destination = v }
         opt.on("-d", "--delete-remote", "Delete remote file/folder after the download") { |v| @delete_remote = true }
         opt.on("-s", "--with-subtitles", "Fetch subtitles from Put.io api") { |v| @with_subtitles = true }
         opt.on("-v", "--version", "Print my-local-putio version") do
@@ -27,6 +29,7 @@ module MyLocalPutio
           exit
         end
 
+        opt.on("--temp-destination FULLPATH", "Temporary destination for the incomplete downloads (Default: 'local_destination'/incomplete_downloads)") { |v| @temp_destination = v }
         opt.on("--silent", "Hide all messages and progress bar") { |v| @silent = true }
         opt.on("--debug", "Debug mode [Developer mode]") { |v| @debug = true }
         opt.on("--socks5-proxy hostname:port", "SOCKS5 hostname and port for proxy. Format: 127.0.0.1:1234") do |v|
@@ -35,6 +38,10 @@ module MyLocalPutio
       end.parse!
     end
 
+    def set_defaults!
+      @temp_destination ||= File.join(@local_destination, "incomplete_downloads")
+    end
+
     def validate_args!
       unless @token
         puts "Missing token"
@@ -46,7 +53,8 @@ module MyLocalPutio
         exit
       end
 
-      destination_folder_checks!
+      folder_checks!(@local_destination)
+      folder_checks!(@temp_destination)
 
       if socks_enabled? && !port_is_open?(@socks_host, @socks_port)
         puts "Cannot connect to socks using '#{@socks_host}:#{@socks_port}'"
@@ -54,11 +62,11 @@ module MyLocalPutio
       end
     end
 
-    def destination_folder_checks!
-      return if File.exists?(@local_destination) && File.writable?(@local_destination)
-      FileUtils.mkdir_p(@local_destination)
+    def folder_checks!(folder)
+      return if File.exists?(folder) && File.writable?(folder)
+      FileUtils.mkdir_p(folder)
     rescue Errno::EACCES
-      puts "Cannot write on the local destination path '#{@local_destination}'"
+      puts "Cannot write on the local destination path '#{folder}'"
       exit
     end
 

data/lib/my-local-putio/downloader.rb

@@ -13,15 +13,34 @@ module MyLocalPutio
       command = download_command(url, path)
       fetch_result = system(*command)
       raise "Unable to download #{path}" unless fetch_result
+      logger.log "Finishing the download..."
+      move_downloaded_file!(path)
     end
 
     private
 
+    def move_downloaded_file!(path)
+      temp_file = File.join(configuration.temp_destination, path)
+      local_file = File.join(configuration.local_destination, path)
+
+      # Create destination folder
+      FileUtils.mkdir_p(File.dirname(local_file))
+
+      logger.debug "Moving file from #{temp_file} to #{local_file}"
+      FileUtils.mv(temp_file, local_file)
+
+      # Delete temporary file
+      FileUtils.rm_rf(temp_file)
+
+      # Delete temporary folder if empty
+      Dir.rmdir(File.dirname(temp_file)) rescue Errno::ENOTEMPTY
+    end
+
     def download_command(url, path)
-      destination = File.join(configuration.local_destination, path)
+      temp_destination = File.join(configuration.temp_destination, path)
 
       command = [
-        "curl", "--create-dirs", "--progress-bar", "-L", "--retry", "5", "-S", "-C", "-", "-o", destination, url.to_s
+        "curl", "--create-dirs", "--progress-bar", "-L", "--retry", "5", "-S", "-C", "-", "-o", temp_destination, url.to_s
       ]
 
       command.push("--silent") if logger.silent?

data/lib/my-local-putio/version.rb

@@ -1,3 +1,3 @@
 module MyLocalPutio
-  VERSION = "4.1.0"
+  VERSION = "4.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my-local-putio
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Rafael Biriba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-23 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler