photein 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cc58c5e8f3fad9d829ef5963b0503070ffb4d91e7a766e34acbac7149ad5aeb
-  data.tar.gz: f2d8a39d9c1c4c0e63354ad273eed73ed4aa2c34b42f2a31699bbf17c90f9282
+  metadata.gz: 4c649546f68f5f0547d94bc0dace264051b1b1fd4f37620e7a769939bc6330cd
+  data.tar.gz: 0e57a9fff26bf6aab6a49676cea4cf3213626693013ce80e4a9d616051e96091
 SHA512:
-  metadata.gz: db242817983284a1dbc2a3f16dc8929197c2e51f4abee657d8bfa179ac555e7a6c8454fb44bb3622ffd97b22c366bee22ed5b688d4c95d2432369b4df7306c2e
-  data.tar.gz: 0d6a7faef4624037b2f71eee2798d72397cde98f5940727f9ef5878c5a8282b8dc6c836ec70cea59724821d0fe31f9192b3fc590357f9dfe77e942edadea10a5
+  metadata.gz: '072889b598976c14a89994fe61ecd24c47f73d34e3f8c090df002ddb92684ca145285bf7b891e98023f0947ed04e602b0335dc0504dcddfe8dba1b7689d1911d'
+  data.tar.gz: e355d41fe3ce4c9bf86ac243524abecac43f595df2eb67f43344098a0e3348edad55ab43af6746efd421021c53706aed0f0b76b1cfe63dfcefb8cdc69ad53174

data/lib/photein/config.rb

@@ -74,10 +74,10 @@ module Photein
 
       def destinations
         @destinations ||= {
-          master:  Pathname(@params[:'library-master']),
-          desktop: Pathname(@params[:'library-desktop']),
-          web:     Pathname(@params[:'library-web'])
-        }.compact
+          master:  @params[:'library-master'],
+          desktop: @params[:'library-desktop'],
+          web:     @params[:'library-web']
+        }.compact.transform_values(&Pathname.method(:new))
       end
     end
   end

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

data/lib/photein/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Photein
-  VERSION = '0.1.1'
+  VERSION = '0.1.4'
 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.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Ryan Lue
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-08-30 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: []