gamerom 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed630a7050f3d5206302cdc93cd126be98bf854a6a89e076a807ae81703dc78d
-  data.tar.gz: 24e25edcaebd1520d48c0ae7c0cc2d148d48ba1c002c16497d95579e372b51be
+  metadata.gz: 964cf92bf92c6fc0be0fb61f0fd6f9f216debb7231ccbfdc31da38b49b93463c
+  data.tar.gz: 2601482af6610a7b639a19f3b16fddf988fccb74a65732fa3b64c97e97cb2d4d
 SHA512:
-  metadata.gz: 7dd4cc672d3bcbf177caf54d53add0070c703fa4cce022e3dca3beddcd6b07ab6793686aef6e0cf4518285b0887b272cf61e4d1063a6a72bb779f4f48633ec82
-  data.tar.gz: b08221243a8b538b8343ffe84c7c2e011093bfeabb96208693f043c78bff396edfbee10ca779851a78bf1eed0db86dbb2bd81240cee56d5f5560ccda6be81642
+  metadata.gz: ce291c55b28cef9805292a5bd53f60a86bd51d5de665707f80cbfb1e38cb363843e9f3355303a625de3a706d07b5d52ea7cb6f565fa81ba96ea684fe067d35e3
+  data.tar.gz: 9b7d17f0ab5f1115f38d0364a05b6a2e9e3d0b57b4ad0965d882ea16f05b46138dfea43d46bbb1e61c3aca02b7e77a634dfbb1de9aafe9e9c8db24ed63c4ce7f

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.2.0] - 2021-05-08
+- Add support for downloading multiple disc ROMs on vimm repo
+- Add progress bar to the install process
+
+## [0.1.0] - 2021-05-07
+- Initial release
+
+[Unreleased]: https://github.com/lucasmundim/gamerom/compare/v0.2.0...HEAD
+[0.2.0]: https://github.com/lucasmundim/gamerom/compare/v0.1.0...v0.2.0
+[0.1.0]: https://github.com/lucasmundim/gamerom/releases/tag/v0.1.0

data/Gemfile.lock

@@ -1,9 +1,11 @@
 PATH
   remote: .
   specs:
-    gamerom (0.1.0)
+    gamerom (0.2.0)
       mechanize (~> 2.8.0)
+      mechanize-progressbar (~> 0.2.0)
       nokogiri (~> 1.11.3)
+      progressbar (~> 0.9.0)
       rest-client (~> 2.1.0)
       thor (~> 1.1.0)
 
@@ -31,6 +33,9 @@ GEM
       rubyntlm (~> 0.6, >= 0.6.3)
       webrick (~> 1.7)
       webrobots (~> 0.1.2)
+    mechanize-progressbar (0.2.0)
+      mechanize (>= 1.0.0)
+      progressbar (>= 0.9.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0225)
@@ -45,6 +50,7 @@ GEM
     parallel (1.20.1)
     parser (3.0.1.0)
       ast (~> 2.4.1)
+    progressbar (0.9.2)
     public_suffix (4.0.6)
     racc (1.5.2)
     rainbow (3.0.0)

data/README.md

@@ -14,7 +14,7 @@ It currently supports the following repositories:
 Add this to your .bashrc, .bash_aliases, etc:
 
 ```
-alias gamerom='docker run --rm -it -v ~/.gamerom:/root/.gamerom docker.io/lucasmundim/gamerom:0.1.0'
+alias gamerom='docker run --rm -it -v ~/.gamerom:/root/.gamerom docker.io/lucasmundim/gamerom:0.2.0'
 ```
 
 Use it as:
@@ -539,7 +539,7 @@ Print program version
 
 ```
 $ gamerom version
-0.1.0
+0.2.0
 ```
 
 ## Development

data/gamerom.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "#{spec.homepage}/CHANGELOG.md"
+  spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/master/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -30,7 +30,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "mechanize", "~> 2.8.0"
+  spec.add_runtime_dependency "mechanize-progressbar", "~> 0.2.0"
   spec.add_runtime_dependency "nokogiri", "~> 1.11.3"
+  spec.add_runtime_dependency "progressbar", "~> 0.9.0"
   spec.add_runtime_dependency "rest-client", "~> 2.1.0"
   spec.add_runtime_dependency "thor", "~> 1.1.0"
 

data/lib/gamerom/cli.rb

@@ -33,7 +33,7 @@ module Gamerom
         shell.say "Game #{game_identifier} not found", :red
       end
       puts game
-      puts game.filename if game.installed?
+      puts game.filenames if game.installed?
     rescue => e
       render_error e, options
       exit 1

data/lib/gamerom/game.rb

@@ -2,11 +2,14 @@
 
 require 'fileutils'
 require 'ostruct'
+require 'yaml'
 
 module Gamerom
   class Game < OpenStruct
-    def filename
-      "#{self.filepath}/#{File.read(self.state_filename)}"
+    def filenames
+      YAML.load_file(self.state_filename).map do |filename|
+        "#{self.filepath}/#{filename}"
+      end
     end
 
     def filepath
@@ -14,8 +17,8 @@ module Gamerom
     end
 
     def install
-      self.repo.install self do |filename|
-        self.update_state filename
+      self.repo.install self do |filenames|
+        self.update_state filenames
       end
     end
 
@@ -32,13 +35,13 @@ module Gamerom
     end
 
     def uninstall
-      FileUtils.rm_rf self.filename
+      FileUtils.rm_rf self.filenames
       FileUtils.rm_rf self.state_filename
     end
 
-    def update_state filename
+    def update_state filenames
       FileUtils.mkdir_p("#{Gamerom::STATE_DIR}/#{self.repo.name}/#{self.platform}/#{self.region}")
-      File.write(self.state_filename, filename)
+      File.write(self.state_filename, filenames.to_yaml)
     end
 
     private

data/lib/gamerom/repo_adapters/coolrom.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'mechanize'
+require 'mechanize/progressbar'
+require 'mechanizeprogress'
 require 'nokogiri'
 require 'rest-client'
 
@@ -58,19 +61,19 @@ module Gamerom
       end
 
       def self.install(game)
-        response = RestClient::Request.execute(
-          method: :get,
-          url: "https://coolrom.com.au/downloader.php?id=#{game.id}",
-          headers: {
-            'User-Agent': "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36",
-          },
-          raw_response: true,
-        )
-        if response.code == 200
-          filename = response.headers[:content_disposition].split('; ')[1].split('"')[1]
+        agent = Mechanize.new
+        agent.pluggable_parser.default = Mechanize::Download
+        agent.user_agent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36'
+
+        response = nil
+        agent.progressbar{
+          response = agent.get("https://coolrom.com.au/downloader.php?id=#{game.id}")
+        }
+        if response.code.to_i == 200
+          filename = response.filename
           FileUtils.mkdir_p(game.filepath)
-          FileUtils.cp(response.file.path, "#{game.filepath}/#{filename}")
-          yield filename
+          response.save!("#{game.filepath}/#{filename}")
+          yield [filename]
         end
       end
     end

data/lib/gamerom/repo_adapters/vimm.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'mechanize'
+require 'mechanize/progressbar'
+require 'mechanizeprogress'
 require 'nokogiri'
 require 'rest-client'
 
@@ -50,21 +52,40 @@ module Gamerom
       end
 
       def self.install(game)
+        FileUtils.mkdir_p(game.filepath)
         agent = Mechanize.new
         agent.pluggable_parser.default = Mechanize::Download
         agent.user_agent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36'
         page = agent.get("https://vimm.net/vault/#{game.id}")
         form = page.form_with(:id => 'download_form')
-        form.action = "https://download4.vimm.net/download/?mediaId=#{game.id}"
-        form.method = 'GET'
-        button = form.button_with(:type => "submit")
-        response = form.click_button(button)
-        if response.code.to_i == 200
-          filename = response.filename
-          FileUtils.mkdir_p(game.filepath)
-          response.save!("#{game.filepath}/#{filename}")
-          yield filename
+
+        filenames = []
+        game_files = []
+        multiple_disks = page.css('#download_disc_number')
+
+        if multiple_disks.empty?
+          game_files << { id: game.id, name: 'single file rom' }
+        else
+          puts "multiple discs detected"
+          game_files.concat multiple_disks.children[1..-2].map { |disk| { name: disk.text, id: disk['value']} }
+        end
+
+        game_files.each do |game_file|
+          puts "downloading #{game_file[:name]}"
+          form.action = "https://download4.vimm.net/download/?mediaId=#{game_file[:id]}"
+          form.method = 'GET'
+          button = form.button_with(:type => "submit")
+          response = nil
+          agent.progressbar{
+            response = form.click_button(button)
+          }
+          if response.code.to_i == 200
+            filename = response.filename
+            response.save!("#{game.filepath}/#{filename}")
+            filenames << filename
+          end
         end
+        yield filenames
       end
     end
   end

data/lib/gamerom/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gamerom
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/mechanizeprogress.rb

@@ -0,0 +1,44 @@
+class Mechanize
+  include MechanizeProgressBarAPI # (1of7)a
+  class HTTP
+    class Agent
+      def response_read response, request, uri = nil
+        body_io = StringIO.new
+        body_io.set_encoding Encoding::BINARY if body_io.respond_to? :set_encoding
+        total = 0
+        mpbar = MechanizeProgressBar.new(self.context, request, response) # (2of7)a
+
+        begin
+          response.read_body { |part|
+            total += part.length
+            body_io.write(part)
+#           log.debug("Read #{part.length} bytes (#{total} total)") if log
+            log.debug("Read #{part.length} bytes (#{total} total)") if log && !mpbar.suppress_logger? # (3of7)m
+            mpbar.inc(part.length) # (4of7)a
+          }
+        rescue Net::HTTP::Persistent::Error => e
+          body_io.rewind
+          raise Mechanize::ResponseReadError.new(e, response, body_io)
+        ensure # (5of7)a
+          mpbar.finish # (6of7)a
+        end
+
+        body_io.rewind
+        log.debug("Read #{total} bytes total") if log && !mpbar.suppress_logger? # (7of7)a
+
+        raise Mechanize::ResponseCodeError, response if
+          Net::HTTPUnknownResponse === response
+
+        content_length = response.content_length
+
+        unless Net::HTTP::Head === request or Net::HTTPRedirection === response then
+          raise EOFError, "Content-Length (#{content_length}) does not match " \
+          "response body length (#{body_io.length})" if
+            content_length and content_length != body_io.length
+        end
+
+        body_io
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamerom
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Lucas Mundim
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-08 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: mechanize-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.11.3
+- !ruby/object:Gem::Dependency
+  name: progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +107,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Dockerfile
 - Gemfile
@@ -99,6 +128,7 @@ files:
 - lib/gamerom/repo_adapters/coolrom.rb
 - lib/gamerom/repo_adapters/vimm.rb
 - lib/gamerom/version.rb
+- lib/mechanizeprogress.rb
 homepage: https://github.com/lucasmundim/gamerom
 licenses:
 - MIT
@@ -106,7 +136,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/lucasmundim/gamerom
   source_code_uri: https://github.com/lucasmundim/gamerom
-  changelog_uri: https://github.com/lucasmundim/gamerom/CHANGELOG.md
+  changelog_uri: https://github.com/lucasmundim/gamerom/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: