From fe40b438d09c1337d489a5cf6bf69226c4a213b9 Mon Sep 17 00:00:00 2001 From: ruidajo Date: Thu, 3 Mar 2022 14:53:00 -0500 Subject: [PATCH] Improving exporting tiddlers files. --- repository/TiddlyWiki/TiddlyWiki.class.st | 40 +++++++++++++++-------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/repository/TiddlyWiki/TiddlyWiki.class.st b/repository/TiddlyWiki/TiddlyWiki.class.st index 003df92..7901436 100644 --- a/repository/TiddlyWiki/TiddlyWiki.class.st +++ b/repository/TiddlyWiki/TiddlyWiki.class.st @@ -46,7 +46,7 @@ TiddlyWiki >> changesAfter: aDateString [ | recent created modified wiki aDate | aDate := aDateString asZTimestamp. - wiki := self withoutImages withoutPDFs contentTiddlers. + wiki := self contentTiddlersWithoutLargeTiddlers. created := wiki select: [ :tiddler | tiddler created > aDate ]. modified := wiki select: [ :tiddler | tiddler modified isNotNil and: [ tiddler modified > aDate ] ]. @@ -81,17 +81,31 @@ TiddlyWiki >> contentTiddlers [ ] { #category : #accessing } -TiddlyWiki >> exportContentTiddlers [ +TiddlyWiki >> contentTiddlersWithoutLargeTiddlers [ | content | content := OrderedCollection new. -content - addAll: (self contentTiddlers - select: [ :each | each isTW5Type or: [ each isNilType ]]); - addAll: (self contentTiddlers select: [ :each | each isJavascript ]); - addAll: (self contentTiddlers select: [ :each | each isXTiddlerDictionary ]); - addAll: (self contentTiddlers select: [ :each | each isTextPlain ]); - addAll: (self contentTiddlers select: [ :each | each isMarkdown ]). + content + addAll: (self contentTiddlers + select: [ :each | each isTW5Type or: [ each isNilType ]]); + addAll: (self contentTiddlers select: [ :each | each isJavascript ]); + addAll: (self contentTiddlers select: [ :each | each isXTiddlerDictionary ]); + addAll: (self contentTiddlers select: [ :each | each isTextPlain ]); + addAll: (self contentTiddlers select: [ :each | each isMarkdown ]). + ^ content. +] + +{ #category : #accessing } +TiddlyWiki >> exportContentShadowAndLargeTiddlersSTONFiles [ + + self exportSTONFiles; exportLargeTiddlers +] + +{ #category : #accessing } +TiddlyWiki >> exportContentTiddlers [ + + | content | + content := self contentTiddlersWithoutLargeTiddlers. ^ content do: [ :each | each exportSTONFileInto: 'tiddlers' ]. ] @@ -152,12 +166,12 @@ TiddlyWiki >> exportSTONFiles [ 'No JSON Tiddlers file found. If you have one, please provide its location'. stonFile := FileLocator temp / 'tiddlers.ston' ] ifNotNil: [ - stonFile := self tiddlersJSONFile withoutExtension , 'ston' ]. + stonFile := self tiddlersJSONFile withoutExtension , 'ston' ]. shadowFile := self largeTiddlersFolder / '_shadow.ston'. wikiTemp := self copy. - wikiTemp tiddlers: self contentTiddlers. - wikiTemp := wikiTemp withoutImages. - wikiTemp := wikiTemp withoutPDFs. + wikiTemp tiddlers: self contentTiddlersWithoutLargeTiddlers. + "wikiTemp := wikiTemp withoutImages. + wikiTemp := wikiTemp withoutPDFs." GrafoscopioUtils exportAsSton: self shadow on: shadowFile. ^ GrafoscopioUtils exportAsSton: wikiTemp on: stonFile ]