Rename GetContentStream() -> GetStream()
This commit is contained in:
parent
f440981e51
commit
f8d9070c61
14 changed files with 15 additions and 15 deletions
|
|
@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl.Library.Export
|
|||
{
|
||||
string path = Path.Combine(outputDirectory, item.FileName);
|
||||
|
||||
using (var sourceStream = await item.GetContentStream(null))
|
||||
using (var sourceStream = await item.GetStream(null))
|
||||
using (var outputStream = File.Create(path))
|
||||
{
|
||||
sourceStream.Stream.CopyTo(outputStream);
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl.Library.Export
|
|||
// If the file is already AMF, it just needs copied to the target path
|
||||
if (Path.GetExtension(streamContent.FileName).ToUpper() == Path.GetExtension(filePathToSave).ToUpper())
|
||||
{
|
||||
using (var result = await streamContent.GetContentStream(null))
|
||||
using (var result = await streamContent.GetStream(null))
|
||||
using (var fileStream = File.Create(filePathToSave))
|
||||
{
|
||||
result.Stream.CopyTo(fileStream);
|
||||
|
|
@ -66,7 +66,7 @@ namespace MatterHackers.MatterControl.Library.Export
|
|||
else
|
||||
{
|
||||
// Otherwise we need to load the content and MeshFileIO save to the target path
|
||||
using (var result = await streamContent.GetContentStream(null))
|
||||
using (var result = await streamContent.GetStream(null))
|
||||
{
|
||||
IObject3D item = Object3D.Load(result.Stream, Path.GetExtension(streamContent.FileName), CancellationToken.None);
|
||||
return MeshFileIo.Save(item, filePathToSave, CancellationToken.None);
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ namespace MatterHackers.MatterControl.Library.Export
|
|||
// TODO: need to test for and resolve name conflicts
|
||||
var entry = zipArchive.CreateEntry(item.FileName);
|
||||
|
||||
using (var sourceStream = await item.GetContentStream(null))
|
||||
using (var sourceStream = await item.GetStream(null))
|
||||
using (var outputStream = entry.Open())
|
||||
{
|
||||
sourceStream.Stream.CopyTo(outputStream);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue