Use "override" terminology instead of "fake"

This is a file format break within development branch.

5 files changed, 47 insertions, 47 deletions

diff --git a/src/generators.c b/src/generators.c
index 457355f..f53ca05 100644
--- a/src/generators.c
+++ b/src/generators.c
@@ -162,17 +162,17 @@ metadata_apply_overrides (ExifData *exif_data,
   if (exif_data->timezone_shift == 0)
     exif_data->timezone_shift = items->metadata_tz_shift;
 
-  exif_data->fake_datetime = item->metadata_fake_datetime;
-  if (exif_data->fake_datetime == (time_t) -1)
-    exif_data->fake_datetime = items->metadata_fake_datetime;
+  exif_data->override_datetime = item->metadata_override_datetime;
+  if (exif_data->override_datetime == (time_t) -1)
+    exif_data->override_datetime = items->metadata_override_datetime;
 
-  exif_data->fake_aperture = item->metadata_fake_aperture;
-  if (exif_data->fake_aperture == -1)
-    exif_data->fake_aperture = items->metadata_fake_aperture;
+  exif_data->override_aperture = item->metadata_override_aperture;
+  if (exif_data->override_aperture == -1)
+    exif_data->override_aperture = items->metadata_override_aperture;
 
-  exif_data->fake_focal_length = item->metadata_fake_focal_length;
-  if (exif_data->fake_focal_length == -1)
-    exif_data->fake_focal_length = items->metadata_fake_focal_length;
+  exif_data->override_focal_length = item->metadata_override_focal_length;
+  if (exif_data->override_focal_length == -1)
+    exif_data->override_focal_length = items->metadata_override_focal_length;
 
   g_free (exif_data->external_exif_data);
   exif_data->external_exif_data = NULL;
diff --git a/src/items.c b/src/items.c
index b3f1fac..2434c77 100644
--- a/src/items.c
+++ b/src/items.c
@@ -177,14 +177,14 @@ parse_album_xml (const gchar *filename, TPathInfo *path_info)
     g_free (s);
   }
 
-  index->metadata_fake_datetime = (time_t) -1;
-  s = xml_file_get_node_attribute (xml, "/gallery/general/metadata/fake", "date");
+  index->metadata_override_datetime = (time_t) -1;
+  s = xml_file_get_node_attribute (xml, "/gallery/general/metadata/override", "date");
   if (s != NULL) {
-    index->metadata_fake_datetime = parse_datetime_string (s);
+    index->metadata_override_datetime = parse_datetime_string (s);
     g_free (s);
   }
-  index->metadata_fake_aperture = xml_file_get_node_attribute_double (xml, "/gallery/general/metadata/fake", "aperture", -1);
-  index->metadata_fake_focal_length = xml_file_get_node_attribute_double (xml, "/gallery/general/metadata/fake", "focal_length", -1);
+  index->metadata_override_aperture = xml_file_get_node_attribute_double (xml, "/gallery/general/metadata/override", "aperture", -1);
+  index->metadata_override_focal_length = xml_file_get_node_attribute_double (xml, "/gallery/general/metadata/override", "focal_length", -1);
   /*  TODO: add support for lens name  */
 
   s = xml_file_get_node_attribute (xml, "/gallery/general/thumbnail", "crop");
@@ -329,15 +329,15 @@ parse_album_xml (const gchar *filename, TPathInfo *path_info)
         g_free (s2);
       }
 
-      item->metadata_fake_datetime = (time_t) -1;
-      s = g_strdup_printf ("/gallery/items/*[%d]/metadata/fake", i + 1);
+      item->metadata_override_datetime = (time_t) -1;
+      s = g_strdup_printf ("/gallery/items/*[%d]/metadata/override", i + 1);
       s2 = xml_file_get_node_attribute (xml, s, "date");
       if (s2 != NULL) {
-        item->metadata_fake_datetime = parse_datetime_string (s2);
+        item->metadata_override_datetime = parse_datetime_string (s2);
         g_free (s2);
       }
-      item->metadata_fake_aperture = xml_file_get_node_attribute_double (xml, s, "aperture", -1);
-      item->metadata_fake_focal_length = xml_file_get_node_attribute_double (xml, s, "focal_length", -1);
+      item->metadata_override_aperture = xml_file_get_node_attribute_double (xml, s, "aperture", -1);
+      item->metadata_override_focal_length = xml_file_get_node_attribute_double (xml, s, "focal_length", -1);
       /*  TODO: add support for lens name  */
       g_free (s);
 
diff --git a/src/items.h b/src/items.h
index 5d27dac..792b7f0 100644
--- a/src/items.h
+++ b/src/items.h
@@ -74,9 +74,9 @@ typedef struct {
   gchar *auth_passwd;
   TAuthType auth_type;
   int metadata_tz_shift;  /*  minutes  */
-  time_t metadata_fake_datetime;
-  double metadata_fake_aperture;
-  double metadata_fake_focal_length;
+  time_t metadata_override_datetime;
+  double metadata_override_aperture;
+  double metadata_override_focal_length;
   TCropHint thumbnail_crop_hint;
 } TAlbum;
 
@@ -96,9 +96,9 @@ typedef struct {
   gboolean hidden;
   gchar *metadata_external_exif;
   int metadata_tz_shift;  /*  minutes  */
-  time_t metadata_fake_datetime;
-  double metadata_fake_aperture;
-  double metadata_fake_focal_length;
+  time_t metadata_override_datetime;
+  double metadata_override_aperture;
+  double metadata_override_focal_length;
   TCropHint thumbnail_crop_hint;
 } TIndexItem;
 
diff --git a/src/jpeg-utils.cpp b/src/jpeg-utils.cpp
index e2d0871..ada7677 100644
--- a/src/jpeg-utils.cpp
+++ b/src/jpeg-utils.cpp
@@ -226,8 +226,8 @@ get_exif_data_fixed (ExifData *exif, const gchar *key)
 
       if (g_str_equal (key, EXIF_APERTURE)) {
         double val = -1;
-        if (exif->fake_aperture != -1)
-          val = exif->fake_aperture;
+        if (exif->override_aperture != -1)
+          val = exif->override_aperture;
         else {
           if (exifData["Exif.Photo.FNumber"].count() > 0)
             val = exifData["Exif.Photo.FNumber"].toFloat();
@@ -264,9 +264,9 @@ get_exif_data_fixed (ExifData *exif, const gchar *key)
 
           memset (&conv, 0, sizeof (conv));
 
-          if (exif->fake_datetime != (time_t) -1) {
+          if (exif->override_datetime != (time_t) -1) {
             tt = (struct tm *) g_malloc0 (sizeof (struct tm));
-            localtime_r (&exif->fake_datetime, tt);
+            localtime_r (&exif->override_datetime, tt);
             if (strftime (&conv[0], sizeof (conv), "%c", tt))
               res = g_strdup (&conv[0]);
           }
@@ -307,7 +307,7 @@ get_exif_data_fixed (ExifData *exif, const gchar *key)
 
       if (g_str_equal (key, EXIF_FOCAL_LENGTH)) {
         double val;
-        val = exif->fake_focal_length != -1 ? exif->fake_focal_length : exifData["Exif.Photo.FocalLength"].toFloat();
+        val = exif->override_focal_length != -1 ? exif->override_focal_length : exifData["Exif.Photo.FocalLength"].toFloat();
         if (val >= 0)
           return g_strdup_printf ("%.0f mm", val);
       }
@@ -658,7 +658,7 @@ shift_iptc_time (Exiv2::IptcData &iptcData, const char *date_key, const char *ti
 }
 
 static gboolean
-fake_exif_time (Exiv2::ExifData &exifData, const char *key, time_t datetime)
+override_exif_time (Exiv2::ExifData &exifData, const char *key, time_t datetime)
 {
   struct tm tt = {0};
   gchar *st;
@@ -680,7 +680,7 @@ fake_exif_time (Exiv2::ExifData &exifData, const char *key, time_t datetime)
 }
 
 static gboolean
-fake_iptc_time (Exiv2::IptcData &iptcData, const char *date_key, const char *time_key, time_t datetime)
+override_iptc_time (Exiv2::IptcData &iptcData, const char *date_key, const char *time_key, time_t datetime)
 {
   struct tm tt = {0};
   Exiv2::DateValue dval;
@@ -746,7 +746,7 @@ modify_exif (const gchar *filename, ExifData *exif, gboolean strip_thumbnail, gb
         }
       }
 
-      if (exif->timezone_shift != 0 && exif->fake_datetime == (time_t) -1) {
+      if (exif->timezone_shift != 0 && exif->override_datetime == (time_t) -1) {
         if (! exifData.empty()) {
           res = shift_exif_time (exifData, "Exif.Photo.DateTimeOriginal", exif->timezone_shift);
           res = shift_exif_time (exifData, "Exif.Photo.DateTimeDigitized", exif->timezone_shift) || res;
@@ -761,33 +761,33 @@ modify_exif (const gchar *filename, ExifData *exif, gboolean strip_thumbnail, gb
         }
       }
 
-      if (exif->fake_datetime != (time_t) -1 && !exifData.empty()) {
+      if (exif->override_datetime != (time_t) -1 && !exifData.empty()) {
         if (! exifData.empty()) {
-          res = fake_exif_time (exifData, "Exif.Photo.DateTimeOriginal", exif->fake_datetime);
-          res = fake_exif_time (exifData, "Exif.Photo.DateTimeDigitized", exif->fake_datetime) || res;
-          res = fake_exif_time (exifData, "Exif.Image.DateTime", exif->fake_datetime) || res;
+          res = override_exif_time (exifData, "Exif.Photo.DateTimeOriginal", exif->override_datetime);
+          res = override_exif_time (exifData, "Exif.Photo.DateTimeDigitized", exif->override_datetime) || res;
+          res = override_exif_time (exifData, "Exif.Image.DateTime", exif->override_datetime) || res;
           modified = TRUE;
         }
         if (! iptcData.empty()) {
-          res = fake_iptc_time (iptcData, "Iptc.Application2.DateCreated", "Iptc.Application2.TimeCreated", exif->fake_datetime);
-          res = fake_iptc_time (iptcData, "Iptc.Application2.DigitizationDate", "Iptc.Application2.DigitizationTime", exif->fake_datetime) || res;
+          res = override_iptc_time (iptcData, "Iptc.Application2.DateCreated", "Iptc.Application2.TimeCreated", exif->override_datetime);
+          res = override_iptc_time (iptcData, "Iptc.Application2.DigitizationDate", "Iptc.Application2.DigitizationTime", exif->override_datetime) || res;
           if (res)
             modified = TRUE;
         }
       }
 
-      if (exif->fake_aperture != -1) {
+      if (exif->override_aperture != -1) {
         if (! exifData.empty()) {
-          exifData["Exif.Photo.FNumber"] = Exiv2::floatToRationalCast (exif->fake_aperture);
+          exifData["Exif.Photo.FNumber"] = Exiv2::floatToRationalCast (exif->override_aperture);
           if (exifData["Exif.Photo.ApertureValue"].count() > 0)
-            exifData["Exif.Photo.ApertureValue"] = Exiv2::floatToRationalCast (exif->fake_aperture);
+            exifData["Exif.Photo.ApertureValue"] = Exiv2::floatToRationalCast (exif->override_aperture);
           modified = TRUE;
         }
       }
 
-      if (exif->fake_focal_length != -1) {
+      if (exif->override_focal_length != -1) {
         if (! exifData.empty()) {
-          exifData["Exif.Photo.FocalLength"] = Exiv2::floatToRationalCast (exif->fake_focal_length);
+          exifData["Exif.Photo.FocalLength"] = Exiv2::floatToRationalCast (exif->override_focal_length);
           modified = TRUE;
         }
       }
diff --git a/src/jpeg-utils.h b/src/jpeg-utils.h
index 86c8dae..6b92b3d 100644
--- a/src/jpeg-utils.h
+++ b/src/jpeg-utils.h
@@ -53,9 +53,9 @@ typedef struct {
 
   gchar *override_copyright;
   int timezone_shift;
-  time_t fake_datetime;
-  double fake_aperture;
-  double fake_focal_length;
+  time_t override_datetime;
+  double override_aperture;
+  double override_focal_length;
   gchar *external_exif_data;
   ThumbnailSquareType squared_thumbnail_type;
   TCropHint thumbnail_crop_hint;