replace using Exif tags after date/time

Author: norbertwg

app/actions.cpp

@@ -1821,23 +1821,31 @@ int renameFile(std::string& newPath, const tm* tm) {
   replace(format, ":dirname:", p.parent_path().filename().string());
   replace(format, ":parentname:", p.parent_path().parent_path().filename().string());
 
+  const size_t max = 1024;
+  char basename[max] = {};
+  if (strftime(basename, max, format.c_str(), tm) == 0) {
+    std::cerr << _("Filename format yields empty filename for the file") << " " << path << "\n";
+    return 1;
+  }
+
+  newPath = (p.parent_path() / (basename + p.extension().string())).string();
+
   // rename using exiv2 tags
+  // is done after calling setting date/time: the value retrieved from tag might include something like %Y, which then
+  // should not be replaced by year
   Exiv2::Image::UniquePtr image;
-  std::regex format_regex(
-      // anything at the start
-      ".*?"
-      // start of tag name after colon
-      "(:("
-      // tag name
-      ".*?"
-      // end of tag name before colon
-      "):)"
-      // anything at the end
-      ".*?");
+  std::regex format_regex(":{1}?(Exif\\..*?):{1}?");
+#if defined(_WIN32)
   std::string illegalChars = "\\/:*?\"<>|";
-
-  std::smatch base_match;
-  while (std::regex_search(format, base_match, format_regex)) {
+#elif defined(__APPLE__)
+  std::string illegalChars = "/:";
+#else
+  std::string illegalChars = "/";
+#endif
+  std::regex_token_iterator<std::string::iterator> rend;
+  std::regex_token_iterator<std::string::iterator> token(format.begin(), format.end(), format_regex);
+  while (token != rend) {
+    std::string tag = token->str().substr(1, token->str().length() - 2);
     if (image == 0) {
       image = Exiv2::ImageFactory::open(path);
       image->readMetadata();
@@ -1847,35 +1855,27 @@ int renameFile(std::string& newPath, const tm* tm) {
       }
     }
     Exiv2::ExifData& exifData = image->exifData();
-    const auto key = exifData.findKey(Exiv2::ExifKey::ExifKey(base_match[2]));
+    const auto key = exifData.findKey(Exiv2::ExifKey::ExifKey(tag));
     std::string val = "";
     if (key != exifData.end()) {
       val = key->print(&exifData);
       if (val.length() == 0) {
-        std::cerr << _("Warning: ") << base_match[2] << _(" is empty.") << std::endl;
+        std::cerr << _("Warning: ") << tag << _(" is empty.") << std::endl;
       } else {
-        // replace characters invalid in file name
-            for (std::string::iterator it = val.begin(); it < val.end(); ++it) {
+        //  replace characters invalid in file name
+        for (std::string::iterator it = val.begin(); it < val.end(); ++it) {
           bool found = illegalChars.find(*it) != std::string::npos;
           if (found) {
             *it = '_';
           }
         }
       }
     } else {
-      std::cerr << _("Warning: ") << base_match[2] << _(" is not included.") << std::endl;
+      std::cerr << _("Warning: ") << tag << _(" is not included.") << std::endl;
     }
-    replace(format, base_match[1], val);
-  }
-
-  const size_t max = 1024;
-  char basename[max] = {};
-  if (strftime(basename, max, format.c_str(), tm) == 0) {
-    std::cerr << _("Filename format yields empty filename for the file") << " " << path << "\n";
-    return 1;
+    replace(newPath, *token++, val);
   }
 
-  newPath = (p.parent_path() / (basename + p.extension().string())).string();
   p = fs::path(newPath);
 
   if (p.parent_path() == oldFsPath.parent_path() && p.filename() == oldFsPath.filename()) {

tests/bash_tests/test_rename.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from system_tests import CaseMeta, CopyTmpFiles, DeleteFiles, path, FileDecoratorBase
+from system_tests import CaseMeta, CopyFiles, CopyTmpFiles, DeleteFiles, path, FileDecoratorBase
 
 ###########################################################
 # rename with different formats
@@ -12,7 +12,7 @@
 
 @CopyTmpFiles("$data_path/" + infile)
 @DeleteFiles("$tmp_path/" + outfile)
-class Rename1(metaclass=CaseMeta):
+class Rename_dbY(metaclass=CaseMeta):
     infilename = path("$tmp_path/" + infile)
     outfilename = path("$tmp_path/" + outfile)
     commands = [
@@ -34,7 +34,7 @@ class Rename1(metaclass=CaseMeta):
 
 @CopyTmpFiles("$data_path/" + infile)
 @DeleteFiles("$tmp_path/" + outfile)
-class Rename2(metaclass=CaseMeta):
+class Rename_YmdHM(metaclass=CaseMeta):
     infilename = path("$tmp_path/" + infile)
     outfilename = path("$tmp_path/" + outfile)
     commands = [
@@ -56,7 +56,7 @@ class Rename2(metaclass=CaseMeta):
 
 @CopyTmpFiles("$data_path/" + infile)
 @DeleteFiles("$tmp_path/" + outfile)
-class Rename3(metaclass=CaseMeta):
+class Rename_ExifTags(metaclass=CaseMeta):
     infilename = path("$tmp_path/" + infile)
     outfilename = path("$tmp_path/" + outfile)
     commands = [
@@ -78,7 +78,7 @@ class Rename3(metaclass=CaseMeta):
 
 @CopyTmpFiles("$data_path/" + infile)
 @DeleteFiles("$tmp_path/" + outfile)
-class Rename4(metaclass=CaseMeta):
+class Rename_ExifTagsInvalidChar(metaclass=CaseMeta):
     infilename = path("$tmp_path/" + infile)
     outfilename = path("$tmp_path/" + outfile)
     commands = [
@@ -97,6 +97,36 @@ class Rename4(metaclass=CaseMeta):
     stderr = [""] * len(commands)
     retval = [0] * len(commands)
 
+###########################################################
+# rename with keeping suffix
+###########################################################
+
+basename ="_DSC8437"
+outfile = "02_Sep_2018.PANO.exv"
+renformat = "%d_%b_%Y:basesuffix:"
+
+@CopyTmpFiles("$data_path/_DSC8437.exv")
+@DeleteFiles("$tmp_path/" + outfile)
+class Rename_basesuffix(metaclass=CaseMeta):
+    infilename1 = path("$tmp_path/" + basename + ".exv")
+    infilename2 = path("$tmp_path/" + basename + ".PANO.exv")
+    outfilename = path("$tmp_path/" + outfile)
+    commands = [
+        # first command to prepare a file name with suffix
+        "$exiv2 --verbose --rename :basename:.PANO "  + infilename1,
+        "$exiv2 --verbose --rename " + renformat + " " + infilename2
+    ]
+    stdout = [
+	"""File 1/1: $infilename1
+Renaming file to $infilename2
+""",
+	"""File 1/1: $infilename2
+Renaming file to $outfilename
+"""
+    ]
+    stderr = [""] * len(commands)
+    retval = [0] * len(commands)
+
 ###########################################################
 # rename error: tag is not included
 ###########################################################
@@ -107,7 +137,7 @@ class Rename4(metaclass=CaseMeta):
 
 @CopyTmpFiles("$data_path/" + infile)
 @DeleteFiles("$tmp_path/" + outfile)
-class RenameError1(metaclass=CaseMeta):
+class Rename_TagNotIncluded(metaclass=CaseMeta):
     infilename = path("$tmp_path/" + infile)
     outfilename = path("$tmp_path/" + outfile)
     commands = [
@@ -123,27 +153,35 @@ class RenameError1(metaclass=CaseMeta):
     retval = [0] * len(commands)
 
 ###########################################################
-# rename error: unbalanced colon
+# rename error: file contains no Exif data
 ###########################################################
 
 infile ="_DSC8437.exv"
 outfile = "_DSC8437_.exv"
-renformat = ":basename:_Exif.Image.ImageDescription:"
+renformat = ":basename:_:Exif.Image.ImageDescription:"
 
 @CopyTmpFiles("$data_path/" + infile)
-@DeleteFiles("$tmp_path/" + outfile)
-class RenameError2(metaclass=CaseMeta):
+#@DeleteFiles("$tmp_path/" + outfile)
+class Rename_NoExifData(metaclass=CaseMeta):
     infilename = path("$tmp_path/" + infile)
     outfilename = path("$tmp_path/" + outfile)
     commands = [
+        "$exiv2 --delete a " + infilename,
         "$exiv2 --verbose --rename " + renformat + " " + infilename
     ]
     stdout = [
+    "",
 	"""File 1/1: $infilename
-Renaming file to $outfilename
 """
     ]
-    stderr = ["""Warning: Exif.Image.ImageDescription is not included.
+    stderr = ["",
+    """$infilename: No Exif data found in the file
 """]
-    retval = [0] * len(commands)
+    retval = [0, 253]
+
+# ###########################################################
+# # rename error: unbalanced colon
+# ###########################################################
+
+