fixes #342 Cannot open anymore OS folder X.

Also move to use a visitor instead of extension methods
pharo-project · Jul 8, 2019 · dab5151 · dab5151
1 parent 1a2b17f
commit dab5151
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 62 deletions.
diff --git a/src/PharoLauncher-Core/MacOSPlatform.extension.st b/src/PharoLauncher-Core/MacOSPlatform.extension.st
diff --git a/src/PharoLauncher-Core/OSPlatform.extension.st b/src/PharoLauncher-Core/OSPlatform.extension.st
diff --git a/src/PharoLauncher-Core/PhLFileBrowser.class.st b/src/PharoLauncher-Core/PhLFileBrowser.class.st
@@ -0,0 +1,65 @@
+"
+I'm a simple visitor in charge of opening an operating system browser on the provided path string.
+"
+Class {
+	#name : #PhLFileBrowser,
+	#superclass : #OSPlatformVisitor,
+	#instVars : [
+		'process',
+		'vmPath',
+		'launchInALoginShell',
+		'imageFile',
+		'usePharoSettings',
+		'path'
+	],
+	#category : #'PharoLauncher-Core-Model'
+}
+
+{ #category : #'instance creation' }
+PhLFileBrowser class >> openOn: aFileReferenceOrPathString [
+
+	^ self new 
+		path: aFileReferenceOrPathString;
+		open.
+]
+
+{ #category : #action }
+PhLFileBrowser >> open [ 
+	self visit
+]
+
+{ #category : #accessing }
+PhLFileBrowser >> path: aFileReferenceOrPathString [
+	"Opens an OS-specific file and directory browser on ==aFileReference==. If aFileReference is a file, opens the browser on its containing directory instead."
+	| ref |
+	aFileReferenceOrPathString isNil ifTrue: [ ^ nil ].
+	ref := aFileReferenceOrPathString asFileReference.
+	ref exists ifFalse: [ ^ nil ].
+
+	ref := ref isFile ifTrue: [ ref parent ] ifFalse: [ ref ].
+	(ref isNil or: [ ref exists not ])
+		ifTrue: [ ^ nil ].
+
+	path := ref fullName.
+]
+
+{ #category : #visiting }
+PhLFileBrowser >> visitMacOS: aPlatform [
+	^ PhLProcessWrapper new 
+		shellCommand;
+		addArgument: ('open "{1}"' format: {path});
+		runUnwatch
+]
+
+{ #category : #visiting }
+PhLFileBrowser >> visitUnix: aPlatform [
+	^  PhLProcessWrapper new 
+		shellCommand;
+		addArgument: ('xdg-open "{1}"' format: {path});
+		runUnwatch
+]
+
+{ #category : #visiting }
+PhLFileBrowser >> visitWindows: aPlatform [
+	^ aPlatform privShellExplore: path
+]
diff --git a/src/PharoLauncher-Core/PhLImage.class.st b/src/PharoLauncher-Core/PhLImage.class.st
@@ -204,7 +204,7 @@ PhLImage >> setLocation: aFile [
 
 { #category : #printing }
 PhLImage >> showNativeFolder [
-	OSPlatform current openFileBrowserOn: file
+	PhLFileBrowser openOn: file
 ]
 
 { #category : #accessing }

diff --git a/src/PharoLauncher-Core/PhLProcessWrapper.class.st b/src/PharoLauncher-Core/PhLProcessWrapper.class.st
@@ -17,15 +17,6 @@ Class {
 	#category : #'PharoLauncher-Core-Download'
 }
 
-{ #category : #'execution - public' }
-PhLProcessWrapper class >> command: aCommand [
-	^ Smalltalk os isWindows
-			ifTrue: [ OSWSWinProcess new
-							shellCommand: aCommand;
-							run ]
-			ifFalse: [ OSProcess command: aCommand utf8Encoded asString ]
-]
-
 { #category : #testing }
 PhLProcessWrapper class >> isCommandAvailable: aCommand [
 	| process |
@@ -39,21 +30,6 @@ PhLProcessWrapper class >> isCommandAvailable: aCommand [
 	do: [ ^ false ]
 ]
 
-{ #category : #'execution - public' }
-PhLProcessWrapper class >> waitForLinuxCommand: aCommand timeout: aDuration [
-	| future externalProcess |
-
-	future := [externalProcess := self command: aCommand.
-				 [externalProcess isComplete] 
-					whileFalse: [(Delay forMilliseconds: 50) wait]. ] future.
-	[ future waitForCompletion: aDuration ]
-		on: TKTTimeoutException 
-		do: [ :error | 
-				externalProcess isComplete ifFalse:
-					[ externalProcess sigkill.
-					PhLProcessTimeOut signal ] ]
-]
-
 { #category : #building }
 PhLProcessWrapper >> addArgument: aString [
 	arguments add: aString

diff --git a/src/PharoLauncher-Core/PhLVirtualMachine.class.st b/src/PharoLauncher-Core/PhLVirtualMachine.class.st
@@ -158,7 +158,7 @@ PhLVirtualMachine >> removeFromSystem [
 
 { #category : #actions }
 PhLVirtualMachine >> showInFolder [
-	OSPlatform current openFileBrowserOn: self vmStore / name
+	PhLFileBrowser openOn: self vmStore / name
 ]
 
 { #category : #updating }

diff --git a/src/PharoLauncher-Core/UnixPlatform.extension.st b/src/PharoLauncher-Core/UnixPlatform.extension.st
diff --git a/src/PharoLauncher-Core/Win32Platform.extension.st b/src/PharoLauncher-Core/Win32Platform.extension.st
@@ -1,11 +1,5 @@
 Extension { #name : #Win32Platform }
 
-{ #category : #'*PharoLauncher-Core' }
-Win32Platform >> privOpenFileBrowserOn: pathString [
-	self privShellExplore: pathString 
-
-]
-
 { #category : #'*PharoLauncher-Core' }
 Win32Platform >> privShellExecute: lpOperation file: lpFile parameters: lpParameters directory: lpDirectory show: nShowCmd [
 

diff --git a/src/PharoLauncher-Tests-Core/PhLFileBrowserTest.class.st b/src/PharoLauncher-Tests-Core/PhLFileBrowserTest.class.st
@@ -0,0 +1,12 @@
+Class {
+	#name : #PhLFileBrowserTest,
+	#superclass : #TestCase,
+	#category : #'PharoLauncher-Tests-Core'
+}
+
+{ #category : #tests }
+PhLFileBrowserTest >> testCanOpenAFileBrowserOnImageFolder [
+	| path |
+	path := Smalltalk image imageDirectory fullName.
+	PhLFileBrowser openOn: path.
+]