From 01daa213054b4b384d64deb7aee8501048958a54 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 24 Apr 2020 23:26:40 +0200
Subject: [PATCH] Use 'RecordDate' instead of 'Year' field, add 'ReleaseDate'
 field

---
 CMakeLists.txt                  | 2 +-
 application/knownfieldmodel.cpp | 6 ++++--
 cli/fieldmapping.cpp            | 1 +
 cli/mainfeatures.cpp            | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6015fdb..88903e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,7 @@ if (WIDGETS_GUI OR QUICK_GUI)
 endif ()
 
 # find tagparser
-find_package(tagparser${CONFIGURATION_PACKAGE_SUFFIX} 9.0.0 REQUIRED)
+find_package(tagparser${CONFIGURATION_PACKAGE_SUFFIX} 9.2.0 REQUIRED)
 use_tag_parser()
 
 # enable experimental JSON export
diff --git a/application/knownfieldmodel.cpp b/application/knownfieldmodel.cpp
index 7b45c51..a9cfb61 100644
--- a/application/knownfieldmodel.cpp
+++ b/application/knownfieldmodel.cpp
@@ -73,6 +73,8 @@ const char *KnownFieldModel::fieldName(KnownField field)
         return QT_TR_NOOP("Vendor");
     case KnownField::AlbumArtist:
         return QT_TR_NOOP("Album artist");
+    case KnownField::ReleaseDate:
+        return QT_TR_NOOP("Release date");
     default:
         return "";
     }
@@ -99,7 +101,7 @@ KnownFieldModel::KnownFieldModel(QObject *parent, DefaultSelection defaultSelect
          mkItem(KnownField::Album, defaultSelected),
          mkItem(KnownField::Artist, defaultSelected),
          mkItem(KnownField::Genre, defaultSelected),
-         mkItem(KnownField::Year, defaultSelected),
+         mkItem(KnownField::RecordDate, defaultSelected),
          mkItem(KnownField::Comment, defaultSelected),
          mkItem(KnownField::AlbumArtist, defaultSelected),
          mkItem(KnownField::Bpm, Qt::Unchecked),
@@ -110,7 +112,6 @@ KnownFieldModel::KnownFieldModel(QObject *parent, DefaultSelection defaultSelect
          mkItem(KnownField::PartNumber, defaultSelected),
          mkItem(KnownField::TotalParts, defaultSelected),
          mkItem(KnownField::Encoder, defaultSelected),
-         mkItem(KnownField::RecordDate, defaultSelected),
          mkItem(KnownField::Performers, defaultSelected),
          mkItem(KnownField::Length, Qt::Unchecked),
          mkItem(KnownField::Language, Qt::Unchecked),
@@ -124,6 +125,7 @@ KnownFieldModel::KnownFieldModel(QObject *parent, DefaultSelection defaultSelect
          mkItem(KnownField::Rating, Qt::Unchecked),
          mkItem(KnownField::Description, Qt::Unchecked),
          mkItem(KnownField::Vendor, Qt::Unchecked),
+         mkItem(KnownField::ReleaseDate, Qt::Unchecked),
     });
     // clang-format on
 }
diff --git a/cli/fieldmapping.cpp b/cli/fieldmapping.cpp
index eeb7035..99ca225 100644
--- a/cli/fieldmapping.cpp
+++ b/cli/fieldmapping.cpp
@@ -26,6 +26,7 @@ static constexpr struct {
     { "totalparts", KnownField::TotalParts },
     { "encoder", KnownField::Encoder },
     { "recorddate", KnownField::RecordDate },
+    { "releasedate", KnownField::ReleaseDate },
     { "performers", KnownField::Performers },
     { "duration", KnownField::Length },
     { "language", KnownField::Language },
diff --git a/cli/mainfeatures.cpp b/cli/mainfeatures.cpp
index 5303ed2..37912b8 100644
--- a/cli/mainfeatures.cpp
+++ b/cli/mainfeatures.cpp
@@ -65,8 +65,8 @@ using namespace QtUtilities;
 namespace Cli {
 
 #define FIELD_NAMES                                                                                                                                  \
-    "title album artist genre year comment bpm bps lyricist track disk part totalparts encoder\n"                                                    \
-    "      recorddate performers duration language encodersettings lyrics synchronizedlyrics grouping\n"                                             \
+    "title album artist genre recorddate comment bpm bps lyricist track disk part totalparts encoder\n"                                              \
+    "      releasedate performers duration language encodersettings lyrics synchronizedlyrics grouping\n"                                            \
     "      recordlabel cover composer rating description vendor albumartist"
 
 #define TRACK_ATTRIBUTE_NAMES "name tracknumber enabled=yes enabled=no forced=yes forced=no default=yes default=no"