First changes

Author: ChristianFeldmann

YUViewLib/src/common/Functions.cpp

@@ -236,4 +236,21 @@ std::optional<int> toInt(const std::string_view text)
   return value;
 }
 
+std::vector<std::string> splitString(const std::string_view text, const char delimiter)
+{
+  std::vector<std::string> results;
+
+  auto currentIt = text.begin();
+  while (true)
+  {
+    const auto nextDelimiter = std::find(currentIt, text.end(), delimiter);
+    results.emplace_back(currentIt, nextDelimiter);
+    if (nextDelimiter == text.end())
+      return results;
+    currentIt = nextDelimiter + 1;
+  }
+
+  return results;
+}
+
 } // namespace functions

YUViewLib/src/common/Functions.h

@@ -101,4 +101,6 @@ template <typename T, typename R> inline T clip(T val, Range<R> range)
 std::optional<unsigned> toUnsigned(const std::string_view text);
 std::optional<int>      toInt(const std::string_view text);
 
+std::vector<std::string> splitString(const std::string_view text, const char delimiter);
+
 } // namespace functions

YUViewLib/src/dataSource/DataSourceLineReader.cpp

@@ -0,0 +1,78 @@
+/*  This file is part of YUView - The YUV player with advanced analytics toolset
+ *   <https://github.com/IENT/YUView>
+ *   Copyright (C) 2015  Institut für Nachrichtentechnik, RWTH Aachen University, GERMANY
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   In addition, as a special exception, the copyright holders give
+ *   permission to link the code of portions of this program with the
+ *   OpenSSL library under certain conditions as described in each
+ *   individual source file, and distribute linked combinations including
+ *   the two.
+ *
+ *   You must obey the GNU General Public License in all respects for all
+ *   of the code used other than OpenSSL. If you modify file(s) with this
+ *   exception, you may extend this exception to your version of the
+ *   file(s), but you are not obligated to do so. If you do not wish to do
+ *   so, delete this exception statement from your version. If you delete
+ *   this exception statement from all source files in the program, then
+ *   also delete it here.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "DataSourceLineReader.h"
+
+namespace datasource
+{
+
+DataSourceLineReader::DataSourceLineReader(std::unique_ptr<IDataSource> dataSource)
+    : dataSource(std::move(dataSource))
+{
+}
+
+std::vector<InfoItem> DataSourceLineReader::getInfoList() const
+{
+  return this->dataSource->getInfoList();
+};
+
+bool DataSourceLineReader::atEnd() const
+{
+  return this->dataSource->atEnd();
+}
+
+bool DataSourceLineReader::isOk() const
+{
+  return this->dataSource->isOk();
+}
+
+std::int64_t DataSourceLineReader::getPosition() const
+{
+  return this->dataSource->getPosition();
+}
+
+bool DataSourceLineReader::wasSourceModified() const
+{
+  return this->dataSource->wasSourceModified();
+}
+
+bool DataSourceLineReader::seek(const std::int64_t pos)
+{
+  return this->dataSource->seek(pos);
+}
+
+std::string DataSourceLineReader::readLine()
+{
+  // Fill buffer and read ...
+}
+
+} // namespace datasource

YUViewLib/src/dataSource/DataSourceLineReader.h

@@ -0,0 +1,63 @@
+/*  This file is part of YUView - The YUV player with advanced analytics toolset
+ *   <https://github.com/IENT/YUView>
+ *   Copyright (C) 2015  Institut für Nachrichtentechnik, RWTH Aachen University, GERMANY
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   In addition, as a special exception, the copyright holders give
+ *   permission to link the code of portions of this program with the
+ *   OpenSSL library under certain conditions as described in each
+ *   individual source file, and distribute linked combinations including
+ *   the two.
+ *
+ *   You must obey the GNU General Public License in all respects for all
+ *   of the code used other than OpenSSL. If you modify file(s) with this
+ *   exception, you may extend this exception to your version of the
+ *   file(s), but you are not obligated to do so. If you do not wish to do
+ *   so, delete this exception statement from your version. If you delete
+ *   this exception statement from all source files in the program, then
+ *   also delete it here.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "IDataSource.h"
+
+namespace datasource
+{
+
+class DataSourceLineReader
+{
+public:
+  DataSourceLineReader(std::unique_ptr<IDataSource> dataSource);
+
+  [[nodiscard]] std::vector<InfoItem> getInfoList() const;
+  [[nodiscard]] bool                  atEnd() const;
+  [[nodiscard]] bool                  isOk() const;
+  [[nodiscard]] std::int64_t          getPosition() const;
+
+  [[nodiscard]] bool wasSourceModified() const;
+
+  [[nodiscard]] bool        seek(const std::int64_t pos);
+  [[nodiscard]] std::string readLine();
+
+  [[nodiscard]] std::optional<std::int64_t> getFileSize() const;
+
+protected:
+  std::unique_ptr<IDataSource> dataSource;
+
+  std::string textBuffer;
+};
+
+} // namespace datasource

YUViewLib/src/filesource/FileSource.cpp

@@ -151,6 +151,15 @@ bool FileSource::getAndResetFileChangedFlag()
   return b;
 }
 
+std::string FileSource::readLine()
+{
+  if (!this->isFileOpened)
+    return {};
+
+  const auto line = this->srcFile.readLine();
+  return line.toStdString();
+}
+
 void FileSource::updateFileWatchSetting()
 {
   // Install a file watcher if file watching is active in the settings.

YUViewLib/src/filesource/FileSource.h

@@ -84,7 +84,7 @@ class FileSource : public QObject
   bool isOk() const { return this->isFileOpened; }
 
   virtual bool atEnd() const { return !this->isFileOpened ? true : this->srcFile.atEnd(); }
-  QByteArray   readLine() { return !this->isFileOpened ? QByteArray() : this->srcFile.readLine(); }
+  std::string  readLine();
   virtual bool seek(int64_t pos) { return !this->isFileOpened ? false : this->srcFile.seek(pos); }
   int64_t      pos() { return !this->isFileOpened ? 0 : this->srcFile.pos(); }
 

YUViewLib/src/statistics/StatisticsFileBase.cpp

@@ -35,12 +35,13 @@
 namespace stats
 {
 
-StatisticsFileBase::StatisticsFileBase(const QString &filename)
+StatisticsFileBase::StatisticsFileBase(std::unique_ptr<datasource::IDataSource> &&dataSource)
 {
-  this->file.openFile(filename.toStdString());
-  if (!this->file.isOk())
+  this->dataSource = std::move(dataSource);
+
+  if (!this->dataSource || !this->dataSource->isOk())
   {
-    this->errorMessage = "Error opening file " + filename;
+    this->errorMessage = "Invalid data source";
     this->error        = true;
   }
 }
@@ -54,7 +55,7 @@ InfoData StatisticsFileBase::getInfo() const
 {
   InfoData info("Statistics File info");
 
-  for (const auto &infoItem : this->file.getFileInfoList())
+  for (const auto &infoItem : this->dataSource->getInfoList())
     info.items.append(infoItem);
   info.items.append(InfoItem("Sorted by POC"sv, this->fileSortedByPOC ? "Yes" : "No"));
   info.items.append(InfoItem("Parsing:", std::to_string(this->parsingProgress) + "..."));

YUViewLib/src/statistics/StatisticsFileBase.h

@@ -32,7 +32,7 @@
 
 #pragma once
 
-#include "filesource/FileSource.h"
+#include "dataSource/IDataSource.h"
 #include "statistics/StatisticsData.h"
 
 #include <QObject>
@@ -47,7 +47,7 @@ class StatisticsFileBase : public QObject
   Q_OBJECT
 
 public:
-  StatisticsFileBase(const QString &filename);
+  StatisticsFileBase(std::unique_ptr<datasource::IDataSource> &&dataSource);
   virtual ~StatisticsFileBase();
 
   // Parse the whole file and get the positions where a new POC/type starts and save them. Later we
@@ -59,13 +59,11 @@ class StatisticsFileBase : public QObject
 
   operator bool() const { return !this->error; };
 
-  // -1 if it could not be parser from the file
-  virtual double getFramerate() const { return -1; }
+  virtual std::optional<double> getFramerate() const { return {}; }
 
   int getMaxPoc() const { return this->maxPOC; }
 
-  bool isFileChanged() { return this->file.getAndResetFileChangedFlag(); }
-  void updateSettings() { this->file.updateFileWatchSetting(); }
+  bool isFileChanged() const { return this->dataSource->wasSourceModified(); }
 
   InfoData getInfo() const;
 
@@ -77,7 +75,7 @@ class StatisticsFileBase : public QObject
   void readPOC(int newPoc);
 
 protected:
-  FileSource file;
+  std::unique_ptr<datasource::IDataSource> dataSource;
 
   // Set if the file is sorted by POC and the types are 'random' within this POC (true)
   // or if the file is sorted by typeID and the POC is 'random'