Mercurial > hg > orthanc
changeset 6852:0b6aa04bca59 streaming
uniformizing StorageAreaDataSource
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 22 May 2026 14:49:45 +0200 |
| parents | 8e4223cc729d |
| children | fac0030a508e |
| files | OrthancFramework/Sources/DataSource/DicomDataSource.cpp OrthancFramework/Sources/DataSource/StorageAreaDataSource.cpp OrthancFramework/Sources/DataSource/StorageAreaDataSource.h OrthancFramework/Sources/DataSource/TranscoderDataSource.cpp OrthancServer/Sources/ServerContext.cpp OrthancServer/Sources/ServerTranscoder.cpp |
| diffstat | 6 files changed, 39 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Sources/DataSource/DicomDataSource.cpp Fri May 22 14:30:40 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/DicomDataSource.cpp Fri May 22 14:49:45 2026 +0200 @@ -69,7 +69,8 @@ virtual StorageAreaDataSource::Range* ReadRange(DataSourceReader& reader) const ORTHANC_OVERRIDE { - return StorageAreaDataSource::ReadAttachment(reader, attachment_, true /* uncompress */); + return StorageAreaDataSource::Execute( + reader, StorageAreaDataSource::CreateAttachmentRequest(attachment_, true /* uncompress */)); } }; @@ -106,7 +107,7 @@ virtual StorageAreaDataSource::Range* ReadRange(DataSourceReader& reader) const ORTHANC_OVERRIDE { - return StorageAreaDataSource::ReadBeginning(reader, attachment_, pixelDataOffset_); + return StorageAreaDataSource::Execute(reader, StorageAreaDataSource::CreateBeginningRequest(attachment_, pixelDataOffset_)); } };
--- a/OrthancFramework/Sources/DataSource/StorageAreaDataSource.cpp Fri May 22 14:30:40 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/StorageAreaDataSource.cpp Fri May 22 14:49:45 2026 +0200 @@ -365,22 +365,18 @@ } - StorageAreaDataSource::Range* StorageAreaDataSource::ReadRange(DataSourceReader& reader, - const std::string& uuid, - FileContentType type, - uint64_t start, - uint64_t end, - const std::string& customData) + IDataIdentifier* StorageAreaDataSource::CreateRangeRequest(const std::string& uuid, + FileContentType type, + uint64_t start, + uint64_t end, + const std::string& pluginCustomData) { - std::unique_ptr<IDataIdentifier> id(new Identifier(uuid, type, start, end, customData)); - boost::shared_ptr<IDynamicObject> value = reader.ReadSingle(id.release()); - return new Range(value); + return new Identifier(uuid, type, start, end, pluginCustomData); } - StorageAreaDataSource::Range* StorageAreaDataSource::ReadAttachment(DataSourceReader& reader, - const FileInfo& attachment, - bool uncompress) + IDataIdentifier* StorageAreaDataSource::CreateAttachmentRequest(const FileInfo& attachment, + bool uncompress) { std::unique_ptr<Identifier> id(new Identifier(attachment.GetUuid(), attachment.GetContentType(), @@ -388,13 +384,12 @@ attachment.GetCustomData())); id->SetPostProcessing(new AttachmentPostProcessing(attachment, uncompress)); - return Execute(reader, id.release()); + return id.release(); } - StorageAreaDataSource::Range* StorageAreaDataSource::ReadBeginning(DataSourceReader& reader, - const FileInfo& attachment, - uint64_t untilPosition) + IDataIdentifier* StorageAreaDataSource::CreateBeginningRequest(const FileInfo& attachment, + uint64_t untilPosition) { if (attachment.GetCompressionType() != CompressionType_None) { @@ -412,8 +407,8 @@ throw OrthancException(ErrorCode_ParameterOutOfRange); } - return ReadRange(reader, attachment.GetUuid(), attachment.GetContentType(), - 0, untilPosition, attachment.GetCustomData()); + return CreateRangeRequest(attachment.GetUuid(), attachment.GetContentType(), + 0, untilPosition, attachment.GetCustomData()); } @@ -428,8 +423,8 @@ attachment.GetCompressionType() != CompressionType_None) { // An uncompression is needed in this case - std::unique_ptr<StorageAreaDataSource::Range> uncompressed( - ReadAttachment(reader, attachment, true /* uncompress */)); + std::unique_ptr<Range> uncompressed( + Execute(reader, CreateAttachmentRequest(attachment, true /* uncompress */))); std::string content; range.Extract(content, uncompressed->GetData(), uncompressed->GetSize()); @@ -450,8 +445,8 @@ } else { - return ReadRange(reader, attachment.GetUuid(), attachment.GetContentType(), - start, endExclusive, attachment.GetCustomData()); + return Execute(reader, CreateRangeRequest(attachment.GetUuid(), attachment.GetContentType(), + start, endExclusive, attachment.GetCustomData())); } } }
--- a/OrthancFramework/Sources/DataSource/StorageAreaDataSource.h Fri May 22 14:30:40 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/StorageAreaDataSource.h Fri May 22 14:49:45 2026 +0200 @@ -94,27 +94,24 @@ static Range* CreateFromSwap(std::string& content); }; - static Range* ReadRange(DataSourceReader& reader, - const std::string& uuid, - FileContentType type, - uint64_t start /* inclusive */, - uint64_t end /* exclusive */, - const std::string& customData); + static IDataIdentifier* CreateRangeRequest(const std::string& uuid, + FileContentType type, + uint64_t start /* inclusive */, + uint64_t end /* exclusive */, + const std::string& pluginCustomData); - static Range* ReadAttachment(DataSourceReader& reader, - const FileInfo& attachment, - bool uncompress); + static IDataIdentifier* CreateAttachmentRequest(const FileInfo& attachment, + bool uncompress); - static Range* ReadBeginning(DataSourceReader& reader, - const FileInfo& attachment, - uint64_t untilPosition /* exclusive */); + static IDataIdentifier* CreateBeginningRequest(const FileInfo& attachment, + uint64_t untilPosition /* exclusive */); + + static Range* Execute(DataSourceReader& reader, + IDataIdentifier* request /* takes ownership */); static Range* ReadRange(DataSourceReader& reader, const FileInfo& attachment, const StorageRange& range, bool uncompress); - - static Range* Execute(DataSourceReader& reader, - IDataIdentifier* request /* takes ownership */); }; }
--- a/OrthancFramework/Sources/DataSource/TranscoderDataSource.cpp Fri May 22 14:30:40 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/TranscoderDataSource.cpp Fri May 22 14:49:45 2026 +0200 @@ -185,7 +185,8 @@ DataSourceReader& storageAreaReader) const { std::unique_ptr<StorageAreaDataSource::Range> range( - StorageAreaDataSource::ReadAttachment(storageAreaReader, attachment_, true /* uncompress */)); + StorageAreaDataSource::Execute( + storageAreaReader, StorageAreaDataSource::CreateAttachmentRequest(attachment_, true /* uncompress */))); IDicomTranscoder::DicomImage source; source.SetExternalBuffer(range->GetData(), range->GetSize());
--- a/OrthancServer/Sources/ServerContext.cpp Fri May 22 14:30:40 2026 +0200 +++ b/OrthancServer/Sources/ServerContext.cpp Fri May 22 14:49:45 2026 +0200 @@ -1480,7 +1480,8 @@ StorageAreaDataSource::Range* ServerContext::ReadAttachment(const FileInfo& attachment, bool uncompress) { - return StorageAreaDataSource::ReadAttachment(*storageAreaReader_, attachment, uncompress); + return StorageAreaDataSource::Execute( + *storageAreaReader_, StorageAreaDataSource::CreateAttachmentRequest(attachment, uncompress)); } @@ -1494,8 +1495,7 @@ StorageAreaDataSource::Range* ServerContext::ReadRawDicom(const std::string& instancePublicId) { - return StorageAreaDataSource::ReadAttachment( - *storageAreaReader_, LookupDicomForInstance(instancePublicId), true /* uncompress */); + return ReadAttachment(LookupDicomForInstance(instancePublicId), true /* uncompress */); }
--- a/OrthancServer/Sources/ServerTranscoder.cpp Fri May 22 14:30:40 2026 +0200 +++ b/OrthancServer/Sources/ServerTranscoder.cpp Fri May 22 14:49:45 2026 +0200 @@ -259,7 +259,8 @@ else { std::unique_ptr<StorageAreaDataSource::Range> range( - StorageAreaDataSource::ReadAttachment(*storageAreaReader, attachment, true /* uncompress */)); + StorageAreaDataSource::Execute( + *storageAreaReader, StorageAreaDataSource::CreateAttachmentRequest(attachment, true /* uncompress */))); return DecodeFrameUsingPluginsDecoder(range->GetData(), range->GetSize(), frameIndex); }
