pulse-downloader 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1d8d3d5f2814c1744f58c8a09b118a478b2d1d3f1e92a66df86fd4352284fe4
-  data.tar.gz: 3384a0e37e73e237edf8cd9a2fbdac640473408b7c8e523b8a43ea80529a0680
+  metadata.gz: 5ae10b909855b29f8c3f0cd5b4c2bd38ee83fc69761ae7e109411b85add11957
+  data.tar.gz: 7eedaf2bc8852e66a7db83a1830f2d369683092293ae16255b3c26746d69a32f
 SHA512:
-  metadata.gz: ee7a13ba93ca48c4306d6cede31c17753610c3496277830a8a5e4bb37b17e141ac231c37ce0bb5166d66db6f7fe6c969e20d8c85d758c3225b5d2b021035ce30
-  data.tar.gz: 6e2999c3df8cbbe876743c10396d59cd8d6c0b1f9723090b910f6594fdd11d0290e30a903b6238e49c36b51fd6f40f04542748c85fcfb34835cdb5f42fb7ab5f
+  metadata.gz: f02637f88ecb337014b6141c4855540cf72a6c52c5123f528999590ec5f0c88a21da7a1e01c3c968c7d823b7da7240f63c433610da4fec947a4331d78a8c5f0f
+  data.tar.gz: a4d222d168bcec0388c535749fd44f30616458fdb798a44a4229004c56bf6298ee6a4ba388e01afbc4fbccad1390f0cbaad0d618a441e134f6e870e39a77feb0

data/.github/workflows/semgrep.yml

@@ -0,0 +1,18 @@
+on:
+  pull_request: {}
+  push:
+    branches:
+    - main
+    - master
+name: Semgrep
+jobs:
+  semgrep:
+    name: Scan
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: returntocorp/semgrep-action@v1
+      with:
+        auditOn: push
+        publishToken: ${{ secrets.SEMGREP_APP_TOKEN }}
+        publishDeployment: 607

data/Gemfile.lock

@@ -1,79 +1,79 @@
 PATH
   remote: .
   specs:
-    pulse-downloader (0.1.2)
+    pulse-downloader (0.1.4)
       active_attr (~> 0.15)
       httparty (~> 0.18)
-      nokogiri (~> 1.10.9)
+      nokogiri (~> 1.11)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.3.2)
-      actionview (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.3.1)
+      actionview (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionview (6.1.3.1)
+      activesupport (= 6.1.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_attr (0.15.0)
-      actionpack (>= 3.0.2, < 6.1)
-      activemodel (>= 3.0.2, < 6.1)
-      activesupport (>= 3.0.2, < 6.1)
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activesupport (6.0.3.2)
+    active_attr (0.15.3)
+      actionpack (>= 3.0.2, < 7.0)
+      activemodel (>= 3.0.2, < 7.0)
+      activesupport (>= 3.0.2, < 7.0)
+    activemodel (6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.6)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    concurrent-ruby (1.1.8)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
-    erubi (1.9.0)
+    erubi (1.10.0)
     hashdiff (1.0.1)
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.3)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.6.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    mime-types-data (3.2021.0225)
+    minitest (5.14.4)
     minitest-focus (1.1.2)
       minitest (>= 4, < 6)
-    minitest-reporters (1.4.2)
+    minitest-reporters (1.4.3)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     mocha (1.11.2)
     multi_xml (0.6.0)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    pry (0.13.1)
+    nokogiri (1.11.3-x86_64-linux)
+      racc (~> 1.4)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
+    racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -83,23 +83,22 @@ GEM
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
     rake (12.3.3)
-    ruby-progressbar (1.10.1)
-    safe_yaml (1.0.5)
-    thread_safe (0.3.6)
-    timecop (0.9.1)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    rexml (3.2.5)
+    ruby-progressbar (1.11.0)
+    timecop (0.9.4)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 2.1.4)
+  bundler (~> 2.2.16)
   minitest (~> 5.0)
   minitest-focus (~> 1.1.2)
   minitest-reporters (~> 1.4.2)
@@ -111,4 +110,4 @@ DEPENDENCIES
   webmock (~> 3.8.3)
 
 BUNDLED WITH
-   2.1.4
+   2.2.16

data/README.md

@@ -30,8 +30,13 @@ client = Pulse::Downloader::Client.new(
   save_path: '',
   read_from_save_path: false,
   verify_ssl: true,
-  report_time: false
+  drop_exitsing_files_in_path: false,
+  save_and_dont_return: true,
+  report_time: false,
+  progress_bar: true
 )
+
+client.call!
 ```
 
 ## Development

data/lib/pulse/downloader.rb

@@ -3,6 +3,7 @@ require 'nokogiri'
 
 require "pulse/downloader/version"
 require 'pulse/downloader/web_page_parser'
+require 'pulse/downloader/file_checker'
 require 'pulse/downloader/file_downloader'
 require 'pulse/downloader/client'
 

data/lib/pulse/downloader/client.rb

@@ -1,7 +1,9 @@
 module Pulse
   module Downloader
     class Client
+      require 'progress_bar'
       include ::Pulse::Downloader::WebPageParser
+      include ::Pulse::Downloader::FileChecker
       include ::Pulse::Downloader::FileDownloader
 
       attr_reader :url,
@@ -10,21 +12,40 @@ module Pulse
         :save_path,
         :read_from_save_path,
         :verify_ssl,
+        :drop_exitsing_files_in_path,
+        :save_and_dont_return,
         :report_time,
         :start_time,
-        :end_time
+        :end_time,
+        :progress_bar
+
+      # Does not continue downloads-
+      # Will only save once the file has been downloaded in memory
 
       # TODO: Validation
       # TODO: Retry
       # TODO: DNS
-      def initialize(url:, file_type:, save_data: false, save_path: '', read_from_save_path: false, verify_ssl: true, report_time: false)
+      def initialize(url:,
+        file_type:,
+        save_data: false,
+        save_path: '',
+        read_from_save_path: false,
+        verify_ssl: true,
+        drop_exitsing_files_in_path: false,
+        save_and_dont_return: true,
+        report_time: false,
+        progress_bar: false)
+
         @url = url
         @file_type = file_type
         @save_data = save_data
         @save_path = save_path
         @read_from_save_path = read_from_save_path
         @verify_ssl = verify_ssl
+        @drop_exitsing_files_in_path = drop_exitsing_files_in_path
+        @save_and_dont_return = save_and_dont_return
         @report_time = report_time
+        @progress_bar = progress_bar
       end
 
       def call!
@@ -34,8 +55,13 @@ module Pulse
       def call
         return false unless valid?
 
+        if @progress_bar
+          @progress_bar = ::ProgressBar.new(fetch_file_paths.size)
+        end
+
         fetch_file_paths.map do |file_path|
-          download(file_path)
+          download(file_path, @progress_bar)
+          @progress_bar.increment!
         end
       end
 
@@ -49,8 +75,14 @@ module Pulse
         (Time.now.to_f * 1000).to_i
       end
 
-      def print_time
-        puts "Request time: #{end_time - start_time} ms."
+      def print_time(progress_bar=nil)
+        output = "Request time: #{end_time - start_time} ms."
+
+        if progress_bar
+          progress_bar.puts output
+        else
+          puts output
+        end
       end
     end
   end

data/lib/pulse/downloader/file_checker.rb

@@ -0,0 +1,27 @@
+module Pulse
+  module Downloader
+    module FileChecker
+      def file_path_in_file_list?(file_path)
+        return false unless drop_exitsing_files_in_path && save_data
+
+        list_files_in(save_path).include?(compute_save_path(file_path))
+      end
+
+      private
+
+      def compute_save_path(url)
+        "#{save_path}/#{compute_filename(url)}".gsub('//', '/')
+      end
+
+      def compute_filename(file_path)
+        file_path.scan(/[\/]\S+/).last
+      end
+
+      def list_files_in(path)
+        `ls #{path}`.split("\n").map do |filename|
+          "#{path}/#{filename}".gsub('//', '/')
+        end
+      end
+    end
+  end
+end

data/lib/pulse/downloader/file_downloader.rb

@@ -1,9 +1,12 @@
 module Pulse
   module Downloader
     module FileDownloader
+      require 'uri'
+
       # save_path and verify_ssl are defined in client.rb
-      def download(file_path)
+      def download(file_path, progress_bar=nil)
         raise "save_path is undefined" if save_data && save_path == ''
+        return if file_path_in_file_list?(file_path) # skip downloading the file
 
         @start_time = get_micro_second_time
 
@@ -12,13 +15,15 @@ module Pulse
         @end_time = get_micro_second_time
 
         if report_time
-          print_time
+          print_time(progress_bar)
         end
 
         if save_data
           File.open(compute_save_path(file_path), 'wb') do |file|
             file.write(file_data.body)
           end
+
+          return true if save_and_dont_return
         end
 
         file_data
@@ -36,14 +41,6 @@ module Pulse
 
       private
 
-      def compute_save_path(url)
-        "#{save_path}/#{compute_filename(url)}"
-      end
-
-      def compute_filename(file_path)
-        file_path.scan(/[\/]\S+/).last
-      end
-
       def compute_file_link(file_path)
         if section?(file_path)
           raise 'invalid download path'

data/lib/pulse/downloader/version.rb

@@ -1,5 +1,5 @@
 module Pulse
   module Downloader
-    VERSION = "0.1.2"
+    VERSION = "0.1.7"
   end
 end

data/pulse-downloader.gemspec

@@ -22,10 +22,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "httparty", "~> 0.18"
   spec.add_dependency "active_attr", "~> 0.15"
-  spec.add_dependency "nokogiri", "~> 1.10.9"
+  spec.add_dependency "nokogiri", "~> 1.11"
+  spec.add_dependency "progress_bar", "~> 1.3.3"
 
   # Development dependancies
-  spec.add_development_dependency "bundler", "~> 2.1.4"
+  spec.add_development_dependency "bundler", "~> 2.2.16"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "minitest-focus", "~> 1.1.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pulse-downloader
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - trex22
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -44,28 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.9
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.9
+        version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: progress_bar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.16
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -185,6 +199,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/semgrep.yml"
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -197,6 +212,7 @@ files:
 - bin/setup
 - lib/pulse/downloader.rb
 - lib/pulse/downloader/client.rb
+- lib/pulse/downloader/file_checker.rb
 - lib/pulse/downloader/file_downloader.rb
 - lib/pulse/downloader/version.rb
 - lib/pulse/downloader/web_page_parser.rb
@@ -205,7 +221,7 @@ homepage: https://github.com/TRex22/pulse-downloader
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -220,8 +236,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.2.3
+signing_key: 
 specification_version: 4
 summary: Client to download datasets from webpages.
 test_files: []