Fix: copying between filesystems failed for non-UTF8-conformant files

Author: j4yk

src/FS-Core.package/FileSystem.class/instance/copy.toReference..st

@@ -7,6 +7,7 @@ copy: aPath toReference: destRef
 	[
 	inputStream := self readStreamOn: path.
 	inputStream ifNil: [ store signalFileDoesNotExist: path ].
+	inputStream binary.
 	destRef filesystem copyFrom: inputStream to: destRef path 
 
 		] ensure: [ inputStream ifNotNil: [ inputStream close ]]

src/FS-Core.package/FileSystem.class/instance/copyFrom.to..st

@@ -6,7 +6,7 @@ copyFrom: inputStream to: destPath
 		ifTrue: [ store signalFileExists: destPath ].
 	^ [ 
 	out := self writeStreamOn: destPath.
-	buffer := (out isBinary ifTrue: [ByteArray] ifFalse: [String]) new: 1024.
+	buffer := ByteArray new: 1024.
 	[ inputStream atEnd ]
 		whileFalse: [ 
 			buffer := inputStream nextInto: buffer.

src/FS-Core.package/FileSystem.class/methodProperties.json

@@ -12,8 +12,8 @@
 		"close" : "cwp 2/19/2011 01:39",
 		"copy:ifAbsent:to:ifPresent:" : "CamilloBruni 1/20/2012 11:42",
 		"copy:to:" : "cwp 4/3/2011 22:17",
-		"copy:toReference:" : "CamilloBruni 1/20/2012 12:33",
-		"copyFrom:to:" : "jr 2/26/2017 01:04",
+		"copy:toReference:" : "jr 2/24/2019 20:41",
+		"copyFrom:to:" : "CamilloBruni 1/20/2012 12:33",
 		"createDirectory:" : "cwp 3/25/2011 13:15",
 		"delete:" : "cwp 3/25/2011 13:14",
 		"delimiter" : "cwp 3/25/2011 19:14",

src/FS-Tests-Core.package/FileSystemTest.class/instance/testCopyBinary.st

@@ -0,0 +1,14 @@
+tests
+testCopyBinary
+	| out in contents |
+	[ 
+	out := filesystem writeStreamOn: 'gooly'.
+	[ out binary; nextPutAll: #[16rFA 16rFB 16rFC 16rFD 16rFE 16rFD] ] ensure: [ out close ].
+	filesystem copy: 'gooly' to: 'plonk'.
+	in := filesystem readStreamOn: 'plonk'.
+	contents := [ in binary; contents ] ensure: [ in close ].
+	self assert: contents = #[16rFA 16rFB 16rFC 16rFD 16rFE 16rFD] ]
+		ensure: [ 
+			filesystem
+				delete: 'gooly';
+				delete: 'plonk' ]

src/FS-Tests-Core.package/FileSystemTest.class/methodProperties.json

@@ -12,6 +12,7 @@
 		"testChangeDirectoryString" : "cwp 3/29/2011 16:34",
 		"testChildrenAt" : "cwp 2/26/2011 18:19",
 		"testCopy" : "lr 7/13/2010 15:19",
+		"testCopyBinary" : "jr 2/24/2019 20:44",
 		"testCopyDestExists" : "CamilloBruni 1/20/2012 13:23",
 		"testCopySourceDoesntExist" : "jr 3/5/2017 13:16",
 		"testCreateDirectoryExists" : "cwp 11/17/2009 16:56",

src/FS-Tests-Memory.package/.squot-contents

@@ -1,4 +1,4 @@
-{
+SquotTrackedObjectMetadata {
 	#objectClassName : #PackageInfo,
 	#serializer : #SquotCypressCodeSerializer
 }

src/FS-Tests-Memory.package/FSMemoryFilesystemTest.class/instance/testCopyBetweenTwoFileSystems.st

@@ -0,0 +1,10 @@
+tests
+testCopyBetweenTwoFileSystems
+	| other bytes source target |
+	other := self createFilesystem.
+	source := (filesystem / 'foo') writeStream.
+	[source nextPutAll: 'abcdef'] ensure: [source close].
+	filesystem / 'foo' copyTo: other / 'foo'.
+	target := (other / 'foo') readStream.
+	bytes := [target upToEnd] ensure: [target close].
+	self assert: 'abcdef' equals: bytes.

src/FS-Tests-Memory.package/FSMemoryFilesystemTest.class/instance/testCopyBinaryBetweenTwoFileSystems.st

@@ -0,0 +1,11 @@
+tests
+testCopyBinaryBetweenTwoFileSystems
+	| other bytes source target |
+	other := self createFilesystem.
+	source := (filesystem / 'foo') writeStream.
+	[source binary; nextPutAll: #[16rFA 16rFB 16rFC 16rFD 16rFE 16rFD]]
+		ensure: [source close].
+	filesystem / 'foo' copyTo: other / 'foo'.
+	target := (other / 'foo') readStream.
+	bytes := [target binary; upToEnd] ensure: [target close].
+	self assert: #[16rFA 16rFB 16rFC 16rFD 16rFE 16rFD] equals: bytes.

src/FS-Tests-Memory.package/FSMemoryFilesystemTest.class/methodProperties.json

@@ -4,4 +4,6 @@
 	"instance" : {
 		"createFilesystem" : "jr 3/2/2017 17:38",
 		"expectedFailures" : "jr 9/14/2016 12:51",
+		"testCopyBetweenTwoFileSystems" : "jr 2/24/2019 20:36",
+		"testCopyBinaryBetweenTwoFileSystems" : "jr 2/24/2019 20:37",
 		"testEqual" : "cwp 7/24/2009 00:41" } }