From d04db00cb55ea0ac0a73760a29e6b6bf91201e9b Mon Sep 17 00:00:00 2001 From: Offray Luna Date: Thu, 27 Oct 2022 08:44:30 -0500 Subject: [PATCH] Debugging tiddlers importation from TiddlyHost. --- repository/TiddlyWiki/TiddlyWiki.class.st | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/repository/TiddlyWiki/TiddlyWiki.class.st b/repository/TiddlyWiki/TiddlyWiki.class.st index 22d2a88..3c0ac51 100644 --- a/repository/TiddlyWiki/TiddlyWiki.class.st +++ b/repository/TiddlyWiki/TiddlyWiki.class.st @@ -428,12 +428,12 @@ TiddlyWiki >> importJSONFile [ { #category : #accessing } TiddlyWiki >> importJSONLink [ - | tiddlersJson | - tiddlersJson := (self remote asString, '/tiddlers.json') asUrl retrieveContents. jsonFile := self folder / 'tiddlers.json'. - self name; file. - MarkupFile exportAsFileOn: jsonFile containing: tiddlersJson. - ^ self fromString: tiddlersJson + self + name; + file. + MarkupFile exportAsFileOn: jsonFile containing: self remoteTiddlersContentsString. + ^ self fromString: self remoteTiddlersContentsString ] { #category : #accessing } @@ -675,6 +675,12 @@ TiddlyWiki >> remote: aUrlString [ remote := aUrlString asZnUrl ] +{ #category : #accessing } +TiddlyWiki >> remoteTiddlersContentsString [ + self isInTiddlyHost ifFalse: [ ^ self ]. + ^ (self remote asString, '/tiddlers.json') asZnUrl retrieveContents. +] + { #category : #accessing } TiddlyWiki >> repository [ @@ -761,7 +767,8 @@ TiddlyWiki >> taggedWith: aTag [ { #category : #accessing } TiddlyWiki >> tiddlers [ - (self isInTiddlyHost and: [ tiddlers isNil ]) ifTrue: [ ^ self importJSONLink]. + tiddlers ifNotNil: [ ^ tiddlers ]. + self isInTiddlyHost ifTrue: [ ^ self importJSONLink]. ^ tiddlers ifNil: [ tiddlers := OrderedCollection new ] ]