src/MiniDocs/FileLocator.extension.st

@@ -23,30 +23,6 @@ FileLocator class >> atAlias: aString put: aFolderOrFile [
 	^ updatedAliases
 ]
 
-{ #category : #'*MiniDocs' }
-FileLocator >> extractMetadata [
-"I package the functionality from [[How to extract meta information using ExifTool]],
-from the GToolkit Book.
-I depend on the external tool ExifTool."
-
-	| process variablesList |
-	process := GtSubprocessWithInMemoryOutput new
-		command: 'exiftool';
-		arguments: { self fullName}.
-	process errorBlock: [ :proc | ^ self error: 'Failed to run exiftool' ].
-	process runAndWait.
-	variablesList := process stdout lines collect: [ :currentLine |
-		| separatorIndex name value |
-		separatorIndex := currentLine indexOf: $:.
-		name := (currentLine copyFrom: 1 to: separatorIndex - 1) trimBoth.
-		value := (currentLine 
-			copyFrom: separatorIndex + 1  
-			to: currentLine size) trimBoth.
-		name -> value 
-	].
-	^ variablesList asOrderedDictionary
-]
-
 { #category : #'*MiniDocs' }
 FileLocator class >> fileAliases [
 	^ MiniDocs appFolder / 'fileAliases.ston'

src/MiniDocs/HedgeDoc.class.st

@@ -37,9 +37,7 @@ HedgeDoc >> asLePage [
 		addSnippet: snippet;
 		yourself.
 	newPage incomingLinks.
-	newPage options 
+	newPage metadata addAll: self metadata.
-		at: 'originalMetadata' put: self metadata;
-		at: 'url' put: self url.
 	^ newPage	
 ]
 
@@ -164,6 +162,7 @@ HedgeDoc >> url: anObject [
 	(html xpath: '//head/meta[@name="application-name"][@content = "HedgeDoc - Ideas grow better together"]') isEmpty
 		ifTrue: [ self inform: 'Not a hedgedoc url'.
 			url := nil ].
+	self metadata at: 'title' put: tempUrl firstPathSegment.
 	server := tempUrl host.
 	url := anObject
 ]

src/MiniDocs/Markdown.class.st

@@ -50,7 +50,7 @@ Markdown >> body: aString [
 { #category : #operation }
 Markdown >> commentYAMLMetadata [
 	| newContents |
-	self contents detectYAMLMetadata ifFalse: [ ^ self ].
+	self detectYAMLMetadata ifFalse: [ ^ self ].
 	newContents := '' writeStream.
 	newContents nextPutAll: '<!--@yaml'; lf.
 	newContents nextPutAll: self yamlMetadataString.
@@ -160,10 +160,7 @@ Markdown >> fromFile: aFileReference [
 { #category : #'instance creation' }
 Markdown >> fromString: markdownString [
 	markdownString yamlMetadata 
-		ifNotNil: [
+		ifNotNil: [(self metadata) at: 'original' put: markdownString yamlMetadata].
-			self metadata 
-				ifEmpty: [self metadata: markdownString yamlMetadata]  
-				ifNotEmpty: [self metadata at: 'original' put: markdownString yamlMetadata]].
 	self body: markdownString contentsWithoutYAMLMetadata
 ]
 
@@ -194,7 +191,6 @@ Markdown >> metadata [
 	
 	^ metadata ifNil: [ metadata := Dictionary new].
 
-
 ]
 
 { #category : #accessing }
@@ -234,8 +230,3 @@ Markdown >> printOn: aStream [
 Markdown >> title [
 	^ title ifNil: [ title:= self headerAsTitle ]
 ]
-
-{ #category : #accessing }
-Markdown >> title: aString [
-	title := aString
-]

src/MiniDocs/Pandoc.class.st

@@ -147,11 +147,17 @@ Pandoc class >> markdownToHtmlOnUnix: inputFile [
 	outputFile := inputFile parent / (inputFile basenameWithoutExtension , '.html').
 	outputFile ensureDelete.
 	outputFile ensureCreateFile.
-	GtSubprocessWithInMemoryOutput new
+	OSSUnixSubprocess new
-		shellCommand: 'pandoc -f markdown+startnum+task_lists --standalone -t html ', inputFile fullName, ' --output ', outputFile fullName;
+		command: 'pandoc';
-		runAndWait;
+		arguments: {'-f'. 'markdown+startnum+task_lists'. '--standalone'. '-t'. 'html'. inputFile fullName. 
-		stdout.
+			'--output'. outputFile fullName  };
-	^ outputFile.
+	redirectStdout;
+	redirectStderr;
+	runAndWaitOnExitDo: [ :process :outString :errString |
+		process isSuccess
+			ifTrue: [ ^ outputFile ]
+			ifFalse: [ ^ inputFile ]
+	]
 ]
 
 { #category : #converters }