|
@@ -3,7 +3,7 @@
|
|
* Company: Lynar Studios
|
|
* Company: Lynar Studios
|
|
* E-Mail: webmaster@lynarstudios.com
|
|
* E-Mail: webmaster@lynarstudios.com
|
|
* Created: 2020-08-17
|
|
* Created: 2020-08-17
|
|
- * Changed: 2023-02-23
|
|
|
|
|
|
+ * Changed: 2023-05-16
|
|
*
|
|
*
|
|
* */
|
|
* */
|
|
|
|
|
|
@@ -20,8 +20,9 @@ using ls::std::io::File;
|
|
using ls::std::io::FileExistenceEvaluator;
|
|
using ls::std::io::FileExistenceEvaluator;
|
|
using ls::std::io::FileReader;
|
|
using ls::std::io::FileReader;
|
|
using std::ifstream;
|
|
using std::ifstream;
|
|
|
|
+using std::string;
|
|
|
|
|
|
-FileReader::FileReader(File &_file) : Class("FileReader"), file(_file)
|
|
|
|
|
|
+FileReader::FileReader(const File &_file) : Class("FileReader"), file(_file)
|
|
{
|
|
{
|
|
FileExistenceEvaluator{_file.getAbsoluteFilePath()}.evaluate();
|
|
FileExistenceEvaluator{_file.getAbsoluteFilePath()}.evaluate();
|
|
}
|
|
}
|
|
@@ -30,11 +31,10 @@ FileReader::~FileReader() noexcept = default;
|
|
|
|
|
|
byte_field FileReader::read()
|
|
byte_field FileReader::read()
|
|
{
|
|
{
|
|
- byte_type *data;
|
|
|
|
ifstream inputStream{this->file.getAbsoluteFilePath(), ifstream::binary};
|
|
ifstream inputStream{this->file.getAbsoluteFilePath(), ifstream::binary};
|
|
- int length = (int) this->file.getSize();
|
|
|
|
- data = new byte_type[length];
|
|
|
|
- inputStream.read(data, length);
|
|
|
|
|
|
+ auto length = (int) this->file.getSize();
|
|
|
|
+ auto data = string(length, 'x');
|
|
|
|
+ inputStream.read(data.data(), length);
|
|
|
|
|
|
if (inputStream.fail())
|
|
if (inputStream.fail())
|
|
{
|
|
{
|
|
@@ -42,13 +42,10 @@ byte_field FileReader::read()
|
|
}
|
|
}
|
|
|
|
|
|
inputStream.close();
|
|
inputStream.close();
|
|
- byte_field readData = byte_field{data, (size_t) this->file.getSize()};
|
|
|
|
- delete[] data;
|
|
|
|
-
|
|
|
|
- return readData;
|
|
|
|
|
|
+ return data;
|
|
}
|
|
}
|
|
|
|
|
|
-void FileReader::reset(File &_file)
|
|
|
|
|
|
+void FileReader::reset(const File &_file)
|
|
{
|
|
{
|
|
FileExistenceEvaluator{_file.getAbsoluteFilePath()}.evaluate();
|
|
FileExistenceEvaluator{_file.getAbsoluteFilePath()}.evaluate();
|
|
this->file = _file;
|
|
this->file = _file;
|