romloader 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87a10ca23bd4fc1e499ef4240027008cc2a4d911
-  data.tar.gz: 953fe06a0b401c28467d65a00acbb7818f84c6ae
+  metadata.gz: ad9d09bd1aafb62ad873edd616512de5e887d4bd
+  data.tar.gz: 827d0debcc137eb05ac9dfc3c5d8dfa4358c2323
 SHA512:
-  metadata.gz: 0c3b71b8b3319c7d2f5a8ec434b87981d7307a36c4e968188f373b66ca1543b1b8fcb47012a13cb4ed38f3f5ffdfd48d159aab3800ea524490d4ff8b47571c1d
-  data.tar.gz: ac72b823b59ca07ac9677116f02264ce8343dc03cefc2aa11765be4e936f73bd2900459d4bf21d27eac81fd97344ce4c2a7a228d5fdc4a87ca758a67dc92da22
+  metadata.gz: ad01221bb446839ee8caa995a8c03514fde47d4ca01fb4a697226a50b0acb1fa9334ebc35d94e5a3047ab81e2620b04b1b09cdbfe06f7c8def80a9dca60f6bc0
+  data.tar.gz: 5f40abfdf5c3aa19f243f63a58181415d17d25394074173e5fc2e4d1c72aff5668654d9c87c84b875313e077266aa738210195a7d06b9d09b28c4df48d9b2429

data/README.md

@@ -27,6 +27,8 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/jinstr
 
 ## Version Changes
 
+v. 1.2: Added basic file managment capability for Windows (requires Powershell v 3.0 or higher). Also updated UI slightly.
+
 v. 1.1: Added basic rom download capability for Windows (requires Powershell v 3.0 or higher)
 
 v. 1.0: Changed the namespacing of classes, added zip/7-zip extraction and rom download directory management. Also, added the ability to open the newly downloaded game from the command line (requires a emulator)

data/lib/romloader/archive_extractor.rb

@@ -2,59 +2,61 @@
 class RomLoader::ArchiveExtractor
 
   #Extracts zip or 7-zip rom files, manages the extracted dirs, then deletes archive files
-  def self.extract(dir,game_obj)
+  def self.extract(archive_dir,extract_dir,game_obj)
     file_or_dir_to_open = nil
-    /(?<=\().+(?=\))/.match(game_obj.system.name) ? system_name = /(?<=\().+(?=\))/.match(game_obj.system.name)[0] : system_name = nil
-    system_name ||= game_obj.system.name
-    system_name = system_name.rstrip.gsub(/[[[:space:]]\/]/, "_").downcase
-    dir_w_system = File.join(Dir.home,"videogame_roms",system_name)
     dir_game_name = game_obj.filename.split(game_obj.file_ext)[0]
-
-    Dir.mkdir(dir_w_system) unless Dir.exist?(dir_w_system)
-    
-    if game_obj.system.name != "MAME"
+      
+    if game_obj.file_ext == ".zip"
       puts "Extracting #{game_obj.filename}"
-      if game_obj.file_ext == ".zip"
-        Zip::File.open(dir) do |zip_archive|
-          zip_archive.glob("*htm").each { |entry| zip_archive.remove(entry) }
-          Dir.mkdir(File.join(dir_w_system,dir_game_name)) if zip_archive.size > 1 && !Dir.exist?(File.join(dir_w_system,dir_game_name))
-          zip_archive.each_entry do |rom|
-            if Dir.exist?(File.join(dir_w_system,dir_game_name))
-              rom.extract(File.join(dir_w_system,dir_game_name,rom.name)) unless File.exist?(File.join(dir_w_system,dir_game_name,rom.name))
-            else
-              rom.extract(File.join(dir_w_system,rom.name)) unless File.exist?(File.join(dir_w_system,rom.name))
-            end
-            zip_archive.size == 1 ? file_or_dir_to_open = File.join(dir_w_system,"\"#{rom.name}\"") : file_or_dir_to_open = File.join(dir_w_system,dir_game_name)
+      Zip::File.open(archive_dir) do |zip_archive|
+        zip_archive.glob("*htm").each { |entry| zip_archive.remove(entry) }
+        Dir.mkdir(File.join(extract_dir,dir_game_name)) if zip_archive.size > 1 && !Dir.exist?(File.join(extract_dir,dir_game_name))
+        zip_archive.each_entry do |rom|
+          if Dir.exist?(File.join(extract_dir,dir_game_name))
+            rom.extract(File.join(extract_dir,dir_game_name,rom.name)) unless File.exist?(File.join(extract_dir,dir_game_name,rom.name))
+          else
+            rom.extract(File.join(extract_dir,rom.name)) unless File.exist?(File.join(extract_dir,rom.name))
           end
+          zip_archive.size == 1 ? file_or_dir_to_open = File.join(extract_dir,"\"#{rom.name}\"") : file_or_dir_to_open = File.join(extract_dir,dir_game_name)
         end
-      elsif game_obj.file_ext == ".7z"
-        File.open(dir, "rb") do |seven_zip_archive|
-          SevenZipRuby::Reader.open(seven_zip_archive) do |szr|
-            if szr.entries.size > 2
-              Dir.mkdir(File.join(dir_w_system,dir_game_name)) unless Dir.exist?(File.join(dir_w_system,dir_game_name))
-              szr.extract_if(File.join(dir_w_system,dir_game_name)) { |entry| !/\.htm/.match(entry.inspect) }
-              file_or_dir_to_open = File.join(dir_w_system,dir_game_name)
-            else
-              szr.extract_if(dir_w_system) do |entry|
-                game_name = /(?<=file, |dir, |anti, )[.[^\.]]+\..+(?=>)/.match(entry.inspect)[0] unless /\.htm/.match(entry.inspect)
-                !/\.htm/.match(entry.inspect)
-              end
-              file_or_dir_to_open = File.join(dir_w_system,"\"#{game_name}\"")
+      end
+    elsif game_obj.file_ext == ".7z"
+      puts "Extracting #{game_obj.filename}"
+      File.open(archive_dir, "rb") do |seven_zip_archive|
+        SevenZipRuby::Reader.open(seven_zip_archive) do |szr|
+          if szr.entries.size > 2
+            Dir.mkdir(File.join(extract_dir,dir_game_name)) unless Dir.exist?(File.join(extract_dir,dir_game_name))
+            szr.extract_if(File.join(extract_dir,dir_game_name)) { |entry| !/\.htm/.match(entry.inspect) }
+            file_or_dir_to_open = File.join(extract_dir,dir_game_name)
+          else
+            szr.extract_if(extract_dir) do |entry|
+              game_name = /(?<=file, |dir, |anti, )[.[^\.]]+\..+(?=>)/.match(entry.inspect)[0] unless /\.htm/.match(entry.inspect)
+              !/\.htm/.match(entry.inspect)
             end
+            file_or_dir_to_open = File.join(extract_dir,"\"#{game_name}\"")
           end
         end
       end
-      File.delete(dir)
-      file_or_dir_to_open
     else
-      if game_obj.system.name == "MAME"
-        puts "NOTE: No archive extraction. MAME roms must remain zipped to play."
-      else
-        puts "NOTE: No archive extraction. Only Zip and 7-Zip extraction is supported."
-      end
-      FileUtils.move dir, dir_w_system
-      file_or_dir_to_open = dir_w_system
+      puts "NOTE: No archive extraction. Only Zip and 7-Zip extraction is supported."
+      file_or_dir_to_open = extract_dir
     end
+    file_or_dir_to_open
+  end
+
+  def self.create_extract_dir(game_obj)
+    /(?<=\().+(?=\))/.match(game_obj.system.name) ? system_name = /(?<=\().+(?=\))/.match(game_obj.system.name)[0].downcase : system_name = game_obj.system.name.rstrip.gsub(/[[[:space:]]\/]/, "_").downcase
+    dir_w_system = File.join(Dir.home,"videogame_roms",system_name)
+    Dir.mkdir(dir_w_system) unless Dir.exist?(dir_w_system)
+    dir_w_system
+  end
+
+  def self.move_archive(src,dest)
+    FileUtils.move src, dest
+  end
+
+  def self.delete_archive(dir)
+    File.delete(dir)
   end
   
 end

data/lib/romloader/romloader_cli.rb

@@ -70,11 +70,16 @@ class RomLoader::RomLoaderCli
             if file_or_dir_to_open
               if /\".+\"/.match(file_or_dir_to_open)
                 game_file = /\".+\"/.match(file_or_dir_to_open)[0]
-                input = input_prompt("Play #{game_file}? (Y/n) [exit]:", /[yn]/,control_flow_level)
+                input = input_prompt("Play #{game_file}? (y/N) [exit]:", /[yn]/,control_flow_level)
               else
-                input = input_prompt("Open #{file_or_dir_to_open}? (Y/n) [exit]:", /[yn]/,control_flow_level)
+                input = input_prompt("Open #{file_or_dir_to_open}? (y/N) [exit]:", /[yn]/,control_flow_level)
+              end
+              
+              if !isWindows?
+                system("open #{file_or_dir_to_open}") if input == 'y'
+              else
+                system("powershell -command \"& { Invoke-Item '#{file_or_dir_to_open}' }\"") if input == 'y'
               end
-                system("open #{file_or_dir_to_open}") if input == 'y' || input == ""
             end 
           end
           input_stack.shift
@@ -181,19 +186,33 @@ class RomLoader::RomLoaderCli
   # Downloads the selected game to the local directory (~/videogame_roms)
   def download_rom(game)
     file_or_dir_to_open = nil
-    puts "Downloading #{game.name} (#{game.size})..."
-    if isWindows?
-      result = Dir.chdir(File.join(Dir.home,"videogame_roms")) { system("powershell -command \"& { Invoke-WebRequest '#{game.download_url}' -OutFile '#{game.filename}' }\"") }
-    else
-      result = Dir.chdir(File.join(Dir.home,"videogame_roms")) { system("curl -Og# \"#{game.download_url}\"") }
-    end
-    
-    if result == true 
-      puts "Finished downloading #{game.filename} to #{File.join(Dir.home,"videogame_roms")}.\n"
-      file_or_dir_to_open = RomLoader::ArchiveExtractor.extract(File.join(Dir.home,"videogame_roms",game.filename),game) unless isWindows?
+    extract_dir = RomLoader::ArchiveExtractor.create_extract_dir(game)
+    if !File.exist?(File.join(extract_dir,game.filename))
+      puts "Downloading #{game.name} (#{game.size})..."
+      if isWindows?
+        result = Dir.chdir(extract_dir) { system("powershell -command \"& { Invoke-WebRequest '#{game.download_url}' -OutFile '#{game.filename}' }\"") }
+      else
+        result = Dir.chdir(extract_dir) { system("curl -Og# \"#{game.download_url}\"") }
+      end
+
+      if result && !isWindows? && game.system.name != "MAME"
+        puts "Finished downloading #{game.filename} to #{extract_dir}. Extracting..."
+        file_or_dir_to_open = RomLoader::ArchiveExtractor.extract(File.join(extract_dir,game.filename),extract_dir,game)
+        RomLoader::ArchiveExtractor.delete_archive(File.join(extract_dir,game.filename))
+      elsif result && !isWindows? && game.system.name == "MAME"
+        puts "Finished downloading #{game.filename} to #{extract_dir}."
+        puts "NOTE: No archive extraction. MAME roms must remain zipped to play."
+        file_or_dir_to_open = extract_dir
+      elsif result && isWindows?
+        puts "Finished downloading #{game.filename} to #{extract_dir}."
+        file_or_dir_to_open = extract_dir
+      else
+        puts "An error occured, the rom couldn't be downloaded.\n\n"
+      end
     else
-      puts "An error occured, the rom couldn't be downloaded.\n"
+      puts "File already exists.\n\n"
     end
+
     sleep 2
     file_or_dir_to_open
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: romloader
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Efrain Perez Jr