parker 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a6140e492f8266e3ee41d4469b399277ea94b69c
-  data.tar.gz: fcf9872e68727c46c18664a41b1c07ff2c3b7c42
+SHA256:
+  metadata.gz: d08e3ea90c474e319b23713fdb05356c88fbc8a5fe97f71d6f47fe53b93d7961
+  data.tar.gz: 180b040e95224d38793d03f1f6dcb65f0318b69b379990fe8842c84c776458bf
 SHA512:
-  metadata.gz: d3e9f6940aa89ccee818dbca691bda029c2ab9446937412c8587aa32c918531466a49ad49f32acf4771e46f2cfa57f7d60231a096421873242217ad002470e23
-  data.tar.gz: bd32a4526d1d5ed7ffe5a7c5f3fc762f20b89e8785cad04a62e89904f79e9e69105ef7a1202b3fa7848bcaadcf2b59392f7ba55e9beb320194d8a9d18b3e638e
+  metadata.gz: c2e16fa870dc63374a443d9aea4fe51e5e471475773a899f178e3e0590618c925d2348082e6f52f48f5572f560e6e307067c57f0a0124632bd043c44dbd9b455
+  data.tar.gz: a0834b75490ccc781a940f5dd61e6fe27380b95af68ced11146fac81abfa001fd289669ecebf3635886832a7b566da6582953ad7964ee90a1e12f97e16126af2

data/lib/parker/platform/ps4.rb

@@ -6,16 +6,22 @@ module Parker
   module Platform
     # A class that models the PlayStation 4 platform.
     class PS4 < Base
+      NAME_FILTER = {
+        '™' => '',
+        '_' => ' -'
+      }.freeze
+
       def scan_games
         screenshots_path = File.join(source_path, '*', File::SEPARATOR, '*.jpg')
 
         Dir.glob(screenshots_path).each do |path|
           next if path.match?(/\_\d.jpg$/)
 
-          game_name = File.basename(path, File.extname(path)).split('_')[0]
+          game_name = File.dirname(path).split(File::SEPARATOR)[-1]
+          game_name.gsub!(/[#{NAME_FILTER.keys.join}]/, NAME_FILTER)
           game_id = Digest::SHA1.hexdigest(game_name)[0..9]
 
-          games[game_id] ||= Game.new(game_id, game_name.sub('™', '').sub('_', ' -'))
+          games[game_id] ||= Game.new(game_id, game_name)
           games[game_id].screenshots << Screenshot.new(path)
         end
       end

data/lib/parker/screenshot.rb

@@ -10,9 +10,15 @@ module Parker
       @path = path
 
       name_pattern = /(\d{4})(\d{2})(\d{2})(\d+).+(\.[a-z]{3})/
-      parts = File.basename(@path).match(name_pattern)
+      base_name = File.basename(@path)
 
-      @filename = parts.to_a[1..-2].join('-') << parts[-1]
+      parts = base_name.match(name_pattern)
+
+      @filename = if parts
+                    parts.to_a[1..-2].join('-') << parts[-1]
+                  else
+                    base_name
+                  end
     end
   end
 end

data/lib/parker/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parker
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2018-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A tool for organising game screenshots