photein 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b3bcb770e66b470a49fd5f486560c447e92ba8df6daa33434c45fdd3564a2e7
-  data.tar.gz: 83df115282d7cef28bfd2f32a42643a843726ea40c8eda1de5e7908f1b7f4832
+  metadata.gz: 90719855955bcdf3585080664753c65528e9edaad99d2646498965c063ae0299
+  data.tar.gz: 874d2e1d44defc090968d10f4c000f84c7501d4f5d3a1bff6b2a2145297bf169
 SHA512:
-  metadata.gz: 33ceaea508cbe94cc40906364a1094c825c647e0bc7a38a1f9bdc21f1624a63a8b0c7e39351a0dcbc973afd2969af0e5e20615f3404d2b7b2af2f2cc6db1930f
-  data.tar.gz: 798e0351b09bcb1cbe0cae6875b6731cbfeeffb2cba1d2e09bc6b5e9ded21ebf009af302e2c17841e5b6cf2f025e5b1cbcd819787ce645205c3167e6afbb6ba7
+  metadata.gz: 9a70c02ce6b74cd0cf58f887d4bf6ba21bdf0df50651f6acd230aa0e6382d6bdf3669d637f4f112acdfc4c5a6d8417425cf7a87f0b28dd6df5383cd539fd339f
+  data.tar.gz: 0a69d825de1c6f7fb4d81add6db960d2a12793b46e1aa6bb277193511dea0a59bcde2b47b97313419a268b6f38e97cc99e5b75642ebef3cbb88a445d4e1de446

data/bin/photein

@@ -9,13 +9,9 @@ Photein.logger.open
 
 # Setup ------------------------------------------------------------------------
 
-SRC_DIR  = Pathname(Photein::Config.source)
-DEST_DIR = Pathname(Photein::Config.dest)
-
 begin
-  raise "#{Photein::Config.source}: no such directory" unless SRC_DIR.exist?
-  raise "#{Photein::Config.dest}: no such directory" unless DEST_DIR.exist?
-  raise "#{Photein::Config.source}: no photos or videos found" if Dir.empty?(SRC_DIR)
+  raise "#{Photein::Config.source}: no such directory" unless Photein::Config.source.exist?
+  raise "#{Photein::Config.source}: no photos or videos found" if Dir.empty?(Photein::Config.source)
 rescue => e
   Photein.logger.fatal(e.message)
   exit 1
@@ -24,7 +20,7 @@ end
 # Cleanup ----------------------------------------------------------------------
 at_exit do
   unless Photein::Config.keep
-    Dir[SRC_DIR.join('**/')].sort
+    Dir[Photein::Config.source.join('**/')].sort
       .drop(1)
       .reverse_each { |d| Dir.rmdir(d) if Dir.empty?(d) }
   end

data/lib/photein/config.rb

@@ -8,15 +8,16 @@ module Photein
     include Singleton
 
     OPTIONS = [
-      ['-v',             '--verbose',                              'print verbose output'],
-      ['-s SOURCE',      '--source=SOURCE',                        'specify the source directory'],
-      ['-d DESTINATION', '--dest=DESTINATION',                     'specify the destination directory'],
-      ['-r',             '--recursive',                            'ingest source files recursively'],
-      ['-k',             '--keep',                                 'do not delete source files'],
-      ['-i',             '--interactive',                          'ask whether to import each file found'],
-      ['-n',             '--dry-run',                              'perform a "no-op" trial run'],
-      [                  '--safe',                                 'skip files in use by other processes'],
-      [                  '--optimize-for=TARGET', %i[desktop web], 'compress images/video before importing']
+      ['-v',             '--verbose',                 'print verbose output'],
+      ['-s SOURCE',      '--source=SOURCE',           'path to the source directory'],
+      ['-m MASTER',      '--library-master=MASTER',   'path to a destination directory (master)'],
+      ['-d DESKTOP',     '--library-desktop=DESKTOP', 'path to a destination directory (desktop-optimized)'],
+      ['-w WEB',         '--library-web=WEB',         'path to a destination directory (web-optimized)'],
+      ['-r',             '--recursive',               'ingest source files recursively'],
+      ['-k',             '--keep',                    'do not delete source files'],
+      ['-i',             '--interactive',             'ask whether to import each file found'],
+      ['-n',             '--dry-run',                 'perform a "no-op" trial run'],
+      [                  '--safe',                    'skip files in use by other processes'],
     ].freeze
 
     OPTION_NAMES = OPTIONS
@@ -46,7 +47,8 @@ module Photein
         @params.freeze
 
         raise "no source directory given" if !@params.key?(:source)
-        raise "no destination directory given" if !@params.key?(:dest)
+        (%i[library-master library-desktop library-web] & @params.keys)
+          .then { |dest_dirs| raise "no destination directory given" if dest_dirs.empty? }
       rescue => e
         warn("#{parser.program_name}: #{e.message}")
         warn(parser.help) if e.is_a?(OptionParser::ParseError)
@@ -65,6 +67,18 @@ module Photein
       def respond_to_missing?(m, *args)
         @params.key?(m.to_s.tr('_', '-').to_sym) || super
       end
+
+      def source
+        @source ||= Pathname(@params[:source])
+      end
+
+      def destinations
+        @destinations ||= {
+          master:  Pathname(@params[:'library-master']),
+          desktop: Pathname(@params[:'library-desktop']),
+          web:     Pathname(@params[:'library-web'])
+        }.compact
+      end
     end
   end
 end

data/lib/photein/image.rb

@@ -22,8 +22,8 @@ module Photein
     }.freeze
     MAX_RES_WEB = 2097152 # 2MP
 
-    def optimize
-      return if Photein::Config.optimize_for == :desktop
+    def optimize(tempfile:, lib_type:)
+      return unless lib_type == :web
 
       case extname
       when '.jpg', '.heic'
@@ -95,10 +95,8 @@ module Photein
       end
     end
 
-    def non_optimizable_format?
-      return false if !Photein::Config.optimize_for
-      return false if Photein::Config.optimize_for == :desktop
-      return true if extname == '.dng'
+    def non_optimizable_format?(lib_type)
+      return true if lib_type == :web && extname == '.dng'
 
       return false
     end

data/lib/photein/media_file.rb

@@ -23,22 +23,38 @@ module Photein
       return if corrupted?
       return if Photein::Config.interactive && denied_by_user?
       return if Photein::Config.safe && in_use?
-      return if Photein::Config.optimize_for && non_optimizable_format?
 
-      FileUtils.mkdir_p(parent_dir, noop: Photein::Config.dry_run)
-
-      optimize if Photein::Config.optimize_for
-
-      Photein.logger.info(<<~MSG.chomp)
-        #{Photein::Config.keep ? 'copying' : 'moving'} #{path.basename} to #{dest_path}
-      MSG
-
-      if File.exist?(tempfile)
-        FileUtils.mv(tempfile, dest_path, noop: Photein::Config.dry_run)
-      else
-        FileUtils.cp(path, dest_path, noop: Photein::Config.dry_run)
-        FileUtils.chmod('-x', dest_path, noop: Photein::Config.dry_run)
-      end
+      Photein::Config.destinations.map do |lib_type, lib_path|
+        next if non_optimizable_format?(lib_type)
+
+        Thread.new do
+          dest_basename = timestamp.strftime(DATE_FORMAT)
+          dest_extname  = self.class::OPTIMIZATION_FORMAT_MAP.dig(lib_type, extname) || extname
+          dest_path     = lib_path
+                            .join(timestamp.strftime('%Y'))
+                            .join("#{dest_basename}#{dest_extname}")
+                            .then(&method(:resolve_name_collision))
+          tempfile      = Pathname(Dir.tmpdir)
+                            .join('photein').join(lib_type.to_s)
+                            .tap(&FileUtils.method(:mkdir_p))
+                            .join(dest_path.basename)
+
+          optimize(tempfile: tempfile, lib_type: lib_type)
+
+          Photein.logger.info(<<~MSG.chomp)
+            #{Photein::Config.keep ? 'copying' : 'moving'} #{path.basename} to #{dest_path}
+          MSG
+
+          FileUtils.mkdir_p(dest_path.dirname, noop: Photein::Config.dry_run)
+
+          if File.exist?(tempfile)
+            FileUtils.mv(tempfile, dest_path, noop: Photein::Config.dry_run)
+          else
+            FileUtils.cp(path, dest_path, noop: Photein::Config.dry_run)
+            FileUtils.chmod('-x', dest_path, noop: Photein::Config.dry_run)
+          end
+        end
+      end.each(&:join)
 
       FileUtils.rm(path, noop: Photein::Config.dry_run || Photein::Config.keep)
     end
@@ -68,29 +84,10 @@ module Photein
       end
     end
 
-    def non_optimizable_format? # may be overridden by subclasses
+    def non_optimizable_format?(lib_type = :master) # may be overridden by subclasses
       return false
     end
 
-    def parent_dir
-      Pathname(Photein::Config.dest).join(timestamp.strftime('%Y'))
-    end
-
-    def tempfile
-      Pathname(Dir.tmpdir).join('photein')
-        .tap(&FileUtils.method(:mkdir_p))
-        .join(dest_path.basename)
-    end
-
-    def dest_path
-      @dest_path ||= begin
-                       base_path = parent_dir.join("#{timestamp.strftime(DATE_FORMAT)}#{dest_extname}")
-                       counter   = resolve_name_collision(base_path.sub_ext("*#{dest_extname}"))
-
-                       base_path.sub_ext("#{counter}#{dest_extname}")
-                     end
-    end
-
     def timestamp
       @timestamp ||= (metadata_stamp || filename_stamp)
     end
@@ -105,16 +102,15 @@ module Photein
       end
     end
 
-    def dest_extname
-      self.class::OPTIMIZATION_FORMAT_MAP
-        .dig(Photein::Config.optimize_for, extname) || extname
-    end
-
     def extname
       @extname ||= NORMAL_EXTNAME_MAP[path.extname.downcase] || path.extname.downcase
     end
 
-    def resolve_name_collision(collision_glob)
+    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
@@ -125,9 +121,10 @@ module Photein
       else # TODO: if multiple files found, rectify them?
       end
 
-      # return the next usable counter
+      # 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
   end
 end

data/lib/photein/version.rb

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

data/lib/photein/video.rb

@@ -33,8 +33,9 @@ module Photein
       web:     '35',
     }.freeze
 
-    def optimize
-      return if video.bitrate < BITRATE_THRESHOLD[Photein::Config.optimize_for]
+    def optimize(tempfile:, lib_type:)
+      return if lib_type == :master
+      return if video.bitrate < BITRATE_THRESHOLD[lib_type]
 
       Photein.logger.info("transcoding #{tempfile}")
       return if Photein::Config.dry_run
@@ -45,7 +46,7 @@ module Photein
           '-map_metadata', '0', # https://video.stackexchange.com/a/26076
           '-movflags',     'use_metadata_tags',
           '-c:v',          'libx264',
-          '-crf',          TARGET_CRF[Photein::Config.optimize_for],
+          '-crf',          TARGET_CRF[lib_type],
         ],
         &method(:display_progress_bar)
       )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photein
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryan Lue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mediainfo