parker 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6b3d51c383bb6974823917dd10513689ac3797a
-  data.tar.gz: 78dcc1a3f3f3500856b0f8926161d78c57b7c211
+  metadata.gz: a6140e492f8266e3ee41d4469b399277ea94b69c
+  data.tar.gz: fcf9872e68727c46c18664a41b1c07ff2c3b7c42
 SHA512:
-  metadata.gz: d49768e3885a97d26f79e9df40502b7f1119956668baf4707054f9451ba5d2f1c69e88de5048f1c933a88d1d48c95601966e2f99f49a1cb7f682417b806f844e
-  data.tar.gz: 02ab2d5533de7a4a170bc91a1ac88390ba914dc01b6314bb8a25eb940f92c03dfd2c5b644f69c280f4812737b57354fe05fe6f31f8827cbc407fb99f26a83c22
+  metadata.gz: d3e9f6940aa89ccee818dbca691bda029c2ab9446937412c8587aa32c918531466a49ad49f32acf4771e46f2cfa57f7d60231a096421873242217ad002470e23
+  data.tar.gz: bd32a4526d1d5ed7ffe5a7c5f3fc762f20b89e8785cad04a62e89904f79e9e69105ef7a1202b3fa7848bcaadcf2b59392f7ba55e9beb320194d8a9d18b3e638e

data/bin/parker

@@ -15,15 +15,15 @@ end
 
 source_directory = File.expand_path(File.join('~/', '.config', 'parker'))
 
-options = Trollop.options do
+Trollop.options do
   version "parker v#{Parker::VERSION}"
-  banner <<-EOS
+  banner <<-BANNER
 A ridiculous tool for organising game screenshots.
 
 Usage:
 parker [output directory]
 Options:
-EOS
+BANNER
 end
 
 unless Dir.exist?(source_directory)
@@ -58,30 +58,30 @@ Dir.glob(File.join(source_directory, 'platforms', '*.json')).each do |path|
 end
 
 if platforms.empty?
-  puts "Nothing to do (no platforms found)."
+  puts 'Nothing to do (no platforms found).'
   exit
 end
 
 output_path = File.expand_path(ARGV[0])
 FileUtils.mkdir_p(output_path) unless Dir.exist?(output_path)
 
-puts "Scanning..."
+puts 'Scanning...'
 
 platforms.each do |platform|
   platform.games.each_value do |game|
-    if game.screenshots.length > 0
-      print "- #{game.name} (#{platform.name}): "
+    next unless game.screenshots.count.positive?
 
-      platform_path = File.join(output_path, platform.name)
-      copied_count = game.copy_screenshots(platform_path)
+    print "- #{game.name} (#{platform.name}): "
 
-      if copied_count > 0
-        puts "Copied #{copied_count} new screenshot#{'s' unless copied_count == 1}."
-      else
-        puts '✓'
-      end
+    platform_path = File.join(output_path, platform.name)
+    copied_count = game.copy_screenshots(platform_path)
+
+    if copied_count.positive?
+      puts "Copied #{copied_count} new screenshot#{'s' if copied_count != 1}."
+    else
+      puts '✓'
     end
   end
 end
 
-puts "\nDone!"
+puts "\nDone!"

data/lib/parker.rb

@@ -11,4 +11,4 @@ require 'parker/screenshot'
 require 'parker/platform/base'
 require 'parker/platform/ps4'
 require 'parker/platform/steam'
-require 'parker/platform/switch'
+require 'parker/platform/switch'

data/lib/parker/game.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Parker
+  # A class that models a single game.
   class Game
     attr_accessor :identifier, :name, :screenshots
 
@@ -26,4 +29,4 @@ module Parker
       copied_screenshots
     end
   end
-end
+end

data/lib/parker/platform/base.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 module Parker
   module Platform
+    # A base class for all platforms.
     class Base
       attr_reader :name, :source_path
       attr_accessor :games
@@ -9,13 +12,11 @@ module Parker
         @source_path = source_path
         @games = {}
 
-        unless game_data.nil?
-          game_data.map do |identifier, name|
-            @games[identifier] = Game.new(identifier, name)
-          end
+        game_data&.map do |game_identifier, game_name|
+          @games[game_identifier] = Game.new(game_identifier, game_name)
         end
 
-        scan_games
+        scan_games if Dir.exist?(@source_path)
       end
 
       def scan_games
@@ -23,4 +24,4 @@ module Parker
       end
     end
   end
-end
+end

data/lib/parker/platform/ps4.rb

@@ -1,21 +1,24 @@
+# frozen_string_literal: true
+
 require 'digest'
 
 module Parker
   module Platform
+    # A class that models the PlayStation 4 platform.
     class PS4 < Base
       def scan_games
         screenshots_path = File.join(source_path, '*', File::SEPARATOR, '*.jpg')
 
         Dir.glob(screenshots_path).each do |path|
-          next if (path =~ /\_\d.jpg$/)
+          next if path.match?(/\_\d.jpg$/)
 
-          (game_name, screenshot_date) = File.basename(path, File.extname(path)).split('_')
+          game_name = File.basename(path, File.extname(path)).split('_')[0]
           game_id = Digest::SHA1.hexdigest(game_name)[0..9]
 
-          games[game_id] ||= Game.new(game_name.sub('™', '').sub('_', ' -'))
+          games[game_id] ||= Game.new(game_id, game_name.sub('™', '').sub('_', ' -'))
           games[game_id].screenshots << Screenshot.new(path)
         end
       end
     end
   end
-end
+end

data/lib/parker/platform/steam.rb

@@ -1,9 +1,17 @@
+# frozen_string_literal: true
+
 module Parker
   module Platform
+    # A class that models the Steam platform.
     class Steam < Base
       def scan_games
         games.each do |identifier, game|
-          screenshot_path = File.join(source_path, identifier.to_s, 'screenshots', '*.jpg')
+          screenshot_path = File.join(
+            source_path,
+            identifier.to_s,
+            'screenshots',
+            '*.jpg'
+          )
 
           Dir.glob(screenshot_path).each do |path|
             game.screenshots << Screenshot.new(path)
@@ -12,4 +20,4 @@ module Parker
       end
     end
   end
-end
+end

data/lib/parker/platform/switch.rb

@@ -1,14 +1,17 @@
+# frozen_string_literal: true
+
 module Parker
   module Platform
+    # A class that models the Nintendo Switch platform.
     class Switch < Base
       def scan_games
         screenshot_path = File.join(source_path, '**', '*.jpg')
 
         Dir.glob(screenshot_path).each do |path|
           game_id = File.basename(path, File.extname(path)).split('-')[-1]
-          games[game_id].screenshots << Screenshot.new(path) if games[game_id]
+          (games[game_id].screenshots ||= {}) << Screenshot.new(path)
         end
       end
     end
   end
-end
+end

data/lib/parker/screenshot.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Parker
+  # A class that models a single game screenshot.
   class Screenshot
     attr_reader :path
     attr_accessor :filename
@@ -6,8 +9,10 @@ module Parker
     def initialize(path)
       @path = path
 
-      parts = File.basename(@path).match(/(\d{4})(\d{2})(\d{2})(\d+).+(\.[a-z]{3})/)
+      name_pattern = /(\d{4})(\d{2})(\d{2})(\d+).+(\.[a-z]{3})/
+      parts = File.basename(@path).match(name_pattern)
+
       @filename = parts.to_a[1..-2].join('-') << parts[-1]
     end
   end
-end
+end

data/lib/parker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parker
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parker
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-05 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop