photein 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8005c4c7e035db2675a5f6cdcc0a0567b53aec6117b279d1242c4dae8d671758
-  data.tar.gz: 9d3ddc4eaf083903e45eaa55de9c93bd97c2201777bc676ee815436b427c0641
+  metadata.gz: 7b3bcb770e66b470a49fd5f486560c447e92ba8df6daa33434c45fdd3564a2e7
+  data.tar.gz: 83df115282d7cef28bfd2f32a42643a843726ea40c8eda1de5e7908f1b7f4832
 SHA512:
-  metadata.gz: 683fd6aa36b788f9e985210e7ae2fc97474b3d155afa04db1d8e1a87c1892b68d9a262e93798b0b3449b83285809e6035c3a82bb4955f1dd3f02f01768173a4f
-  data.tar.gz: 74cfbc6831fb2fbdb88a09dd0d3412ceac70ddc62379bf37e3bc800e442433b9b13d112bdff358cf04276b5ed6d59dc8804ef0fef757d223dcb466ebc726a627
+  metadata.gz: 33ceaea508cbe94cc40906364a1094c825c647e0bc7a38a1f9bdc21f1624a63a8b0c7e39351a0dcbc973afd2969af0e5e20615f3404d2b7b2af2f2cc6db1930f
+  data.tar.gz: 798e0351b09bcb1cbe0cae6875b6731cbfeeffb2cba1d2e09bc6b5e9ded21ebf009af302e2c17841e5b6cf2f025e5b1cbcd819787ce645205c3167e6afbb6ba7

data/bin/photein

@@ -5,7 +5,7 @@ require 'photein'
 require 'pathname'
 
 Photein::Config.parse_opts!
-Photein::Logger.open
+Photein.logger.open
 
 # Setup ------------------------------------------------------------------------
 
@@ -17,7 +17,7 @@ begin
   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)
 rescue => e
-  Photein::Logger.fatal(e.message)
+  Photein.logger.fatal(e.message)
   exit 1
 end
 

data/lib/photein/image.rb

@@ -29,7 +29,7 @@ module Photein
       when '.jpg', '.heic'
         return false if image.dimensions.reduce(&:*) < MAX_RES_WEB
 
-        Photein::Logger.info "optimizing #{path}"
+        Photein.logger.info "optimizing #{path}"
         MiniMagick::Tool::Convert.new do |convert|
           convert << path
           convert.colorspace('sRGB')
@@ -42,11 +42,11 @@ module Photein
         end unless Photein::Config.dry_run
       when '.png'
         FileUtils.cp(path, tempfile, noop: Photein::Config.dry_run)
-        Photein::Logger.info "optimizing #{path}"
+        Photein.logger.info "optimizing #{path}"
         begin
           Optipng.optimize(tempfile, level: 4) unless Photein::Config.dry_run
         rescue Errno::ENOENT
-          Photein::Logger.error('optipng is required to compress PNG images')
+          Photein.logger.error('optipng is required to compress PNG images')
           raise
         end
       end
@@ -57,7 +57,7 @@ module Photein
     def image
       @image ||= MiniMagick::Image.open(path)
     rescue MiniMagick::Invalid => e
-      Photein::Logger.error(<<~MSG) if e.message.match?(/You must have ImageMagick/)
+      Photein.logger.error(<<~MSG) if e.message.match?(/You must have ImageMagick/)
         ImageMagick is required to manipulate image files
       MSG
       raise
@@ -66,7 +66,7 @@ module Photein
     def metadata_stamp
       MiniExiftool.new(path.to_s).date_time_original
     rescue MiniExiftool::Error => e
-      Photein::Logger.error(<<~MSG) if e.message.match?(/exiftool: not found/)
+      Photein.logger.error(<<~MSG) if e.message.match?(/exiftool: not found/)
         exiftool is required to read timestamp metadata
       MSG
       raise

data/lib/photein/logger.rb

@@ -4,6 +4,14 @@ require 'logger'
 require 'singleton'
 
 module Photein
+  class << self
+    attr_writer :logger
+
+    def logger
+      @logger ||= Photein::Logger
+    end
+  end
+
   class Logger
     include Singleton
 

data/lib/photein/media_file.rb

@@ -29,7 +29,7 @@ module Photein
 
       optimize if Photein::Config.optimize_for
 
-      Photein::Logger.info(<<~MSG.chomp)
+      Photein.logger.info(<<~MSG.chomp)
         #{Photein::Config.keep ? 'copying' : 'moving'} #{path.basename} to #{dest_path}
       MSG
 
@@ -47,7 +47,7 @@ module Photein
 
     def corrupted?(result = false)
       return result.tap do |r|
-        Photein::Logger.error("#{path.basename}: cannot import corrupted file") if r
+        Photein.logger.error("#{path.basename}: cannot import corrupted file") if r
       end
     end
 
@@ -61,7 +61,7 @@ module Photein
 
       if status.success? # Do open files ALWAYS return exit status 0? (I think so.)
         cmd, pid = out.lines[1]&.split&.first(2)
-        Photein::Logger.fatal("skipping #{path}: file in use by #{cmd} (PID #{pid})")
+        Photein.logger.fatal("skipping #{path}: file in use by #{cmd} (PID #{pid})")
         return true
       else
         return false
@@ -119,7 +119,7 @@ module Photein
       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')
+          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?

data/lib/photein/version.rb

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

data/lib/photein/video.rb

@@ -36,7 +36,7 @@ module Photein
     def optimize
       return if video.bitrate < BITRATE_THRESHOLD[Photein::Config.optimize_for]
 
-      Photein::Logger.info("transcoding #{tempfile}")
+      Photein.logger.info("transcoding #{tempfile}")
       return if Photein::Config.dry_run
 
       video.transcode(
@@ -60,7 +60,7 @@ module Photein
     def video
       @video ||= FFMPEG::Movie.new(path.to_s)
     rescue Errno::ENOENT
-      Photein::Logger.error('ffmpeg is required to manipulate video files')
+      Photein.logger.error('ffmpeg is required to manipulate video files')
       raise
     end
 
@@ -68,7 +68,7 @@ module Photein
       # video timestamps are typically UTC
       MediaInfo.from(path.to_s).general.encoded_date&.getlocal
     rescue MediaInfo::EnvironmentError
-      Photein::Logger.error('mediainfo is required to read timestamp metadata')
+      Photein.logger.error('mediainfo is required to read timestamp metadata')
       raise
     end
 

metadata

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