From d4dee4f6357e1b1919ae0a7e0c500e23a2be4b50 Mon Sep 17 00:00:00 2001
From: ChristianFeldmann <christian.feldmann@gmx.de>
Date: Sun, 6 Oct 2024 22:47:50 +0200
Subject: [PATCH] First set of changes

---
 .../common/{FileInfo.h => InfoItemAndData.h}  | 24 ++++-------
 YUViewLib/src/decoder/decoderHM.h             | 16 ++++----
 YUViewLib/src/decoder/decoderVTM.h            |  2 +-
 YUViewLib/src/decoder/decoderVVDec.h          |  2 +-
 YUViewLib/src/filesource/FileSource.cpp       | 41 +++++++++++--------
 YUViewLib/src/filesource/FileSource.h         | 22 +++++-----
 YUViewLib/src/video/FrameHandler.h            |  8 ++--
 7 files changed, 55 insertions(+), 60 deletions(-)
 rename YUViewLib/src/common/{FileInfo.h => InfoItemAndData.h} (75%)

diff --git a/YUViewLib/src/common/FileInfo.h b/YUViewLib/src/common/InfoItemAndData.h
similarity index 75%
rename from YUViewLib/src/common/FileInfo.h
rename to YUViewLib/src/common/InfoItemAndData.h
index 49a7e924b..5d52634c1 100644
--- a/YUViewLib/src/common/FileInfo.h
+++ b/YUViewLib/src/common/InfoItemAndData.h
@@ -37,26 +37,16 @@
 #include <QString>
 
 /*
- * An info item has a name, a text and an optional toolTip. These are used to show them in the
- * fileInfoWidget. For example: ["File Name", "file.yuv"] or ["Number Frames", "123"] Another option
- * is to show a button. If the user clicks on it, the callback function infoListButtonPressed() for
- * the corresponding playlist item is called.
+ * An info item has a name, a text and an optional description. These are used to show them in the
+ * fileInfoWidget. For example: ["File Name", "file.yuv"] or ["Number Frames", "123"].
  */
 struct InfoItem
 {
-  InfoItem(const QString &name,
-           const QString &text,
-           const QString &toolTip  = QString(),
-           bool           button   = false,
-           int            buttonID = -1)
-      : name(name), text(text), button(button), buttonID(buttonID), toolTip(toolTip)
-  {
-  }
-  QString name{};
-  QString text{};
-  bool    button{};
-  int     buttonID{};
-  QString toolTip{};
+  std::string name{};
+  std::string text{};
+  std::string description{};
+
+  InfoItem(std::string &&name, std::string &&text) : name(std::move(name)), text(std::move(text)) {}
 };
 
 struct InfoData
diff --git a/YUViewLib/src/decoder/decoderHM.h b/YUViewLib/src/decoder/decoderHM.h
index fb465f36a..88022d7ac 100644
--- a/YUViewLib/src/decoder/decoderHM.h
+++ b/YUViewLib/src/decoder/decoderHM.h
@@ -34,7 +34,7 @@
 
 #include <QLibrary>
 
-#include <common/FileInfo.h>
+#include <common/InfoItemAndData.h>
 #include <decoder/decoderBase.h>
 #include <decoder/externalHeader/libHMDecoder.h>
 #include <video/yuv/videoHandlerYUV.h>
@@ -51,11 +51,11 @@ struct LibraryFunctionsHM
   void (*libHMDec_set_SEI_Check)(libHMDec_context *, bool check_hash){};
   void (*libHMDec_set_max_temporal_layer)(libHMDec_context *, int max_layer){};
   libHMDec_error (*libHMDec_push_nal_unit)(libHMDec_context *decCtx,
-                                           const void *      data8,
+                                           const void       *data8,
                                            int               length,
                                            bool              eof,
-                                           bool &            bNewPicture,
-                                           bool &            checkOutputPictures){};
+                                           bool             &bNewPicture,
+                                           bool             &checkOutputPictures){};
 
   // Get a picture and retrive information on the picture
   libHMDec_picture *(*libHMDec_get_picture)(libHMDec_context *){};
@@ -77,8 +77,8 @@ struct LibraryFunctionsHM
   libHMDec_BlockValue *(*libHMDEC_get_internal_info)(libHMDec_context *,
                                                      libHMDec_picture *pic,
                                                      unsigned int      typeIdx,
-                                                     unsigned int &    nrValues,
-                                                     bool &            callAgain){};
+                                                     unsigned int     &nrValues,
+                                                     bool             &callAgain){};
   libHMDec_error (*libHMDEC_clear_internal_info)(libHMDec_context *decCtx){};
 };
 
@@ -107,7 +107,7 @@ class decoderHM : public decoderBaseSingleLib
 private:
   // A private constructor that creates an uninitialized decoder library.
   // Used by checkLibraryFile to check if a file can be used as a this decoder.
-  decoderHM(){};
+  decoderHM() {};
 
   // Return the possible names of the HM library
   QStringList getLibraryNames() const override;
@@ -150,7 +150,7 @@ class decoderHM : public decoderBaseSingleLib
   QByteArray currentOutputBuffer;
   void       copyImgToByteArray(
             libHMDec_picture *src,
-            QByteArray &      dst); // Copy the raw data from the de265_image source *src to the byte array
+            QByteArray &dst); // Copy the raw data from the de265_image source *src to the byte array
 #endif
 
   LibraryFunctionsHM lib;
diff --git a/YUViewLib/src/decoder/decoderVTM.h b/YUViewLib/src/decoder/decoderVTM.h
index e304a2070..4eba0c522 100644
--- a/YUViewLib/src/decoder/decoderVTM.h
+++ b/YUViewLib/src/decoder/decoderVTM.h
@@ -34,7 +34,7 @@
 
 #include <QLibrary>
 
-#include <common/FileInfo.h>
+#include <common/InfoItemAndData.h>
 
 #include "decoderBase.h"
 #include "externalHeader/libVTMDecoder.h"
diff --git a/YUViewLib/src/decoder/decoderVVDec.h b/YUViewLib/src/decoder/decoderVVDec.h
index f622d2f07..80e0e6755 100644
--- a/YUViewLib/src/decoder/decoderVVDec.h
+++ b/YUViewLib/src/decoder/decoderVVDec.h
@@ -34,7 +34,7 @@
 
 #include <QLibrary>
 
-#include <common/FileInfo.h>
+#include <common/InfoItemAndData.h>
 #include <decoder/decoderBase.h>
 #include <decoder/externalHeader/vvdec/vvdec.h>
 #include <video/yuv/videoHandlerYUV.h>
diff --git a/YUViewLib/src/filesource/FileSource.cpp b/YUViewLib/src/filesource/FileSource.cpp
index 336d9d1c8..35d416214 100644
--- a/YUViewLib/src/filesource/FileSource.cpp
+++ b/YUViewLib/src/filesource/FileSource.cpp
@@ -34,6 +34,8 @@
 
 #include <common/Typedef.h>
 
+#include <format>
+
 #include <QDateTime>
 #include <QDir>
 #include <QSettings>
@@ -55,26 +57,21 @@ FileSource::FileSource()
           &FileSource::fileSystemWatcherFileChanged);
 }
 
-bool FileSource::openFile(const QString &filePath)
+bool FileSource::openFile(const std::string &filePath)
 {
-  // Check if the file exists
-  this->fileInfo.setFile(filePath);
-  if (!this->fileInfo.exists() || !this->fileInfo.isFile())
+  if (!std::filesystem::is_regular_file(filePath))
     return false;
 
   if (this->isFileOpened && this->srcFile.isOpen())
     this->srcFile.close();
 
-  // open file for reading
-  this->srcFile.setFileName(filePath);
+  this->srcFile.setFileName(QString::fromStdString(filePath));
   this->isFileOpened = this->srcFile.open(QIODevice::ReadOnly);
   if (!this->isFileOpened)
     return false;
 
-  // Save the full file path
   this->fullFilePath = filePath;
 
-  // Install a watcher for the file (if file watching is active)
   this->updateFileWatchSetting();
   this->fileChanged = false;
 
@@ -115,27 +112,37 @@ int64_t FileSource::readBytes(QByteArray &targetBuffer, int64_t startPos, int64_
   return this->srcFile.read(targetBuffer.data(), nrBytes);
 }
 
-QList<InfoItem> FileSource::getFileInfoList() const
+std::vector<InfoItem> FileSource::getFileInfoList() const
 {
-  QList<InfoItem> infoList;
-
   if (!this->isFileOpened)
-    return infoList;
+    return {};
+
+  std::vector<InfoItem> infoList;
+  infoList.emplace_back("File Path", this->fullFilePath);
+  infoList.emplace_back("Time Modified", std::format())
+
 
-  infoList.append(InfoItem("File Path", this->fileInfo.absoluteFilePath()));
 #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
   auto createdtime = this->fileInfo.created().toString("yyyy-MM-dd hh:mm:ss");
 #else
   auto createdtime = this->fileInfo.birthTime().toString("yyyy-MM-dd hh:mm:ss");
 #endif
-  infoList.append(InfoItem("Time Created", createdtime));
-  infoList.append(
-      InfoItem("Time Modified", this->fileInfo.lastModified().toString("yyyy-MM-dd hh:mm:ss")));
-  infoList.append(InfoItem("Nr Bytes", QString("%1").arg(this->fileInfo.size())));
+  infoList.emplace_back("Time Created", createdtime.toStdString());
+  infoList.emplace_back("Time Modified",
+                        this->fileInfo.lastModified().toString("yyyy-MM-dd hh:mm:ss"));
+  infoList.emplace_back("Nr Bytes", QString("%1").arg(this->fileInfo.size()));
 
   return infoList;
 }
 
+int64_t FileSource::getFileSize() const
+{
+  if (!this->isFileOpened)
+    return -1;
+
+  return !isFileOpened ? -1 : fileInfo.size();
+}
+
 QString FileSource::getAbsoluteFilePath() const
 {
   return this->isFileOpened ? this->fileInfo.absoluteFilePath() : QString();
diff --git a/YUViewLib/src/filesource/FileSource.h b/YUViewLib/src/filesource/FileSource.h
index c6057b512..81c8f6b72 100644
--- a/YUViewLib/src/filesource/FileSource.h
+++ b/YUViewLib/src/filesource/FileSource.h
@@ -39,8 +39,8 @@
 #include <QMutexLocker>
 #include <QString>
 
-#include <common/FileInfo.h>
 #include <common/EnumMapper.h>
+#include <common/InfoItemAndData.h>
 #include <common/Typedef.h>
 
 enum class InputFormat
@@ -70,14 +70,13 @@ class FileSource : public QObject
 public:
   FileSource();
 
-  virtual bool openFile(const QString &filePath);
+  virtual bool openFile(const std::string &filePath);
 
-  virtual QList<InfoItem> getFileInfoList() const;
-  int64_t                 getFileSize() const { return !isFileOpened ? -1 : fileInfo.size(); }
-  QString                 getAbsoluteFilePath() const;
-  QFileInfo               getFileInfo() const { return this->fileInfo; }
-  QFile                  *getQFile() { return &this->srcFile; }
-  bool                    getAndResetFileChangedFlag();
+  virtual std::vector<InfoItem> getFileInfoList() const;
+  int64_t                       getFileSize() const;
+  std::string                   getAbsoluteFilePath() const;
+  QFile                        *getQFile() { return &this->srcFile; }
+  bool                          getAndResetFileChangedFlag();
 
   // Return true if the file could be opened and is ready for use.
   bool isOk() const { return this->isFileOpened; }
@@ -107,10 +106,9 @@ private slots:
   void fileSystemWatcherFileChanged(const QString &) { fileChanged = true; }
 
 protected:
-  QString   fullFilePath{};
-  QFileInfo fileInfo;
-  QFile     srcFile;
-  bool      isFileOpened{};
+  std::string fullFilePath{};
+  QFile       srcFile;
+  bool        isFileOpened{};
 
 private:
   QFileSystemWatcher fileWatcher{};
diff --git a/YUViewLib/src/video/FrameHandler.h b/YUViewLib/src/video/FrameHandler.h
index 0b4a0c51d..13181776c 100644
--- a/YUViewLib/src/video/FrameHandler.h
+++ b/YUViewLib/src/video/FrameHandler.h
@@ -32,7 +32,7 @@
 
 #pragma once
 
-#include <common/FileInfo.h>
+#include <common/InfoItemAndData.h>
 #include <common/SaveUi.h>
 #include <common/Typedef.h>
 #include <common/YUViewDomElement.h>
@@ -94,7 +94,7 @@ class FrameHandler : public QObject
   // Calculate the difference of this FrameHandler to another FrameHandler. This
   // function can be overloaded by more specialized video items. For example the videoHandlerYUV
   // overloads this and calculates the difference directly on the YUV values (if possible).
-  virtual QImage calculateDifference(FrameHandler *   item2,
+  virtual QImage calculateDifference(FrameHandler    *item2,
                                      const int        frameIdxItem0,
                                      const int        frameIdxItem1,
                                      QList<InfoItem> &differenceInfoList,
@@ -115,9 +115,9 @@ class FrameHandler : public QObject
   // playlistItemYUVSource). If a second FrameHandler item is provided, the difference values will
   // be drawn. For the second item, a second frame index must be provided (set markDifference if you
   // want only differing values to be marked).
-  virtual void drawPixelValues(QPainter *    painter,
+  virtual void drawPixelValues(QPainter     *painter,
                                const int     frameIdx,
-                               const QRect & videoRect,
+                               const QRect  &videoRect,
                                const double  zoomFactor,
                                FrameHandler *item2          = nullptr,
                                const bool    markDifference = false,