From 27a20e83b0495cb29bcdf23bd142818f94723803 Mon Sep 17 00:00:00 2001 From: Offray Luna Date: Mon, 25 Mar 2024 16:23:14 -0500 Subject: [PATCH] Improving HedgeDoc objects reading from web links. --- src/MiniDocs/HedgeDoc.class.st | 10 ++++++++-- src/MiniDocs/Markdown.class.st | 8 ++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/MiniDocs/HedgeDoc.class.st b/src/MiniDocs/HedgeDoc.class.st index 77b1715..c4e780a 100644 --- a/src/MiniDocs/HedgeDoc.class.st +++ b/src/MiniDocs/HedgeDoc.class.st @@ -42,7 +42,7 @@ HedgeDoc >> asMarkdownTiddler [ { #category : #accessing } HedgeDoc >> contents [ - ^ body + ^ super contents ] { #category : #accessing } @@ -55,6 +55,12 @@ HedgeDoc >> defaultServer [ self server: 'https://docutopia.tupale.co'. ] +{ #category : #accessing } +HedgeDoc >> fromLink: aString [ + self url: aString. + self retrieveContents +] + { #category : #'as yet unclassified' } HedgeDoc >> htmlUrl [ | link | @@ -81,7 +87,7 @@ HedgeDoc >> pad: anObject [ { #category : #accessing } HedgeDoc >> retrieveContents [ self url ifNil: [ ^ self ]. - self contents: (self url addPathSegment: 'download') retrieveContents. + self fromString: (self url addPathSegment: 'download') retrieveContents. ^ self. ] diff --git a/src/MiniDocs/Markdown.class.st b/src/MiniDocs/Markdown.class.st index 21864d6..33739c8 100644 --- a/src/MiniDocs/Markdown.class.st +++ b/src/MiniDocs/Markdown.class.st @@ -62,7 +62,7 @@ Markdown >> contents [ response nextPutAll: '---'; cr; nextPutAll: self metadataAsYAML; cr; - nextPutAll: '---'; cr; cr; + nextPutAll: '---'; cr; nextPutAll: self body. ^ response contents ] @@ -76,7 +76,7 @@ Markdown >> contents: aString [ Markdown >> documentTree [ | parser| self contents ifNil: [^ nil]. - parser := PPCommonMarkBlockParser new parse: self contents. + parser := PPCommonMarkBlockParser new parse: self body. ^ parser accept: CMBlockVisitor new ] @@ -191,7 +191,7 @@ Markdown >> metadata: rawMeta [ { #category : #accessing } Markdown >> metadataAsYAML [ self metadata isEmptyOrNil ifTrue: [ ^ '' ]. - ^ YQ jsonToYaml: self metadata + ^ (YQ jsonToYaml: self metadata) accentedCharactersCorrection ] { #category : #persistence } @@ -215,5 +215,5 @@ Markdown >> printOn: aStream [ { #category : #accessing } Markdown >> title [ - ^ self metadata at: 'title' ifAbsentPut: [ self headerAsTitle] + ^ self metadata at: 'title' ifAbsentPut: [ self headerAsTitle ] ]