Implementation of readFileStream and writeFileStream on GRPlatform for Pharo9

Johan Brichau · Johan Brichau · commit 2908a8f721c2 · 2020-05-21T12:02:21.000+02:00
diff --git a/repository/Grease-Core.package/GRPlatform.class/instance/fileStreamOn.do.binary..st b/repository/Grease-Core.package/GRPlatform.class/instance/fileStreamOn.do.binary..st
@@ -1,3 +1,6 @@
 file library
 fileStreamOn: aString do: aBlock binary: aBoolean
-	self subclassResponsibility 
+	self 
+		greaseDeprecatedApi: 'GRPlatform>>#fileStreamOn:do:binary:'
+		details: 'Use readFileStreamOn:do:binary:'.
+	^ self readFileStreamOn: aString do: aBlock binary: aBoolean
diff --git a/repository/Grease-Core.package/GRPlatform.class/instance/readFileStreamOn.do.binary..st b/repository/Grease-Core.package/GRPlatform.class/instance/readFileStreamOn.do.binary..st
@@ -0,0 +1,3 @@
+file library
+readFileStreamOn: aString do: aBlock binary: aBoolean
+	self subclassResponsibility 
diff --git a/repository/Grease-Core.package/GRPlatform.class/instance/writeFileStreamOn.do.binary..st b/repository/Grease-Core.package/GRPlatform.class/instance/writeFileStreamOn.do.binary..st
@@ -0,0 +1,3 @@
+file library
+writeFileStreamOn: aString do: aBlock binary: aBoolean
+	self subclassResponsibility 
diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/contentsOfFile.binary..st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/contentsOfFile.binary..st
@@ -1,3 +1,3 @@
 file library
 contentsOfFile: aString binary: aBoolean
-	^ self fileStreamOn: aString do: [ :stream | stream contents ] binary: aBoolean
+	^ self readFileStreamOn: aString do: [ :stream | stream contents ] binary: aBoolean
diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/fileStreamOn.do.binary..st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/fileStreamOn.do.binary..st
diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/readFileStreamOn.do.binary..st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/readFileStreamOn.do.binary..st
@@ -0,0 +1,7 @@
+file library
+readFileStreamOn: aString do: aBlock binary: aBoolean
+	"Line end conversion is no longer done for ascii... TBD!"
+
+	^ aBoolean
+		ifTrue: [ aString asFileReference binaryReadStreamDo: aBlock ]
+		ifFalse: [ aString asFileReference readStreamEncoded: 'ascii' do: aBlock ]
diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/write.toFile.inFolder..st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/write.toFile.inFolder..st
@@ -1,15 +1,11 @@
 file library
 write: aStringOrByteArray toFile: aFileNameString inFolder: aFolderString
 	"writes aStringOrByteArray to a file named aFilenameString in the folder aFolderString"
-	| folder stream fullFilePath |
+
+	| folder |
 	folder := FileSystem disk resolveString: aFolderString.
-	fullFilePath := (folder / aFileNameString) asFileReference.
-	stream := aStringOrByteArray isString
-		ifTrue: [
-			(MultiByteFileStream forceNewFileNamed: fullFilePath fullName)
-				ascii;
-				wantsLineEndConversion: true;
-				yourself ]
-		ifFalse: [ (FileStream forceNewFileNamed: fullFilePath fullName) binary ].
-	[ stream nextPutAll: aStringOrByteArray ]
-		ensure: [ stream close ]
+	"TODO: wantsLineEndConversion: true; ??"
+	^ self
+		writeFileStreamOn: (folder / aFileNameString) asFileReference ensureDelete fullName
+		do: [ :stream | stream nextPutAll: aStringOrByteArray ]
+		binary: aStringOrByteArray isString not
diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/writeFileStreamOn.do.binary..st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/writeFileStreamOn.do.binary..st
@@ -0,0 +1,5 @@
+file library
+writeFileStreamOn: aString do: aBlock binary: aBoolean
+	^ aBoolean
+		ifTrue: [ aString asFileReference binaryWriteStreamDo: aBlock ]
+		ifFalse: [ aString asFileReference writeStreamEncoded: 'ascii' do: aBlock ]

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+file library`
	`2`	`+readFileStreamOn: aString do: aBlock binary: aBoolean`
	`3`	`+ self subclassResponsibility`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+file library`
	`2`	`+writeFileStreamOn: aString do: aBlock binary: aBoolean`
	`3`	`+ self subclassResponsibility`