phtools 0.11.2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88b9383b08dbf6122708f49f7dca05848094b9e8
-  data.tar.gz: 2600e31ae1221ac0f354ea5d27b1d3ab88e49664
+  metadata.gz: 50c505c8d68963e5316f8d25a73ebff6c36522af
+  data.tar.gz: 1537c9723b68f2f413bb15f0bdee7df181a1f379
 SHA512:
-  metadata.gz: febc61babbd310c24de54f41b67b673694296b2114d0bcd3fe6d2d1b2bda3868255fe11c0b37ac881f323ac0808e938f34806390f9c2b4d2967bf4c02298a9a1
-  data.tar.gz: aeebf94c79f56643b229886c91b301e93d91b7a73fbe6418e40588be668264008d329e4546fbed250591def80d502b1f49033b4d4b602ab9a7fea9ac6548f616
+  metadata.gz: 589135775c85fb42c059b097207ad2f8d4f7e2c89d63c2e29cb2e96f9301ad18e0084ad68fb26a98f16cb2e30fdd11996d073229f4b3e03338dda2d95d04c087
+  data.tar.gz: ca264e71b619e5c63ce81e28ac1b0a6d36740bcc9e0cadeec8d3b3628dfe9aea7c4288e191a3e21bfdd3968e4146e96c6daf719aeb9226b3401bd227fdad0732

data/.rubocop.yml

@@ -8,9 +8,9 @@ AllCops:
     - 'Guardfile'
   TargetRubyVersion: 2.3
 
-Style/Encoding:
-  EnforcedStyle: when_needed
-  Enabled: true
+# Style/Encoding:
+#   EnforcedStyle: when_needed
+#   Enabled: true
 
 #Style/FrozenStringLiteralComment:
 #  EnforcedStyle: always
@@ -24,6 +24,9 @@ Metrics/ClassLength:
 Metrics/MethodLength:
   Enabled: false
 
+Metrics/BlockNesting:
+  Enabled: false
+
 Metrics/CyclomaticComplexity:
   Enabled: false
 
@@ -39,5 +42,11 @@ Style/Documentation:
 Style/SignalException:
   Enabled: false
 
-Style/AccessorMethodName:
+Style/DateTime:
+  Enabled: false
+
+Style/UnneededInterpolation:
+  Enabled: false
+
+Naming/AccessorMethodName:
   Enabled: false

data/TODO.md

@@ -7,6 +7,7 @@
 - [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
 
 ### phmove
 - [x] phmove: create phmove tool based on ftarrange code (see ftools repo)
@@ -23,9 +24,11 @@
 - [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`
 - [ ] 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)
+- [ ] support option -e --composite of exiftool
 
 ### phfixfmd
 - [x] create phfixfmd - fix FileModifyDate to get equal to date-time-in-the-name

data/exe/phbackup

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 # encoding: UTF-8
+
 # (c) ANB Andrew Bizyaev
 
 module PhTools
@@ -8,25 +9,25 @@ module PhTools
   require tool_name.to_s
 
   file_type = FILE_TYPE_IMAGE + FILE_TYPE_VIDEO + FILE_TYPE_AUDIO
-  usage = <<DOCOPT
-***************************************************
-phtools - *Keep Your Photos In Order* (c) ANB
-***************************************************
-#{tool_name} copies the input file to backup directory.
-Optimized to be used with other *phtools* via pipes.
-Example: phls | #{tool_name} | phrename ...
+  usage = <<~DOCOPT
+    ***************************************************
+    phtools - *Keep Your Photos In Order* (c) ANB
+    ***************************************************
+    #{tool_name} copies the input file to backup directory.
+    Optimized to be used with other *phtools* via pipes.
+    Example: phls | #{tool_name} | phrename ...
 
-Usage:
-  #{tool_name} [--backup DIR] [-D]
-  #{tool_name} -h | --help
-  #{tool_name} -v | --version
+    Usage:
+      #{tool_name} [--backup DIR] [-D]
+      #{tool_name} -h | --help
+      #{tool_name} -v | --version
 
-Options:
-  -b DIR --backup=DIR  Sets the backup directory [Default: ./backup]
-  -D --debug           Turn on debugging (verbose) mode
-  -h --help            Show this screen.
-  -v --version         Show version.
-DOCOPT
+    Options:
+      -b DIR --backup=DIR  Sets the backup directory [Default: ./backup]
+      -D --debug           Turn on debugging (verbose) mode
+      -h --help            Show this screen.
+      -v --version         Show version.
+  DOCOPT
 
   PhTools.const_get(tool_name.capitalize).new(usage, file_type).run!
 end

data/exe/phfixdto

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 # encoding: UTF-8
+
 # (c) ANB Andrew Bizyaev
 
 module PhTools
@@ -8,36 +9,36 @@ module PhTools
   require tool_name.to_s
 
   file_type = FILE_TYPE_IMAGE + FILE_TYPE_VIDEO + FILE_TYPE_AUDIO
-  usage = <<DOCOPT
-***************************************************
-phtools - *Keep Your Photos In Order* (c) ANB
-***************************************************
-  #{tool_name} updates the input file's DateTimeOriginal (CreateDate) tags with
-the date-time encoded in the filename (date-time-in-the-name). The file should
-be renamed to phtools Standard Name before using this command (use phrename for
-this).
-  This program uses external utility ExifTool created by Phil Harvey
-(http://www.sno.phy.queensu.ca/~phil/exiftool/).
-  #{tool_name} acts as a 'sink' program meaning it expects the input files
-to be passed to STDIN, does its job on the files and produces no useful
-(for other pipe-optimized programs) output.
-In other words this command is intended to be used with other programs
-connected via input pipes as a last command in the pipe chain, e.g.:
-  phls | phrename - a anb | #{tool_name}
+  usage = <<~DOCOPT
+    ***************************************************
+    phtools - *Keep Your Photos In Order* (c) ANB
+    ***************************************************
+      #{tool_name} updates the input file's DateTimeOriginal (CreateDate) tags with
+    the date-time encoded in the filename (date-time-in-the-name). The file should
+    be renamed to phtools Standard Name before using this command (use phrename for
+    this).
+      This program uses external utility ExifTool created by Phil Harvey
+    (http://www.sno.phy.queensu.ca/~phil/exiftool/).
+      #{tool_name} acts as a 'sink' program meaning it expects the input files
+    to be passed to STDIN, does its job on the files and produces no useful
+    (for other pipe-optimized programs) output.
+    In other words this command is intended to be used with other programs
+    connected via input pipes as a last command in the pipe chain, e.g.:
+      phls | phrename - a anb | #{tool_name}
 
-Usage:
-  #{tool_name} [-N] [-D]
-  #{tool_name} -h | --help
-  #{tool_name} -v | --version
+    Usage:
+      #{tool_name} [-N] [-D]
+      #{tool_name} -h | --help
+      #{tool_name} -v | --version
 
-Options:
-  -N --no_run   Dry-run mode means no run exiftool command, only generate script
-                file 'exif_tagger_dto.txt'. User can check the script and
-                manually run the command: `exiftool -@ exif_tagger_dto.txt`
-  -D --debug    Turn on debugging (verbose) mode
-  -h --help     Show this screen.
-  -v --version  Show version.
-DOCOPT
+    Options:
+      -N --no_run   Dry-run mode means no run exiftool command, only generate script
+                    file 'exif_tagger_dto.txt'. User can check the script and
+                    manually run the command: `exiftool -@ exif_tagger_dto.txt`
+      -D --debug    Turn on debugging (verbose) mode
+      -h --help     Show this screen.
+      -v --version  Show version.
+  DOCOPT
 
   PhTools.const_get(tool_name.capitalize).new(usage, file_type).run!
 end

data/exe/phfixfmd

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 # encoding: UTF-8
+
 # (c) ANB Andrew Bizyaev
 
 module PhTools
@@ -8,29 +9,29 @@ module PhTools
   require tool_name.to_s
 
   file_type = FILE_TYPE_IMAGE + FILE_TYPE_VIDEO + FILE_TYPE_AUDIO
-  usage = <<DOCOPT
-***************************************************
-phtools - *Keep Your Photos In Order* (c) ANB
-***************************************************
-  #{tool_name} changes an input file's modify-date according to the date encoded
-in the filename (date-time-in-the-name). Therefore the file should be renamed
-to phtools Standard Name before using this command (use phrename for this).
-  #{tool_name} acts as a 'filter' program meaning it expects the input files
-to be passed to STDIN and after the job is done it produces STDOUT with the list
-of processed files. In other words this command is intended to be used with
-other programs connected via pipes, e.g.:
-  phls | phrename -a anb | #{tool_name} | phmove ~/targed/folder
+  usage = <<~DOCOPT
+    ***************************************************
+    phtools - *Keep Your Photos In Order* (c) ANB
+    ***************************************************
+      #{tool_name} changes an input file's modify-date according to the date encoded
+    in the filename (date-time-in-the-name). Therefore the file should be renamed
+    to phtools Standard Name before using this command (use phrename for this).
+      #{tool_name} acts as a 'filter' program meaning it expects the input files
+    to be passed to STDIN and after the job is done it produces STDOUT with the list
+    of processed files. In other words this command is intended to be used with
+    other programs connected via pipes, e.g.:
+      phls | phrename -a anb | #{tool_name} | phmove ~/targed/folder
 
-Usage:
-  #{tool_name} [-D]
-  #{tool_name} -h | --help
-  #{tool_name} -v | --version
+    Usage:
+      #{tool_name} [-D]
+      #{tool_name} -h | --help
+      #{tool_name} -v | --version
 
-Options:
-  -D --debug    Turn on debugging (verbose) mode
-  -h --help     Show this screen.
-  -v --version  Show version.
-DOCOPT
+    Options:
+      -D --debug    Turn on debugging (verbose) mode
+      -h --help     Show this screen.
+      -v --version  Show version.
+  DOCOPT
 
   PhTools.const_get(tool_name.capitalize).new(usage, file_type).run!
 end

data/exe/phgettags

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 # encoding: UTF-8
+
 # (c) ANB Andrew Bizyaev
 
 module PhTools
@@ -8,33 +9,33 @@ module PhTools
   require tool_name.to_s
 
   file_type = FILE_TYPE_IMAGE + FILE_TYPE_VIDEO + FILE_TYPE_AUDIO
-  usage = <<DOCOPT
-***************************************************
-phtools - *Keep Your Photos In Order* (c) ANB
-***************************************************
-  #{tool_name} extracts the list of tags stored inside the given file.
-
-  #{tool_name} acts as a 'sink' program meaning it expects the input files
-to be passed to STDIN, does its job on the input files and produces no useful
-(for other pipe-optimized programs) output.
-In other words this command is intended to be used with other programs
-connected via input pipes as a last command in the pipe chain, e.g.:
-  phls | #{tool_name}
-
-This program uses external utility ExifTool created by Phil Harvey
-(http://www.sno.phy.queensu.ca/~phil/exiftool/).
-
-Usage:
-  #{tool_name} [-f] [-D]
-  #{tool_name} -h | --help
-  #{tool_name} -v | --version
-
-Options:
-  -f --full_dump  Print all tags
-  -D --debug      Turn on debugging (verbose) mode
-  -h --help       Show this screen.
-  -v --version    Show version.
-DOCOPT
+  usage = <<~DOCOPT
+    ***************************************************
+    phtools - *Keep Your Photos In Order* (c) ANB
+    ***************************************************
+      #{tool_name} extracts the list of tags stored inside the given file.
+
+      #{tool_name} acts as a 'sink' program meaning it expects the input files
+    to be passed to STDIN, does its job on the input files and produces no useful
+    (for other pipe-optimized programs) output.
+    In other words this command is intended to be used with other programs
+    connected via input pipes as a last command in the pipe chain, e.g.:
+      phls | #{tool_name}
+
+    This program uses external utility ExifTool created by Phil Harvey
+    (http://www.sno.phy.queensu.ca/~phil/exiftool/).
+
+    Usage:
+      #{tool_name} [-f] [-D]
+      #{tool_name} -h | --help
+      #{tool_name} -v | --version
+
+    Options:
+      -f --full_dump  Print all tags
+      -D --debug      Turn on debugging (verbose) mode
+      -h --help       Show this screen.
+      -v --version    Show version.
+  DOCOPT
 
   PhTools.const_get(tool_name.capitalize).new(usage, file_type).run!
 end

data/exe/phls

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 # encoding: UTF-8
+
 # (c) ANB Andrew Bizyaev
 
 module PhTools
@@ -8,37 +9,37 @@ module PhTools
   require tool_name.to_s
 
   file_type = FILE_TYPE_IMAGE + FILE_TYPE_VIDEO + FILE_TYPE_AUDIO
-  usage = <<DOCOPT
-***************************************************
-phtools - *Keep Your Photos In Order* (c) ANB
-***************************************************
-  #{tool_name} scans given directories and generates list of files to standard
-output. In short it acts like a smart 'ls' command (or 'dir' in Windows).
-Set DIRs to be scanned as a parameters. If no DIRs are set - current dir (.)
-will be scanned. Set FILEMASKs as a parameters - and only files matching the
-masks will be processed. If no FILEMASK is set '*.*' will be used by-default.
-To avoid unnessesary mask extraction by OS - put it in ''.
-Note, #{tool_name} works only with phtools-friendly file types: #{file_type * ','}
+  usage = <<~DOCOPT
+    ***************************************************
+    phtools - *Keep Your Photos In Order* (c) ANB
+    ***************************************************
+      #{tool_name} scans given directories and generates list of files to standard
+    output. In short it acts like a smart 'ls' command (or 'dir' in Windows).
+    Set DIRs to be scanned as a parameters. If no DIRs are set - current dir (.)
+    will be scanned. Set FILEMASKs as a parameters - and only files matching the
+    masks will be processed. If no FILEMASK is set '*.*' will be used by-default.
+    To avoid unnessesary mask extraction by OS - put it in ''.
+    Note, #{tool_name} works only with phtools-friendly file types: #{file_type * ','}
 
-  #{tool_name} acts as a 'source' program meaning it does not require any input
-from STDIN, it generates list of files based on input parameters and send it
-to STDOUT.
-  In other words this command is intended to be used with other programs
-connected via pipes as a 1st command in the pipe chain, e.g.:
-  #{tool_name} abc '*aaa*' | phrename -a anb => scans 'abc' folder and
-sends all found phtools friendly files filtered with *aaa* to phrename command.
+      #{tool_name} acts as a 'source' program meaning it does not require any input
+    from STDIN, it generates list of files based on input parameters and send it
+    to STDOUT.
+      In other words this command is intended to be used with other programs
+    connected via pipes as a 1st command in the pipe chain, e.g.:
+      #{tool_name} abc '*aaa*' | phrename -a anb => scans 'abc' folder and
+    sends all found phtools friendly files filtered with *aaa* to phrename command.
 
-Usage:
-  #{tool_name} [-D] [-R] [DIR_OR_FILEMASK...]
-  #{tool_name} -h | --help
-  #{tool_name} -v | --version
+    Usage:
+      #{tool_name} [-D] [-R] [DIR_OR_FILEMASK...]
+      #{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.
-  -v --version    Show version.
-DOCOPT
+    Options:
+      -D --debug      Turn on debugging (verbose) mode
+      -R --recursive  Recursively scan directories
+      -h --help       Show this screen.
+      -v --version    Show version.
+  DOCOPT
 
   PhTools.const_get(tool_name.capitalize).new(usage, file_type).run!
 end

data/exe/phmove

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 # encoding: UTF-8
+
 # (c) ANB Andrew Bizyaev
 
 module PhTools
@@ -8,32 +9,32 @@ module PhTools
   require tool_name.to_s
 
   file_type = FILE_TYPE_IMAGE + FILE_TYPE_VIDEO + FILE_TYPE_AUDIO
-  usage = <<DOCOPT
-***************************************************
-phtools - *Keep Your Photos In Order* (c) ANB
-***************************************************
-#{tool_name} moves input file(s) into TARGET_FOLDER.
-If TARGET_FOLDER is not set - current folder (.) will be used as a target.
-If --arrange option is set it separates photo files, RAW photo files and VIDEO files
-to corresponding subfolders.
-phtools friendly files: #{file_type * ','}
-
-Optimized to be used with other *phtools* via pipes.
-Example: phls | phrename -a anb | #{tool_name} -a target/folder
-
-
-Usage:
-  #{tool_name} [-D] [-a] [TARGET_FOLDER]
-  #{tool_name} -h | --help
-  #{tool_name} -v | --version
-
-Options:
-  -a --arrange  Move photos to TARGET_FOLDER, videos to TARGET_FOLDER/VIDEO
-                raw-files to TARGET_FOLDER/RAW
-  -D --debug    Turn on debugging (verbose) mode
-  -h --help     Show this screen.
-  -v --version  Show version.
-DOCOPT
+  usage = <<~DOCOPT
+    ***************************************************
+    phtools - *Keep Your Photos In Order* (c) ANB
+    ***************************************************
+    #{tool_name} moves input file(s) into TARGET_FOLDER.
+    If TARGET_FOLDER is not set - current folder (.) will be used as a target.
+    If --arrange option is set it separates photo files, RAW photo files and VIDEO files
+    to corresponding subfolders.
+    phtools friendly files: #{file_type * ','}
+
+    Optimized to be used with other *phtools* via pipes.
+    Example: phls | phrename -a anb | #{tool_name} -a target/folder
+
+
+    Usage:
+      #{tool_name} [-D] [-a] [TARGET_FOLDER]
+      #{tool_name} -h | --help
+      #{tool_name} -v | --version
+
+    Options:
+      -a --arrange  Move photos to TARGET_FOLDER, videos to TARGET_FOLDER/VIDEO
+                    raw-files to TARGET_FOLDER/RAW
+      -D --debug    Turn on debugging (verbose) mode
+      -h --help     Show this screen.
+      -v --version  Show version.
+  DOCOPT
 
   PhTools.const_get(tool_name.capitalize).new(usage, file_type).run!
 end

data/exe/phrename

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 # encoding: UTF-8
+
 # (c) ANB Andrew Bizyaev
 
 module PhTools
@@ -8,68 +9,80 @@ module PhTools
   require tool_name.to_s
 
   file_type = FILE_TYPE_IMAGE + FILE_TYPE_VIDEO + FILE_TYPE_AUDIO
-  usage = <<DOCOPT
-***************************************************
-phtools - *Keep Your Photos In Order* (c) ANB
-***************************************************
-#{tool_name} renames the input file to Standard Name:
-  YYYYmmdd-HHMMSS_AAA ORIGINAL.EXT, where:
-  YYYYmmdd-HHMMSS - Date-Time of photo creation,
-  AAA - the author nickname,
-  ORIGINAL.EXT - the photo name given by digital camera.
-By default date-time information will be taken from EXIF area as the 1st non-zero
-value of the tags (shown in the order the program scans values):
-  EXIF:DateTimeOriginal -> IPTC:DateCreated + IPTC:TimeCreated -> XMP:DateCreated ->
-  -> EXIF:CreateDate -> XMP:CreateDate -> IPTC:DigitalCreationDate + IPTC:DigitalCreationTime ->
-  -> FileModifyDate
-Example: input file DSC03455.JPG will be renamed to 20130108-124145_ANB DSC03455.JPG
+  usage = <<~DOCOPT
+    ***************************************************
+    phtools - *Keep Your Photos In Order* (c) ANB
+    ***************************************************
+    #{tool_name} renames the input file to Standard Name:
+      YYYYmmdd-HHMMSS_AAA ORIGINAL.EXT, where:
+      YYYYmmdd-HHMMSS - Date-Time of photo creation,
+      AAA - the author nickname,
+      ORIGINAL.EXT - the photo name given by digital camera.
+    By default date-time information will be taken from EXIF area as the 1st non-zero
+    value of the tags (shown in the order the program scans values):
+      EXIF:DateTimeOriginal -> IPTC:DateCreated + IPTC:TimeCreated -> XMP:DateCreated ->
+      -> EXIF:CreateDate -> XMP:CreateDate -> IPTC:DigitalCreationDate + IPTC:DigitalCreationTime ->
+      -> FileModifyDate
+    Example: input file DSC03455.JPG will be renamed to 20130108-124145_ANB DSC03455.JPG
+
+    Input file should be one of the supported types: #{file_type * ','}.
+    #{tool_name} acts as a 'filter' meaning it expects the input files to be passed
+    to STDIN and after the job is done it produces STDOUT with the list of renamed
+    files. In other words this command is intended to be used with other programs
+    connected via pipes, e.g.:
+      phls | #{tool_name} -a anb | phmove ~/targed/folder
+
+    The program is designed to be safe to re-run on the same file several times
+    - every re-run produces the same result (idempotent behaviour).
+    Once the file was renamed to Standard Name, the date-time kept in the name
+    is considered as a master date-time of the photo creation and will not be
+    changed by re-running #{tool_name} unless user explicitly sets '-t' or '-s' option.
 
-Input file should be one of the supported types: #{file_type * ','}.
-#{tool_name} acts as a 'filter' meaning it expects the input files to be passed
-to STDIN and after the job is done it produces STDOUT with the list of renamed
-files. In other words this command is intended to be used with other programs
-connected via pipes, e.g.:
-  phls | #{tool_name} -a anb | phmove ~/targed/folder
+    This program uses external utility ExifTool created by Phil Harvey
+    (http://www.sno.phy.queensu.ca/~phil/exiftool/).
 
-The program is designed to be safe to re-run on the same file several times
-- every re-run produces the same result (idempotent behaviour).
-Once the file was renamed to Standard Name, the date-time kept in the name
-is considered as a master date-time of the photo creation and will not be
-changed by re-running #{tool_name} unless user explicitly sets '-t' or '-s' option.
+    Usage:
+      #{tool_name} -a NICK [-t TAG] [-D]
+      #{tool_name} -s DELTA [-D]
+      #{tool_name} -m DT -a NICK [-s DELTA] [-H HEADER][-D]
+      #{tool_name} -c [-H HEADER][-D]
+      #{tool_name} -h | --help
+      #{tool_name} -v | --version
 
-This program uses external utility ExifTool created by Phil Harvey
-(http://www.sno.phy.queensu.ca/~phil/exiftool/).
+    Options:
+      -a NICK --author=NICK  Author nickname size should be #{PhFile::NICKNAME_SIZE} chars,
+                             supports only latin ASCII chars (e.g. ANB).
+                             No digits, no spaces, no other non-word chars allowed.
 
-Usage:
-  #{tool_name} -a NICK [-t TAG] [-D]
-  #{tool_name} -s DELTA [-D]
-  #{tool_name} -c [-D]
-  #{tool_name} -h | --help
-  #{tool_name} -v | --version
+      -t TAG --tag_date=TAG  Force program to use TAG as a Date-Time creation
+                             info instead of standard phtools tags.
+                             You can retreive all existing tags using command:
+                             `phls filename|phgettags -f` OR
+                             `exiftool -s filename`
 
-Options:
-  -a NICK --author=NICK  Author nickname size should be #{PhFile::NICKNAME_SIZE} chars,
-                         supports only latin ASCII chars (e.g. ANB).
-                         No digits, no spaces, no other non-word chars allowed.
+      -s DELTA --shift_time=DELTA  DELTA (in seconds) will be added to Date-Time value
+                             kept in the name. If DELTA is positive the photo
+                             will become yonger: e.g. 20140720-100005, DELTA = 65
+                             result = 20140720-100110. If DELTA is negative the photo
+                             will get DELTA seconds older.
+                             In manual_date mode -s DELTA is used increment
+                             date-time-in-the-name for every processed file
 
-  -t TAG --tag_date=TAG  Force program to use TAG as a Date-Time creation
-                         info instead of standard phtools tags.
-                         You can retreive all existing tags using command:
-                         `phls filename|phgettags -f` OR
-                         `exiftool -s filename`
+      -m DT --manual_date=DT Force program to use given date-time to rename files.
+                             DT should comply with phtools standard. Example:
+                             '20171029-204805'
 
-  -s DELTA --shift_time=DELTA  DELTA (in seconds) will be added to Date-Time value
-                         kept in the name. If DELTA is positive the photo
-                         will become yonger: e.g. 20140720-100005, DELTA = 65
-                         result = 20140720-100110. If DELTA is negative the photo
-                         will get DELTA seconds older.
+      -H HEADER --header=HEADER In manual_date mode adds HEADER to the begining
+                             of the original basename.
+                             In clean mode removes HEADER from the beginning of
+                             the original basename.
 
-  -c --clean             Rename file back to it's original name
+      -c --clean             Rename file back to it's original name
 
-  -D --debug    Turn on debugging (verbose) mode
-  -h --help     Show this screen.
-  -v --version  Show version.
-DOCOPT
+      -D --debug    Turn on debugging (verbose) mode
+      -h --help     Show this screen.
+      -v --version  Show version.
+  DOCOPT
 
   PhTools.const_get(tool_name.capitalize).new(usage, file_type).run!
 end

data/exe/phtools

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 # encoding: UTF-8
+
 # (c) ANB Andrew Bizyaev
 
 require 'phtools'
 
-puts PhTools::about
+puts PhTools.about

data/lib/phls.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 # encoding: UTF-8
+
 # (c) ANB Andrew Bizyaev
 
 require 'phtools/runner'
@@ -14,13 +15,14 @@ module PhTools
     def run!
       @dirs_to_scan.each do |dir|
         fmask = File.join(dir, @options_cli['--recursive'] ? '**' : '', "{#{@filemasks * ','}}")
-        Dir.glob(fmask, File::FNM_CASEFOLD).each { |f| output_file(PhFile.new(f)) if File.file?(f) }
+        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) }
       end
-
     rescue SignalException
       PhTools.puts_error 'EXIT on user interrupt Ctrl-C'
       exit 1
-    rescue => e
+    rescue StandardError => e
       PhTools.puts_error "FATAL: #{e.message}", e
       exit 1
     end

data/lib/phrename.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 # encoding: UTF-8
+
 # (c) ANB Andrew Bizyaev
 
 require 'date'
@@ -16,14 +17,27 @@ module PhTools
     private
 
     def validate_options
-      if @options_cli['--author']
+      if @options_cli['--manual_date']
+        @mode = :manual_rename
+        @manual_date = PhFile.get_date_time(@options_cli['--manual_date'])
+        fail PhTools::Error, '--manual_date value is incorrect' if @manual_date == PhFile::ZERO_DATE
+        @author = @options_cli['--author'].upcase
+        ok, msg = PhFile.validate_author(@author)
+        fail PhTools::Error, msg unless ok
+        @shift_seconds = @options_cli['--shift_time'].to_i
+        @header = @options_cli['--header'].to_s.strip
+
+      elsif @options_cli['--author']
         @mode = :rename
         @author = @options_cli['--author'].upcase
         ok, msg = PhFile.validate_author(@author)
         fail PhTools::Error, msg unless ok
         @user_tag_date = @options_cli['--tag_date'] || ''
+
       elsif @options_cli['--clean']
         @mode = :clean
+        @header = @options_cli['--header'].to_s.strip
+
       elsif @options_cli['--shift_time']
         @mode = :shift_time
         @shift_seconds = @options_cli['--shift_time'].to_i
@@ -39,7 +53,7 @@ module PhTools
         if phfile_out.basename_is_standard? && @user_tag_date.empty?
           # change only author, keeping date-time safe
           phfile_out.standardize!(author: @author)
-          info_msg = "'#{phfile.basename + phfile.extname}' already standard name. Keeping date-time part unchanged"
+          info_msg = "'#{phfile.basename + phfile.extname}' already standard name. Keeping date-time-in-name unchanged"
         else # full rename
           begin
             tags = MiniExiftool.new(phfile.filename,
@@ -52,45 +66,45 @@ module PhTools
           if @user_tag_date.empty?
             # searching for DateTime stamp value in the tags using priority:
             # EXIF:DateTimeOriginal -> IPTC:DateCreated + IPTC:TimeCreated -> XMP:DateCreated -> EXIF:CreateDate -> XMP:CreateDate -> IPTC:DigitalCreationDate + IPTC:DigitalCreationTime -> FileModifyDate
-            if !tags.date_time_original.nil? && tags.date_time_original.kind_of?(DateTime)
+            if !tags.date_time_original.nil? && tags.date_time_original.is_a?(DateTime)
               # EXIF:DateTimeOriginal or IPTC:DateCreated + IPTC:TimeCreated
               dto = tags.date_time_original
-              tag_used = "DateTimeOriginal"
+              tag_used = 'DateTimeOriginal'
 
-            elsif !tags.date_created.nil? && tags.date_created.kind_of?(DateTime)
+            elsif !tags.date_created.nil? && tags.date_created.is_a?(DateTime)
               # XMP:DateCreated
               dto = tags.date_created
-              tag_used = "DateCreated"
+              tag_used = 'DateCreated'
 
-            elsif !tags.create_date.nil? && tags.create_date.kind_of?(DateTime)
+            elsif !tags.create_date.nil? && tags.create_date.is_a?(DateTime)
               # EXIF:CreateDate or XMP:CreateDate or! QuickTime:CreateDate
               dto = tags.create_date
-              tag_used = "CreateDate"
+              tag_used = 'CreateDate'
 
             elsif !tags.digital_creation_date.nil? &&
                   !tags.digital_creation_time.nil? &&
-                  tags.digital_creation_date.kind_of?(String) &&
-                  tags.digital_creation_time.kind_of?(String)
+                  tags.digital_creation_date.is_a?(String) &&
+                  tags.digital_creation_time.is_a?(String)
               # IPTC:DigitalCreationDate + IPTC:DigitalCreationTime
-              dcdt = tags.digital_creation_date + " " + tags.digital_creation_time
+              dcdt = tags.digital_creation_date + ' ' + tags.digital_creation_time
               begin
                 s = dcdt.sub(/^(\d+):(\d+):/, '\1-\2-')
                 dto = DateTime.parse(s)
               rescue ArgumentError
                 dto = PhFile::ZERO_DATE
               end
-              tag_used = "DigitalCreationDate + DigitalCreationTime"
+              tag_used = 'DigitalCreationDate + DigitalCreationTime'
 
             else
               # FileModifyDate
               dto = File.mtime(phfile.filename).to_datetime
-              tag_used = "FileModifyDate"
+              tag_used = 'FileModifyDate'
             end
 
           else
             # tag is set by the user
             fail PhTools::Error, "tag #{@user_tag_date} is not found in a file" unless tags[@user_tag_date]
-            fail PhTools::Error, "tag #{@user_tag_date} is not a DateTime type" unless tags[@user_tag_date].kind_of?(DateTime)
+            fail PhTools::Error, "tag #{@user_tag_date} is not a DateTime type" unless tags[@user_tag_date].is_a?(DateTime)
             dto = tags[@user_tag_date] || PhFile::ZERO_DATE
             tag_used = "#{@user_tag_date}"
           end
@@ -99,18 +113,27 @@ module PhTools
         end
 
       when :clean
-        phfile_out.cleanse!
+        phfile_out.cleanse!(basename_clean: phfile_out.basename_clean.sub(/^#{@header}/, ''))
 
       when :shift_time
         fail PhTools::Error, 'non-standard file name' unless phfile_out.basename_is_standard?
         phfile_out.standardize!(date_time: phfile_out.date_time + @shift_seconds * (1.0 / 86_400))
+
+      when :manual_rename
+        if phfile_out.basename_is_standard?
+          # keeping date-time safe
+          info_msg = "'#{phfile.basename + phfile.extname}' already standard name. Keeping date-time-in-name unchanged"
+        else # renaming
+          basename_clean = (@header.empty? ? '' : @header) + phfile_out.basename_clean
+          phfile_out.standardize!(date_time: @manual_date, author: @author, basename_clean: basename_clean)
+          @manual_date += @shift_seconds * (1.0 / 86_400)
+        end
       end
 
       FileUtils.mv(phfile.filename, phfile_out.filename, verbose: PhTools.debug) unless phfile == phfile_out
       PhTools.puts_error info_msg unless info_msg.empty?
       phfile_out
-
-    rescue => e
+    rescue StandardError => e
       raise PhTools::Error, 'file renaming - ' + e.message
     end
   end

data/lib/phtools/ph_file.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 # encoding: UTF-8
+
 # (c) ANB Andrew Bizyaev
 
 require 'phtools/error'
@@ -9,11 +10,11 @@ require 'fileutils'
 
 module PhTools
   # media type constants
-  FILE_TYPE_IMAGE_NORMAL = %w(jpg jpeg tif tiff png).freeze
-  FILE_TYPE_IMAGE_RAW = %w(orf arw dng).freeze
+  FILE_TYPE_IMAGE_NORMAL = %w[jpg jpeg tif tiff png].freeze
+  FILE_TYPE_IMAGE_RAW = %w[orf arw dng].freeze
   FILE_TYPE_IMAGE = FILE_TYPE_IMAGE_NORMAL + FILE_TYPE_IMAGE_RAW
-  FILE_TYPE_VIDEO = %w(avi mp4 mpg mts dv mov mkv m2t m2ts 3gp).freeze
-  FILE_TYPE_AUDIO = %w(wav).freeze
+  FILE_TYPE_VIDEO = %w[avi mp4 mpg mts dv mov mkv m2t m2ts 3gp].freeze
+  FILE_TYPE_AUDIO = %w[wav].freeze
 
   # phtools file name operations
   class PhFile
@@ -49,6 +50,13 @@ module PhTools
       [true, '']
     end
 
+    def self.get_date_time(date_string)
+      /^(?<date>\d{8})-(?<time>\d{6})/ =~ date_string
+      DateTime.parse("#{Regexp.last_match(:date)}T#{Regexp.last_match(:time)}")
+    rescue ArgumentError
+      PhFile::ZERO_DATE
+    end
+
     attr_reader :filename, :dirname, :extname, :type, :basename, :basename_part,
                 :basename_clean, :date_time, :author
 
@@ -181,7 +189,6 @@ module PhTools
 
       return ZERO_DATE if strptime_string.empty?
       DateTime.strptime(strptime_string, strptime_template)
-
     rescue ArgumentError
       return ZERO_DATE
     end

data/lib/phtools/runner.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 # encoding: UTF-8
+
 # (c) ANB Andrew Bizyaev
 
 require 'phtools/utils/ruby_version.rb'
@@ -28,11 +29,10 @@ module PhTools
       PhTools.debug = true if @options_cli['--debug']
 
       validate_options
-
     rescue Docopt::Exit => e
       STDERR.puts e.message
       exit 1
-    rescue => e
+    rescue StandardError => e
       PhTools.puts_error "FATAL: #{e.message}", e
       exit 1
     ensure
@@ -59,29 +59,25 @@ module PhTools
       end
 
       process_after
-
     rescue SignalException
       PhTools.puts_error 'EXIT on user interrupt Ctrl-C'
       exit 1
-    rescue => e
+    rescue StandardError => e
       PhTools.puts_error "FATAL: #{e.message}", e
       exit 1
     end
 
     private
 
-    def validate_options
-    end
+    def validate_options; end
 
-    def process_before
-    end
+    def process_before; end
 
     def process_file(file)
       file
     end
 
-    def process_after
-    end
+    def process_after; end
 
     def context
       instance_variables.map do |item|

data/lib/phtools/utils/ruby_version.rb

@@ -1,13 +1,15 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 # encoding: UTF-8
+
 # (c) ANB Andrew Bizyaev
 
-RUBY_VERSION_WANTED = '2.0.0'
+RUBY_VERSION_WANTED = '2.4.0'
 
 begin
   fail "Ruby version must be >= #{RUBY_VERSION_WANTED}" if
     RUBY_VERSION < RUBY_VERSION_WANTED
-rescue => e
+rescue StandardError => e
   STDERR.puts e.message
   exit 1
 end

data/lib/phtools/version.rb

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

data/phtools.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'phtools/version'
@@ -8,13 +7,12 @@ Gem::Specification.new do |spec|
 
   spec.name       = 'phtools'
   spec.version    = PhTools::VERSION
-  # spec.date       = '2016-08-23'
   spec.authors    = ["Andrew Bizyaev"]
   spec.email      = ["andrew.bizyaev@gmail.com"]
   spec.license    = 'MIT'
 
-  spec.summary       = %q{A set of usefull tools to manipulate photo-video files.}
-  spec.description   = %q{A bundle of small CLI tools for arranging, renaming, tagging of the photo and video files. Helps to keep your photo-video assets in order.}
+  spec.summary       = %q(A set of usefull tools to manipulate photo-video files.)
+  spec.description   = %q(A bundle of small CLI tools for arranging, renaming, tagging of the photo and video files. Helps to keep your photo-video assets in order.)
   spec.homepage      = "https://github.com/AndrewBiz/phtools.git"
 
   spec.requirements  = %q{ExifTool by Phil Harvey (http://www.sno.phy.queensu.ca/~phil/exiftool/)}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phtools
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.14.0
 platform: ruby
 authors:
 - Andrew Bizyaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-01 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -344,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ExifTool by Phil Harvey (http://www.sno.phy.queensu.ca/~phil/exiftool/)
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A set of usefull tools to manipulate photo-video files.