photein 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a6e9370cd73bb024486ffb10e0a2aa17dce4262d7602e6b978e4019aeb23f55
-  data.tar.gz: e523c18ea04dfa84afa666b9a928a0ea761e5aca98b5dbd8a634f4fe5edd72ae
+  metadata.gz: 3490aa4f980df5aed87bc73a127ab9908229edb18e5369377e75c459704f91f5
+  data.tar.gz: 4fac58b8aaaf96eda55b07496e7b0fc99bb347863ffe3d50ad75429f7f9940f8
 SHA512:
-  metadata.gz: 702e7a3f7c626ec9d57e2c41bd2ba04076b769c4aca27ae0be29d2807a738307cca34ed315eca62356a7991ac68e847994e096b0671c81587eef66d200623e16
-  data.tar.gz: b19a618fc185ceb0aa52399fe60c87d13437bcc2edc919738f002a2266fd9f4fd203d32aeabb4ebd475d291805c8f77ddd040cf9c1fd36524c2848b8cc420c60
+  metadata.gz: 8a414155ee73eac20adf275cb57d593f433531b7e7c70390b5cfa887e16b1e2247f39aea0e31cecc1e2e31b8cd0e093e640c3cf3558ced57a3573893540a8e71
+  data.tar.gz: c8187a8cfa3f54bf5e2e1e1c9ea8ba4ccd02242fee55b220f8528380c77f8f1c7769bac0e497bf129bbd5a895640124360f8b74ec06d7423236ff052dd2d067c

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}){5}[-\d]*$/ # Signal: datetime + optional counter (at receipt)
-          Time.strptime(filename[0, 26], 'signal-%F-%H-%M-%S')
+        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 /^\d{13}$/ # LINE: UNIX time in milliseconds (at download)
           Time.strptime(filename[0..-4], '%s')
         else

data/lib/photein/media_file.rb

@@ -54,9 +54,10 @@ module Photein
             FileUtils.chmod('-x', dest_path, noop: Photein::Config.dry_run)
           end
         end
-      end.compact.each(&:join)
-
-      FileUtils.rm(path, noop: Photein::Config.dry_run || Photein::Config.keep)
+      end.compact.map(&:join).then do |threads|
+        # e.g.: with --library-web only, .dngs are skipped, so DON'T DELETE!
+        FileUtils.rm(path, noop: threads.empty? || Photein::Config.dry_run || Photein::Config.keep)
+      end
     end
 
     private
@@ -106,25 +107,22 @@ module Photein
       @extname ||= NORMAL_EXTNAME_MAP[path.extname.downcase] || path.extname.downcase
     end
 
-    def resolve_name_collision(filename)
-      raise ArgumentError, 'Invalid filename' if filename.to_s.include?('*')
-
-      collision_glob = Pathname(filename).sub_ext("*#{filename.extname}")
-
-      case Dir[collision_glob].length
-      when 0 # if no files found, no biggie
-      when 1 # if one file found, WITH OR WITHOUT COUNTER, reset counter to a
-        if Dir[collision_glob].first != collision_glob.sub('*', 'a') # don't try if it's already a lone, correctly-countered file
-          Photein.logger.info('conflicting timestamp found; adding counter to existing file')
-          FileUtils.mv(Dir[collision_glob].first, collision_glob.sub('*', 'a'), noop: Photein::Config.dry_run)
-        end
-      else # TODO: if multiple files found, rectify them?
+    def resolve_name_collision(pathname)
+      raise ArgumentError, 'Invalid filename' if pathname.to_s.include?('*')
+
+      collisions = Dir[pathname.sub_ext("*#{pathname.extname}")]
+
+      case collisions.length
+      when 0
+        return pathname
+      when 1
+        return pathname.sub_ext("+1#{pathname.extname}")
+      else # TODO: what to do for heterogeneous suffixes?
+        collisions.tap { |c| c.delete(pathname.to_s) }.max
+          .slice(/(?<=^#{pathname.to_s.delete_suffix(pathname.extname)}).*(?=#{pathname.extname}$)/)
+          .tap { |counter| raise 'Unresolved timestamp conflict' unless counter&.match?(/^\+[1-8]$/) }
+          .then { |counter| pathname.sub_ext("#{counter.next}#{pathname.extname}") }
       end
-
-      # return the next usable filename
-      Dir[collision_glob].max&.slice(/.(?=#{Regexp.escape(collision_glob.extname)})/)&.next
-        .tap { |counter| raise 'Unresolved timestamp conflict' unless [*Array('a'..'z'), nil].include?(counter) }
-        .then { |counter| filename.sub_ext("#{counter}#{filename.extname}") }
     end
 
     class << self

data/lib/photein/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: photein
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Ryan Lue
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2024-12-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: mediainfo
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: pstore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Import/rename photos & videos from one directory to another.