photein 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 808d8afeddb75b1ec710f2335b5e1f51d9d6ffec91b1cb5a2cd2c1d8950486ca
-  data.tar.gz: b45b43586500db69c52fcc2a046063b90e1e375dd4d5ef41a042eef0a2a5a984
+  metadata.gz: 4a6e9370cd73bb024486ffb10e0a2aa17dce4262d7602e6b978e4019aeb23f55
+  data.tar.gz: e523c18ea04dfa84afa666b9a928a0ea761e5aca98b5dbd8a634f4fe5edd72ae
 SHA512:
-  metadata.gz: d9c2de4bf1b3e0433dbee191e44ef80c2d910a1416c02ccc0bd44fda3acc583282b2a07f2745a1c2345d39a83d055c270604858163b83c39ba7e8e519ae28c2b
-  data.tar.gz: bde27862fbeb2b281cb23f8504bb16fe603ff59ed4401765128566b46e024a3afc66684f88ff07c4c0932de08f83fde35d7b5e3f03c1665c799e0733959cb60f
+  metadata.gz: 702e7a3f7c626ec9d57e2c41bd2ba04076b769c4aca27ae0be29d2807a738307cca34ed315eca62356a7991ac68e847994e096b0671c81587eef66d200623e16
+  data.tar.gz: b19a618fc185ceb0aa52399fe60c87d13437bcc2edc919738f002a2266fd9f4fd203d32aeabb4ebd475d291805c8f77ddd040cf9c1fd36524c2848b8cc420c60

data/lib/photein/image.rb

@@ -85,8 +85,8 @@ module Photein
           Time.strptime(filename, 'IMG-%Y%m%d-WA%M%S')
         when /^IMG_\d{8}_\d{6}_\d{3}$/ # Telegram: datetime in milliseconds (at download)
           Time.strptime(filename, 'IMG_%Y%m%d_%H%M%S_%L')
-        when /^signal-\d{4}-\d{2}-\d{2}-\d{6}( \(\d+\))?$/ # Signal: datetime + optional counter (at receipt)
-          Time.strptime(filename[0, 24], 'signal-%F-%H%M%S')
+        when /^signal-\d{4}(-\d{2}){5}[-\d]*$/ # Signal: datetime + optional counter (at receipt)
+          Time.strptime(filename[0, 26], 'signal-%F-%H-%M-%S')
         when /^\d{13}$/ # LINE: UNIX time in milliseconds (at download)
           Time.strptime(filename[0..-4], '%s')
         else

data/lib/photein/media_file.rb

@@ -54,7 +54,7 @@ module Photein
             FileUtils.chmod('-x', dest_path, noop: Photein::Config.dry_run)
           end
         end
-      end.each(&:join)
+      end.compact.each(&:join)
 
       FileUtils.rm(path, noop: Photein::Config.dry_run || Photein::Config.keep)
     end
@@ -132,7 +132,7 @@ module Photein
         file = Pathname(file)
         raise Errno::ENOENT, "#{file}" unless file.exist?
 
-        [Image, Video].find { |type| type::SUPPORTED_FORMATS.include?(file.extname) }
+        [Image, Video].find { |type| type::SUPPORTED_FORMATS.include?(file.extname.downcase) }
           .tap { |type| raise ArgumentError, "#{file}: Invalid media file" if type.nil? }
           .then { |type| type.new(file) }
       end

data/lib/photein/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Photein
-  VERSION = '0.1.2'
+  VERSION = '0.1.5'
 end

data/lib/photein.rb

@@ -11,10 +11,13 @@ module Photein
   class << self
     def run
       [Photein::Image, Photein::Video].each do |media_type|
+        # Why not use Dir.glob? It refuses to do case-insensitive matching on Linux
+        ftype_regex = /(#{media_type::SUPPORTED_FORMATS.join('|').gsub('.', '\.')})$/i
+
         Pathname(Photein::Config.source)
-          .join(Photein::Config.recursive ? '**' : '')
-          .join("*{#{media_type::SUPPORTED_FORMATS.join(',')}}")
-          .then { |glob| Dir.glob(glob, File::FNM_CASEFOLD).sort }
+          .join(Photein::Config.recursive ? '**' : '', '*')
+          .then(&Dir.method(:glob)).sort
+          .select { |file| file.match?(ftype_regex) }
           .map(&media_type.method(:new))
           .each(&:import)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photein
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - Ryan Lue
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mediainfo
@@ -144,7 +144,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/rlue/photein
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -159,8 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Import/rename photos & videos from one directory to another.
 test_files: []