phtools 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50c505c8d68963e5316f8d25a73ebff6c36522af
-  data.tar.gz: 1537c9723b68f2f413bb15f0bdee7df181a1f379
+  metadata.gz: 78670fe468c1b5d9bbf25c5a5d8460a408354f36
+  data.tar.gz: 2566973828624a1aa604b02c0916d46cdec09b55
 SHA512:
-  metadata.gz: 589135775c85fb42c059b097207ad2f8d4f7e2c89d63c2e29cb2e96f9301ad18e0084ad68fb26a98f16cb2e30fdd11996d073229f4b3e03338dda2d95d04c087
-  data.tar.gz: ca264e71b619e5c63ce81e28ac1b0a6d36740bcc9e0cadeec8d3b3628dfe9aea7c4288e191a3e21bfdd3968e4146e96c6daf719aeb9226b3401bd227fdad0732
+  metadata.gz: 9fac26d39ead526578a63fac032a39884dec6520b7220da590e476a86bc75013c4cd1490d90af61d22e0e36d49bd1b077bb4d5a40c7cca0db13b4c6cc6a66612
+  data.tar.gz: 59fe892d791534da62fbc2e94d675eb38b4fc230ab40ce801601d21d887c9fe47ebad22a99ad5b20237e52d47dc2f9496189888328f698852bff6efec75cfab2

data/History.md

@@ -1,5 +1,16 @@
 # RELEASED
 
+## [v0.15.0](https://github.com/andrewbiz/phtools/compare/v0.14.0...v0.15.0)
+* phls now supports --range parameter allowing the user to filter files which name endings are not in the given range
+
+## [v0.14.0](https://github.com/andrewbiz/phtools/compare/v0.10.0...v0.14.0)
+* ruby version required >= 2.4.0
+* phmove: now default TARGET_FOLDER is '.'
+* added 3gp video files support
+* phls: sort files in alphabet order
+* phrename: added new mode - manual rename. User sets date-time-in-the-name, increment and header to generate filename
+* code refactor (code optimizations, ruby 2.4.2 adaptation, new rubocop rules)
+
 ## [v0.10.0](https://github.com/andrewbiz/phtools/compare/v0.8.0...v0.10.0)
 * phgettags added to the bundle
 * phfixdto added to the bundle

data/TODO.md

@@ -6,8 +6,9 @@
 ### phls
 - [x] phls: use init method to initialize variables
 - [x] phls: change -r to -R
-- [ ] phls: make it work with .folders (like ftls did)
 - [x] phls: sort files in alphabet order
+- [x] phls: support --range parameter to filter files which belong to the range
+- [ ] phls: make it work with .folders (like ftls did)
 
 ### phmove
 - [x] phmove: create phmove tool based on ftarrange code (see ftools repo)
@@ -22,9 +23,9 @@
 - [x] phrename: add -s --shift_time option (based on ftfixdate functionality)
 - [x] phrename: by-default read tags for DateTime in this order: DateTimeOriginal, DateCreated, CreateDate, DigitalCreationDate, FileModifyDate (eqv to File::mtime). 1st non-zero value will be taken as a master photo creation timestamp. It means no longer names like '00000101-000000_ANB IMG_0183.PNG' will appear.
 - [x] phrename: make it safe and smart. Once the file was renamed to PHTOOL standard, re-run of phrename should not change the date-time info unless options -t or -s are used. If user wants to reset file name using exif tag - 1st clean it `phrename --clean`, then rename `phrename -a anb`
+- [x] phrename: new mode 'manual rename' renames files using given date-time template, author name and prefix. Good for mass renaming of the scanned films and photos (when date-time is not set in the tags and only human knows the real date-time)
 - [ ] phrename: make new usage mode: `phrename -t TAG`. Useful if user wants to re-set date-time using TAG keeping author-nickname unchanged
 - [ ] phrename: add QuickTime.CreationDate into analysis when calculate date-time-in-the-name (useful for iOS mov files). In iOS QuickTime.CreateDate is wrong (always in Grinvich zone), while QuickTime.CreationDate is Ok
-- [ ] phrename: new mode 'manual rename' renames files using given date-time template, author name and prefix. Good for mass renaming of the scanned films and photos (when date-time is not set in the tags and only human knows the real date-time)
 
 ### phgettags
 - [x] create phgettags (based on ftmtags)

data/exe/phls

@@ -30,14 +30,18 @@ module PhTools
     sends all found phtools friendly files filtered with *aaa* to phrename command.
 
     Usage:
-      #{tool_name} [-D] [-R] [DIR_OR_FILEMASK...]
+      #{tool_name} [-D] [-R] [DIR_OR_FILEMASK...] [-r RANGE]
       #{tool_name} -h | --help
       #{tool_name} -v | --version
 
     Options:
       -D --debug      Turn on debugging (verbose) mode
       -R --recursive  Recursively scan directories
-      -h --help       Show this screen.
+      -r RANGE --range=RANGE  Sets the range of filename endings to be included
+                      into the output. Example: -r '05..07' will take only files
+                      with the filename endings 05, 06, 07 and will not take
+                      any other files
+      -h --help       Show this screen
       -v --version    Show version.
   DOCOPT
 

data/lib/phls.rb

@@ -14,7 +14,7 @@ module PhTools
 
     def run!
       @dirs_to_scan.each do |dir|
-        fmask = File.join(dir, @options_cli['--recursive'] ? '**' : '', "{#{@filemasks * ','}}")
+        fmask = File.join(dir, @recursive ? '**' : '', "{#{@filemasks * ','}}")
         files = Dir.glob(fmask, File::FNM_CASEFOLD)
         files_sorted = files.sort_by(&:downcase)
         files_sorted.each { |f| output_file(PhFile.new(f)) if File.file?(f) }
@@ -37,10 +37,21 @@ module PhTools
       end
       @dirs_to_scan = ['.'] if @dirs_to_scan.empty?
       @filemasks = ['*.*'] if @filemasks.empty?
+      @recursive = @options_cli['--recursive']
+      @range = @options_cli['--range']
+      return unless @range
+      /^(?<_range1>[[:alnum:]]+)\.\.(?<_range2>[[:alnum:]]+)/ =~ @range
+      @range_start = Regexp.last_match(:_range1)
+      @range_end = Regexp.last_match(:_range2)
+      @ending_size = [@range_start.size, @range_end.size].max
     end
 
     def output_file(phfile)
-      @os.output(phfile) if @file_type.include?(phfile.type)
+      return unless @file_type.include?(phfile.type)
+      if @range
+        return unless (@range_start..@range_end).cover?(phfile.basename_clean.slice(-@ending_size, @ending_size))
+      end
+      @os.output(phfile)
     end
   end
 end

data/lib/phtools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PhTools
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phtools
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Andrew Bizyaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler