my-local-putio 4.3.0 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fda9ccd9e21d1f3028968ec7a14e6457053553910740739fba4f5b56d39ea47
-  data.tar.gz: d9299607c186f5c6cdb339c0e3d5a3e2075af67dc2ef3243fc0e282df65723d4
+  metadata.gz: 9b97f8142ada24f92bd2ba81ad1a698bf75b730ecb98f7878a10ddf84bfc6968
+  data.tar.gz: b1616b5139f17b2528fa61637df6082be9d330980d13ac515bdbe398a2effc4a
 SHA512:
-  metadata.gz: 0f4facdcd383dfc2c0f3a2e85e04617bf15c23b35a149a0f6686353406e15c3f96dc60588417f0858b65a7972674158a1b221d8053e8df84ce5e3c7c0bc3ba77
-  data.tar.gz: 6497ba264ee6de19adfa927adb54ca118ec4a22993e6c37753277a3383b9ad5be7df04457574e67c9a097d742fa0f41828c3070be976004db1f4878bfe83ebe3
+  metadata.gz: 6c6b14174288fea62fe55b7b92b10afad8a0a8d2149c1bb2cebc73864b89caf7c45b6129ae658a2c03ef1a2420769ed877e1a6a3235f941a110500a8fac763e0
+  data.tar.gz: 60c701b5765e86541188bf4a43bd2b4c9fe69cc81809edfab416f657c640314bcf4a96d6ab1b2f9ea6ca57d13199c86b0e5f1289689efd76b535fa552c55fd51

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+3.1.0

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+# v4.4.2
+
+- Package updates
+
+# v4.4.1
+
+- Bugfix: Checking if folder is empty before removing it, due to per page limit
+- Bugfix: Downloader creating folder dir when downloading a single file
+
+# v4.4.0
+
+- Introducing --detailed-progress
+  - Display the default curl output with a detailed information of the download, instead of a simple progress bar.
+
+# v4.3.1
+
+- Bugfix: Already downloaded files no longer need to be downloaded again
+  - No parameter is necessary this is the default behaviour
+  - The codes matches the name and the filesize
+
 # v4.3.0
 
 - Introducing --disk-threshold

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    my-local-putio (4.2.0)
+    my-local-putio (4.4.2)
       socksify (= 1.7.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (13.0.1)
+    rake (13.0.6)
     socksify (1.7.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0)
+  bundler (~> 2.3)
   my-local-putio!
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.0.2
+   2.3.17

data/README.md

@@ -42,11 +42,12 @@ To update your installed version:
       -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
+          --debug                      Debug mode [Developer mode]
+          --disk-threshold size        Stops the downloads when the disk space threshold is reached. (Size in MB, e.g: 2000 for 2GB)
+          --detailed-progress          Detailed download information instead a progress bar
           --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
-          --disk-threshold size        Stops the downloads when the disk space threshold is reached. (Size in MB, e.g: 2000 for 2GB)
 
 #### Required attributes:
 * **-t** or **--token**: Your Put.io Token. This attribute becames optional if you set `PUTIO_TOKEN` env variable with your token (Can be inline or into your bash profile). Check examples below.
@@ -57,7 +58,7 @@ Examples:
     my-local-putio -t 123 -l Downloads
     my-local-putio -l Downloads --token 123
     my-local-putio -l Downloads -t token123 -d -s --socks5-proxy 127.0.0.1:1234
-    my-local-putio -d -s --disk-threshold size 1000
+    my-local-putio -d -s --disk-threshold 1000
 
 With Token variable (inline or exporting):
 
@@ -71,11 +72,12 @@ 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
+* **--debug**: Developer mode: Prints everything and expose URLs with tokens for debug purposes.
+* **--disk-threshold**: Set a disk threshold **(in MB)** to prevent the script to fill up the entire disk. The threshold value is in MB **(e.g 1000 for 1GB)**. The script will test both download folder and temporary folder to detect if there is enough space before download each file. If the free space is less than (file size + disk threshold) the script will stop. (Example: If the folder have 10GB available, and the threshold is set to 2GB (2000), the script will stop before start downloading a file with 9GB size)
+* **--detailed-progress**: Display the default curl output with a detailed information of the download, instead of a simple progress bar.
 * **--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.
-* **--disk-threshold**: Set a disk threshold **(in MB)** to prevent the script to fill up the entire disk. The threshold value is in MB **(e.g 1000 for 1GB)**. The script will test both download folder and temporary folder to detect if there is enough space before download each file. If the free space is less than (file size + disk threshold) the script will stop. (Example: If the folder have 10GB available, and the threshold is set to 2GB (2000), the script will stop before start downloading a file with 9GB size)
 
 Examples:
 
@@ -85,11 +87,11 @@ Examples:
     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
-    my-local-putio -d -s --disk-threshold size 1000
+    my-local-putio -d -s --disk-threshold 1000
 
 Verbose output example:
 
-    my-local-putio -t 123 -l Downloads -d -s --socks5-proxy 127.0.0.1:3333 --temp-destination /tmp --disk-threshold size 2000
+    my-local-putio -t 123 -l Downloads -d -s --socks5-proxy 127.0.0.1:3333 --temp-destination /tmp --disk-threshold 2000 --detailed-progress
 
     Starting My Local Put.io - version 4.3.0
     https://github.com/rafaelbiriba/my-local-putio
@@ -98,6 +100,7 @@ Verbose output example:
     Full path of the temporary destination: /tmp (Free space: 8543 MB)
     >>> Delete remote files enabled!
     >>> With subtitles enabled!
+    >>> With detailed progress bar!
     >>> SOCKS5 enabled with 127.0.0.1:3333
     >>> With disk threshold of 2000 MB!
     =============================================

data/Rakefile

@@ -1,2 +1,3 @@
 require "bundler/gem_tasks"
+require "fileutils"
 task :default => :spec

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

@@ -2,7 +2,7 @@ module MyLocalPutio
   class Configuration
     attr_reader :token, :local_destination, :temp_destination,
                 :silent, :debug, :socks_host, :socks_port, :delete_remote, :with_subtitles,
-                :disk_threshold
+                :disk_threshold, :detailed_progress
 
     def initialize
       read_args_from_envs!
@@ -35,15 +35,21 @@ module MyLocalPutio
           exit
         end
 
+        opt.on("--debug", "Debug mode [Developer mode]") { |v| @debug = true }
+
+        opt.on("--disk-threshold size", "Stops the downloads when the disk space threshold is reached. (Size in MB, e.g: 2000 for 2GB)") do |v|
+          @disk_threshold = v.to_i
+        end
+
+        opt.on("--detailed-progress", "Detailed download information instead a progress bar") { |v| @detailed_progress = true }
+
         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|
           @socks_host, @socks_port = v.to_s.split(":")
         end
-        opt.on("--disk-threshold size", "Stops the downloads when the disk space threshold is reached. (Size in MB, e.g: 2000 for 2GB)") do |v|
-          @disk_threshold = v.to_i
-        end
       end.parse!
     end
 

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

@@ -37,12 +37,14 @@ module MyLocalPutio
     end
 
     def download_command(url, path)
-      temp_destination = File.join(configuration.temp_destination, path)
+      temp_destination = File.join(configuration.temp_destination, File.dirname(path))
 
       command = [
-        "curl", "--create-dirs", "--progress-bar", "-L", "--retry", "5", "-S", "-C", "-", "-o", temp_destination, url.to_s
+        "curl", "--create-dirs", "-L", "--retry", "5", "-S", "-C", "-", "-o", temp_destination, url.to_s
       ]
 
+      command.push("--progress-bar") unless configuration.detailed_progress
+
       command.push("--silent") if logger.silent?
 
       if configuration.socks_enabled?

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

@@ -27,27 +27,34 @@ module MyLocalPutio
     end
 
     def process_file(file, path)
-      local_file_path = File.join(path, file.name)
+      file_path = File.join(path, file.name)
       if file.content_type == "application/x-directory"
-        fetch_files(id: file.id, path: local_file_path)
+        while !directory_empty?(file)
+          fetch_files(id: file.id, path: file_path)
+        end
       else
         url = cli.get_download_url(file.id)["url"]
         disk_manager.check_for_available_space_on_destinations!(file.size/1024/1024)
-        Downloader.new(@configuration).download(url, local_file_path) unless file_exists?(local_file_path, file)
+        Downloader.new(@configuration).download(url, file_path) unless file_exists?(file_path, file)
         SubtitlesManager.new(configuration).fetch(file, path)
       end
-      delete_file(local_file_path, file)
+      delete_file(file_path, file) 
     end
 
-    def delete_file(local_file_path, file)
+    def directory_empty?(file)
+      cli.get_files(file.id)["files"].count < 1
+    end
+
+    def delete_file(file_path, file)
       return unless configuration.delete_remote
-      logger.log "Deleting remote #{file.file_type.downcase}: #{local_file_path}"
+      logger.log "Deleting remote #{file.file_type.downcase}: #{file_path}"
       cli.delete_file(file.id)
     end
 
-    def file_exists?(local_file_path, file)
-      file_exists = File.exists?(local_file_path) && File.size(local_file_path) == file.size
-      logger.log "File already downloaded #{local_file_path}" if file_exists
+    def file_exists?(file_path, file)
+      local_full_path = File.join(configuration.local_destination, file_path)
+      file_exists = File.exists?(local_full_path) && File.size(local_full_path)/1024 == file.size/1024
+      logger.log "File already downloaded #{file_path}" if file_exists
       file_exists
     end
   end

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

@@ -1,3 +1,3 @@
 module MyLocalPutio
-  VERSION = "4.3.0"
+  VERSION = "4.4.2"
 end

data/lib/my-local-putio.rb

@@ -40,6 +40,7 @@ module MyLocalPutio
     puts "Full path of the temporary destination: #{File.realdirpath(configuration.temp_destination)} (Free space: #{configuration.disk_manager.get_folder_free_space(configuration.temp_destination)} MB)"
     puts ">>> Delete remote files enabled!" if configuration.delete_remote
     puts ">>> With subtitles enabled!" if configuration.with_subtitles
+    puts ">>> With detailed progress bar!" if configuration.detailed_progress
     puts ">>> SOCKS5 enabled with #{configuration.socks_host}:#{configuration.socks_port}" if configuration.socks_enabled?
     puts ">>> With disk threshold of #{configuration.disk_threshold} MB!" if configuration.disk_threshold
     puts ">>> DEBUG enabled! Hello Mr(s) developer :)" if configuration.debug

data/my-local-putio.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "bundler", "~> 2.3"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_dependency "socksify", "1.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my-local-putio
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.2
 platform: ruby
 authors:
 - Rafael Biriba
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2022-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ metadata:
   homepage_uri: https://github.com/rafaelbiriba/my-local-putio
   source_code_uri: https://github.com/rafaelbiriba/my-local-putio
   changelog_uri: https://github.com/rafaelbiriba/my-local-putio/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -100,8 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: The easiest script to synchronise all your put.io files locally.
 test_files: []