Skip to content

style(InputTextStream): Use std::unique_ptr<std::ifstream> #1425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
N-Dekker wants to merge 1 commit into from
Closed

style(InputTextStream): Use std::unique_ptr<std::ifstream> #1425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 10 additions & 28 deletions include/itkInputTextStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "itkPipeline.h"
#include "itkWasmStringStream.h"

#include <memory> // For unique_ptr.
#include <string>
#include <sstream>
#include <fstream>
Expand Down Expand Up @@ -48,54 +49,35 @@ class WebAssemblyInterface_EXPORT InputTextStream
std::istream &
Get()
{
return *m_IStream;
return *GetPointer();
}

std::istream *
GetPointer()
{
return m_IStream;
using ReturnType = std::istream *;
return m_WasmStringStream ? ReturnType{ &(m_WasmStringStream->GetStringStream()) }
: ReturnType{ m_InputFileStream.get() };
}

void
SetJSON(const std::string & json)
{
if (m_DeleteIStream && m_IStream != nullptr)
{
delete m_IStream;
}
m_DeleteIStream = false;
m_InputFileStream.reset();
m_WasmStringStream = WasmStringStream::New();
m_WasmStringStream->SetJSON(json.c_str());

m_IStream = &(m_WasmStringStream->GetStringStream());
}

void
SetFileName(const std::string & fileName)
{
if (m_DeleteIStream && m_IStream != nullptr)
{
delete m_IStream;
}
m_IStream = new std::ifstream(fileName, std::ifstream::in);
m_DeleteIStream = true;
}

InputTextStream() = default;
~InputTextStream()
{
if (m_DeleteIStream && m_IStream != nullptr)
{
delete m_IStream;
}
m_WasmStringStream = nullptr;
m_InputFileStream = std::make_unique<std::ifstream>(fileName);

Copilot AI Jul 21, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file stream is created without checking if the file was successfully opened. Consider adding error handling to verify the stream state after creation, or document that callers should check the stream state via GetPointer().

Suggested change
m_InputFileStream = std::make_unique<std::ifstream>(fileName);
m_InputFileStream = std::make_unique<std::ifstream>(fileName);
if (!m_InputFileStream->is_open())
{
throw std::ios_base::failure("Failed to open file: " + fileName);
}

Copilot uses AI. Check for mistakes.

Copilot AI Jul 21, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Consider adding the std::ifstream::in flag for consistency with the previous implementation, even though it's the default for ifstream: std::make_unique<std::ifstream>(fileName, std::ifstream::in)

Suggested change
m_InputFileStream = std::make_unique<std::ifstream>(fileName);
m_InputFileStream = std::make_unique<std::ifstream>(fileName, std::ifstream::in);

Copilot uses AI. Check for mistakes.
}

private:
std::istream * m_IStream{ nullptr };
bool m_DeleteIStream{ false };

WasmStringStream::Pointer m_WasmStringStream;
std::unique_ptr<std::ifstream> m_InputFileStream;
WasmStringStream::Pointer m_WasmStringStream;
};


Expand Down